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

Updated helper build scripts, this may break compilation of some projects

Browse Source
This commit is contained in:
pelya
2012-12-28 16:03:11 +02:00
parent 5a68d9a803
commit 7a20583ead
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
project/jni/application/freetype-config
View File

@@ -13,10 +13,10 @@ LOCAL_PATH=`dirname $0`
LOCAL_PATH=`cd $LOCAL_PATH && pwd`
prefix=$LOCAL_PATH/../freetype
exec_prefix=$LOCAL_PATH/../../obj/local/armeabi
#exec_prefix=$LOCAL_PATH/../../obj/local/armeabi # Breaks armeabi-v7a build
exec_prefix_set=no
includedir=${prefix}/include
libdir=${exec_prefix}/lib
#libdir=${exec_prefix}/lib
enable_shared=
wl=-Wl,
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
@@ -146,7 +146,7 @@ if test "$echo_libs" = "yes" ; then
fi
libs="-lfreetype "
if test "$libdir" != "/usr/lib" && test "$libdir" != "/usr/lib64"; then
echo -L$libdir $rpath $libs
echo $rpath $libs #-L$libdir
else
echo $libs
fi

2
project/jni/application/openarena/engine

Submodule project/jni/application/openarena/engine updated: 5c6bfe3c1e...8e5c2bbce3

2
project/jni/application/openarena/vm

Submodule project/jni/application/openarena/vm updated: 6f83b0c5a4...86f8d32314

6
project/jni/application/sdl-config
View File

@@ -4,7 +4,7 @@ LOCAL_PATH=`dirname $0`
LOCAL_PATH=`cd $LOCAL_PATH && pwd`
prefix=$LOCAL_PATH/../sdl-1.2
exec_prefix=$LOCAL_PATH/../../obj/local/armeabi
#exec_prefix=$LOCAL_PATH/../../obj/local/armeabi # Breaks armeabi-v7a build
exec_prefix_set=no
#usage="\
@@ -50,11 +50,11 @@ while test $# -gt 0; do
echo -I${prefix}/include -D_GNU_SOURCE=1 -D_REENTRANT
;;
--libs)
echo -L${exec_prefix} -lsdl-1.2
echo -lsdl-1.2 #-L${exec_prefix}
;;
--static-libs)
# --libs|--static-libs)
echo -L${exec_prefix} -lsdl-1.2
echo -lsdl-1.2 #-L${exec_prefix}
;;
*)
echo "${usage}" 1>&2