From 58b0feff640b0dd0ca6764d15278152d1d7e49d5 Mon Sep 17 00:00:00 2001 From: pelya Date: Thu, 22 Jul 2010 11:13:32 +0300 Subject: [PATCH] Added CFLAGS option to ChangeAppSettings.shr, renamed Alien Blaster to separate dir and created symlink to it --- alienblaster/ChangeAppSettings.sh | 24 ++++++++++++++++--- alienblaster/project/jni/Android.mk | 2 ++ .../project/jni/application/Android.mk | 1 + .../{src => alienblaster}/Makefile | 0 .../{src => alienblaster}/SdlForwardCompat.h | 0 .../{src => alienblaster}/asstring.h | 0 .../{src => alienblaster}/background.cpp | 0 .../{src => alienblaster}/background.h | 0 .../{src => alienblaster}/banner.cpp | 0 .../{src => alienblaster}/banner.h | 0 .../{src => alienblaster}/banners.cpp | 0 .../{src => alienblaster}/banners.h | 0 .../{src => alienblaster}/boundingBox.cpp | 0 .../{src => alienblaster}/boundingBox.h | 0 .../{src => alienblaster}/enemy.cpp | 0 .../application/{src => alienblaster}/enemy.h | 0 .../{src => alienblaster}/enemys.cpp | 0 .../{src => alienblaster}/enemys.h | 0 .../{src => alienblaster}/explosion.cpp | 0 .../{src => alienblaster}/explosion.h | 0 .../{src => alienblaster}/explosions.cpp | 0 .../{src => alienblaster}/explosions.h | 0 .../{src => alienblaster}/font.cpp | 0 .../application/{src => alienblaster}/font.h | 0 .../{src => alienblaster}/formation.cpp | 0 .../{src => alienblaster}/formation.h | 0 .../{src => alienblaster}/game.cpp | 0 .../application/{src => alienblaster}/game.h | 0 .../{src => alienblaster}/geometry.cpp | 0 .../{src => alienblaster}/geometry.h | 0 .../{src => alienblaster}/global.cpp | 0 .../{src => alienblaster}/global.h | 0 .../application/{src => alienblaster}/gpl.txt | 0 .../{src => alienblaster}/infoscreen.cpp | 0 .../{src => alienblaster}/infoscreen.h | 0 .../{src => alienblaster}/input.cpp | 0 .../application/{src => alienblaster}/input.h | 0 .../{src => alienblaster}/intro.cpp | 0 .../application/{src => alienblaster}/intro.h | 0 .../{src => alienblaster}/item.cpp | 0 .../application/{src => alienblaster}/item.h | 0 .../{src => alienblaster}/items.cpp | 0 .../application/{src => alienblaster}/items.h | 0 .../{src => alienblaster}/main.cpp | 0 .../{src => alienblaster}/menuArcadeMode.cpp | 0 .../{src => alienblaster}/menuArcadeMode.h | 0 .../{src => alienblaster}/mixer.cpp | 0 .../application/{src => alienblaster}/mixer.h | 0 .../{src => alienblaster}/options.cpp | 0 .../{src => alienblaster}/options.h | 0 .../{src => alienblaster}/racer.cpp | 0 .../application/{src => alienblaster}/racer.h | 0 .../{src => alienblaster}/racers.cpp | 0 .../{src => alienblaster}/racers.h | 0 .../{src => alienblaster}/setDifficulty.cpp | 0 .../{src => alienblaster}/setDifficulty.h | 0 .../{src => alienblaster}/settings.cpp | 0 .../{src => alienblaster}/settings.h | 0 .../{src => alienblaster}/shieldGlow.cpp | 0 .../{src => alienblaster}/shieldGlow.h | 0 .../{src => alienblaster}/shot.cpp | 0 .../application/{src => alienblaster}/shot.h | 0 .../{src => alienblaster}/shots.cpp | 0 .../application/{src => alienblaster}/shots.h | 0 .../{src => alienblaster}/smokePuff.cpp | 0 .../{src => alienblaster}/smokePuff.h | 0 .../{src => alienblaster}/smokePuffs.cpp | 0 .../{src => alienblaster}/smokePuffs.h | 0 .../{src => alienblaster}/sonic.cpp | 0 .../application/{src => alienblaster}/sonic.h | 0 .../{src => alienblaster}/soundDB.cpp | 0 .../{src => alienblaster}/soundDB.h | 0 .../{src => alienblaster}/surfaceDB.cpp | 0 .../{src => alienblaster}/surfaceDB.h | 0 .../{src => alienblaster}/video.cpp | 0 .../application/{src => alienblaster}/video.h | 0 .../{src => alienblaster}/wreck.cpp | 0 .../application/{src => alienblaster}/wreck.h | 0 .../{src => alienblaster}/wrecks.cpp | 0 .../{src => alienblaster}/wrecks.h | 0 alienblaster/project/jni/application/src | 1 + 81 files changed, 25 insertions(+), 3 deletions(-) rename alienblaster/project/jni/application/{src => alienblaster}/Makefile (100%) rename alienblaster/project/jni/application/{src => alienblaster}/SdlForwardCompat.h (100%) rename alienblaster/project/jni/application/{src => alienblaster}/asstring.h (100%) rename alienblaster/project/jni/application/{src => alienblaster}/background.cpp (100%) rename alienblaster/project/jni/application/{src => alienblaster}/background.h (100%) rename alienblaster/project/jni/application/{src => alienblaster}/banner.cpp (100%) rename alienblaster/project/jni/application/{src => alienblaster}/banner.h (100%) rename alienblaster/project/jni/application/{src => alienblaster}/banners.cpp (100%) rename alienblaster/project/jni/application/{src => alienblaster}/banners.h (100%) rename alienblaster/project/jni/application/{src => alienblaster}/boundingBox.cpp (100%) rename alienblaster/project/jni/application/{src => alienblaster}/boundingBox.h (100%) rename alienblaster/project/jni/application/{src => alienblaster}/enemy.cpp (100%) rename alienblaster/project/jni/application/{src => alienblaster}/enemy.h (100%) rename alienblaster/project/jni/application/{src => alienblaster}/enemys.cpp (100%) rename alienblaster/project/jni/application/{src => alienblaster}/enemys.h (100%) rename alienblaster/project/jni/application/{src => alienblaster}/explosion.cpp (100%) rename alienblaster/project/jni/application/{src => alienblaster}/explosion.h (100%) rename alienblaster/project/jni/application/{src => alienblaster}/explosions.cpp (100%) rename alienblaster/project/jni/application/{src => alienblaster}/explosions.h (100%) rename alienblaster/project/jni/application/{src => alienblaster}/font.cpp (100%) rename alienblaster/project/jni/application/{src => alienblaster}/font.h (100%) rename alienblaster/project/jni/application/{src => alienblaster}/formation.cpp (100%) rename alienblaster/project/jni/application/{src => alienblaster}/formation.h (100%) rename alienblaster/project/jni/application/{src => alienblaster}/game.cpp (100%) rename alienblaster/project/jni/application/{src => alienblaster}/game.h (100%) rename alienblaster/project/jni/application/{src => alienblaster}/geometry.cpp (100%) rename alienblaster/project/jni/application/{src => alienblaster}/geometry.h (100%) rename alienblaster/project/jni/application/{src => alienblaster}/global.cpp (100%) rename alienblaster/project/jni/application/{src => alienblaster}/global.h (100%) rename alienblaster/project/jni/application/{src => alienblaster}/gpl.txt (100%) rename alienblaster/project/jni/application/{src => alienblaster}/infoscreen.cpp (100%) rename alienblaster/project/jni/application/{src => alienblaster}/infoscreen.h (100%) rename alienblaster/project/jni/application/{src => alienblaster}/input.cpp (100%) rename alienblaster/project/jni/application/{src => alienblaster}/input.h (100%) rename alienblaster/project/jni/application/{src => alienblaster}/intro.cpp (100%) rename alienblaster/project/jni/application/{src => alienblaster}/intro.h (100%) rename alienblaster/project/jni/application/{src => alienblaster}/item.cpp (100%) rename alienblaster/project/jni/application/{src => alienblaster}/item.h (100%) rename alienblaster/project/jni/application/{src => alienblaster}/items.cpp (100%) rename alienblaster/project/jni/application/{src => alienblaster}/items.h (100%) rename alienblaster/project/jni/application/{src => alienblaster}/main.cpp (100%) rename alienblaster/project/jni/application/{src => alienblaster}/menuArcadeMode.cpp (100%) rename alienblaster/project/jni/application/{src => alienblaster}/menuArcadeMode.h (100%) rename alienblaster/project/jni/application/{src => alienblaster}/mixer.cpp (100%) rename alienblaster/project/jni/application/{src => alienblaster}/mixer.h (100%) rename alienblaster/project/jni/application/{src => alienblaster}/options.cpp (100%) rename alienblaster/project/jni/application/{src => alienblaster}/options.h (100%) rename alienblaster/project/jni/application/{src => alienblaster}/racer.cpp (100%) rename alienblaster/project/jni/application/{src => alienblaster}/racer.h (100%) rename alienblaster/project/jni/application/{src => alienblaster}/racers.cpp (100%) rename alienblaster/project/jni/application/{src => alienblaster}/racers.h (100%) rename alienblaster/project/jni/application/{src => alienblaster}/setDifficulty.cpp (100%) rename alienblaster/project/jni/application/{src => alienblaster}/setDifficulty.h (100%) rename alienblaster/project/jni/application/{src => alienblaster}/settings.cpp (100%) rename alienblaster/project/jni/application/{src => alienblaster}/settings.h (100%) rename alienblaster/project/jni/application/{src => alienblaster}/shieldGlow.cpp (100%) rename alienblaster/project/jni/application/{src => alienblaster}/shieldGlow.h (100%) rename alienblaster/project/jni/application/{src => alienblaster}/shot.cpp (100%) rename alienblaster/project/jni/application/{src => alienblaster}/shot.h (100%) rename alienblaster/project/jni/application/{src => alienblaster}/shots.cpp (100%) rename alienblaster/project/jni/application/{src => alienblaster}/shots.h (100%) rename alienblaster/project/jni/application/{src => alienblaster}/smokePuff.cpp (100%) rename alienblaster/project/jni/application/{src => alienblaster}/smokePuff.h (100%) rename alienblaster/project/jni/application/{src => alienblaster}/smokePuffs.cpp (100%) rename alienblaster/project/jni/application/{src => alienblaster}/smokePuffs.h (100%) rename alienblaster/project/jni/application/{src => alienblaster}/sonic.cpp (100%) rename alienblaster/project/jni/application/{src => alienblaster}/sonic.h (100%) rename alienblaster/project/jni/application/{src => alienblaster}/soundDB.cpp (100%) rename alienblaster/project/jni/application/{src => alienblaster}/soundDB.h (100%) rename alienblaster/project/jni/application/{src => alienblaster}/surfaceDB.cpp (100%) rename alienblaster/project/jni/application/{src => alienblaster}/surfaceDB.h (100%) rename alienblaster/project/jni/application/{src => alienblaster}/video.cpp (100%) rename alienblaster/project/jni/application/{src => alienblaster}/video.h (100%) rename alienblaster/project/jni/application/{src => alienblaster}/wreck.cpp (100%) rename alienblaster/project/jni/application/{src => alienblaster}/wreck.h (100%) rename alienblaster/project/jni/application/{src => alienblaster}/wrecks.cpp (100%) rename alienblaster/project/jni/application/{src => alienblaster}/wrecks.h (100%) create mode 120000 alienblaster/project/jni/application/src diff --git a/alienblaster/ChangeAppSettings.sh b/alienblaster/ChangeAppSettings.sh index 0b5cd2e0f..02e5ef50e 100755 --- a/alienblaster/ChangeAppSettings.sh +++ b/alienblaster/ChangeAppSettings.sh @@ -3,6 +3,8 @@ var="" +echo -n "\n===== libSDL on Android configuration =====\n\nIf you will supply empty string as answer the previous value will be used\n" + LibSdlVersionOld=$LibSdlVersion echo -n "\nlibSDL version to use (1.2 or 1.3), 1.2 is not HW accelerated yet ($LibSdlVersion): " read var @@ -79,6 +81,12 @@ if [ -n "$var" ] ; then CompiledLibraries="$var" fi +echo -n "\nAditional CFLAGS for application ($AppCflags): " +read var +if [ -n "$var" ] ; then + AppCflags="$var" +fi + echo -n "\nHere you may type some short readme text that will be shown when app data is downloaded." echo -n "\nCurrent text:\n" echo -n "`echo $ReadmeText | tr '^' '\\n'`" @@ -112,6 +120,7 @@ echo MultiABI=$MultiABI >> AppSettings.cfg echo AppVersionCode=$AppVersionCode >> AppSettings.cfg echo AppVersionName=\"$AppVersionName\" >> AppSettings.cfg echo CompiledLibraries=\"$CompiledLibraries\" >> AppSettings.cfg +echo AppCflags=\'$AppCflags\' >> AppSettings.cfg echo ReadmeText=\'$ReadmeText\' >> AppSettings.cfg AppShortName=`echo $AppName | sed 's/ //g'` @@ -192,16 +201,25 @@ cat project/jni/Android.mk | \ sed "s/SDL_JAVA_PACKAGE_PATH := .*/SDL_JAVA_PACKAGE_PATH := $AppFullNameUnderscored/" | \ sed "s^SDL_CURDIR_PATH := .*^SDL_CURDIR_PATH := $DataPath^" | \ sed "s^SDL_VIDEO_RENDER_RESIZE := .*^SDL_VIDEO_RENDER_RESIZE := $SdlVideoResize^" | \ - sed "s^COMPILED_LIBRARIES := .*^COMPILED_LIBRARIES := $CompiledLibraries^" > \ + sed "s^COMPILED_LIBRARIES := .*^COMPILED_LIBRARIES := $CompiledLibraries^" | + sed "s^APPLICATION_ADDITIONAL_CFLAGS :=.*^APPLICATION_ADDITIONAL_CFLAGS := $AppCflags^" > \ project/jni/Android.mk.1 -mv -f project/jni/Android.mk.1 project/jni/Android.mk +if [ -n "`diff -w project/jni/Android.mk.1 project/jni/Android.mk`" ] ; then + mv -f project/jni/Android.mk.1 project/jni/Android.mk +else + rm -rf project/jni/Android.mk.1 +fi echo Patching project/jni/Application.mk cat project/jni/Application.mk | \ sed "s/APP_MODULES := .*/APP_MODULES := application sdl sdl_main stlport tremor png jpeg freetype $CompiledLibraries/" | \ sed "s/APP_ABI := .*/APP_ABI := $MultiABI/" > \ project/jni/Application.mk.1 -mv -f project/jni/Application.mk.1 project/jni/Application.mk +if [ -n "`diff -w project/jni/Application.mk.1 project/jni/Application.mk`" ] ; then + mv -f project/jni/Application.mk.1 project/jni/Application.mk +else + rm -rf project/jni/Application.mk.1 +fi echo Patching project/res/values/strings.xml cat project/res/values/strings.xml | \ diff --git a/alienblaster/project/jni/Android.mk b/alienblaster/project/jni/Android.mk index 9da565b55..2e25d73fc 100644 --- a/alienblaster/project/jni/Android.mk +++ b/alienblaster/project/jni/Android.mk @@ -25,6 +25,8 @@ SDL_VIDEO_RENDER_RESIZE := 1 COMPILED_LIBRARIES := sdl_mixer sdl_image +APPLICATION_ADDITIONAL_CFLAGS := + # If SDL_Mixer should link to libMAD SDL_MIXER_USE_LIBMAD := ifneq ($(strip $(filter mad, $(COMPILED_LIBRARIES))),) diff --git a/alienblaster/project/jni/application/Android.mk b/alienblaster/project/jni/application/Android.mk index 4066e1718..b82d760bd 100644 --- a/alienblaster/project/jni/application/Android.mk +++ b/alienblaster/project/jni/application/Android.mk @@ -17,6 +17,7 @@ LOCAL_CFLAGS := $(foreach D, $(APP_SUBDIRS), -I$(LOCAL_PATH)/$(D)) \ -I$(LOCAL_PATH)/../sdl_blitpool \ -I$(LOCAL_PATH)/../stlport/stlport \ +LOCAL_CFLAGS += $(APPLICATION_ADDITIONAL_CFLAGS) #Change C++ file extension as appropriate LOCAL_CPP_EXTENSION := .cpp diff --git a/alienblaster/project/jni/application/src/Makefile b/alienblaster/project/jni/application/alienblaster/Makefile similarity index 100% rename from alienblaster/project/jni/application/src/Makefile rename to alienblaster/project/jni/application/alienblaster/Makefile diff --git a/alienblaster/project/jni/application/src/SdlForwardCompat.h b/alienblaster/project/jni/application/alienblaster/SdlForwardCompat.h similarity index 100% rename from alienblaster/project/jni/application/src/SdlForwardCompat.h rename to alienblaster/project/jni/application/alienblaster/SdlForwardCompat.h diff --git a/alienblaster/project/jni/application/src/asstring.h b/alienblaster/project/jni/application/alienblaster/asstring.h similarity index 100% rename from alienblaster/project/jni/application/src/asstring.h rename to alienblaster/project/jni/application/alienblaster/asstring.h diff --git a/alienblaster/project/jni/application/src/background.cpp b/alienblaster/project/jni/application/alienblaster/background.cpp similarity index 100% rename from alienblaster/project/jni/application/src/background.cpp rename to alienblaster/project/jni/application/alienblaster/background.cpp diff --git a/alienblaster/project/jni/application/src/background.h b/alienblaster/project/jni/application/alienblaster/background.h similarity index 100% rename from alienblaster/project/jni/application/src/background.h rename to alienblaster/project/jni/application/alienblaster/background.h diff --git a/alienblaster/project/jni/application/src/banner.cpp b/alienblaster/project/jni/application/alienblaster/banner.cpp similarity index 100% rename from alienblaster/project/jni/application/src/banner.cpp rename to alienblaster/project/jni/application/alienblaster/banner.cpp diff --git a/alienblaster/project/jni/application/src/banner.h b/alienblaster/project/jni/application/alienblaster/banner.h similarity index 100% rename from alienblaster/project/jni/application/src/banner.h rename to alienblaster/project/jni/application/alienblaster/banner.h diff --git a/alienblaster/project/jni/application/src/banners.cpp b/alienblaster/project/jni/application/alienblaster/banners.cpp similarity index 100% rename from alienblaster/project/jni/application/src/banners.cpp rename to alienblaster/project/jni/application/alienblaster/banners.cpp diff --git a/alienblaster/project/jni/application/src/banners.h b/alienblaster/project/jni/application/alienblaster/banners.h similarity index 100% rename from alienblaster/project/jni/application/src/banners.h rename to alienblaster/project/jni/application/alienblaster/banners.h diff --git a/alienblaster/project/jni/application/src/boundingBox.cpp b/alienblaster/project/jni/application/alienblaster/boundingBox.cpp similarity index 100% rename from alienblaster/project/jni/application/src/boundingBox.cpp rename to alienblaster/project/jni/application/alienblaster/boundingBox.cpp diff --git a/alienblaster/project/jni/application/src/boundingBox.h b/alienblaster/project/jni/application/alienblaster/boundingBox.h similarity index 100% rename from alienblaster/project/jni/application/src/boundingBox.h rename to alienblaster/project/jni/application/alienblaster/boundingBox.h diff --git a/alienblaster/project/jni/application/src/enemy.cpp b/alienblaster/project/jni/application/alienblaster/enemy.cpp similarity index 100% rename from alienblaster/project/jni/application/src/enemy.cpp rename to alienblaster/project/jni/application/alienblaster/enemy.cpp diff --git a/alienblaster/project/jni/application/src/enemy.h b/alienblaster/project/jni/application/alienblaster/enemy.h similarity index 100% rename from alienblaster/project/jni/application/src/enemy.h rename to alienblaster/project/jni/application/alienblaster/enemy.h diff --git a/alienblaster/project/jni/application/src/enemys.cpp b/alienblaster/project/jni/application/alienblaster/enemys.cpp similarity index 100% rename from alienblaster/project/jni/application/src/enemys.cpp rename to alienblaster/project/jni/application/alienblaster/enemys.cpp diff --git a/alienblaster/project/jni/application/src/enemys.h b/alienblaster/project/jni/application/alienblaster/enemys.h similarity index 100% rename from alienblaster/project/jni/application/src/enemys.h rename to alienblaster/project/jni/application/alienblaster/enemys.h diff --git a/alienblaster/project/jni/application/src/explosion.cpp b/alienblaster/project/jni/application/alienblaster/explosion.cpp similarity index 100% rename from alienblaster/project/jni/application/src/explosion.cpp rename to alienblaster/project/jni/application/alienblaster/explosion.cpp diff --git a/alienblaster/project/jni/application/src/explosion.h b/alienblaster/project/jni/application/alienblaster/explosion.h similarity index 100% rename from alienblaster/project/jni/application/src/explosion.h rename to alienblaster/project/jni/application/alienblaster/explosion.h diff --git a/alienblaster/project/jni/application/src/explosions.cpp b/alienblaster/project/jni/application/alienblaster/explosions.cpp similarity index 100% rename from alienblaster/project/jni/application/src/explosions.cpp rename to alienblaster/project/jni/application/alienblaster/explosions.cpp diff --git a/alienblaster/project/jni/application/src/explosions.h b/alienblaster/project/jni/application/alienblaster/explosions.h similarity index 100% rename from alienblaster/project/jni/application/src/explosions.h rename to alienblaster/project/jni/application/alienblaster/explosions.h diff --git a/alienblaster/project/jni/application/src/font.cpp b/alienblaster/project/jni/application/alienblaster/font.cpp similarity index 100% rename from alienblaster/project/jni/application/src/font.cpp rename to alienblaster/project/jni/application/alienblaster/font.cpp diff --git a/alienblaster/project/jni/application/src/font.h b/alienblaster/project/jni/application/alienblaster/font.h similarity index 100% rename from alienblaster/project/jni/application/src/font.h rename to alienblaster/project/jni/application/alienblaster/font.h diff --git a/alienblaster/project/jni/application/src/formation.cpp b/alienblaster/project/jni/application/alienblaster/formation.cpp similarity index 100% rename from alienblaster/project/jni/application/src/formation.cpp rename to alienblaster/project/jni/application/alienblaster/formation.cpp diff --git a/alienblaster/project/jni/application/src/formation.h b/alienblaster/project/jni/application/alienblaster/formation.h similarity index 100% rename from alienblaster/project/jni/application/src/formation.h rename to alienblaster/project/jni/application/alienblaster/formation.h diff --git a/alienblaster/project/jni/application/src/game.cpp b/alienblaster/project/jni/application/alienblaster/game.cpp similarity index 100% rename from alienblaster/project/jni/application/src/game.cpp rename to alienblaster/project/jni/application/alienblaster/game.cpp diff --git a/alienblaster/project/jni/application/src/game.h b/alienblaster/project/jni/application/alienblaster/game.h similarity index 100% rename from alienblaster/project/jni/application/src/game.h rename to alienblaster/project/jni/application/alienblaster/game.h diff --git a/alienblaster/project/jni/application/src/geometry.cpp b/alienblaster/project/jni/application/alienblaster/geometry.cpp similarity index 100% rename from alienblaster/project/jni/application/src/geometry.cpp rename to alienblaster/project/jni/application/alienblaster/geometry.cpp diff --git a/alienblaster/project/jni/application/src/geometry.h b/alienblaster/project/jni/application/alienblaster/geometry.h similarity index 100% rename from alienblaster/project/jni/application/src/geometry.h rename to alienblaster/project/jni/application/alienblaster/geometry.h diff --git a/alienblaster/project/jni/application/src/global.cpp b/alienblaster/project/jni/application/alienblaster/global.cpp similarity index 100% rename from alienblaster/project/jni/application/src/global.cpp rename to alienblaster/project/jni/application/alienblaster/global.cpp diff --git a/alienblaster/project/jni/application/src/global.h b/alienblaster/project/jni/application/alienblaster/global.h similarity index 100% rename from alienblaster/project/jni/application/src/global.h rename to alienblaster/project/jni/application/alienblaster/global.h diff --git a/alienblaster/project/jni/application/src/gpl.txt b/alienblaster/project/jni/application/alienblaster/gpl.txt similarity index 100% rename from alienblaster/project/jni/application/src/gpl.txt rename to alienblaster/project/jni/application/alienblaster/gpl.txt diff --git a/alienblaster/project/jni/application/src/infoscreen.cpp b/alienblaster/project/jni/application/alienblaster/infoscreen.cpp similarity index 100% rename from alienblaster/project/jni/application/src/infoscreen.cpp rename to alienblaster/project/jni/application/alienblaster/infoscreen.cpp diff --git a/alienblaster/project/jni/application/src/infoscreen.h b/alienblaster/project/jni/application/alienblaster/infoscreen.h similarity index 100% rename from alienblaster/project/jni/application/src/infoscreen.h rename to alienblaster/project/jni/application/alienblaster/infoscreen.h diff --git a/alienblaster/project/jni/application/src/input.cpp b/alienblaster/project/jni/application/alienblaster/input.cpp similarity index 100% rename from alienblaster/project/jni/application/src/input.cpp rename to alienblaster/project/jni/application/alienblaster/input.cpp diff --git a/alienblaster/project/jni/application/src/input.h b/alienblaster/project/jni/application/alienblaster/input.h similarity index 100% rename from alienblaster/project/jni/application/src/input.h rename to alienblaster/project/jni/application/alienblaster/input.h diff --git a/alienblaster/project/jni/application/src/intro.cpp b/alienblaster/project/jni/application/alienblaster/intro.cpp similarity index 100% rename from alienblaster/project/jni/application/src/intro.cpp rename to alienblaster/project/jni/application/alienblaster/intro.cpp diff --git a/alienblaster/project/jni/application/src/intro.h b/alienblaster/project/jni/application/alienblaster/intro.h similarity index 100% rename from alienblaster/project/jni/application/src/intro.h rename to alienblaster/project/jni/application/alienblaster/intro.h diff --git a/alienblaster/project/jni/application/src/item.cpp b/alienblaster/project/jni/application/alienblaster/item.cpp similarity index 100% rename from alienblaster/project/jni/application/src/item.cpp rename to alienblaster/project/jni/application/alienblaster/item.cpp diff --git a/alienblaster/project/jni/application/src/item.h b/alienblaster/project/jni/application/alienblaster/item.h similarity index 100% rename from alienblaster/project/jni/application/src/item.h rename to alienblaster/project/jni/application/alienblaster/item.h diff --git a/alienblaster/project/jni/application/src/items.cpp b/alienblaster/project/jni/application/alienblaster/items.cpp similarity index 100% rename from alienblaster/project/jni/application/src/items.cpp rename to alienblaster/project/jni/application/alienblaster/items.cpp diff --git a/alienblaster/project/jni/application/src/items.h b/alienblaster/project/jni/application/alienblaster/items.h similarity index 100% rename from alienblaster/project/jni/application/src/items.h rename to alienblaster/project/jni/application/alienblaster/items.h diff --git a/alienblaster/project/jni/application/src/main.cpp b/alienblaster/project/jni/application/alienblaster/main.cpp similarity index 100% rename from alienblaster/project/jni/application/src/main.cpp rename to alienblaster/project/jni/application/alienblaster/main.cpp diff --git a/alienblaster/project/jni/application/src/menuArcadeMode.cpp b/alienblaster/project/jni/application/alienblaster/menuArcadeMode.cpp similarity index 100% rename from alienblaster/project/jni/application/src/menuArcadeMode.cpp rename to alienblaster/project/jni/application/alienblaster/menuArcadeMode.cpp diff --git a/alienblaster/project/jni/application/src/menuArcadeMode.h b/alienblaster/project/jni/application/alienblaster/menuArcadeMode.h similarity index 100% rename from alienblaster/project/jni/application/src/menuArcadeMode.h rename to alienblaster/project/jni/application/alienblaster/menuArcadeMode.h diff --git a/alienblaster/project/jni/application/src/mixer.cpp b/alienblaster/project/jni/application/alienblaster/mixer.cpp similarity index 100% rename from alienblaster/project/jni/application/src/mixer.cpp rename to alienblaster/project/jni/application/alienblaster/mixer.cpp diff --git a/alienblaster/project/jni/application/src/mixer.h b/alienblaster/project/jni/application/alienblaster/mixer.h similarity index 100% rename from alienblaster/project/jni/application/src/mixer.h rename to alienblaster/project/jni/application/alienblaster/mixer.h diff --git a/alienblaster/project/jni/application/src/options.cpp b/alienblaster/project/jni/application/alienblaster/options.cpp similarity index 100% rename from alienblaster/project/jni/application/src/options.cpp rename to alienblaster/project/jni/application/alienblaster/options.cpp diff --git a/alienblaster/project/jni/application/src/options.h b/alienblaster/project/jni/application/alienblaster/options.h similarity index 100% rename from alienblaster/project/jni/application/src/options.h rename to alienblaster/project/jni/application/alienblaster/options.h diff --git a/alienblaster/project/jni/application/src/racer.cpp b/alienblaster/project/jni/application/alienblaster/racer.cpp similarity index 100% rename from alienblaster/project/jni/application/src/racer.cpp rename to alienblaster/project/jni/application/alienblaster/racer.cpp diff --git a/alienblaster/project/jni/application/src/racer.h b/alienblaster/project/jni/application/alienblaster/racer.h similarity index 100% rename from alienblaster/project/jni/application/src/racer.h rename to alienblaster/project/jni/application/alienblaster/racer.h diff --git a/alienblaster/project/jni/application/src/racers.cpp b/alienblaster/project/jni/application/alienblaster/racers.cpp similarity index 100% rename from alienblaster/project/jni/application/src/racers.cpp rename to alienblaster/project/jni/application/alienblaster/racers.cpp diff --git a/alienblaster/project/jni/application/src/racers.h b/alienblaster/project/jni/application/alienblaster/racers.h similarity index 100% rename from alienblaster/project/jni/application/src/racers.h rename to alienblaster/project/jni/application/alienblaster/racers.h diff --git a/alienblaster/project/jni/application/src/setDifficulty.cpp b/alienblaster/project/jni/application/alienblaster/setDifficulty.cpp similarity index 100% rename from alienblaster/project/jni/application/src/setDifficulty.cpp rename to alienblaster/project/jni/application/alienblaster/setDifficulty.cpp diff --git a/alienblaster/project/jni/application/src/setDifficulty.h b/alienblaster/project/jni/application/alienblaster/setDifficulty.h similarity index 100% rename from alienblaster/project/jni/application/src/setDifficulty.h rename to alienblaster/project/jni/application/alienblaster/setDifficulty.h diff --git a/alienblaster/project/jni/application/src/settings.cpp b/alienblaster/project/jni/application/alienblaster/settings.cpp similarity index 100% rename from alienblaster/project/jni/application/src/settings.cpp rename to alienblaster/project/jni/application/alienblaster/settings.cpp diff --git a/alienblaster/project/jni/application/src/settings.h b/alienblaster/project/jni/application/alienblaster/settings.h similarity index 100% rename from alienblaster/project/jni/application/src/settings.h rename to alienblaster/project/jni/application/alienblaster/settings.h diff --git a/alienblaster/project/jni/application/src/shieldGlow.cpp b/alienblaster/project/jni/application/alienblaster/shieldGlow.cpp similarity index 100% rename from alienblaster/project/jni/application/src/shieldGlow.cpp rename to alienblaster/project/jni/application/alienblaster/shieldGlow.cpp diff --git a/alienblaster/project/jni/application/src/shieldGlow.h b/alienblaster/project/jni/application/alienblaster/shieldGlow.h similarity index 100% rename from alienblaster/project/jni/application/src/shieldGlow.h rename to alienblaster/project/jni/application/alienblaster/shieldGlow.h diff --git a/alienblaster/project/jni/application/src/shot.cpp b/alienblaster/project/jni/application/alienblaster/shot.cpp similarity index 100% rename from alienblaster/project/jni/application/src/shot.cpp rename to alienblaster/project/jni/application/alienblaster/shot.cpp diff --git a/alienblaster/project/jni/application/src/shot.h b/alienblaster/project/jni/application/alienblaster/shot.h similarity index 100% rename from alienblaster/project/jni/application/src/shot.h rename to alienblaster/project/jni/application/alienblaster/shot.h diff --git a/alienblaster/project/jni/application/src/shots.cpp b/alienblaster/project/jni/application/alienblaster/shots.cpp similarity index 100% rename from alienblaster/project/jni/application/src/shots.cpp rename to alienblaster/project/jni/application/alienblaster/shots.cpp diff --git a/alienblaster/project/jni/application/src/shots.h b/alienblaster/project/jni/application/alienblaster/shots.h similarity index 100% rename from alienblaster/project/jni/application/src/shots.h rename to alienblaster/project/jni/application/alienblaster/shots.h diff --git a/alienblaster/project/jni/application/src/smokePuff.cpp b/alienblaster/project/jni/application/alienblaster/smokePuff.cpp similarity index 100% rename from alienblaster/project/jni/application/src/smokePuff.cpp rename to alienblaster/project/jni/application/alienblaster/smokePuff.cpp diff --git a/alienblaster/project/jni/application/src/smokePuff.h b/alienblaster/project/jni/application/alienblaster/smokePuff.h similarity index 100% rename from alienblaster/project/jni/application/src/smokePuff.h rename to alienblaster/project/jni/application/alienblaster/smokePuff.h diff --git a/alienblaster/project/jni/application/src/smokePuffs.cpp b/alienblaster/project/jni/application/alienblaster/smokePuffs.cpp similarity index 100% rename from alienblaster/project/jni/application/src/smokePuffs.cpp rename to alienblaster/project/jni/application/alienblaster/smokePuffs.cpp diff --git a/alienblaster/project/jni/application/src/smokePuffs.h b/alienblaster/project/jni/application/alienblaster/smokePuffs.h similarity index 100% rename from alienblaster/project/jni/application/src/smokePuffs.h rename to alienblaster/project/jni/application/alienblaster/smokePuffs.h diff --git a/alienblaster/project/jni/application/src/sonic.cpp b/alienblaster/project/jni/application/alienblaster/sonic.cpp similarity index 100% rename from alienblaster/project/jni/application/src/sonic.cpp rename to alienblaster/project/jni/application/alienblaster/sonic.cpp diff --git a/alienblaster/project/jni/application/src/sonic.h b/alienblaster/project/jni/application/alienblaster/sonic.h similarity index 100% rename from alienblaster/project/jni/application/src/sonic.h rename to alienblaster/project/jni/application/alienblaster/sonic.h diff --git a/alienblaster/project/jni/application/src/soundDB.cpp b/alienblaster/project/jni/application/alienblaster/soundDB.cpp similarity index 100% rename from alienblaster/project/jni/application/src/soundDB.cpp rename to alienblaster/project/jni/application/alienblaster/soundDB.cpp diff --git a/alienblaster/project/jni/application/src/soundDB.h b/alienblaster/project/jni/application/alienblaster/soundDB.h similarity index 100% rename from alienblaster/project/jni/application/src/soundDB.h rename to alienblaster/project/jni/application/alienblaster/soundDB.h diff --git a/alienblaster/project/jni/application/src/surfaceDB.cpp b/alienblaster/project/jni/application/alienblaster/surfaceDB.cpp similarity index 100% rename from alienblaster/project/jni/application/src/surfaceDB.cpp rename to alienblaster/project/jni/application/alienblaster/surfaceDB.cpp diff --git a/alienblaster/project/jni/application/src/surfaceDB.h b/alienblaster/project/jni/application/alienblaster/surfaceDB.h similarity index 100% rename from alienblaster/project/jni/application/src/surfaceDB.h rename to alienblaster/project/jni/application/alienblaster/surfaceDB.h diff --git a/alienblaster/project/jni/application/src/video.cpp b/alienblaster/project/jni/application/alienblaster/video.cpp similarity index 100% rename from alienblaster/project/jni/application/src/video.cpp rename to alienblaster/project/jni/application/alienblaster/video.cpp diff --git a/alienblaster/project/jni/application/src/video.h b/alienblaster/project/jni/application/alienblaster/video.h similarity index 100% rename from alienblaster/project/jni/application/src/video.h rename to alienblaster/project/jni/application/alienblaster/video.h diff --git a/alienblaster/project/jni/application/src/wreck.cpp b/alienblaster/project/jni/application/alienblaster/wreck.cpp similarity index 100% rename from alienblaster/project/jni/application/src/wreck.cpp rename to alienblaster/project/jni/application/alienblaster/wreck.cpp diff --git a/alienblaster/project/jni/application/src/wreck.h b/alienblaster/project/jni/application/alienblaster/wreck.h similarity index 100% rename from alienblaster/project/jni/application/src/wreck.h rename to alienblaster/project/jni/application/alienblaster/wreck.h diff --git a/alienblaster/project/jni/application/src/wrecks.cpp b/alienblaster/project/jni/application/alienblaster/wrecks.cpp similarity index 100% rename from alienblaster/project/jni/application/src/wrecks.cpp rename to alienblaster/project/jni/application/alienblaster/wrecks.cpp diff --git a/alienblaster/project/jni/application/src/wrecks.h b/alienblaster/project/jni/application/alienblaster/wrecks.h similarity index 100% rename from alienblaster/project/jni/application/src/wrecks.h rename to alienblaster/project/jni/application/alienblaster/wrecks.h diff --git a/alienblaster/project/jni/application/src b/alienblaster/project/jni/application/src new file mode 120000 index 000000000..4de17cd97 --- /dev/null +++ b/alienblaster/project/jni/application/src @@ -0,0 +1 @@ +alienblaster \ No newline at end of file