Menu
▾
▴
[Opengate-svn] SF.net SVN: opengate: [95]
|
From: <eg...@us...> - 2006-07-17 20:16:57
|
Revision: 95 Author: egore Date: 2006-07-17 13:16:48 -0700 (Mon, 17 Jul 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=95&view=rev Log Message: ----------- update autogenerated files for support of CEGUI-OGRE Modified Paths: -------------- Makefile.in configure configure.in opengate.kdevelop Modified: Makefile.in =================================================================== --- Makefile.in 2006-07-16 20:54:25 UTC (rev 94) +++ Makefile.in 2006-07-17 20:16:48 UTC (rev 95) @@ -87,6 +87,8 @@ CCDEPMODE = @CCDEPMODE@ CEGUI_CFLAGS = @CEGUI_CFLAGS@ CEGUI_LIBS = @CEGUI_LIBS@ +CEGUI_OGRE_CFLAGS = @CEGUI_OGRE_CFLAGS@ +CEGUI_OGRE_LIBS = @CEGUI_OGRE_LIBS@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ Modified: configure =================================================================== --- configure 2006-07-16 20:54:25 UTC (rev 94) +++ configure 2006-07-17 20:16:48 UTC (rev 95) @@ -859,6 +859,8 @@ AM_LDFLAGS CEGUI_CFLAGS CEGUI_LIBS +CEGUI_OGRE_CFLAGS +CEGUI_OGRE_LIBS LIBOBJS LTLIBOBJS' ac_subst_files='' @@ -880,7 +882,9 @@ OGRE_CFLAGS OGRE_LIBS CEGUI_CFLAGS -CEGUI_LIBS' +CEGUI_LIBS +CEGUI_OGRE_CFLAGS +CEGUI_OGRE_LIBS' # Initialize some variables set by options. @@ -1493,6 +1497,10 @@ CEGUI_CFLAGS C compiler flags for CEGUI, overriding pkg-config CEGUI_LIBS linker flags for CEGUI, overriding pkg-config + CEGUI_OGRE_CFLAGS + C compiler flags for CEGUI_OGRE, overriding pkg-config + CEGUI_OGRE_LIBS + linker flags for CEGUI_OGRE, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -4900,7 +4908,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4903 "configure"' > conftest.$ac_ext + echo '#line 4911 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7379,11 +7387,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7382: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7390: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7386: \$? = $ac_status" >&5 + echo "$as_me:7394: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7647,11 +7655,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7650: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7658: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7654: \$? = $ac_status" >&5 + echo "$as_me:7662: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7751,11 +7759,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7754: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7762: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7758: \$? = $ac_status" >&5 + echo "$as_me:7766: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10240,7 +10248,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10243 "configure" +#line 10251 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10340,7 +10348,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10343 "configure" +#line 10351 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12708,11 +12716,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12711: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12719: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12715: \$? = $ac_status" >&5 + echo "$as_me:12723: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -12812,11 +12820,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12815: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12823: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12819: \$? = $ac_status" >&5 + echo "$as_me:12827: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14419,11 +14427,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14422: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14430: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14426: \$? = $ac_status" >&5 + echo "$as_me:14434: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14523,11 +14531,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14526: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14534: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14530: \$? = $ac_status" >&5 + echo "$as_me:14538: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16790,11 +16798,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16793: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16801: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16797: \$? = $ac_status" >&5 + echo "$as_me:16805: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17058,11 +17066,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17061: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17069: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17065: \$? = $ac_status" >&5 + echo "$as_me:17073: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17162,11 +17170,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17165: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17173: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17169: \$? = $ac_status" >&5 + echo "$as_me:17177: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -20024,12 +20032,12 @@ pkg_cv_OGRE_CFLAGS="$OGRE_CFLAGS" else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"OGRE >= 1.2.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "OGRE >= 1.2.0") 2>&5 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"OGRE >= 1.2.1\"") >&5 + ($PKG_CONFIG --exists --print-errors "OGRE >= 1.2.1") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_OGRE_CFLAGS=`$PKG_CONFIG --cflags "OGRE >= 1.2.0" 2>/dev/null` + pkg_cv_OGRE_CFLAGS=`$PKG_CONFIG --cflags "OGRE >= 1.2.1" 2>/dev/null` else pkg_failed=yes fi @@ -20042,12 +20050,12 @@ pkg_cv_OGRE_LIBS="$OGRE_LIBS" else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"OGRE >= 1.2.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "OGRE >= 1.2.0") 2>&5 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"OGRE >= 1.2.1\"") >&5 + ($PKG_CONFIG --exists --print-errors "OGRE >= 1.2.1") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_OGRE_LIBS=`$PKG_CONFIG --libs "OGRE >= 1.2.0" 2>/dev/null` + pkg_cv_OGRE_LIBS=`$PKG_CONFIG --libs "OGRE >= 1.2.1" 2>/dev/null` else pkg_failed=yes fi @@ -20066,14 +20074,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - OGRE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "OGRE >= 1.2.0"` + OGRE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "OGRE >= 1.2.1"` else - OGRE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "OGRE >= 1.2.0"` + OGRE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "OGRE >= 1.2.1"` fi # Put the nasty error message in config.log where it belongs echo "$OGRE_PKG_ERRORS" >&5 - { { echo "$as_me:$LINENO: error: Package requirements (OGRE >= 1.2.0) were not met: + { { echo "$as_me:$LINENO: error: Package requirements (OGRE >= 1.2.1) were not met: $OGRE_PKG_ERRORS @@ -20084,7 +20092,7 @@ and OGRE_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. " >&5 -echo "$as_me: error: Package requirements (OGRE >= 1.2.0) were not met: +echo "$as_me: error: Package requirements (OGRE >= 1.2.1) were not met: $OGRE_PKG_ERRORS @@ -20250,8 +20258,126 @@ AM_LDFLAGS="$AM_LDFLAGS" -ac_config_files="$ac_config_files Makefile src/Makefile doc/Makefile src/common/Makefile src/client/Makefile src/server/Makefile src/common/objects/Makefile src/common/equipment/Makefile src/common/equipment/engines/Makefile src/common/equipment/ecms/Makefile src/common/objects/ships/Makefile data/Makefile data/Ships/Makefile data/Ships/Conflux/Makefile data/Ships/Conflux/C-0/Makefile data/Ships/Conflux/C-1/Makefile data/Ships/Conflux/C-2/Makefile data/Ships/Conflux/C-3/Makefile src/common/components/Makefile src/client/input/Makefile src/client/ui/Makefile" +pkg_failed=no +{ echo "$as_me:$LINENO: checking for CEGUI_OGRE" >&5 +echo $ECHO_N "checking for CEGUI_OGRE... $ECHO_C" >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$CEGUI_OGRE_CFLAGS"; then + pkg_cv_CEGUI_OGRE_CFLAGS="$CEGUI_OGRE_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"CEGUI-OGRE >= 1.2.1\"") >&5 + ($PKG_CONFIG --exists --print-errors "CEGUI-OGRE >= 1.2.1") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_CEGUI_OGRE_CFLAGS=`$PKG_CONFIG --cflags "CEGUI-OGRE >= 1.2.1" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$CEGUI_OGRE_LIBS"; then + pkg_cv_CEGUI_OGRE_LIBS="$CEGUI_OGRE_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"CEGUI-OGRE >= 1.2.1\"") >&5 + ($PKG_CONFIG --exists --print-errors "CEGUI-OGRE >= 1.2.1") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_CEGUI_OGRE_LIBS=`$PKG_CONFIG --libs "CEGUI-OGRE >= 1.2.1" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + CEGUI_OGRE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "CEGUI-OGRE >= 1.2.1"` + else + CEGUI_OGRE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "CEGUI-OGRE >= 1.2.1"` + fi + # Put the nasty error message in config.log where it belongs + echo "$CEGUI_OGRE_PKG_ERRORS" >&5 + + { { echo "$as_me:$LINENO: error: Package requirements (CEGUI-OGRE >= 1.2.1) were not met: + +$CEGUI_OGRE_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables CEGUI_OGRE_CFLAGS +and CEGUI_OGRE_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" >&5 +echo "$as_me: error: Package requirements (CEGUI-OGRE >= 1.2.1) were not met: + +$CEGUI_OGRE_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables CEGUI_OGRE_CFLAGS +and CEGUI_OGRE_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" >&2;} + { (exit 1); exit 1; }; } +elif test $pkg_failed = untried; then + { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables CEGUI_OGRE_CFLAGS +and CEGUI_OGRE_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. +See \`config.log' for more details." >&5 +echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables CEGUI_OGRE_CFLAGS +and CEGUI_OGRE_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +else + CEGUI_OGRE_CFLAGS=$pkg_cv_CEGUI_OGRE_CFLAGS + CEGUI_OGRE_LIBS=$pkg_cv_CEGUI_OGRE_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + : +fi +AM_CXXFLAGS="$AM_CXXFLAGS $CEGUI_OGRE_CFLAGS" +AM_LDFLAGS="$AM_LDFLAGS $CEGUI_OGRE_LIBS" +AM_CXXFLAGS="$AM_CXXFLAGS" + +AM_LDFLAGS="$AM_LDFLAGS" + + +ac_config_files="$ac_config_files Makefile src/Makefile doc/Makefile src/common/Makefile src/client/Makefile src/server/Makefile src/common/objects/Makefile src/common/equipment/Makefile src/common/equipment/engines/Makefile src/common/equipment/ecms/Makefile src/common/objects/ships/Makefile data/Makefile data/Ships/Makefile data/Ships/Conflux/Makefile data/Ships/Conflux/C-0/Makefile data/Ships/Conflux/C-1/Makefile data/Ships/Conflux/C-2/Makefile data/Ships/Conflux/C-3/Makefile src/client/input/Makefile src/client/ui/Makefile src/common/equipment/capacitors/Makefile src/common/equipment/guns/Makefile src/common/components/Makefile" + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -20842,9 +20968,11 @@ "data/Ships/Conflux/C-1/Makefile") CONFIG_FILES="$CONFIG_FILES data/Ships/Conflux/C-1/Makefile" ;; "data/Ships/Conflux/C-2/Makefile") CONFIG_FILES="$CONFIG_FILES data/Ships/Conflux/C-2/Makefile" ;; "data/Ships/Conflux/C-3/Makefile") CONFIG_FILES="$CONFIG_FILES data/Ships/Conflux/C-3/Makefile" ;; - "src/common/components/Makefile") CONFIG_FILES="$CONFIG_FILES src/common/components/Makefile" ;; "src/client/input/Makefile") CONFIG_FILES="$CONFIG_FILES src/client/input/Makefile" ;; "src/client/ui/Makefile") CONFIG_FILES="$CONFIG_FILES src/client/ui/Makefile" ;; + "src/common/equipment/capacitors/Makefile") CONFIG_FILES="$CONFIG_FILES src/common/equipment/capacitors/Makefile" ;; + "src/common/equipment/guns/Makefile") CONFIG_FILES="$CONFIG_FILES src/common/equipment/guns/Makefile" ;; + "src/common/components/Makefile") CONFIG_FILES="$CONFIG_FILES src/common/components/Makefile" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} @@ -21055,11 +21183,13 @@ AM_LDFLAGS!$AM_LDFLAGS$ac_delim CEGUI_CFLAGS!$CEGUI_CFLAGS$ac_delim CEGUI_LIBS!$CEGUI_LIBS$ac_delim +CEGUI_OGRE_CFLAGS!$CEGUI_OGRE_CFLAGS$ac_delim +CEGUI_OGRE_LIBS!$CEGUI_OGRE_LIBS$ac_delim LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 12; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 14; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 Modified: configure.in =================================================================== --- configure.in 2006-07-16 20:54:25 UTC (rev 94) +++ configure.in 2006-07-17 20:16:48 UTC (rev 95) @@ -7,7 +7,7 @@ AC_PROG_CXX AM_PROG_LIBTOOL -PKG_CHECK_MODULES(OGRE, [OGRE >= 1.2.0]) +PKG_CHECK_MODULES(OGRE, [OGRE >= 1.2.1]) AM_CXXFLAGS="$AM_CXXFLAGS $OGRE_CFLAGS" AM_LDFLAGS="$AM_LDFLAGS $OGRE_LIBS" AC_SUBST(AM_CXXFLAGS, "$AM_CXXFLAGS") @@ -19,4 +19,10 @@ AC_SUBST(AM_CXXFLAGS, "$AM_CXXFLAGS") AC_SUBST(AM_LDFLAGS, "$AM_LDFLAGS") -AC_OUTPUT(Makefile src/Makefile doc/Makefile src/common/Makefile src/client/Makefile src/server/Makefile src/common/objects/Makefile src/common/equipment/Makefile src/common/equipment/engines/Makefile src/common/equipment/ecms/Makefile src/common/objects/ships/Makefile data/Makefile data/Ships/Makefile data/Ships/Conflux/Makefile data/Ships/Conflux/C-0/Makefile data/Ships/Conflux/C-1/Makefile data/Ships/Conflux/C-2/Makefile data/Ships/Conflux/C-3/Makefile src/common/components/Makefile src/client/input/Makefile src/client/ui/Makefile) +PKG_CHECK_MODULES(CEGUI_OGRE, [CEGUI-OGRE >= 1.2.1]) +AM_CXXFLAGS="$AM_CXXFLAGS $CEGUI_OGRE_CFLAGS" +AM_LDFLAGS="$AM_LDFLAGS $CEGUI_OGRE_LIBS" +AC_SUBST(AM_CXXFLAGS, "$AM_CXXFLAGS") +AC_SUBST(AM_LDFLAGS, "$AM_LDFLAGS") + +AC_OUTPUT(Makefile src/Makefile doc/Makefile src/common/Makefile src/client/Makefile src/server/Makefile src/common/objects/Makefile src/common/equipment/Makefile src/common/equipment/engines/Makefile src/common/equipment/ecms/Makefile src/common/objects/ships/Makefile data/Makefile data/Ships/Makefile data/Ships/Conflux/Makefile data/Ships/Conflux/C-0/Makefile data/Ships/Conflux/C-1/Makefile data/Ships/Conflux/C-2/Makefile data/Ships/Conflux/C-3/Makefile src/client/input/Makefile src/client/ui/Makefile src/common/equipment/capacitors/Makefile src/common/equipment/guns/Makefile src/common/components/Makefile) Modified: opengate.kdevelop =================================================================== --- opengate.kdevelop 2006-07-16 20:54:25 UTC (rev 94) +++ opengate.kdevelop 2006-07-17 20:16:48 UTC (rev 95) @@ -18,7 +18,7 @@ </general> <kdevautoproject> <general> - <activetarget>src/opengate-client</activetarget> + <activetarget>src/common/equipment/libopengate-equipment.la</activetarget> <useconfiguration>debug</useconfiguration> <useactivetarget>true</useactivetarget> </general> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
