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

android: force static openmp linking 

Issue #30
This commit is contained in:
Flyinghead 2020-03-17 14:16:23 +01:00
parent d5cd4e5834
commit bb345bf291
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -31,6 +31,7 @@ install:
- sudo apt-get -qq update - sudo apt-get -qq update
- touch ~/.android/repositories.cfg - touch ~/.android/repositories.cfg
- echo y | sdkmanager 'ndk-bundle' - echo y | sdkmanager 'ndk-bundle'
- echo y | sdkmanager 'ndk;21.0.6113669'
- export NDK=ANDROID_NDK=ANDROID_NDK_HOME=$ANDROID_HOME/ndk-bundle - export NDK=ANDROID_NDK=ANDROID_NDK_HOME=$ANDROID_HOME/ndk-bundle
- export PATH=${PATH}:$ANDROID_HOME/tools - export PATH=${PATH}:$ANDROID_HOME/tools
- export PATH=${PATH}:$ANDROID_HOME/platform-tools - export PATH=${PATH}:$ANDROID_HOME/platform-tools

4
shell/android-studio/reicast/src/main/jni/Android.mk
View File

@ -75,8 +75,8 @@ ifdef CHD5_FLAC
endif endif
LOCAL_CFLAGS += -DGLES3 LOCAL_CFLAGS += -DGLES3
LOCAL_CPPFLAGS += -std=c++11 -fopenmp LOCAL_CPPFLAGS += -std=c++11 -fopenmp -static-openmp
LOCAL_LDFLAGS += -fopenmp LOCAL_LDFLAGS += -fopenmp -static-openmp
ifeq ($(TARGET_ARCH_ABI),x86) ifeq ($(TARGET_ARCH_ABI),x86)
LOCAL_CFLAGS+= -DTARGET_NO_AREC -DTARGET_NO_OPENMP LOCAL_CFLAGS+= -DTARGET_NO_AREC -DTARGET_NO_OPENMP