Enabled more aggressive optimizations for all apps and libs

This commit is contained in:
pelya
2010-11-02 12:35:21 +02:00
parent 5c8e55a843
commit 9e2d61c75b
25 changed files with 28 additions and 24 deletions

View File

@@ -276,6 +276,10 @@ class DataDownloader extends Thread
{
try {
stream = new CountingInputStream(Parent.getAssets().open(url));
while( stream.skip(65536) > 0 ) { };
totalLen = stream.getBytesRead();
stream.close();
stream = new CountingInputStream(Parent.getAssets().open(url));
} catch( IOException e ) {
Status.setText( res.getString(R.string.error_dl_from, url) );
return false;

View File

@@ -23,7 +23,7 @@ AppVersionCode=110013
AppVersionName="1.1.0.13 - fixed crashes for some devices"
CompiledLibraries="sdl_mixer sdl_image"
CustomBuildScript=n
AppCflags='-finline-functions -O2'
AppCflags='-O3'
AppLdflags=''
AppSubdirsBuild=''
AppUseCrystaXToolchain=n

View File

@@ -23,7 +23,7 @@ AppVersionCode=1
AppVersionName="0.1"
CompiledLibraries="sdl_mixer sdl_image sdl_ttf intl lua png xerces"
CustomBuildScript=n
AppCflags='-finline-functions -O2'
AppCflags='-Os'
AppLdflags=''
AppSubdirsBuild=''
AppUseCrystaXToolchain=y

View File

@@ -23,7 +23,7 @@ AppVersionCode=2116
AppVersionName="2.1.16 - fixed crashes for some devices"
CompiledLibraries="sdl_net"
CustomBuildScript=n
AppCflags='-finline-functions -O2'
AppCflags='-O3'
AppLdflags=''
AppSubdirsBuild=''
AppUseCrystaXToolchain=n

View File

@@ -23,7 +23,7 @@ AppVersionCode=06916
AppVersionName="0.6.9.16 - fixed crashes for some devices"
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 -DHAVE_JOYSTICK=1 -DDIRECTIONAL_JOYSTICK_MELEE=1'
AppCflags='-O3 -DTHREADLIB_SDL=1 -DTIMELIB=SDL -DOVCODEC_TREMOR=1 -DNETPLAY=1 -DHAVE_REGEX=1 -DHAVE_GETOPT_LONG=1 -DHAVE_ZIP=1 -DHAVE_JOYSTICK=1 -DDIRECTIONAL_JOYSTICK_MELEE=1'
AppLdflags=''
AppSubdirsBuild=''
AppUseCrystaXToolchain=n

View File

@@ -23,7 +23,7 @@ AppVersionCode=5203
AppVersionName="0.5.2.03 - fixed crashes for some devices"
CompiledLibraries="sdl_image freetype"
CustomBuildScript=n
AppCflags='-O2'
AppCflags='-O3'
AppLdflags=''
AppSubdirsBuild=''
AppUseCrystaXToolchain=n

View File

@@ -4,7 +4,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := flac
LOCAL_CFLAGS := -I$(LOCAL_PATH)/include -I$(LOCAL_PATH)/src/include -I$(LOCAL_PATH) -DHAVE_CONFIG_H -DFLAC__LPC_UNROLLED_FILTER_LOOPS -I$(LOCAL_PATH)/../ogg/include
LOCAL_CFLAGS := -O3 -I$(LOCAL_PATH)/include -I$(LOCAL_PATH)/src/include -I$(LOCAL_PATH) -DHAVE_CONFIG_H -DFLAC__LPC_UNROLLED_FILTER_LOOPS -I$(LOCAL_PATH)/../ogg/include
ifeq "$(TARGET_ARCH_ABI)" "armeabi"
LOCAL_CFLAGS += -DFLAC__INTEGER_ONLY_LIBRARY

View File

@@ -6,7 +6,7 @@ LOCAL_MODULE := freetype
APP_SUBDIRS := $(patsubst $(LOCAL_PATH)/%, %, $(shell find $(LOCAL_PATH)/src -type d))
LOCAL_CFLAGS := $(foreach D, $(APP_SUBDIRS), -I$(LOCAL_PATH)/$(D)) \
LOCAL_CFLAGS := -Os $(foreach D, $(APP_SUBDIRS), -I$(LOCAL_PATH)/$(D)) \
-I$(LOCAL_PATH)/include -DFT2_BUILD_LIBRARY

View File

@@ -8,7 +8,7 @@ APP_SUBDIRS := src
# Add more subdirs here, like src/subdir1 src/subdir2
LOCAL_CFLAGS := -I$(LOCAL_PATH)/src -I$(LOCAL_PATH)/include -DBUILDING_LIBINTL -DBUILDING_DLL \
LOCAL_CFLAGS := -Os -I$(LOCAL_PATH)/src -I$(LOCAL_PATH)/include -DBUILDING_LIBINTL -DBUILDING_DLL \
-DIN_LIBINTL -DENABLE_RELOCATABLE=1 -DIN_LIBRARY \
-Dset_relocation_prefix=libintl_set_relocation_prefix \
-Drelocate=libintl_relocate -DDEPENDS_ON_LIBICONV=1 \

View File

@@ -4,7 +4,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := lua
LOCAL_CFLAGS := -I$(LOCAL_PATH)/src -I$(LOCAL_PATH)/include
LOCAL_CFLAGS := -O3 -I$(LOCAL_PATH)/src -I$(LOCAL_PATH)/include
LOCAL_CPP_EXTENSION := .cpp

View File

@@ -4,7 +4,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := mad
LOCAL_CFLAGS := -I$(LOCAL_PATH) -I$(LOCAL_PATH)/include \
LOCAL_CFLAGS := -O3 -I$(LOCAL_PATH) -I$(LOCAL_PATH)/include \
-DFPM_64BIT -DOPT_SPEED \
-DSTDC_HEADERS -DHAVE_UNISTD_H \
-DSIZEOF_INT=4 -DSIZEOF_LONG=4 -DSIZEOF_LONG_LONG=8 \

View File

@@ -4,7 +4,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := ogg
LOCAL_CFLAGS := -I$(LOCAL_PATH)/include
LOCAL_CFLAGS := -O3 -I$(LOCAL_PATH)/include
LOCAL_CPP_EXTENSION := .cpp

View File

@@ -21,7 +21,7 @@ common_SRC_FILES := \
pngwtran.c \
pngwutil.c
common_CFLAGS := ## -fomit-frame-pointer
common_CFLAGS := -O3
common_C_INCLUDES += $(LOCAL_PATH)/include

View File

@@ -8,7 +8,7 @@ ifndef SDL_JAVA_PACKAGE_PATH
$(error Please define SDL_JAVA_PACKAGE_PATH to the path of your Java package with dots replaced with underscores, for example "com_example_SanAngeles")
endif
LOCAL_CFLAGS := -I$(LOCAL_PATH)/include \
LOCAL_CFLAGS := -O3 -I$(LOCAL_PATH)/include \
-DSDL_JAVA_PACKAGE_PATH=$(SDL_JAVA_PACKAGE_PATH) \
-DSDL_CURDIR_PATH=\"$(SDL_CURDIR_PATH)\" \
-DSDL_TRACKBALL_KEYUP_DELAY=$(SDL_TRACKBALL_KEYUP_DELAY) \

View File

@@ -4,7 +4,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := sdl_blitpool
LOCAL_CFLAGS := -I$(LOCAL_PATH) -I$(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include -I$(LOCAL_PATH)/include
LOCAL_CFLAGS := -O3 -I$(LOCAL_PATH) -I$(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include -I$(LOCAL_PATH)/include
LOCAL_CPP_EXTENSION := .cpp

View File

@@ -4,7 +4,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := sdl_gfx
LOCAL_CFLAGS := -I$(LOCAL_PATH) -I$(LOCAL_PATH)/.. \
LOCAL_CFLAGS := -O3 -I$(LOCAL_PATH) -I$(LOCAL_PATH)/.. \
-I$(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include -I$(LOCAL_PATH)/include -Os
LOCAL_CPP_EXTENSION := .cpp

View File

@@ -4,7 +4,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := sdl_image
LOCAL_CFLAGS := -I$(LOCAL_PATH) -I$(LOCAL_PATH)/../jpeg/include -I$(LOCAL_PATH)/../png/include -I$(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include -I$(LOCAL_PATH)/include \
LOCAL_CFLAGS := -O3 -I$(LOCAL_PATH) -I$(LOCAL_PATH)/../jpeg/include -I$(LOCAL_PATH)/../png/include -I$(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include -I$(LOCAL_PATH)/include \
-DLOAD_PNG -DLOAD_JPG -DLOAD_GIF -DLOAD_BMP
LOCAL_CPP_EXTENSION := .cpp

View File

@@ -4,7 +4,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := sdl_mixer
LOCAL_CFLAGS := -I$(LOCAL_PATH) -I$(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include -I$(LOCAL_PATH)/include \
LOCAL_CFLAGS := -O3 -I$(LOCAL_PATH) -I$(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include -I$(LOCAL_PATH)/include \
-I$(LOCAL_PATH)/../mad/include -I$(LOCAL_PATH)/../flac/include -I$(LOCAL_PATH)/../ogg/include -I$(LOCAL_PATH)/../vorbis/include -I$(LOCAL_PATH)/../tremor/include \
-DWAV_MUSIC -DOGG_USE_TREMOR -DOGG_MUSIC -DFLAC_MUSIC

View File

@@ -4,7 +4,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := sdl_net
LOCAL_CFLAGS := -I$(LOCAL_PATH) -I$(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include -I$(LOCAL_PATH)/include
LOCAL_CFLAGS := -O3 -I$(LOCAL_PATH) -I$(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include -I$(LOCAL_PATH)/include
LOCAL_CPP_EXTENSION := .cpp

View File

@@ -4,7 +4,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := sdl_ttf
LOCAL_CFLAGS := -I$(LOCAL_PATH) -I$(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include -I$(LOCAL_PATH)/../freetype/include -I$(LOCAL_PATH)/include
LOCAL_CFLAGS := -Os -I$(LOCAL_PATH) -I$(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include -I$(LOCAL_PATH)/../freetype/include -I$(LOCAL_PATH)/include
LOCAL_CPP_EXTENSION := .cpp

View File

@@ -8,7 +8,7 @@ ifneq ($(CRYSTAX_TOOLCHAIN),)
LOCAL_CPP_EXTENSION := .cpp
LOCAL_SRC_FILES := dummy.c
else
LOCAL_CFLAGS := -I$(LOCAL_PATH)/stlport -I$(LOCAL_PATH)/src
LOCAL_CFLAGS := -O3 -I$(LOCAL_PATH)/stlport -I$(LOCAL_PATH)/src
LOCAL_CPP_EXTENSION := .cpp
LOCAL_SRC_FILES := $(addprefix src/,$(notdir $(wildcard $(LOCAL_PATH)/src/*.cpp $(LOCAL_PATH)/src/*.c)))
endif

View File

@@ -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/tremor
LOCAL_CFLAGS := -O3 -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

View File

@@ -4,7 +4,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := vorbis
LOCAL_CFLAGS := -I$(LOCAL_PATH)/include -I$(LOCAL_PATH)/src -I$(LOCAL_PATH) -DHAVE_CONFIG_H -I$(LOCAL_PATH)/../ogg/include
LOCAL_CFLAGS := -O3 -I$(LOCAL_PATH)/include -I$(LOCAL_PATH)/src -I$(LOCAL_PATH) -DHAVE_CONFIG_H -I$(LOCAL_PATH)/../ogg/include
LOCAL_CPP_EXTENSION := .cpp

View File

@@ -6,7 +6,7 @@ XERCES_SUBDIRS := $(patsubst $(LOCAL_PATH)/%, %, $(shell find $(LOCAL_PATH)/src/
LOCAL_MODULE := xerces
LOCAL_CFLAGS := -DHAVE_CONFIG_H -I$(LOCAL_PATH) -I$(LOCAL_PATH)/src -I$(LOCAL_PATH)/include -I$(LOCAL_PATH)/..
LOCAL_CFLAGS := -Os -DHAVE_CONFIG_H -I$(LOCAL_PATH) -I$(LOCAL_PATH)/src -I$(LOCAL_PATH)/include -I$(LOCAL_PATH)/..
LOCAL_CPP_EXTENSION := .cpp

View File

@@ -4,7 +4,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := xml2
LOCAL_CFLAGS := -I$(LOCAL_PATH) -I$(LOCAL_PATH)/include
LOCAL_CFLAGS := -Os -I$(LOCAL_PATH) -I$(LOCAL_PATH)/include
LOCAL_CPP_EXTENSION := .cpp