diff --git a/Android/jni/Android.mk b/Android/jni/Android.mk index 24006fd..7d418d1 100644 --- a/Android/jni/Android.mk +++ b/Android/jni/Android.mk @@ -3,16 +3,17 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := NativePath -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../../NativePath +LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../NativePath $(LOCAL_PATH)/../../source LOCAL_CFLAGS := $(LOCAL_C_INCLUDES:%=-I%) -O3 -DANDROID_NDK -Wall LOCAL_SRC_FILES := \ - ../../NativePath/NativeMath.c \ - ../../NativePath/NativeMemory.c \ - ../../NativePath/lol_trig.cpp \ - ../../NativePath/NativeTime.cpp \ - ../../NativePath/NativeDynamicLinking.c + ../../source/NativeMath.c \ + ../../source/NativeMemory.c \ + ../../source/lol_trig.cpp \ + ../../source/NativeTime.cpp \ + ../../source/NativeDynamicLinking.c \ + ../../source/stdio.c \ + ../../source/stdlib.c include $(BUILD_STATIC_LIBRARY) \ No newline at end of file diff --git a/buildLinux.sh b/buildLinux.sh index 069f49e..a4f0c22 100755 --- a/buildLinux.sh +++ b/buildLinux.sh @@ -3,13 +3,13 @@ mkdir -p build/Linux/x86 mkdir -p build/Linux/x86_64 -sources="NativePath/NativeMath.c NativePath/NativeMemory.c NativePath/lol_trig.cpp NativePath/NativeTime.cpp NativePath/NativeDynamicLinking.c" +sources="source/NativeMath.c source/NativeMemory.c source/lol_trig.cpp source/NativeTime.cpp source/NativeDynamicLinking.c source/stdio.c source/stdlib.c" if [ "$CC" = "" ]; then CC=clang-3.6 fi -CFLAGS="-Wall -Wno-unused-const-variable -Wno-unused-function" +CFLAGS="-Wall -Wno-unused-const-variable -Wno-unused-function -Isource" #Linux 64 $CC -fPIC -m64 $CFLAGS -c $sources