libretro/Play-
1
0
Fork 0
mirror of https://github.com/libretro/Play-.git synced 2025-02-08 10:06:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make IszImageStream compile on Android.

Browse Source
This commit is contained in:
Jean-Philip Desjardins 2015-04-09 02:17:42 -04:00
parent d0f3345903
commit 09e61b0543
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/PS2VM.cpp
View File

@ -649,12 +649,10 @@ void CPS2VM::CDROM0_Mount(const char* path)
}
//Gotta think of something better than that...
#ifndef __ANDROID__ //This is temporary till we get bzip2 to compile on Android
if(!stricmp(extension, ".isz"))
{
stream = new CIszImageStream(new Framework::CStdStream(path, "rb"));
}
#endif
#ifdef WIN32
else if(path[0] == '\\')
{

12
build_android/jni/Android.mk
View File

@ -11,6 +11,13 @@ include $(PREBUILT_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := libbzip2
LOCAL_SRC_FILES := $(DEPENDENCIES_PATH)/build_android/obj/local/$(TARGET_ARCH_ABI)/libbzip2.a
include $(PREBUILT_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := libFramework
LOCAL_SRC_FILES := $(FRAMEWORK_PATH)/build_android/obj/local/$(TARGET_ARCH_ABI)/libFramework.a
@ -108,6 +115,7 @@ LOCAL_SRC_FILES := ../../Source/AppConfig.cpp \
../../Source/IPU_MacroblockTypeITable.cpp \
../../Source/IPU_MacroblockTypePTable.cpp \
../../Source/IPU_MotionCodeTable.cpp \
../../Source/IszImageStream.cpp \
../../Source/Log.cpp \
../../Source/MA_EE.cpp \
../../Source/MA_EE_Reflection.cpp \
@ -153,10 +161,10 @@ LOCAL_SRC_FILES := ../../Source/AppConfig.cpp \
../../Source/VUShared.cpp \
../../Source/VUShared_Reflection.cpp
LOCAL_CFLAGS := -Wno-extern-c-compat -D_IOP_EMULATE_MODULES -DDISABLE_LOGGING -DGLES_COMPATIBILITY
LOCAL_C_INCLUDES := $(BOOST_PATH) $(FRAMEWORK_PATH)/include $(CODEGEN_PATH)/include $(LOCAL_PATH)/../../include
LOCAL_C_INCLUDES := $(BOOST_PATH) $(DEPENDENCIES_PATH)/bzip2-1.0.6 $(FRAMEWORK_PATH)/include $(CODEGEN_PATH)/include $(LOCAL_PATH)/../../include
LOCAL_CPP_FEATURES := exceptions rtti
LOCAL_LDLIBS := -landroid -llog -lGLESv3 -lEGL -lz
LOCAL_STATIC_LIBRARIES := libCodeGen libFramework libboost
LOCAL_STATIC_LIBRARIES := libCodeGen libFramework libbzip2 libboost
ifeq ($(APP_OPTIM),debug)
LOCAL_CFLAGS += -D_DEBUG