Browse files

Fixes to build system and to debug builds

  • Loading branch information...
1 parent 18b9646 commit 3170168b38050f97258dbada0716c1121a23dda5 @pelya committed Nov 28, 2013
Showing with 7 additions and 1 deletion.
  1. +3 −0 build.sh
  2. +2 −1 project/jni/application/Android.mk
  3. +2 −0 project/jni/sdl-1.2/Android.mk
View
3 build.sh
@@ -30,6 +30,7 @@ fi
if [ "$#" -gt 0 -a "$1" = "debug" ]; then
shift
build_release=false
+ export NDK_DEBUG=1
fi
if [ "$#" -gt 0 -a "$1" = "-h" ]; then
@@ -59,6 +60,8 @@ if ( grep "package $AppFullName;" project/src/Globals.java > /dev/null 2>&1 && \
fi
if $build_release ; then
sed -i 's/android:debuggable="true"/android:debuggable="false"/g' project/AndroidManifest.xml
+else
+ sed -i 's/android:debuggable="false"/android:debuggable="true"/g' project/AndroidManifest.xml
fi
MYARCH=linux-x86
View
3 project/jni/application/Android.mk
@@ -73,7 +73,8 @@ ifneq ($(APPLICATION_CUSTOM_BUILD_SCRIPT),)
.PHONY: OVERRIDE_CUSTOM_LIB
OVERRIDE_CUSTOM_LIB:
# Prevent ./AndroidBuild.sh to be invoked in parallel for different architectures, it may do things like downloading files which work poorly when launched in parallel
-.NOTPARALLEL: $(LOCAL_PATH)/src/libapplication-armeabi.so $(LOCAL_PATH)/src/libapplication-armeabi-v7a.so $(LOCAL_PATH)/src/libapplication-mips.so $(LOCAL_PATH)/src/libapplication-x86.so
+# For some reason it prevents other sources from building in parallel, so disabled it
+#.NOTPARALLEL: $(LOCAL_PATH)/src/libapplication-armeabi.so $(LOCAL_PATH)/src/libapplication-armeabi-v7a.so $(LOCAL_PATH)/src/libapplication-mips.so $(LOCAL_PATH)/src/libapplication-x86.so
LOCAL_PATH_SDL_APPLICATION := $(LOCAL_PATH)
View
2 project/jni/sdl-1.2/Android.mk
@@ -56,6 +56,8 @@ LOCAL_CPP_EXTENSION := .cpp
# Note this "simple" makefile var substitution, you can find even more complex examples in different Android projects
LOCAL_SRC_FILES := $(foreach F, $(SDL_SRCS), $(addprefix $(dir $(F)),$(notdir $(wildcard $(LOCAL_PATH)/$(F)))))
+LOCAL_SHARED_LIBRARIES := sdl_native_helpers # Not really a dependency, needed for CustomBuildScript
+
LOCAL_LDLIBS := -lGLESv1_CM -ldl -llog
include $(BUILD_SHARED_LIBRARY)

0 comments on commit 3170168

Please sign in to comment.