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

Disable support for irrlicht 1.7*, enforce usage of irrlicht 1.8.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8159 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2011-03-31 23:42:32 +00:00
parent fc1a60cbbf
commit e1ab88c42b
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
configure.ac
View File

@ -1,6 +1,6 @@
# Process this file with autogen.sh to produce a configure script. # Process this file with autogen.sh to produce a configure script.
AC_INIT(supertuxkart, SVN) AC_INIT(supertuxkart,SVN)
AC_CONFIG_SRCDIR([src/main.cpp]) AC_CONFIG_SRCDIR([src/main.cpp])
AC_PREREQ(2.61) AC_PREREQ(2.61)
@ -232,7 +232,7 @@ fi
case "${host}" in case "${host}" in
*-*-linux* ) *-*-linux* )
irrlicht_LIBS="-L/$with_irrlicht/lib/Linux -L/$with_irrlicht/lib -lIrrlicht" irrlicht_LIBS="-L/$with_irrlicht/lib/Linux -L/$with_irrlicht/lib -lIrrlicht -lXcursor"
;; ;;
*darwin*|*macosx*) *darwin*|*macosx*)
irrlicht_LIBS="-L/$with_irrlicht/lib/ -lIrrlicht -framework Cocoa" irrlicht_LIBS="-L/$with_irrlicht/lib/ -lIrrlicht -framework Cocoa"
@ -303,9 +303,10 @@ AC_TRY_RUN(
# include "irrlicht.h" # include "irrlicht.h"
int main() { int main() {
#if (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR == 7) #if (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR == 7)
// ok #error "STK needs irrlicht 1.8* to work properly (which might be only available"
#error "as svn trunk atm"
#else #else
#error "You need irrLicht 1.7.* to build STK, irrlicht 1.8 is not supported yet" // ok
#endif #endif
return 0; return 0;
} }
@ -315,7 +316,9 @@ AC_TRY_RUN(
) )
if test x$irrlicht_min_version_met = xfalse; then if test x$irrlicht_min_version_met = xfalse; then
AC_MSG_ERROR([Your irrLicht is too old, please update irrLicht.]) AC_MSG_ERROR([Your irrLicht is too old, please update irrLicht.
You need irrlicht 1.8.
While irrlicht 1.8 is not released, we recommend using version 3629 from irrlicht SVN trunk.])
else else
echo "yes" echo "yes"
fi fi