Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2024-11-18 20:07:55 +00:00
Code Issues Projects Releases Wiki Activity

Switch Android toolchain to stable Clang

Browse Source
This commit is contained in:
Aaron Culliney 2016-02-20 13:41:19 -08:00
parent 44b9c4c408
commit c5ed0bb5c6
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Android/jni/build.sh
View File

@ -104,8 +104,8 @@ fi
if test "x$do_build" = "x1" -o "x$do_release" = "x1" ; then if test "x$do_build" = "x1" -o "x$do_release" = "x1" ; then
#CC=`which clang` CC=`which clang`
CC=`which gcc` #CC=`which gcc`
CFLAGS="-std=gnu11" CFLAGS="-std=gnu11"
# ROMz # ROMz
@ -122,14 +122,14 @@ if test "x$do_build" = "x1" -o "x$do_release" = "x1" ; then
if test "x$do_build" = "x1" ; then if test "x$do_build" = "x1" ; then
export BUILD_MODE=debug export BUILD_MODE=debug
ndk-build V=1 NDK_MODULE_PATH=. NDK_DEBUG=1 # NDK_TOOLCHAIN_VERSION=clang ndk-build V=1 NDK_MODULE_PATH=. NDK_DEBUG=1 NDK_TOOLCHAIN_VERSION=clang
ret=$? ret=$?
if test "x$ret" != "x0" ; then if test "x$ret" != "x0" ; then
exit $ret exit $ret
fi fi
else else
export BUILD_MODE=release export BUILD_MODE=release
ndk-build V=1 NDK_MODULE_PATH=. # NDK_TOOLCHAIN_VERSION=clang ndk-build V=1 NDK_MODULE_PATH=. NDK_TOOLCHAIN_VERSION=clang
ret=$? ret=$?
if test "x$ret" != "x0" ; then if test "x$ret" != "x0" ; then
exit $ret exit $ret

2
Android/jni/sources.mk
View File

@ -41,7 +41,7 @@ APPLE2_MAIN_SRC = \
APPLE2_OPTIM_CFLAGS := -O2 APPLE2_OPTIM_CFLAGS := -O2
APPLE2_BASE_CFLAGS := -DAPPLE2IX=1 -DINTERFACE_TOUCH=1 -DMOBILE_DEVICE=1 -DVIDEO_OPENGL=1 -DDEBUGGER=1 -DAUDIO_ENABLED=1 -std=gnu11 -DPREVENT_TEXTREL=1 -fPIC $(APPLE2_OPTIM_CFLAGS) -I$(APPLE2_SRC_PATH) APPLE2_BASE_CFLAGS := -DAPPLE2IX=1 -DINTERFACE_TOUCH=1 -DMOBILE_DEVICE=1 -DVIDEO_OPENGL=1 -DDEBUGGER=1 -DAUDIO_ENABLED=1 -std=gnu11 -DPREVENT_TEXTREL=1 -fPIC $(APPLE2_OPTIM_CFLAGS) -I$(APPLE2_SRC_PATH)
APPLE2_BASE_LDLIBS := -llog -landroid -lGLESv2 -lz -lOpenSLES APPLE2_BASE_LDLIBS := -llog -landroid -lGLESv2 -lz -lOpenSLES -latomic
LOCAL_WHOLE_STATIC_LIBRARIES += cpufeatures LOCAL_WHOLE_STATIC_LIBRARIES += cpufeatures