Update of /cvsroot/csp/APPLICATIONS/CSPSim
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20217
Modified Files:
CHANGES.current Makefile.in acinclude.m4 configure.in
Log Message:
Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/CHANGES.current,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -d -r1.83 -r1.84
*** CHANGES.current 27 Jan 2004 20:57:11 -0000 1.83
--- CHANGES.current 31 Jan 2004 17:11:40 -0000 1.84
***************
*** 2,5 ****
--- 2,14 ----
===========================
+ 2004-01-31: onsight
+ * Patched acinclude.m4, configure.in, and Source/Makefile.in to
+ handle SWIG 1.3.20 and newer. When used with a newer version
+ of SWIG, the '-c' flag is replace with '-noruntime', and the
+ swigpy library is not linked against. You may need to rebuild
+ SimData (which has undergone a similar change).
+
+ * Now tests for and links against the osgFX library.
+
2004-01-27: delta
* Added a method to access viewport dimensions in VirtualScene.
Index: Makefile.in
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Makefile.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Makefile.in 17 Aug 2003 18:39:51 -0000 1.7
--- Makefile.in 31 Jan 2004 17:11:41 -0000 1.8
***************
*** 5,11 ****
export GDEBUGF = -g -Wall
! export GCFLAGS = -fPIC -O2# -DSWIG_GLOBAL #-march=athon-tbird
! export GLDOPTS = -shared -lswigpy -ldl
! export GSWOPTS = -c -c++ -python -noexcept
export CXX = g++
export SWIG = swig
--- 5,11 ----
export GDEBUGF = -g -Wall
! export GCFLAGS = -fPIC -O2# -DSWIG_GLOBAL
! export GLDOPTS = -shared -ldl @SWIG_SWIGPY@
! export GSWOPTS = -c++ -python -noexcept @SWIG_NORUNTIME@
export CXX = g++
export SWIG = swig
***************
*** 21,28 ****
@$(MAKE) InputMaps
- #default:
- # @for dir in $(SUBDIRS); do \
- # $(MAKE) -C $${dir} $@ || exit 1; \
- # done
Makefile: Makefile.in configure.in acinclude.m4
--- 21,24 ----
***************
*** 30,33 ****
--- 26,30 ----
./configure
+
InputMaps: aircraft.hid gamescreen.hid
Index: acinclude.m4
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/acinclude.m4,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** acinclude.m4 20 Oct 2003 00:23:22 -0000 1.9
--- acinclude.m4 31 Jan 2004 17:11:41 -0000 1.10
***************
*** 250,251 ****
--- 250,305 ----
])
+ dnl check for swig
+ AC_DEFUN(CHECK_SWIG, [
+ min_version=$1
+ AC_MSG_CHECKING(for swig)
+ swig_version_output=`swig -version 2>&1`
+ major=`echo $swig_version_output | sed 's/.* \([[0-9]]\)\.\([[0-9]]\+\)\.\([[0-9]]\+\) .*/\1/'`
+ minor=`echo $swig_version_output | sed 's/.* \([[0-9]]\)\.\([[0-9]]\+\)\.\([[0-9]]\+\) .*/\2/'`
+ micro=`echo $swig_version_output | sed 's/.* \([[0-9]]\)\.\([[0-9]]\+\)\.\([[0-9]]\+\) .*/\3/'`
+ major_min=`echo $min_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+ minor_min=`echo $min_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+ micro_min=`echo $min_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+ version_proper=`expr \
+ $major \> $major_min \| \
+ $major \= $major_min \& \
+ $minor \> $minor_min \| \
+ $major \= $major_min \& \
+ $minor \= $minor_min \& \
+ $micro \>= $micro_min `
+ new_style=`expr \
+ $major \> 1 \| \
+ $major \= 1 \& \
+ $minor \> 3 \| \
+ $major \= 1 \& \
+ $minor \= 3 \& \
+ $micro \>= 20 `
+ if test "$version_proper" = "1" ; then
+ AC_MSG_RESULT(yes)
+ AC_MSG_CHECKING(swig runtime)
+ if test "$new_style" = "1" ; then
+ AC_MSG_RESULT(new style)
+ SWIG_SWIGPY=''
+ SWIG_RUNTIME='-noruntime'
+ SWIG_NORUNTIME='-noruntime'
+ else
+ AC_MSG_RESULT(old style)
+ SWIG_SWIGPY='-lswigpy'
+ SWIG_RUNTIME=''
+ SWIG_NORUNTIME='-c'
+ fi
+ AC_SUBST(SWIG_SWIGPY)
+ AC_SUBST(SWIG_RUNTIME)
+ AC_SUBST(SWIG_NORUNTIME)
+ else
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([
+ SWIG version >= $min_version must be installed. SWIG is
+ avalable in prepackaged binary and source distributions from
+ http://www.swig.org.
+ ])
+ fi
+ ])
+
+
+
Index: configure.in
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/configure.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** configure.in 20 Oct 2003 06:52:12 -0000 1.15
--- configure.in 31 Jan 2004 17:11:41 -0000 1.16
***************
*** 32,35 ****
--- 32,37 ----
AC_ST_BLKSIZE
+ CHECK_SWIG([1.3.16])
+
_CSP_CHECK_PKG_CONFIG([])
***************
*** 59,62 ****
--- 61,71 ----
CSP_OSG_CONFIG(osgText, 0.9.6, [OpenSceneGraph Text library])
CSP_OSG_CONFIG(osgParticle, 0.9.6, [OpenSceneGraph Particle library])
+ dnl check for osgFX
+ dnl osgFX does not include a version() function, so we use AC_CHECK_LIB instead
+ dnl CSP_OSG_CONFIG(osgFX, 0.9.6, [OpenSceneGraph Effects library])
+ AC_HAVE_LIBRARY(osgFX, [], [AC_MSG_ERROR([
+ OpenSceneGraph osgFX library needs to be installed. This library
+ is included with OpenSceneGraph 0.9.6 and newer, which can be
+ downloaded from http://www.openscenegraph.org])])
dnl check for libSigC++ type-safe signal libraryy
|
