Changeset 527c9ba5
- Timestamp:
- May 31, 2011 11:30:10 AM (10 years ago)
- Branches:
- master
- Children:
- 43ba271
- Parents:
- d4bf2523
- Location:
- core
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
core/c/jbigi/mbuild_jbigi.sh
rd4bf2523 r527c9ba5 24 24 LINKFLAGS="-dynamiclib -framework JavaVM" 25 25 LIBFILE="libjbigi.jnilib";; 26 SunOS*) 27 COMPILEFLAGS="-fPIC -Wall" 28 INCLUDES="-I. -I../../jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/solaris" 29 LINKFLAGS="-shared -Wl,-soname,libjbigi.so" 30 LIBFILE="libjbigi.so";; 31 26 32 *) 27 33 COMPILEFLAGS="-fPIC -Wall" -
core/c/jcpuid/build.sh
rd4bf2523 r527c9ba5 4 4 MINGW*) 5 5 echo "Building windows .dll's";; 6 SunOS*) 7 echo "Building solaris .so's";; 6 8 CYGWIN*) 7 9 echo "Building windows .dll's";; … … 32 34 LINKFLAGS="-shared -static -static-libgcc -Wl,--kill-at" 33 35 LIBFILE="lib/freenet/support/CPUInformation/jcpuid-x86-windows.dll";; 36 SunOS*) 37 COMPILEFLAGS="-Wall" 38 INCLUDES="-I. -Iinclude -I$JAVA_HOME/include/ -I$JAVA_HOME/include/solaris/" 39 LINKFLAGS="-shared -static -Wl,-soname,libjcpuid-x86-solaris.so" 40 LIBFILE="lib/freenet/support/CPUInformation/libjcpuid-x86-solaris.so";; 34 41 FreeBSD*) 35 42 COMPILEFLAGS="-Wall" -
core/java/src/freenet/support/CPUInformation/CPUID.java
rd4bf2523 r527c9ba5 53 53 private static final boolean isLinux = System.getProperty("os.name").toLowerCase().contains("linux"); 54 54 private static final boolean isFreebsd = System.getProperty("os.name").toLowerCase().contains("freebsd"); 55 private static final boolean isSunos = System.getProperty("os.name").toLowerCase().contains("sunos"); 55 56 56 57 /** … … 720 721 if(isFreebsd) 721 722 return "jcpuid-x86-freebsd"; // The convention on freebsd... 723 if(isSunos) 724 return "jcpuid-x86-solaris"; // The convention on SunOS 722 725 //throw new RuntimeException("Dont know jcpuid library name for os type '"+System.getProperty("os.name")+"'"); 723 726 // use linux as the default, don't throw exception … … 731 734 if(isFreebsd) 732 735 return "jcpuid-x86_64-freebsd"; 736 if(isSunos) 737 return "jcpuid-x86_64-solaris"; 733 738 // use linux as the default, don't throw exception 734 739 return "jcpuid-x86_64-linux";
Note: See TracChangeset
for help on using the changeset viewer.