Author: nextgens
Date: 2006-11-11 16:02:39 +0000 (Sat, 11 Nov 2006)
New Revision: 10883
Added:
trunk/contrib/fec/lib/win32-x32/
Removed:
trunk/contrib/fec/lib/win32/
Modified:
trunk/contrib/fec/common/src/com/onionnetworks/util/NativeDeployer.java
trunk/contrib/fec/lib/native.properties
Log:
Contrib: FEC: rename some win32 things to win32-x32 to please toad :p
I need to check out what System.getProperty(os.name); gives on win64 anyway
Modified:
trunk/contrib/fec/common/src/com/onionnetworks/util/NativeDeployer.java
===================================================================
--- trunk/contrib/fec/common/src/com/onionnetworks/util/NativeDeployer.java
2006-11-11 13:31:50 UTC (rev 10882)
+++ trunk/contrib/fec/common/src/com/onionnetworks/util/NativeDeployer.java
2006-11-11 16:02:39 UTC (rev 10883)
@@ -51,7 +51,7 @@
public final static String OS_ARCH;
static {
if(System.getProperty("os.name").startsWith("Windows "))
- OS_ARCH="win32";
+ OS_ARCH="win32-x32";
else{
if(System.getProperty("os.arch").toLowerCase().matches("(i?[x0-9]86_64|amd64)"))
OS_ARCH=System.getProperty("os.name").toLowerCase()+"-x86_64";
Modified: trunk/contrib/fec/lib/native.properties
===================================================================
--- trunk/contrib/fec/lib/native.properties 2006-11-11 13:31:50 UTC (rev
10882)
+++ trunk/contrib/fec/lib/native.properties 2006-11-11 16:02:39 UTC (rev
10883)
@@ -1,4 +1,4 @@
-com.onionnetworks.native.keys=fec8-linux-x86,fec16-linux-x86,fec8-linux-x86_64,fec16-linux-x86_64,fec8-win32,fec16-win32
+com.onionnetworks.native.keys=fec8-linux-x86,fec16-linux-x86,fec8-linux-x86_64,fec16-linux-x86_64,fec8-win32-x86,fec16-win32-x32
com.onionnetworks.native.fec8-linux-x86.name=fec8
com.onionnetworks.native.fec8-linux-x86.osarch=linux-x86
@@ -17,9 +17,9 @@
com.onionnetworks.native.fec16-linux-x86_64.path=lib/linux/x86_64/libfec16.so
com.onionnetworks.native.fec8-win32.name=fec8
-com.onionnetworks.native.fec8-win32.osarch=win32
-com.onionnetworks.native.fec8-win32.path=lib/win32/fec8.dll
+com.onionnetworks.native.fec8-win32.osarch=win32-x32
+com.onionnetworks.native.fec8-win32.path=lib/win32-x32/fec8.dll
com.onionnetworks.native.fec16-win32.name=fec16
-com.onionnetworks.native.fec16-win32.osarch=win32
-com.onionnetworks.native.fec16-win32.path=lib/win32/fec16.dll
+com.onionnetworks.native.fec16-win32.osarch=win32-x32
+com.onionnetworks.native.fec16-win32.path=lib/win32-x32/fec16.dll
Copied: trunk/contrib/fec/lib/win32-x32 (from rev 10882,
trunk/contrib/fec/lib/win32)
