Kaynağa Gözat

Linux compatibility...

Thomas Buck 12 yıl önce
ebeveyn
işleme
80971edf9f

BIN
CubeControl/CubeControlMac.jar Dosyayı Görüntüle


+ 10
- 4
CubeControl/libSerial/makefile Dosyayı Görüntüle

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

+ 1
- 1
CubeControl/makefile Dosyayı Görüntüle

@@ -17,7 +17,7 @@ HEADERPATH = /System/Library/Frameworks/JavaVM.framework/Headers
17 17
 else
18 18
 INJAR += libSerial.so
19 19
 PLATFORM = Linux
20
-HEADERPATH = /usr/java-1.6/include
20
+HEADERPATH = /usr/lib/jvm/java-6-openjdk/include
21 21
 endif
22 22
 endif
23 23
 

Loading…
İptal
Kaydet