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

Updated OpenArena

Browse Source
This commit is contained in:
pelya
2013-01-04 19:23:46 +02:00
parent e02236cd1f
commit d9ebc13514
4 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,10 +37,10 @@ HiddenMenuOptions='OptionalDownloadConfig DisplaySizeConfig'
FirstStartMenuOptions='' FirstStartMenuOptions=''
MultiABI=y MultiABI=y
AppMinimumRAM=300 AppMinimumRAM=300
AppVersionCode=08816 AppVersionCode=08817
AppVersionName="0.8.8.16" AppVersionName="0.8.8.17"
ResetSdlConfigForThisVersion=y ResetSdlConfigForThisVersion=y
DeleteFilesOnUpgrade="libsdl-DownloadFinished-10.flag" DeleteFilesOnUpgrade="libsdl-DownloadFinished-10.flag .openarena/baseoa/q3config.cfg"
CompiledLibraries="sdl_mixer sdl_image freetype curl vorbis ogg" CompiledLibraries="sdl_mixer sdl_image freetype curl vorbis ogg"
CustomBuildScript=y CustomBuildScript=y
AppCflags='-O2 -finline-functions' AppCflags='-O2 -finline-functions'

2
project/jni/application/openarena/engine

Submodule project/jni/application/openarena/engine updated: 04beb872b9...82513e8861

2
project/jni/application/openarena/vm

Submodule project/jni/application/openarena/vm updated: d0ca7339f0...5c6363076d

10
project/jni/application/vcmi/Makefile
View File

@@ -24,7 +24,10 @@ OBJS_GENIUSAI=$(patsubst %.cpp, out/%.o, $(SOURCES_GENIUSAI))
SOURCES_ERM=$(wildcard vcmi/Scripting/ERM/*.cpp) SOURCES_ERM=$(wildcard vcmi/Scripting/ERM/*.cpp)
OBJS_ERM=$(patsubst %.cpp, out/%.o, $(SOURCES_ERM)) OBJS_ERM=$(patsubst %.cpp, out/%.o, $(SOURCES_ERM))
all: AndroidData/binaries.zip SOURCES_CLIENT=$(wildcard vcmi/client/*.cpp vcmi/CCallback.cpp)
OBJS_CLIENT=$(patsubst %.cpp, out/%.o, $(SOURCES_CLIENT))
all: AndroidData/binaries.zip libapplication.so
AndroidData/binaries.zip: vcmiserver AI/libGeniusAI.so AI/libStupidAI.so Scripting/libvcmiERM.so AndroidData/binaries.zip: vcmiserver AI/libGeniusAI.so AI/libStupidAI.so Scripting/libvcmiERM.so
rm -f $@ rm -f $@
@@ -75,6 +78,11 @@ Scripting/libvcmiERM.so: $(OBJS_ERM) -lvcmi
libvcmi.so: $(OBJS_LIB) libvcmi.so: $(OBJS_LIB)
$(LINK_LIB) $(LINK_LIB)
libapplication.so: $(OBJS_CLIENT) libvcmi.so
env BUILD_EXECUTABLE=1 ../setEnvironment.sh sh -c \
"$(GCC_PREFIX)-g++ $^ -o $@ \
\$$LDFLAGS -L. -lvcmi -lboost_filesystem -lboost_iostreams -lboost_system -lboost_thread"
clean: clean:
rm -rf out debug *.so vcmiserver* AndroidData/vcmiserver* libapplication.so AI Scripting rm -rf out debug *.so vcmiserver* AndroidData/vcmiserver* libapplication.so AI Scripting