ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update build system after enet & bullet got moved to lib/ directory.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11614 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
mbjornstk 2012-09-20 01:13:32 +00:00
parent 38f75c73a8
commit 38cfc79deb
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure.ac
View File

@ -370,8 +370,8 @@ fi
# Bullet physics # Bullet physics
# ============== # ==============
AC_DEFINE([BT_NO_PROFILE], [], [Disable bullet internal profiling]) AC_DEFINE([BT_NO_PROFILE], [], [Disable bullet internal profiling])
BULLETTREE="src/bullet" BULLETTREE="lib/bullet"
bullet_LIBS="-Lbullet/src -lbulletdynamics -lbulletcollision -lbulletmath" bullet_LIBS="-L../lib/bullet/src -lbulletdynamics -lbulletcollision -lbulletmath"
# ==== # ====
@ -399,10 +399,10 @@ case "${host}" in
enet_LIBS="-Lenet -lenet -lws2_32" enet_LIBS="-Lenet -lenet -lws2_32"
;; ;;
*) *)
enet_LIBS="-Lenet -lenet" enet_LIBS="-L../lib/enet -lenet"
;; ;;
esac esac
ENETTREE="src/enet" ENETTREE="lib/enet"
# ========================================== # ==========================================
# Check for a known compiler bug, details in # Check for a known compiler bug, details in
@ -453,9 +453,9 @@ AC_CONFIG_FILES([ \
doc/Makefile \ doc/Makefile \
src/Makefile \ src/Makefile \
src/ide/Makefile \ src/ide/Makefile \
src/bullet/Makefile \ lib/bullet/Makefile \
src/bullet/src/Makefile \ lib/bullet/src/Makefile \
src/enet/Makefile \ lib/enet/Makefile \
tools/Makefile tools/Makefile
]) ])
AC_OUTPUT AC_OUTPUT

2
src/Makefile.am
View File

@ -6,7 +6,7 @@ bindir=$(prefix)/games
bin_PROGRAMS = supertuxkart bin_PROGRAMS = supertuxkart
AM_CPPFLAGS = -DSUPERTUXKART_DATADIR="\"$(datadir)/games/$(PACKAGE)/\"" \ AM_CPPFLAGS = -DSUPERTUXKART_DATADIR="\"$(datadir)/games/$(PACKAGE)/\"" \
-I$(srcdir)/bullet/src/ -I$(srcdir)/enet/include/ -I$(srcdir)/../lib/bullet/src/ -I$(srcdir)/../lib/enet/include/
supertuxkart_SOURCES = \ supertuxkart_SOURCES = \
main.cpp \ main.cpp \