diff --git a/project/jni/Android.mk b/project/jni/Android.mk index 8a617074b..d00ecb421 100644 --- a/project/jni/Android.mk +++ b/project/jni/Android.mk @@ -25,7 +25,7 @@ SDL_VIDEO_RENDER_RESIZE := 1 SDL_VIDEO_RENDER_RESIZE_KEEP_ASPECT := 0 -COMPILED_LIBRARIES := sdl_image tremor +COMPILED_LIBRARIES := sdl_image tremor ogg APPLICATION_ADDITIONAL_CFLAGS := -O2 -finline-functions -DTHREADLIB_SDL=1 -DTIMELIB=SDL -DOVCODEC_TREMOR=1 -DNETPLAY=1 -DHAVE_REGEX=1 -DHAVE_GETOPT_LONG=1 -DHAVE_ZIP=1 diff --git a/project/jni/Application.mk b/project/jni/Application.mk index ba6d21263..424b07fe6 100644 --- a/project/jni/Application.mk +++ b/project/jni/Application.mk @@ -2,7 +2,7 @@ APP_PROJECT_PATH := $(call my-dir)/.. # Available libraries: mad (GPL-ed!) sdl_mixer sdl_image sdl_ttf sdl_net sdl_blitpool sdl_gfx intl xml2 lua jpeg png ogg flac tremor vorbis freetype xerces -APP_MODULES := application sdl-1.2 sdl_main stlport jpeg png ogg flac vorbis freetype sdl_image tremor +APP_MODULES := application sdl-1.2 sdl_main stlport jpeg png ogg flac vorbis freetype sdl_image tremor ogg # To filter out static libs from all libs in makefile APP_AVAILABLE_STATIC_LIBS := jpeg png tremor freetype xerces ogg tremor vorbis flac diff --git a/project/jni/application/sc2/AndroidAppSettings.cfg b/project/jni/application/sc2/AndroidAppSettings.cfg index 497e14a3e..5f60dd01a 100644 --- a/project/jni/application/sc2/AndroidAppSettings.cfg +++ b/project/jni/application/sc2/AndroidAppSettings.cfg @@ -21,7 +21,7 @@ AppTouchscreenKeyboardKeysAmountAutoFire=0 MultiABI=n AppVersionCode=1013 AppVersionName="1.0.13" -CompiledLibraries="sdl_image tremor" +CompiledLibraries="sdl_image tremor ogg" CustomBuildScript=n AppCflags='-O2 -finline-functions -DTHREADLIB_SDL=1 -DTIMELIB=SDL -DOVCODEC_TREMOR=1 -DNETPLAY=1 -DHAVE_REGEX=1 -DHAVE_GETOPT_LONG=1 -DHAVE_ZIP=1' AppLdflags='' diff --git a/project/jni/tremor/Android.mk b/project/jni/tremor/Android.mk index 8b1aa45cc..b4251226b 100644 --- a/project/jni/tremor/Android.mk +++ b/project/jni/tremor/Android.mk @@ -4,7 +4,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := tremor -LOCAL_CFLAGS := -I$(LOCAL_PATH) -DHAVE_ALLOCA_H -I$(LOCAL_PATH)/../ogg/include/ogg -I$(LOCAL_PATH)/../ogg/include -I$(LOCAL_PATH)/include +LOCAL_CFLAGS := -I$(LOCAL_PATH) -DHAVE_ALLOCA_H -I$(LOCAL_PATH)/../ogg/include/ogg -I$(LOCAL_PATH)/../ogg/include -I$(LOCAL_PATH)/include/tremor LOCAL_CPP_EXTENSION := .cpp