Browse Source

Linux compatibility...

Thomas Buck 12 years ago
parent
commit
80971edf9f
3 changed files with 11 additions and 5 deletions
  1. BIN
      CubeControl/CubeControlMac.jar
  2. 10
    4
      CubeControl/libSerial/makefile
  3. 1
    1
      CubeControl/makefile

BIN
CubeControl/CubeControlMac.jar View File


+ 10
- 4
CubeControl/libSerial/makefile View File

3
 ifdef SystemRoot
3
 ifdef SystemRoot
4
 HEADERPATH = C:/Program\ Files/Java/jdk1.6.0_29/include
4
 HEADERPATH = C:/Program\ Files/Java/jdk1.6.0_29/include
5
 RM = del
5
 RM = del
6
-PLATFORM = Win
7
 else
6
 else
8
-HEADERPATH = /System/Library/Frameworks/JavaVM.framework/Headers
9
 RM = rm -f
7
 RM = rm -f
10
-PLATFORM = Mac
8
+UNAME := $(shell uname -s)
9
+ifeq ($(UNAME),Darwin)
10
+HEADERPATH = /System/Library/Frameworks/JavaVM.framework/Headers
11
+else 
12
+HEADERPATH = /usr/lib/jvm/java-6-openjdk/include
13
+endif
11
 endif
14
 endif
12
 
15
 
13
 # --------------------------------------
16
 # --------------------------------------
27
 ifdef SystemRoot
30
 ifdef SystemRoot
28
 libSerial: Serial.dll
31
 libSerial: Serial.dll
29
 else
32
 else
30
-UNAME := $(shell uname -s)
31
 ifeq ($(UNAME),Darwin)
33
 ifeq ($(UNAME),Darwin)
32
 libSerial: libSerial.jnilib
34
 libSerial: libSerial.jnilib
33
 else
35
 else
55
 ifdef SystemRoot
57
 ifdef SystemRoot
56
 	$(RM) *.dll
58
 	$(RM) *.dll
57
 else
59
 else
60
+ifeq ($(UNAME),Darwin)
58
 	$(RM) *.jnilib
61
 	$(RM) *.jnilib
62
+else
63
+	$(RM) *.so
64
+endif
59
 endif
65
 endif

+ 1
- 1
CubeControl/makefile View File

17
 else
17
 else
18
 INJAR += libSerial.so
18
 INJAR += libSerial.so
19
 PLATFORM = Linux
19
 PLATFORM = Linux
20
-HEADERPATH = /usr/java-1.6/include
20
+HEADERPATH = /usr/lib/jvm/java-6-openjdk/include
21
 endif
21
 endif
22
 endif
22
 endif
23
 
23
 

Loading…
Cancel
Save