miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes to compile with crystaX NDK r5 beta3

Browse Source
This commit is contained in:
pelya
2011-04-28 15:47:29 +03:00
parent 0742977a5e
commit 5caee5cdfe
6 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
project/jni/Android.mk
View File

@@ -25,5 +25,11 @@ ifneq ($(findstring r5b,$(NDK_VERSION))$(findstring r5-crystax,$(NDK_VERSION)),)
$(info Building with NDK r5b - internal STLPort disabled)
NDK_R5_TOOLCHAIN := 1
endif
ifneq ($(findstring r5-crystax-1.beta3,$(NDK_VERSION)),)
$(info Building with CrystaX r5 beta3 toolchain - internal STLPort disabled, wchar support enabled)
CRYSTAX_R5B3_TOOLCHAIN := 1
endif
NDK_PATH := $(shell dirname $(shell which ndk-build))
include $(call all-subdir-makefiles)

3
project/jni/application/Android.mk
View File

@@ -25,6 +25,9 @@ LOCAL_C_INCLUDES :=
ifeq ($(CRYSTAX_TOOLCHAIN)$(NDK_R5_TOOLCHAIN),)
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../stlport/stlport
endif
ifneq ($(CRYSTAX_R5B3_TOOLCHAIN),)
LOCAL_C_INCLUDES += $(NDK_PATH)/sources/wchar-support/include
endif
LOCAL_C_INCLUDES += $(foreach D, $(APP_SUBDIRS), $(LOCAL_PATH)/$(D)) \
$(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include \

2
project/jni/application/NewRAW

Submodule project/jni/application/NewRAW updated: c26a6b7d49...cee0514149

2
project/jni/application/commandergenius

Submodule project/jni/application/commandergenius updated: 448aa2a71d...72d8bf8969

6
project/jni/application/fheroes2/AndroidAppSettings.cfg
View File

@@ -23,11 +23,11 @@ AppTouchscreenKeyboardKeysAmount=0
AppTouchscreenKeyboardKeysAmountAutoFire=0
RedefinedKeysScreenKb="LCTRL M T H E C SPACE C S L"
MultiABI=n
AppVersionCode=231412
AppVersionName="2314.12"
AppVersionCode=234913
AppVersionName="2349.13"
CompiledLibraries="sdl_net sdl_mixer sdl_image sdl_ttf png intl"
CustomBuildScript=n
AppCflags='-finline-functions -O2 -DWITH_ZLIB -DWITH_MIXER -DWITH_XML -DWITH_IMAGE -DWITH_TTF -DWITH_AI=simple'
AppCflags='-finline-functions -O2 -DWITH_ZLIB -DWITH_MIXER -DWITH_XML -DWITH_IMAGE -DWITH_TTF -DWITH_AI=simple -DWITH_NET'
AppLdflags=''
AppSubdirsBuild='fheroes2/src/engine/* fheroes2/src/xmlccwrap/* fheroes2/src/fheroes2/ai fheroes2/src/fheroes2/ai/simple fheroes2/src/fheroes2/agg fheroes2/src/fheroes2/algorithm fheroes2/src/fheroes2/army fheroes2/src/fheroes2/battle2 fheroes2/src/fheroes2/castle fheroes2/src/fheroes2/dialog fheroes2/src/fheroes2/editor fheroes2/src/fheroes2/game fheroes2/src/fheroes2/gui fheroes2/src/fheroes2/heroes fheroes2/src/fheroes2/image fheroes2/src/fheroes2/kingdom fheroes2/src/fheroes2/maps fheroes2/src/fheroes2/monster fheroes2/src/fheroes2/network fheroes2/src/fheroes2/objects fheroes2/src/fheroes2/pocketpc fheroes2/src/fheroes2/resource fheroes2/src/fheroes2/spell fheroes2/src/fheroes2/system fheroes2/src/fheroes2/test'
AppCmdline='fheroes2 -d 500'

5
project/jni/sdl_fake_stdout/Android.mk
View File

@@ -18,4 +18,9 @@ LOCAL_SRC_FILES := SDL_fake_stdout.cpp
LOCAL_SHARED_LIBRARIES :=
LOCAL_LDLIBS := -llog
ifneq ($(CRYSTAX_R5B3_TOOLCHAIN),)
LOCAL_C_INCLUDES += $(NDK_PATH)/sources/wchar-support/include
LOCAL_LDFLAGS += sources/wchar-support/libs/armeabi/libwchar_static.a
endif
include $(BUILD_STATIC_LIBRARY)