# HG changeset patch # User koda # Date 1361641785 -3600 # Node ID 0e113487c4b2da79113193a49b14287dd0bbd601 # Parent 55365fccb07513a12f85efc0902691397d1ddec4 blindly updated Android build files for new physfs diff -r 55365fccb075 -r 0e113487c4b2 misc/Android.mk --- a/misc/Android.mk Sat Feb 23 18:38:57 2013 +0100 +++ b/misc/Android.mk Sat Feb 23 18:49:45 2013 +0100 @@ -4,4 +4,6 @@ include $(MISC_DIR)/libfreetype/Android.mk include $(MISC_DIR)/liblua/Android.mk include $(MISC_DIR)/libtremor/Android.mk -include $(MISC_DIR)/physfs/Android.mk +include $(MISC_DIR)/libphysfs/Android.mk +include $(MISC_DIR)/libphyslayer/Android.mk + diff -r 55365fccb075 -r 0e113487c4b2 misc/libphysfs/Android.mk --- a/misc/libphysfs/Android.mk Sat Feb 23 18:38:57 2013 +0100 +++ b/misc/libphysfs/Android.mk Sat Feb 23 18:49:45 2013 +0100 @@ -4,29 +4,24 @@ LOCAL_MODULE := physfs -LOCAL_CFLAGS := -O2 -DPHYSFS_NO_CDROM_SUPPORT +LOCAL_CFLAGS := -O2 -DPHYSFS_NO_CDROM_SUPPORT -LOCAL_C_INCLUDES := $(LOCAL_PATH) $(MISC_DIR)/liblua $(MISC_DIR)/liblua $(JNI_DIR)/SDL/include +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 \ - ../extras/hwpacksmounter.c \ - ../extras/physfslualoader.c \ - ../extras/physfsrwops.c \ +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 \ -LOCAL_SHARED_LIBRARIES += SDL lua - include $(BUILD_SHARED_LIBRARY) diff -r 55365fccb075 -r 0e113487c4b2 misc/libphyslayer/Android.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/misc/libphyslayer/Android.mk Sat Feb 23 18:49:45 2013 +0100 @@ -0,0 +1,17 @@ +LOCAL_PATH := $(call my-dir) + +include $(CLEAR_VARS) + +LOCAL_MODULE := physlayer + +LOCAL_CFLAGS := -O2 + +LOCAL_C_INCLUDES := $(LOCAL_PATH) $(MISC_DIR)/liblua $(MISC_DIR)/liblua $(JNI_DIR)/SDL/include + +LOCAL_SRC_FILES := hwpacksmounter.c \ + physfslualoader.c \ + physfsrwops.c \ + +LOCAL_SHARED_LIBRARIES += SDL lua + +include $(BUILD_SHARED_LIBRARY) diff -r 55365fccb075 -r 0e113487c4b2 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 Sat Feb 23 18:38:57 2013 +0100 +++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/EngineProtocol/PascalExports.java Sat Feb 23 18:49:45 2013 +0100 @@ -32,6 +32,7 @@ System.loadLibrary("SDL_ttf"); System.loadLibrary("lua5.1"); System.loadLibrary("physfs"); + System.loadLibrary("physlayer"); System.loadLibrary("hwengine"); }