Menu
▾
▴
[Opengate-svn] SF.net SVN: opengate: [745] branches/ogsector
|
From: <eg...@us...> - 2007-09-20 21:54:18
|
Revision: 745
http://opengate.svn.sourceforge.net/opengate/?rev=745&view=rev
Author: egore
Date: 2007-09-20 14:54:16 -0700 (Thu, 20 Sep 2007)
Log Message:
-----------
rework build system to be more standard and hopefully faster
Modified Paths:
--------------
branches/ogsector/configure.ac
branches/ogsector/src/Makefile.am
Modified: branches/ogsector/configure.ac
===================================================================
--- branches/ogsector/configure.ac 2007-09-20 21:07:22 UTC (rev 744)
+++ branches/ogsector/configure.ac 2007-09-20 21:54:16 UTC (rev 745)
@@ -1,39 +1,60 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl Created by Anjuta application wizard.
+
AC_PREREQ(2.59)
-AC_INIT([ogsector], [0.0.1], [spo...@so...])
+AC_INIT([opengate], [0.0.1], [http://sourceforge.net/projects/opengate/])
+AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION, [dist-bzip2])
AM_CONFIG_HEADER(config.h)
+AM_MAINTAINER_MODE
AM_INIT_AUTOMAKE(ogsector, 0.0.1)
+AC_ISC_POSIX
AC_LANG_CPLUSPLUS
AC_PROG_CXX
-#AM_PROG_LIBTOOL
+AM_PROG_CC_STDC
+AC_HEADER_STDC
+AM_PROG_CC_C_O
OGSECTOR_PATH=$PWD
AC_PREFIX_DEFAULT($OGSECTOR_PATH)
OGSECTOR_EXTERNALS_PATH=$OGSECTOR_PATH/externals
+AC_SUBST(OGSECTOR_EXTERNALS_PATH)
AC_SUBST(PKG_CONFIG_PATH, "$OGSECTOR_EXTERNALS_PATH/lib/pkgconfig:$PKG_CONFIG_PATH")
-# OGRE - http://www.ogre3d.org/
+AM_PROG_LIBTOOL
+
PKG_CHECK_MODULES(OGRE, [OGRE >= 1.4.0])
-AC_SUBST(AM_CXXFLAGS,"$AM_CXXFLAGS $OGRE_CFLAGS")
-AC_SUBST(AM_LDFLAGS,"$AM_LDFLAGS $OGRE_LIBS")
+AC_SUBST(OGRE_CFLAGS)
+AC_SUBST(OGRE_LIBS)
PKG_CHECK_MODULES(CEGUI, [CEGUI >= 0.5.0])
-AC_SUBST(AM_CXXFLAGS,"$AM_CXXFLAGS $CEGUI_CFLAGS")
-AC_SUBST(AM_LDFLAGS,"$AM_LDFLAGS $CEGUI_LIBS")
+AC_SUBST(CEGUI_CFLAGS)
+AC_SUBST(CEGUI_LIBS)
PKG_CHECK_MODULES(CEGUIOGRE, [CEGUI-OGRE >= 1.4.0])
-AC_SUBST(AM_CXXFLAGS,"$AM_CXXFLAGS $CEGUIOGRE_CFLAGS")
-AC_SUBST(AM_LDFLAGS,"$AM_LDFLAGS $CEGUIOGRE_LIBS")
+AC_SUBST(CEGUIOGRE_CFLAGS)
+AC_SUBST(CEGUIOGRE_LIBS)
-dnl OIS - http://www.sourceforge.net/projects/wgois/
-PKG_CHECK_MODULES(OIS, [OIS >= 0.9.9])
-AC_SUBST(AM_CXXFLAGS, "$AM_CXXFLAGS $OIS_CFLAGS")
-AC_SUBST(AM_LDFLAGS, "$AM_LDFLAGS $OIS_LIBS")
+PKG_CHECK_MODULES(OIS, [OIS >= 1.0.0])
+AC_SUBST(OIS_CFLAGS)
+AC_SUBST(OIS_LIBS)
+PKG_CHECK_MODULES(freealut, [freealut >= 1.0.1])
+AC_SUBST(freealut_CFLAGS)
+AC_SUBST(freealut_LIBS)
+
+PKG_CHECK_MODULES(vorbis, [vorbis >= 1.1.2])
+AC_SUBST(vorbis_CFLAGS)
+AC_SUBST(vorbis_LIBS)
+
+PKG_CHECK_MODULES(vorbisfile, [vorbisfile >= 1.1.2])
+AC_SUBST(vorbisfile_CFLAGS)
+AC_SUBST(vorbisfile_LIBS)
+
dnl asio: http://sourceforge.net/projects/asio/
AC_CHECK_HEADER([asio.hpp],,
[
@@ -46,44 +67,16 @@
dnl # some of the boost headers are needed by asio
#AC_CHECK_HEADER([boost/bind.h])
-AC_SUBST(AM_LDFLAGS, "$AM_LDFLAGS -lboost_thread")
+AC_SUBST(AM_LDFLAGS, "$AM_LDFLAGS -lboost_thread -lboost_regex")
-
-
-#freealut - http://www.openal.org
-PKG_CHECK_MODULES(freealut, [freealut >= 1.0.1])
-AC_SUBST(AM_CXXFLAGS, "$AM_CXXFLAGS $freealut_CFLAGS")
-AC_SUBST(AM_LDFLAGS, "$AM_LDFLAGS $freealut_LIBS")
-
-#vorbis - http://xiph.org/vorbis/
-PKG_CHECK_MODULES(vorbis, [vorbis >= 1.1.2])
-AC_SUBST(AM_CXXFLAGS, "$AM_CXXFLAGS $vorbis_CFLAGS")
-AC_SUBST(AM_LDFLAGS, "$AM_LDFLAGS $vorbis_LIBS")
-
-PKG_CHECK_MODULES(vorbisfile, [vorbisfile >= 1.1.2])
-AC_SUBST(AM_CXXFLAGS, "$AM_CXXFLAGS $vorbisfile_CFLAGS")
-AC_SUBST(AM_LDFLAGS, "$AM_LDFLAGS $vorbisfile_LIBS")
-
-AC_SUBST([CXXFLAGS], ["${CXXFLAGS} -Wall -I$OGSECTOR_EXTERNALS_PATH/include"])
+AC_SUBST([CXXFLAGS], ["${CXXFLAGS} -I$OGSECTOR_EXTERNALS_PATH/include"])
AC_SUBST([CXXFLAGS], ["${CXXFLAGS} -I$OGSECTOR_EXTERNALS_PATH/ogreopcode/include"])
AC_SUBST([CXXFLAGS], ["${CXXFLAGS} -I$OGSECTOR_EXTERNALS_PATH/ogreopcode/opcode132"])
-AC_SUBST([LDFLAGS], ["${LDFLAGS} -L$OGSECTOR_EXTERNALS_PATH/lib/ -lOpcode -lOgreOpcode -lboost_regex"])
+AC_SUBST([LDFLAGS], ["${LDFLAGS} -L$OGSECTOR_EXTERNALS_PATH/lib/ -lOpcode -lOgreOpcode"])
-#AC_SUBST([CXXFLAGS], ["-g -Wall ${CXXFLAGS}"])
-dnl #libopcode
-dnl PKG_CHECK_MODULES(GRAPPLE, [GRAPPLE >= 0.9])
-dnl AM_CXXFLAGS="$AM_CXXFLAGS $GRAPPLE_CFLAGS"
-dnl AM_LDFLAGS="$AM_LDFLAGS $GRAPPLE_LIBS"
+AC_OUTPUT([
+Makefile
+src/Makefile
+])
-#openAL, alut
-dnl AC_SUBST(AM_CXXFLAGS, "$AM_CXXFLAGS")
-dnl AC_SUBST(AM_LDFLAGS, "$AM_LDFLAGS")
-
-AC_CONFIG_FILES([ \
- Makefile \
- src/Makefile \
- ] )
-
-AC_OUTPUT
-
AC_MSG_RESULT([Configuration successful! Now type 'make'.])
Modified: branches/ogsector/src/Makefile.am
===================================================================
--- branches/ogsector/src/Makefile.am 2007-09-20 21:07:22 UTC (rev 744)
+++ branches/ogsector/src/Makefile.am 2007-09-20 21:54:16 UTC (rev 745)
@@ -66,6 +66,19 @@
metaserver.h \
metaserver.cpp
+opengateclient_LDFLAGS = \
+ $(OGRE_LIBS) \
+ $(CEGUI_LIBS) \
+ $(CEGUIOGRE_LIBS) \
+ $(freealut_LIBS) \
+ $(vorbisfile_LIBS) \
+ $(OIS_LIBS) \
+ -L$(OGSECTOR_EXTERNALS_PATH)/lib/
+
+opengateclient_CXXFLAGS = \
+ $(OGRE_CFLAGS) \
+ $(CEGUI_CFLAGS)
+
opengateserver_SOURCES = \
opengateserver.cpp \
common.h \
@@ -84,6 +97,13 @@
metaserver.h \
metaserver.cpp
+opengateserver_LDFLAGS = \
+ $(OGRE_LIBS) \
+ $(OIS_LIBS)
+
+opengateserver_CXXFLAGS = \
+ $(OGRE_CFLAGS)
+
testopenalmanager_SOURCES = \
testopenalmanager.cpp \
common.h \
@@ -109,6 +129,18 @@
ResourceManager.h \
ResourceManager.cpp
+testopenalmanager_LDFLAGS = \
+ $(OGRE_LIBS) \
+ $(CEGUI_LIBS) \
+ $(CEGUIOGRE_LIBS) \
+ $(freealut_LIBS) \
+ $(vorbisfile_LIBS) \
+ $(OIS_LIBS)
+
+testopenalmanager_CXXFLAGS = \
+ $(OGRE_CFLAGS) \
+ $(CEGUI_CFLAGS)
+
distclean: maintainer-clean
rm -rf *~ \
Makefile.in
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
