miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SDL: filter out c++_shared library from setEnvironment LDFLAGS

Browse Source
This commit is contained in:
Sergii Pylypenko
2019-04-25 18:40:18 +03:00
parent 90f5ab5684
commit f78c911f0a
5 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
project/jni/Application.mk
View File

@@ -2,7 +2,11 @@ APP_PROJECT_PATH := $(call my-dir)/..
include jni/Settings.mk
ifneq ($(filter c++_shared, $(APP_MODULES)),)
APP_STL := c++_shared
else
APP_STL := none
endif
APP_CFLAGS := -g
ifneq ($(NDK_DEBUG),1)
APP_CFLAGS += -Oz -DNDEBUG # -Oz works best with clang

2
project/jni/application/setEnvironment-arm64-v8a.sh
View File

@@ -37,7 +37,7 @@ all:
APP_SHARED_LIBS=$(
echo $APP_MODULES | xargs -n 1 echo | while read LIB ; do
STATIC=`echo $APP_AVAILABLE_STATIC_LIBS application sdl_main stlport stdout-test | grep "\\\\b$LIB\\\\b"`
STATIC=`echo $APP_AVAILABLE_STATIC_LIBS application sdl_main c++_shared | grep "\\\\b$LIB\\\\b"`
if [ -n "$STATIC" ] ; then true
else
case $LIB in

2
project/jni/application/setEnvironment-armeabi-v7a.sh
View File

@@ -38,7 +38,7 @@ all:
APP_SHARED_LIBS=$(
echo $APP_MODULES | xargs -n 1 echo | while read LIB ; do
STATIC=`echo $APP_AVAILABLE_STATIC_LIBS application sdl_main stlport stdout-test | grep "\\\\b$LIB\\\\b"`
STATIC=`echo $APP_AVAILABLE_STATIC_LIBS application sdl_main c++_shared | grep "\\\\b$LIB\\\\b"`
if [ -n "$STATIC" ] ; then true
else
case $LIB in

2
project/jni/application/setEnvironment-x86.sh
View File

@@ -37,7 +37,7 @@ all:
APP_SHARED_LIBS=$(
echo $APP_MODULES | xargs -n 1 echo | while read LIB ; do
STATIC=`echo $APP_AVAILABLE_STATIC_LIBS application sdl_main stlport stdout-test | grep "\\\\b$LIB\\\\b"`
STATIC=`echo $APP_AVAILABLE_STATIC_LIBS application sdl_main c++_shared | grep "\\\\b$LIB\\\\b"`
if [ -n "$STATIC" ] ; then true
else
case $LIB in

2
project/jni/application/setEnvironment-x86_64.sh
View File

@@ -37,7 +37,7 @@ all:
APP_SHARED_LIBS=$(
echo $APP_MODULES | xargs -n 1 echo | while read LIB ; do
STATIC=`echo $APP_AVAILABLE_STATIC_LIBS application sdl_main stlport stdout-test | grep "\\\\b$LIB\\\\b"`
STATIC=`echo $APP_AVAILABLE_STATIC_LIBS application sdl_main c++_shared | grep "\\\\b$LIB\\\\b"`
if [ -n "$STATIC" ] ; then true
else
case $LIB in