Minor update to OpenArena, small x64 fixes to random headers

project/jni/application/openarena/AndroidAppSettings.cfg

@@ -213,7 +213,7 @@ FirstStartMenuOptions=''
 
 # Specify architectures to compile, 'all' or 'y' to compile for all architectures.
 # Available architectures: armeabi armeabi-v7a armeabi-v7a-hard x86 mips
-MultiABI='armeabi-v7a'
+MultiABI='armeabi-v7a x86 mips'
 
 # Minimum amount of RAM application requires, in Mb, SDL will print warning to user if it's lower
 AppMinimumRAM=300

project/jni/application/openarena/AndroidBuild.sh

@@ -5,7 +5,6 @@ LOCAL_PATH=`cd $LOCAL_PATH && pwd`
 
 if [ "$1" = "armeabi-v7a" ]; then (
 	mkdir -p AndroidData
-	[ -e libapplication.so ] || ln -s libapplication-armeabi.so libapplication.so
 	make -j8 -C vm BUILD_MISSIONPACK=0 || exit 1
 	cd vm/build/release-linux-`uname -m`/baseq3
 	#rm -f ../../../../AndroidData/binaries.zip ../../../../AndroidData/pak7-android.pk3

project/jni/application/xrick/AndroidAppSettings.cfg

@@ -7,10 +7,10 @@ AppName="XRick"
 AppFullName=net.xrick.sdl
 
 # Application version code (integer)
-AppVersionCode=102121208
+AppVersionCode=102121209
 
 # Application user-visible version name (string)
-AppVersionName="021212.08"
+AppVersionName="021212.09"
 
 # Specify path to download application data in zip archive in the form 'Description|URL|MirrorURL^Description2|URL2|MirrorURL2^...'
 # If you'll start Description with '!' symbol it will be enabled by default, other downloads should be selected by user from startup config menu

project/jni/flac/config.h

@@ -113,7 +113,11 @@
 #define PACKAGE_VERSION ""
 
 /* The size of a `void*', as computed by sizeof. */
+#ifdef __LP64__
+#define SIZEOF_VOIDP 8
+#else
 #define SIZEOF_VOIDP 4
+#endif
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1

project/jni/jpeg/Android.mk

@@ -30,7 +30,7 @@ LOCAL_SRC_FILES += jidctint.c jidctfst.S
 endif
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
-LOCAL_CFLAGS += -DAVOID_TABLES -DANDROID_RGB
+LOCAL_CFLAGS += -DAVOID_TABLES
 LOCAL_CFLAGS += -O3 -fstrict-aliasing -fprefetch-loop-arrays
 
 LOCAL_MODULE:= jpeg

project/jni/openal/src/config.h

@@ -42,7 +42,13 @@
 #define HAVE___INT64
 
 /* Define to the size of a long int type */
+#ifdef __LP64__
+#define SIZEOF_LONG 8
+#define SIZEOF_VOIDP 8
+#else
 #define SIZEOF_LONG 4
+#define SIZEOF_VOIDP 4
+#endif
 
 /* Define to the size of a long long int type */
 #define SIZEOF_LONG_LONG 8
@@ -51,7 +57,6 @@
 #define SIZEOF_UINT 4
 
 /* Define to the size of a void pointer type */
-#define SIZEOF_VOIDP 4
 
 /* Define if we have GCC's destructor attribute */
 #define HAVE_GCC_DESTRUCTOR 1

project/jni/sdl-1.2/include/SDL_config_android.h

@@ -61,8 +61,12 @@
 
 #define HAVE_STDIO_H 1
 
-
+#ifdef __LP64__
+#define SIZEOF_VOIDP 8
+#else
 #define SIZEOF_VOIDP 4
+#endif
+
 #define SDL_HAS_64BIT_TYPE 1
 
 /* FireSlash found that SDL native memcpy crashes sometimes, these defines fix it (and they are faster) */