ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Streamline the build process to prevent possibility for errors

This commit is contained in:
TwistedUmbrella 2014-03-04 03:32:12 -05:00
parent ba9094747f
commit 3954d719f5
6 changed files with 20 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
README.md
View File

@ -31,15 +31,9 @@ Tools required:
From project root directory: From project root directory:
``` ```
cd shell\android\xperia export ANDROID_NDK=\ <-Type the full path to your NDK here
rm -rf libs cd shell\android
android update project -p . --target "android-9"
ndk-build -j4
cd ..\
android update project -p . --target "android-19" android update project -p . --target "android-19"

10
shell/android/custom_rules.xml
View File

@ -8,16 +8,6 @@
<exec executable="${ndk.dir}/ndk-build" failonerror="true" osfamily="unix"> <exec executable="${ndk.dir}/ndk-build" failonerror="true" osfamily="unix">
<arg line="-j8 ${ndkbuildopt}"/> <arg line="-j8 ${ndkbuildopt}"/>
</exec> </exec>
<copy todir="${jar.libs.dir}/armeabi-v7a">
<fileset
dir="xperia/libs/armeabi-v7a"
includes="libsexplay.so" />
</copy>
<copy todir="${jar.libs.dir}/x86">
<fileset
dir="xperia/libs/x86"
includes="libsexplay.so" />
</copy>
</target> </target>
<target name="clean" depends="android_rules.clean"> <target name="clean" depends="android_rules.clean">
<exec executable="${ndk.dir}/ndk-build.cmd" failonerror="true" osfamily="windows"> <exec executable="${ndk.dir}/ndk-build.cmd" failonerror="true" osfamily="windows">

19
shell/android/jni/Android.mk
View File

@ -28,7 +28,9 @@ endif
include $(LOCAL_PATH)/../../core/core.mk include $(LOCAL_PATH)/../../core/core.mk
LOCAL_SRC_FILES := $(RZDCY_FILES) $(wildcard $(LOCAL_PATH)/jni/src/*.cpp) LOCAL_SRC_FILES := $(RZDCY_FILES)
LOCAL_SRC_FILES += $(wildcard $(LOCAL_PATH)/jni/src/Android.cpp)
LOCAL_SRC_FILES += $(wildcard $(LOCAL_PATH)/jni/src/utils.cpp)
LOCAL_CXXFLAGS := $(RZDCY_CXXFLAGS) LOCAL_CXXFLAGS := $(RZDCY_CXXFLAGS)
LOCAL_SHARED_LIBRARIES:= libcutils libutils LOCAL_SHARED_LIBRARIES:= libcutils libutils
@ -63,3 +65,18 @@ LOCAL_ARM_MODE := arm
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
$(call import-module,android/native_app_glue) $(call import-module,android/native_app_glue)
LOCAL_CERTIFICATE := shared
LOCAL_PATH:= $(call my-dir)/..
include $(CLEAR_VARS)
LOCAL_MODULE := sexplay
LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/jni/src/XperiaPlay.c)
LOCAL_LDLIBS := -llog -landroid -lEGL -lGLESv1_CM
LOCAL_STATIC_LIBRARIES := android_native_app_glue
include $(BUILD_SHARED_LIBRARY)
$(call import-module,android/native_app_glue)

0
shell/android/xperia/jni/XperiaPlay.c → shell/android/jni/src/XperiaPlay.c
View File

15
shell/android/xperia/jni/Android.mk
View File

@ -1,15 +0,0 @@
LOCAL_CERTIFICATE := shared
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := sexplay
LOCAL_SRC_FILES := XperiaPlay.c
LOCAL_LDLIBS := -llog -landroid -lEGL -lGLESv1_CM
LOCAL_STATIC_LIBRARIES := android_native_app_glue
include $(BUILD_SHARED_LIBRARY)
$(call import-module,android/native_app_glue)

4
shell/android/xperia/jni/Application.mk
View File

@ -1,4 +0,0 @@
APP_ABI := armeabi-v7a x86
#APP_ABI := armeabi-v7a
APP_PLATFORM := android-9
NDK_TOOLCHAIN_VERSION := 4.8