Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Multiple extensions for C++ files can be used now, this requires NDK …

…r7 or newer
  • Loading branch information...
commit e2ef381b4c9a3fcd897fc2f7a38007304f8de6dd 1 parent 299fac3
@pelya authored
View
4 project/jni/application/Android.mk
@@ -30,7 +30,7 @@ LOCAL_C_INCLUDES += $(foreach D, $(APP_SUBDIRS), $(LOCAL_PATH)/$(D)) \
LOCAL_CFLAGS += $(APPLICATION_ADDITIONAL_CFLAGS)
-#Change C++ file extension as appropriate
+# Change C++ file extension as appropriate
LOCAL_CPP_EXTENSION := .cpp
ifneq ($(APPLICATION_CUSTOM_BUILD_SCRIPT),)
@@ -52,6 +52,8 @@ LOCAL_LDFLAGS += $(APPLICATION_ADDITIONAL_LDFLAGS)
ifneq ($(NDK_R7_TOOLCHAIN)$(CRYSTAX_R7_TOOLCHAIN),) # NDK r7 broke it even more
LOCAL_C_INCLUDES += $(NDK_PATH)/sources/cxx-stl/gnu-libstdc++/include
LOCAL_LDLIBS += -L$(NDK_PATH)/sources/cxx-stl/gnu-libstdc++/libs/$(TARGET_ARCH_ABI) -lgnustl_static
+# You can have multiple C++ file extensions starting from NDK r7
+LOCAL_CPP_EXTENSION := .cpp .cxx .cc
else
ifneq ($(NDK_R6_TOOLCHAIN),) # NDK r6 broke it
LOCAL_C_INCLUDES += $(NDK_PATH)/sources/cxx-stl/gnu-libstdc++/include
View
2  project/jni/application/teeworlds/cleanConfig.sh
@@ -1,2 +0,0 @@
-#!/bin/sh
-adb shell rm -r /data/data/com.teeworlds/files/.teeworlds
Please sign in to comment.
Something went wrong with that request. Please try again.