I've finally managed to build Flightgear from fresh CVS. However, it
needed patching in several places to get it to compile. I've attached
the patch for discussion, and in case anyone else finds it useful.
--
Ross
Index: Makefile.am
===================================================================
RCS file: /var/cvs/FlightGear-0.7/FlightGear/Makefile.am,v
retrieving revision 1.28
diff -u -u -r1.28 Makefile.am
--- Makefile.am 12 Jul 2001 15:48:57 -0000 1.28
+++ Makefile.am 1 Jan 2002 22:19:19 -0000
@@ -2,14 +2,14 @@
tests \
src
-EXTRA_DIST = Thanks acsite.m4 acconfig.h irix-hack.sh \
+EXTRA_DIST = Thanks acconfig.h irix-hack.sh \
FlightGear.dsp FlightGear.dsw
dist-hook:
(cd $(top_srcdir); $(HOME)/projects/FlightGear-0.7/admin/am2dsp.pl)
(cd $(top_srcdir); tar --exclude docs-mini/CVS --exclude hints/CVS \
-cf - docs-mini ) | (cd $(distdir); tar xvf -)
- # tar cf - Simulator/FDM/JSBsim/aircraft Simulator/FDM/JSBsim/engine | (cd
$(distdir); tar xvf -)
+# tar cf - Simulator/FDM/JSBsim/aircraft Simulator/FDM/JSBsim/engine | (cd
+$(distdir); tar xvf -)
##########################################################################
Index: configure.in
===================================================================
RCS file: /var/cvs/FlightGear-0.7/FlightGear/configure.in,v
retrieving revision 1.90
diff -u -u -r1.90 configure.in
--- configure.in 28 Dec 2001 21:29:59 -0000 1.90
+++ configure.in 1 Jan 2002 22:19:20 -0000
@@ -259,13 +259,7 @@
fi
# check for glut
- AC_CHECK_LIB(glut, glutGetModifiers)
-
- # test for glutGameModeString, but avoid adding glut a second time into
- # the list of libraries
- save_LIBS="$LIBS"
- AC_CHECK_LIB(glut, glutGameModeString)
- LIBS="$save_LIBS"
+ CONFIGURE_GLUT()
else
# Win32 is a little wierd because it has to try to handle the various
# winbloze-isms. We'll just do this manually for now.
Index:Index: src/Main/Makefile.am
===================================================================
RCS file: /var/cvs/FlightGear-0.7/FlightGear/src/Main/Makefile.am,v
retrieving revision 1.62
diff -u -u -r1.62 Makefile.am
--- src/Main/Makefile.am 28 Dec 2001 21:30:12 -0000 1.62
+++ src/Main/Makefile.am 1 Jan 2002 22:19:26 -0000
@@ -72,19 +72,20 @@
$(top_builddir)/src/Scenery/libScenery.a \
$(top_builddir)/src/Sound/libSound.a \
$(top_builddir)/src/Airports/libAirports.a \
- $(NETWORK_LIBS) \
$(top_builddir)/src/Objects/libObjects.a \
$(top_builddir)/src/Time/libTime.a \
- $(WEATHER_LIBS) \
$(top_builddir)/src/Input/libInput.a \
- -lsgroute -lsgsky -lsgephem -lsgtiming -lsgio -lsgscreen \
- -lsgmath -lsgbucket -lsgdebug -lsgmagvar -lsgmisc -lsgxml \
+ $(NETWORK_LIBS) \
+ $(WEATHER_LIBS) \
$(SERIAL_LIBS) \
$(THREAD_LIBS) \
- -lplibpu -lplibfnt -lplibnet -lplibssg -lplibsg \
- -lmk4 -lz \
+ $(GLUT_LIBS) \
$(opengl_LIBS) \
- $(audio_LIBS)
+ $(audio_LIBS) \
+ -lsgroute -lsgsky -lsgephem -lsgtiming -lsgio -lsgscreen \
+ -lsgmath -lsgbucket -lsgdebug -lsgmagvar -lsgmisc -lsgxml \
+ -lsgserial -lplibpu -lplibfnt -lplibnet -lplibssg -lplibsg \
+ -lmk4 -lz
fgfs_CFLAGS = -DTHIS_IS_A_TEST
Index: src/Main/fg_props.cxx
===================================================================
RCS file: /var/cvs/FlightGear-0.7/FlightGear/src/Main/fg_props.cxx,v
retrieving revision 1.34
diff -u -u -r1.34 fg_props.cxx
--- src/Main/fg_props.cxx 11 Dec 2001 21:40:15 -0000 1.34
+++ src/Main/fg_props.cxx 1 Jan 2002 22:19:31 -0000
@@ -44,6 +44,7 @@
#include "fgfs.hxx"
#include "fg_props.hxx"
+#include "options.hxx"
#include "viewmgr.hxx"
#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
Index: src/Time/Makefile.am
===================================================================
RCS file: /var/cvs/FlightGear-0.7/FlightGear/src/Time/Makefile.am,v
retrieving revision 1.9
diff -u -u -r1.9 Makefile.am
--- src/Time/Makefile.am 28 Dec 2001 21:30:04 -0000 1.9
+++ src/Time/Makefile.am 1 Jan 2002 22:19:32 -0000
@@ -7,10 +7,10 @@
moonpos.cxx moonpos.hxx \
sunpos.cxx sunpos.hxx \
tmp.cxx tmp.hxx
- # fg_time.cxx fg_time.hxx \
- # geocoord.cxx geocoord.h \
- # lowleveltime.cxx lowleveltime.h \
- # timezone.cxx timezone.h
+# fg_time.cxx fg_time.hxx \
+# geocoord.cxx geocoord.h \
+# lowleveltime.cxx lowleveltime.h \
+# timezone.cxx timezone.h
if OLD_AUTOMAKE
INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
Index: tests/Makefile.am
===================================================================
RCS file: /var/cvs/FlightGear-0.7/FlightGear/tests/Makefile.am,v
retrieving revision 1.6
diff -u -u -r1.6 Makefile.am
--- tests/Makefile.am 31 Aug 2001 20:57:27 -0000 1.6
+++ tests/Makefile.am 1 Jan 2002 22:19:33 -0000
@@ -6,7 +6,7 @@
est_epsilon_LDADD = $(base_LIBS)
gl_info_SOURCES = gl-info.c
-gl_info_LDADD = $(opengl_LIBS)
+gl_info_LDADD = $(opengl_LIBS) $(GLUT_LIBS)
test_gethostname_SOURCES = test-gethostname.cxx
test_gethostname_LDADD = $(base_LIBS)
