# HG changeset patch
# User Xeli
# Date 1353263595 -3600
# Node ID abbcdf73327a853b261333413c8ad1acd2c9a5f0
# Parent  341fa76d07497e075906e9a2eb3461a52af57f90
allow the engine to use physfs on android too

diff -r 341fa76d0749 -r abbcdf73327a hedgewars/uPhysFSLayer.pas
--- a/hedgewars/uPhysFSLayer.pas	Sun Nov 18 18:58:46 2012 +0400
+++ b/hedgewars/uPhysFSLayer.pas	Sun Nov 18 19:33:15 2012 +0100
@@ -1,7 +1,11 @@
 unit uPhysFSLayer;
-
-{$LINKLIB ../bin/libphysfs.a}
-{$LINKLIB ../bin/libphysfsrwops.a}
+{$IFDEF ANDROID}
+    {$linklib physfs}
+    {$linklib physfsrwops}
+{$ELSE}
+    {$LINKLIB ../bin/libphysfs.a}
+    {$LINKLIB ../bin/libphysfsrwops.a}
+{$ENDIF}
 
 interface
 uses SDLh;
diff -r 341fa76d0749 -r abbcdf73327a misc/Android.mk
--- a/misc/Android.mk	Sun Nov 18 18:58:46 2012 +0400
+++ b/misc/Android.mk	Sun Nov 18 19:33:15 2012 +0100
@@ -4,3 +4,4 @@
 include $(MISC_DIR)/libfreetype/Android.mk
 include $(MISC_DIR)/liblua/Android.mk
 include $(MISC_DIR)/libtremor/Android.mk
+include $(MISC_DIR)/physfs/Android.mk
diff -r 341fa76d0749 -r abbcdf73327a misc/physfs/Android.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/physfs/Android.mk	Sun Nov 18 19:33:15 2012 +0100
@@ -0,0 +1,1 @@
+include $(call all-subdir-makefiles)
diff -r 341fa76d0749 -r abbcdf73327a misc/physfs/extras/Android.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/physfs/extras/Android.mk	Sun Nov 18 19:33:15 2012 +0100
@@ -0,0 +1,17 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE    := physfsrwops
+
+LOCAL_CFLAGS := -O2 -DPHYSFS_NO_CDROM_SUPPORT 
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../liblua $(LOCAL_PATH)/../src $(LOCAL_PATH)/../../../project_files/Android-build/SDL-android-project/jni/SDL/include
+
+LOCAL_SRC_FILES := hwpacksmounter.c \
+                   physfslualoader.c \
+                   physfsrwops.c   
+
+LOCAL_SHARED_LIBRARIES := SDL physfs
+    
+include $(BUILD_SHARED_LIBRARY)
diff -r 341fa76d0749 -r abbcdf73327a misc/physfs/src/Android.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/physfs/src/Android.mk	Sun Nov 18 19:33:15 2012 +0100
@@ -0,0 +1,27 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE    := physfs
+
+LOCAL_CFLAGS := -O2 -DPHYSFS_NO_CDROM_SUPPORT 
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)
+
+LOCAL_SRC_FILES :=    physfs.c \
+    physfs_byteorder.c \
+    physfs_unicode.c \
+    platform_posix.c \
+    platform_unix.c \
+    platform_macosx.c \
+    platform_windows.c \
+    archiver_dir.c \
+    archiver_grp.c \
+    archiver_hog.c \
+    archiver_lzma.c \
+    archiver_mvl.c \
+    archiver_qpak.c \
+    archiver_wad.c \
+    archiver_zip.c \
+    
+include $(BUILD_SHARED_LIBRARY)
diff -r 341fa76d0749 -r abbcdf73327a project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/EngineProtocol/PascalExports.java
--- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/EngineProtocol/PascalExports.java	Sun Nov 18 18:58:46 2012 +0400
+++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/EngineProtocol/PascalExports.java	Sun Nov 18 19:33:15 2012 +0100
@@ -31,6 +31,8 @@
 		System.loadLibrary("SDL_mixer");
 		System.loadLibrary("SDL_ttf");
 		System.loadLibrary("lua5.1");
+		System.loadLibrary("physfs");
+		System.loadLibrary("physfsrwops");
 		System.loadLibrary("hwengine");
 	}
 	
diff -r 341fa76d0749 -r abbcdf73327a project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/frontlib/Flib.java
--- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/frontlib/Flib.java	Sun Nov 18 18:58:46 2012 +0400
+++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/frontlib/Flib.java	Sun Nov 18 19:33:15 2012 +0100
@@ -28,6 +28,7 @@
 
 public class Flib {
 	static {
+		System.loadLibrary("SDL");
 		System.loadLibrary("SDL_net");
 		System.setProperty("jna.encoding", "UTF8"); // Ugly global setting, but it seems JNA doesn't allow setting this per-library... 
 	}
@@ -58,4 +59,4 @@
 		INSTANCE.flib_log_setLevel(Frontlib.FLIB_LOGLEVEL_INFO);
 		INSTANCE.flib_log_setCallback(logCb);
 	}
-}
\ No newline at end of file
+}
diff -r 341fa76d0749 -r abbcdf73327a project_files/frontlib/hwconsts.h
--- a/project_files/frontlib/hwconsts.h	Sun Nov 18 18:58:46 2012 +0400
+++ b/project_files/frontlib/hwconsts.h	Sun Nov 18 19:33:15 2012 +0100
@@ -44,7 +44,7 @@
 // Used for sending scripts to the engine
 #define MULTIPLAYER_SCRIPT_PATH "Scripts/Multiplayer/"
 
-#define WEAPONS_COUNT 55
+#define WEAPONS_COUNT 56
 
 // TODO allow frontend to override these?
 /* A merge of mikade/bugq colours w/ a bit of channel feedback */