Merge branch 'master' of [email protected]:NeuronRobotics/nrjavaserial.git

into java11 Conflicts: src/main/c/resources/native/windows/x86_32/libNRJavaSerial.dll src/main/c/resources/native/windows/x86_64/libNRJavaSerial.dll src/main/resources/com/neuronrobotics/nrjavaserial/build.properties
NeuronRobotics · Apr 8, 2020 · 4a1444d · 4a1444d
2 parents 247ae28 + c682753
commit 4a1444d
Show file tree

Hide file tree

Showing 15 changed files with 13 additions and 13 deletions.
diff --git a/Makefile b/Makefile
@@ -12,7 +12,7 @@ linux:
 	make -C src/main/c linux
 	./gradlew build
 linux32:
-	sudo apt-get install  liblockfile-dev libc6-dev-i386
+	sudo apt-get install  liblockfile-dev libc6-dev-i386 linux-libc-dev
 	make -C src/main/c linux32
 	./gradlew build
 linux64:

diff --git a/src/main/c/Makefile b/src/main/c/Makefile
@@ -19,12 +19,12 @@ LINKOSX=cc $(OSXARCH) -dynamiclib -framework JavaVM -framework IOKit -framework
 
 
 LINOBJ=build/fixup.o build/fuserImp.o build/SerialImp.o
-LININCLUDE=    -I"./include" -I"./include/target" -I$(JDKLOCATION)/include -I$(JDKLOCATION)/include/linux
+LININCLUDE=    -I./include -I./include/target -I$(JDKLOCATION)/include -I$(JDKLOCATION)/include/linux
 
-CCLIN32=gcc $(LININCLUDE)  -O3 -Wall -c -fmessage-length=0 -fPIC -m32 -MMD
-LINKLIN32=g++ -m32 -shared -Lcross-compile-libs/x86_32
+CCLIN32=gcc $(LININCLUDE) -I./include/ubuntu-multilib-fix  -O3 -Wall -fmessage-length=0 -fPIC -m32 -MMD
+LINKLIN32=gcc -m32 -shared 
 
-CCLIN64=gcc $(LININCLUDE)  -O3 -Wall -c -fmessage-length=0 -fPIC -m64 -MMD
+CCLIN64=gcc $(LININCLUDE)  -O3 -Wall -fmessage-length=0 -fPIC -m64 -MMD
 LINKLIN64=g++ -m64 -shared
 
 CCLINARM32=arm-linux-gnueabi-gcc $(LININCLUDE)  -O3 -Wall -c -fmessage-length=0 -fPIC -MMD -MP
@@ -144,19 +144,19 @@ windows32:dirs
 	$(LINKWIN32) -o"resources/native/windows/x86_32/libNRJavaSerial.dll" build/SerialImp.o build/fuserImp.o build/fixup.o build/termios.o build/init.o
 
 	rm build/*
-linux:linux32 linux64 arm ppc
+linux:linux32 linux64 arm 
 	echo all Linux ok!
 linux32:dirs
-	$(CCLIN32) -m32 src/fixup.c -o build/fixup.o
-	$(CCLIN32) -m32  src/fuserImp.c -o build/fuserImp.o
-	$(CCLIN32) -m32  src/SerialImp.c -o build/SerialImp.o
+	$(CCLIN32) -c  src/fixup.c -o build/fixup.o
+	$(CCLIN32) -c  src/fuserImp.c -o build/fuserImp.o
+	$(CCLIN32) -c src/SerialImp.c -o build/SerialImp.o
 	#rm "resources/native/linux/x86_32/libNRJavaSerial.so"
 	$(LINKLIN32) -o"resources/native/linux/x86_32/libNRJavaSerial.so" $(LINOBJ) 
 	rm build/*
 linux64:dirs
-	$(CCLIN64) src/fixup.c -o build/fixup.o
-	$(CCLIN64) src/fuserImp.c -o build/fuserImp.o
-	$(CCLIN64) src/SerialImp.c -o build/SerialImp.o
+	$(CCLIN64)  -c src/fixup.c -o build/fixup.o
+	$(CCLIN64)  -c src/fuserImp.c -o build/fuserImp.o
+	$(CCLIN64)  -c src/SerialImp.c -o build/SerialImp.o
 	#rm "resources/native/linux/x86_64/libNRJavaSerial.so"
 	$(LINKLIN64) -o"resources/native/linux/x86_64/libNRJavaSerial.so" $(LINOBJ) 
 	rm build/*

diff --git a/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv5.so b/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv5.so
diff --git a/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv6.so b/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv6.so
diff --git a/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv6_HF.so b/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv6_HF.so
diff --git a/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv7.so b/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv7.so
diff --git a/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv7_HF.so b/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv7_HF.so
diff --git a/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv8.so b/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv8.so
diff --git a/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv8_HF.so b/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv8_HF.so
diff --git a/src/main/c/resources/native/linux/ARM_64/libNRJavaSerialv8.so b/src/main/c/resources/native/linux/ARM_64/libNRJavaSerialv8.so
diff --git a/src/main/c/resources/native/linux/x86_32/libNRJavaSerial.so b/src/main/c/resources/native/linux/x86_32/libNRJavaSerial.so
diff --git a/src/main/c/resources/native/linux/x86_64/libNRJavaSerial.so b/src/main/c/resources/native/linux/x86_64/libNRJavaSerial.so
diff --git a/src/main/c/resources/native/windows/x86_32/libNRJavaSerial.dll b/src/main/c/resources/native/windows/x86_32/libNRJavaSerial.dll
diff --git a/src/main/c/resources/native/windows/x86_64/libNRJavaSerial.dll b/src/main/c/resources/native/windows/x86_64/libNRJavaSerial.dll
diff --git a/src/main/resources/com/neuronrobotics/nrjavaserial/build.properties b/src/main/resources/com/neuronrobotics/nrjavaserial/build.properties
@@ -1,2 +1,2 @@
 app.name = nrjavaserial
-app.version = 4.0.2
+app.version = 4.1.0