From bfcffa7f77a76d5247ce0acee044c30371601c60 Mon Sep 17 00:00:00 2001 From: pelya Date: Tue, 3 Jan 2012 14:34:05 +0200 Subject: [PATCH] Removed references to the crystax_static lib, which disappeared from the CrystaX NDK r6 and above --- build.sh | 2 + project/jni/application/Android.mk | 4 -- .../ballfield/AndroidAppSettings.cfg | 4 +- .../{ballfield.zip => ballfield2.zip} | Bin 936680 -> 937102 bytes .../jni/application/ballfield/ballfield.cpp | 64 +++++++++++++++++- project/jni/application/ballfield/unaligned.c | 22 ++++++ project/jni/application/setEnvironment-r5b.sh | 8 +-- project/jni/application/setEnvironment.sh | 6 +- project/jni/application/src | 2 +- project/jni/curl/Android.mk | 4 -- project/jni/intl/Android.mk | 4 -- project/jni/openal/Android.mk | 4 -- project/jni/sdl-1.2/Android.mk | 4 -- project/jni/sdl-1.3/Android.mk | 4 -- 14 files changed, 96 insertions(+), 36 deletions(-) rename project/jni/application/ballfield/AndroidData/{ballfield.zip => ballfield2.zip} (99%) create mode 100644 project/jni/application/ballfield/unaligned.c diff --git a/build.sh b/build.sh index 7c9a18de7..e8fe55a6b 100755 --- a/build.sh +++ b/build.sh @@ -24,6 +24,8 @@ if uname -s | grep -i "windows" > /dev/null ; then MYARCH=windows-x86 fi +rm -f project/bin/*.apk project/bin/*.apk.d project/bin/*.ap_ project/bin/*.ap_.d # New Android SDK introduced some lame-ass optimizations to the build system which we should take care about + cd project && env PATH=$NDKBUILDPATH nice -n19 ndk-build V=1 -j4 && \ { grep "CustomBuildScript=y" ../AndroidAppSettings.cfg > /dev/null && \ [ -`which ndk-build | grep '/android-ndk-r[56789]'` != - ] && \ diff --git a/project/jni/application/Android.mk b/project/jni/application/Android.mk index 41241ecf2..d5b2c8853 100644 --- a/project/jni/application/Android.mk +++ b/project/jni/application/Android.mk @@ -56,10 +56,6 @@ 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) -lstdc++ endif endif -ifneq ($(CRYSTAX_R5_TOOLCHAIN),) -LOCAL_C_INCLUDES += $(NDK_PATH)/sources/crystax/include -LOCAL_LDLIBS += -L$(NDK_PATH)/sources/crystax/libs/$(TARGET_ARCH_ABI) -lcrystax_static -endif LIBS_WITH_LONG_SYMBOLS := $(strip $(shell \ for f in $(LOCAL_PATH)/../../obj/local/armeabi/*.so ; do \ diff --git a/project/jni/application/ballfield/AndroidAppSettings.cfg b/project/jni/application/ballfield/AndroidAppSettings.cfg index 399bcc510..5137cc29d 100644 --- a/project/jni/application/ballfield/AndroidAppSettings.cfg +++ b/project/jni/application/ballfield/AndroidAppSettings.cfg @@ -5,8 +5,8 @@ AppName="Ballfield" AppFullName=net.olofson.ballfield ScreenOrientation=h InhibitSuspend=n -AppDataDownloadUrl="Game data is 1 Mb|ballfield.zip" -VideoDepthBpp=32 +AppDataDownloadUrl="Game data is 1 Mb|ballfield2.zip" +VideoDepthBpp=16 NeedDepthBuffer=n NeedStencilBuffer=n NeedGles2=n diff --git a/project/jni/application/ballfield/AndroidData/ballfield.zip b/project/jni/application/ballfield/AndroidData/ballfield2.zip similarity index 99% rename from project/jni/application/ballfield/AndroidData/ballfield.zip rename to project/jni/application/ballfield/AndroidData/ballfield2.zip index c4ada48d524566307cb02aed91662bf5f4c05c9f..655e4ce197b3a496240dc9e79b2a15108fb70169 100644 GIT binary patch delta 488 zcmaDc)v|AVC z+aJ4IafpqPfnl2<1A_pA3`1IeUWs{yp@D8jYK2}>Zb4`WCj)cysh@rzTw1}+z{v7~ znSlXJybV3bd&q!?=l;JN4eG)M4E1G+EMX6ivgsTZP}Ew*68dI$G1rzL?YS<=Iq}8M zpH%G15B@L1^{t-udDFUt$z^|kEj=QCm;3PK;B(s3db9V{9*A-`)PMIi?bpItE80(O z49kyjwmJSk@pokD%>2#w_SU4vt_{3xJmvJa)Ex?cr^IOUf9*b|bnlyq!@blWf1UQ< znio~P8^wuP(nLUwrZWs)uX0zxaOcqBZkW z8xiMwA3t6BymYGi> (pos * 4) ) & 0xf ) * 7; + SDL_BlitSurface(font, &from, dst, &to); + } +} /*---------------------------------------------------------- ballfield_t functions @@ -391,12 +411,18 @@ void tiled_back(SDL_Surface *back, SDL_Surface *screen, int xo, int yo) main() ----------------------------------------------------------*/ +extern "C" void unaligned_test(unsigned * data, unsigned * target); +extern "C" unsigned val0, val1, val2, val3, val4; + +unsigned char data[8] = { 1, 2, 3, 4, 5, 6, 7, 8 }; +//unsigned val0 = 0x12345678, val1 = 0x23456789, val2 = 0x34567890, val3 = 0x45678901, val4 = 0x56789012; + int main(int argc, char* argv[]) { ballfield_t *balls; SDL_Surface *screen; SDL_Surface *temp_image; - SDL_Surface *back, *logo, *font; + SDL_Surface *back, *logo, *font, *font_hex; SDL_Event event; int bpp = 16, flags = 0, @@ -487,6 +513,17 @@ int main(int argc, char* argv[]) font = SDL_DisplayFormat(temp_image); SDL_FreeSurface(temp_image); + temp_image = SDL_LoadBMP("font7x10-hex.bmp"); + if(!temp_image) + { + fprintf(stderr, "Could not load hex font!\n"); + exit(-1); + } + SDL_SetColorKey(temp_image, SDL_SRCCOLORKEY, + SDL_MapRGB(temp_image->format, 255, 0, 255)); + font_hex = SDL_DisplayFormat(temp_image); + SDL_FreeSurface(temp_image); + last_avg_tick = last_tick = SDL_GetTicks(); enum { MAX_POINTERS = 16, PTR_PRESSED = 4 }; @@ -496,7 +533,7 @@ int main(int argc, char* argv[]) SDL_Joystick * joysticks[MAX_POINTERS+1]; for(i=0; iw-37, screen->h-12, fps); + print_num_hex(screen, font_hex, 0, 40, val0); + print_num_hex(screen, font_hex, 0, 60, val1); + print_num_hex(screen, font_hex, 0, 80, val2); + print_num_hex(screen, font_hex, 0, 100, val3); + print_num_hex(screen, font_hex, 0, 120, val4); + print_num_hex(screen, font_hex, 0, 180, 0x12345678); + ++fps_count; for(i=0; i + +extern void unaligned_test2(int x1, int x2, int x3, int x4, int x5, int x6, int x7, unsigned * data, unsigned * target); +extern void unaligned_test(unsigned * data, unsigned * target); +extern unsigned val0, val1, val2, val3, val4; + +unsigned val0 = 1, val1 = 2, val2 = 3, val3 = 4, val4 = 5; + +void unaligned_test2(int x1, int x2, int x3, int x4, int x5, int x6, int x7, unsigned * data, unsigned * target) +{ + int xx = x1 + x2 - x3 + x4 - x5 + x6 - x7; + *target = xx + data[3]; +} + +void unaligned_test(unsigned * data, unsigned * target) +{ + //__android_log_print(ANDROID_LOG_INFO, "Ballfield", "data %p target %p", data, target); + int x1 = *data, x2 = *target, x3 = *data + *target, x4 = *data - *target, x5 = *data - *target * 2, x6 = *data + *target * 2, x7 = *target * 3 + *data; + unaligned_test2(x1, x2, x3, x4, x5, x6, x7, data-3, target); +}; + diff --git a/project/jni/application/setEnvironment-r5b.sh b/project/jni/application/setEnvironment-r5b.sh index e9f39b829..fff3ff97e 100755 --- a/project/jni/application/setEnvironment-r5b.sh +++ b/project/jni/application/setEnvironment-r5b.sh @@ -40,10 +40,10 @@ done MISSING_INCLUDE= MISSING_LIB= -if [ -n "$CRYSTAX_WCHAR" ]; then - MISSING_INCLUDE="$MISSING_INCLUDE -isystem$NDK/sources/crystax/include" - MISSING_LIB="$MISSING_LIB $NDK/sources/crystax/libs/armeabi/libcrystax_static.a" -fi +#if [ -n "$CRYSTAX_WCHAR" ]; then +# MISSING_INCLUDE="$MISSING_INCLUDE -isystem$NDK/sources/crystax/include" +# MISSING_LIB="$MISSING_LIB $NDK/sources/crystax/libs/armeabi/libcrystax_static.a" +#fi #if [ -n "$MISSING_LIBCXX_PATH" ]; then # MISSING_INCLUDE="$MISSING_INCLUDE -isystem$NDK/sources/cxx-stl/gnu-libstdc++/include" # MISSING_LIB="$MISSING_LIB -lgnustl_static -lsupc++" diff --git a/project/jni/application/setEnvironment.sh b/project/jni/application/setEnvironment.sh index bbe2102e4..9e064f8c2 100755 --- a/project/jni/application/setEnvironment.sh +++ b/project/jni/application/setEnvironment.sh @@ -16,9 +16,9 @@ SCRIPT=setEnvironment-r4b.sh CRYSTAX_WCHAR= if [ -n "`echo $NDK | grep 'android-ndk-r[56789]'`" ]; then SCRIPT=setEnvironment-r5b.sh - if [ -n "`echo $NDK | grep 'android-ndk-r[56789]-crystax'`" ]; then - CRYSTAX_WCHAR=1 - fi +# if [ -n "`echo $NDK | grep 'android-ndk-r[56789]-crystax'`" ]; then +# CRYSTAX_WCHAR=1 +# fi fi env CRYSTAX_WCHAR=$CRYSTAX_WCHAR $LOCAL_PATH/$SCRIPT "$@" diff --git a/project/jni/application/src b/project/jni/application/src index bdffdd12c..104f796a6 120000 --- a/project/jni/application/src +++ b/project/jni/application/src @@ -1 +1 @@ -frogatto \ No newline at end of file +ballfield \ No newline at end of file diff --git a/project/jni/curl/Android.mk b/project/jni/curl/Android.mk index 4260d1518..cabfc5e6c 100644 --- a/project/jni/curl/Android.mk +++ b/project/jni/curl/Android.mk @@ -79,9 +79,5 @@ LOCAL_SHARED_LIBRARIES := LOCAL_LDLIBS := -lz -ifneq ($(CRYSTAX_R5_TOOLCHAIN),) -LOCAL_LDLIBS += -L$(NDK_PATH)/sources/crystax/libs/armeabi -lcrystax_static -endif - include $(BUILD_SHARED_LIBRARY) diff --git a/project/jni/intl/Android.mk b/project/jni/intl/Android.mk index db1c1102c..c64f3feeb 100644 --- a/project/jni/intl/Android.mk +++ b/project/jni/intl/Android.mk @@ -23,10 +23,6 @@ LOCAL_CFLAGS := -Os -DBUILDING_LIBINTL -DBUILDING_DLL \ # -DINSTALLDIR=\"/usr/local/lib\" LOCAL_SRC_FILES := $(foreach F, $(APP_SUBDIRS), $(addprefix $(F)/,$(notdir $(wildcard $(LOCAL_PATH)/$(F)/*.c)))) -ifneq ($(CRYSTAX_R5_TOOLCHAIN),) -LOCAL_C_INCLUDES += $(NDK_PATH)/sources/crystax/include -LOCAL_LDLIBS += -L$(NDK_PATH)/sources/crystax/libs/armeabi -lcrystax_static -endif LOCAL_SHARED_LIBRARIES := diff --git a/project/jni/openal/Android.mk b/project/jni/openal/Android.mk index 53d71f527..59807496c 100644 --- a/project/jni/openal/Android.mk +++ b/project/jni/openal/Android.mk @@ -20,8 +20,4 @@ LOCAL_STATIC_LIBRARIES := LOCAL_LDLIBS := -llog -ifneq ($(CRYSTAX_R5_TOOLCHAIN),) -LOCAL_LDLIBS += -L$(NDK_PATH)/sources/crystax/libs/armeabi -lcrystax_static # I have no idea how could OpenAL link to C++ wide-char support lib -endif - include $(BUILD_SHARED_LIBRARY) diff --git a/project/jni/sdl-1.2/Android.mk b/project/jni/sdl-1.2/Android.mk index b32c0e2e5..6760e5504 100644 --- a/project/jni/sdl-1.2/Android.mk +++ b/project/jni/sdl-1.2/Android.mk @@ -58,8 +58,4 @@ LOCAL_SRC_FILES := $(foreach F, $(SDL_SRCS), $(addprefix $(dir $(F)),$(notdir $( LOCAL_LDLIBS := -lGLESv1_CM -ldl -llog -ifneq ($(CRYSTAX_R5_TOOLCHAIN),) -LOCAL_LDLIBS += -L$(NDK_PATH)/sources/crystax/libs/armeabi -lcrystax_static -endif - include $(BUILD_SHARED_LIBRARY) diff --git a/project/jni/sdl-1.3/Android.mk b/project/jni/sdl-1.3/Android.mk index 4db07c53f..dab5cfb47 100644 --- a/project/jni/sdl-1.3/Android.mk +++ b/project/jni/sdl-1.3/Android.mk @@ -61,8 +61,4 @@ LOCAL_SRC_FILES := $(foreach F, $(SDL_SRCS), $(addprefix $(dir $(F)),$(notdir $( LOCAL_LDLIBS := -lGLESv1_CM -ldl -llog -ifneq ($(CRYSTAX_R5_TOOLCHAIN),) -LOCAL_LDLIBS += -L$(NDK_PATH)/sources/crystax/libs/armeabi -lcrystax_static -endif - include $(BUILD_SHARED_LIBRARY)