utilities: nexutil now compiles on the raspberry pi again. i therefor…

…e merged some parts of the pull request #34.
seemoo-lab · Feb 9, 2017 · 81a347b · 81a347b
1 parent 222a74b
commit 81a347b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/utilities/libnexio/Makefile b/utilities/libnexio/Makefile
@@ -1,5 +1,15 @@
+GIT_VERSION := $(shell git describe --abbrev=4 --dirty --always --tags)
+
+all: libs/armeabi/libnexio.a
+
+ifneq ($(shell uname -m),armv7l)
 libs/armeabi/libnexio.a: Android.mk
 	$(NDK_ROOT)/ndk-build NDK_APPLICATION_MK=`pwd`/Application.mk NDK_APP_OUT=. TARGET_PLATFORM=android-21
+else
+libs/armeabi/libnexio.a: libnexio.c
+	gcc -c libnexio.c -o libnexio.o -DBUILD_ON_RPI -DVERSION=\"$GIT_VERSION\" -I../../patches/include
+	ar rcs libnexio.a libnexio.o
+endif
 
 clean:
 	rm -Rf libs

diff --git a/utilities/nexutil/Makefile b/utilities/nexutil/Makefile
@@ -8,7 +8,7 @@ libs/armeabi/nexutil: Android.mk nexutil.c ../libargp/local/armeabi/libargp.a ..
 	$(NDK_ROOT)/ndk-build NDK_APPLICATION_MK=`pwd`/Application.mk NDK_APP_OUT=. TARGET_PLATFORM=android-21 GIT_VERSION=$(GIT_VERSION)
 else
 libs/armeabi/nexutil: nexutil.c FORCE
-	gcc -o nexutil nexutil.c -DBUILD_ON_RPI -DVERSION=\"$GIT_VERSION\" -I../../patches/include
+	gcc -static -o nexutil nexutil.c -DBUILD_ON_RPI -DVERSION=\"$GIT_VERSION\" -I. -I../../patches/include -I../libnexio -L../libnexio/ -lnexio -I../libargp
 endif
 
 ../libargp/local/armeabi/libargp.a: FORCE
@@ -33,4 +33,4 @@ clean:
 	rm -Rf local
 
 FORCE:
-
+
diff --git a/utilities/nexutil/wlcnt.h b/utilities/nexutil/wlcnt.h
@@ -32,8 +32,8 @@
  *                                                                         *
  **************************************************************************/
 
-typedef uint32_t uint32;
-typedef uint16_t uint16;
+typedef unsigned int uint32;
+typedef unsigned short uint16;
 
 // source of wl_cnt_t: http://svn.dd-wrt.com/browser/src/linux/universal/linux-3.10/brcm/arm/include/wlioctl.h?rev=23022