Skip to content

Commit

Permalink
Use mysql_config for linking mysql client
Browse files Browse the repository at this point in the history
  • Loading branch information
M-itch committed Nov 26, 2014
1 parent 9c974a2 commit 2195b49
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions doit.sh
Expand Up @@ -124,7 +124,7 @@ if [ "$1" == "" ] || [ "$1" == "cod2_1_3" ]; then

echo "##### LINK lib$1.so #####"
objects="$(ls objects_normal/*.opp) $(ls objects_$1/*.opp)"
$cc -m32 -shared -L/lib32 $mysql_link -L./vendors/lib -o bin/lib$1.so $objects $objects_tcc -Os -s -ldl -Wall $java_lib
$cc -m32 -shared -L/lib32 -o bin/lib$1.so $objects $objects_tcc -Os -s -ldl -Wall $java_lib `mysql_config --cflags --libs`
fi
# -Xlinker --defsym -Xlinker stackStart=0x08297500

Expand All @@ -143,7 +143,7 @@ if [ "$1" == "" ] || [ "$1" == "cod2_1_2" ]; then

echo "##### LINK lib$1.so #####"
objects="$(ls objects_normal/*.opp) $(ls objects_$1/*.opp)"
$cc -m32 -shared -L/lib32 $mysql_link -L./vendors/lib -o bin/lib$1.so $objects $objects_tcc -Os -s -ldl -Wall $java_lib
$cc -m32 -shared -L/lib32 -o bin/lib$1.so $objects $objects_tcc -Os -s -ldl -Wall $java_lib `mysql_config --cflags --libs`
fi

if [ "$1" == "" ] || [ "$1" == "cod2_1_0" ]; then
Expand All @@ -161,7 +161,7 @@ if [ "$1" == "" ] || [ "$1" == "cod2_1_0" ]; then

echo "##### LINK lib$1.so #####"
objects="$(ls objects_normal/*.opp) $(ls objects_$1/*.opp)"
$cc -m32 -shared -L/lib32 $mysql_link -L./vendors/lib -o bin/lib$1.so $objects $objects_tcc -Os -s -ldl -Wall $java_lib
$cc -m32 -shared -L/lib32 -o bin/lib$1.so $objects $objects_tcc -Os -s -ldl -Wall $java_lib `mysql_config --cflags --libs`
fi


Expand All @@ -176,7 +176,7 @@ if [ "$1" == "" ] || [ "$1" == "cod1_1_5" ]; then
#$cc $options $constants -c gsc_player.cpp -o gsc_player.opp

echo "##### LINK libcod1_1_5.so #####"
$cc -m32 -shared -L/lib32 -lmysqlclient -L./vendors/lib -o bin/libcod1_1_5.so libcod2.opp gsc.opp gsc_player.opp gsc_astar.opp gsc_mysql.opp server.opp gsc_memory.opp cracking.opp $objects_tcc -Os -s -ldl -Wall
$cc -m32 -shared -L/lib32 -o bin/libcod1_1_5.so libcod2.opp gsc.opp gsc_player.opp gsc_astar.opp gsc_mysql.opp server.opp gsc_memory.opp cracking.opp $objects_tcc -Os -s -ldl -Wall `mysql_config --cflags --libs`
fi


Expand All @@ -195,7 +195,7 @@ if [ "$1" == "" ] || [ "$1" == "cod4_1_7" ]; then

echo "##### LINK lib$1.so #####"
objects="$(ls objects_normal/*.opp) $(ls objects_$1/*.opp)"
$cc -m32 -shared -L/lib32 $mysql_link -L./vendors/lib -o bin/lib$1.so $objects $objects_tcc -Os -s -ldl -Wall $java_lib
$cc -m32 -shared -L/lib32 -o bin/lib$1.so $objects $objects_tcc -Os -s -ldl -Wall $java_lib `mysql_config --cflags --libs`
fi


Expand All @@ -214,7 +214,7 @@ if [ "$1" == "" ] || [ "$1" == "cod4_1_7_l" ]; then

echo "##### LINK lib$1.so #####"
objects="$(ls objects_normal/*.opp) $(ls objects_$1/*.opp)"
$cc -m32 -shared -L/lib32 $mysql_link -L./vendors/lib -o bin/lib$1.so $objects $objects_tcc -Os -s -ldl -Wall $java_lib
$cc -m32 -shared -L/lib32 -o bin/lib$1.so $objects $objects_tcc -Os -s -ldl -Wall $java_lib `mysql_config --cflags --libs`
fi


Expand All @@ -232,4 +232,4 @@ if [ "$1" == "wrapper" ]; then

cp wrapper_libcod2.so bin/libcod2.so
#cp wrapper_libcod2.so /root/helper/game_cod2/libs/libcod2.so # other then "mv", "ld" can use it so (not just from game-libs-folder)
fi
fi

0 comments on commit 2195b49

Please sign in to comment.