rpms / scorched3d

Clone
Source Code
GIT

Files

f10 f11 f12 f13 f14 f15 f16 f17 f18 f19 f20 f21 f22 f23 f24 f25 f26 f27 f28 f29 f30 f31 f32 f33 f34 f35 f36 f37 f38 f39 f40 f7 f8 f9 fc6 main rawhide
  1.   f9
  2.   scorched3d-syslibs.patch
Blob Blame History Raw 
diff -up scorched/src/XML/XMLParser.h.syslibs scorched/src/XML/XMLParser.h
--- scorched/src/XML/XMLParser.h.syslibs	2006-05-01 01:42:52.000000000 +0200
+++ scorched/src/XML/XMLParser.h	2007-10-31 20:45:00.000000000 +0100
@@ -21,7 +21,7 @@
 #if !defined(__INCLUDE_XMLParserh_INCLUDE__)
 #define __INCLUDE_XMLParserh_INCLUDE__
 
-#include <XML/expat.h>
+#include <expat.h>
 #include <XML/XMLNode.h>
 
 class XMLParser
diff -up scorched/src/scorcheds/Makefile.am.syslibs scorched/src/scorcheds/Makefile.am
--- scorched/src/scorcheds/Makefile.am.syslibs	2007-10-31 11:12:14.000000000 +0100
+++ scorched/src/scorcheds/Makefile.am	2007-10-31 20:45:00.000000000 +0100
@@ -113,7 +113,6 @@ scorched3ds_SOURCES = \
 	../common/ProgressCounter.h \
 	../common/RandomGenerator.cpp \
 	../common/RandomGenerator.h \
-	../common/snprintf.c \
 	../common/SplineCurve.cpp \
 	../common/SplineCurve.h \
 	../common/SplinePath.cpp \
@@ -347,29 +346,14 @@ scorched3ds_SOURCES = \
 	../net/NetServerUDP.h \
 	../net/NetServerUDPDestination.cpp \
 	../net/NetServerUDPDestination.h \
-	../XML/ascii.h \
-	../XML/asciitab.h \
-	../XML/expat.h \
-	../XML/expat_config.h \
-	../XML/iasciitab.h \
-	../XML/internal.h \
-	../XML/latin1tab.h \
-	../XML/nametab.h \
-	../XML/utf8tab.h \
-	../XML/winconfig.h \
 	../XML/XMLFile.cpp \
 	../XML/XMLFile.h \
 	../XML/XMLNode.cpp \
 	../XML/XMLNode.h \
-	../XML/xmlparse.c \
 	../XML/XMLParser.cpp \
 	../XML/XMLParser.h \
-	../XML/xmlrole.c \
-	../XML/xmlrole.h \
 	../XML/XMLStringBuffer.cpp \
 	../XML/XMLStringBuffer.h \
-	../XML/xmltok.c \
-	../XML/xmltok.h \
 	../engine/Action.cpp \
 	../engine/Action.h \
 	../engine/ActionController.cpp \
@@ -790,5 +774,5 @@ scorched3ds_SOURCES = \
 	../movement/TargetMovementEntrySpline.h
 
 AM_CPPFLAGS = -I../porting -I.. -DS3D_SERVER=1 @SDL_CFLAGS@ @MYSQL_CFLAGS@
-LDADD = @SDL_LIBS@ @MYSQL_LIBS@
+LDADD = @SDL_LIBS@ @MYSQL_LIBS@ -lexpat
 
diff -up scorched/src/scorcheds/Makefile.in.syslibs scorched/src/scorcheds/Makefile.in
--- scorched/src/scorcheds/Makefile.in.syslibs	2007-10-31 11:20:54.000000000 +0100
+++ scorched/src/scorcheds/Makefile.in	2007-10-31 20:46:32.000000000 +0100
@@ -72,7 +72,7 @@ am_scorched3ds_OBJECTS = AddTarget.$(OBJ
 	OptionsGame.$(OBJEXT) OptionsMasterListServer.$(OBJEXT) \
 	OptionsParameters.$(OBJEXT) OptionsScorched.$(OBJEXT) \
 	OptionsTransient.$(OBJEXT) ProgressCounter.$(OBJEXT) \
-	RandomGenerator.$(OBJEXT) snprintf.$(OBJEXT) \
+	RandomGenerator.$(OBJEXT) \
 	SplineCurve.$(OBJEXT) SplinePath.$(OBJEXT) \
 	StatsLogger.$(OBJEXT) StatsLoggerDatabase.$(OBJEXT) \
 	StatsLoggerFile.$(OBJEXT) StatsLoggerMySQL.$(OBJEXT) \
@@ -140,9 +140,8 @@ am_scorched3ds_OBJECTS = AddTarget.$(OBJ
 	NetOptions.$(OBJEXT) NetServerTCP.$(OBJEXT) \
 	NetServerTCPProtocol.$(OBJEXT) NetServerTCPRead.$(OBJEXT) \
 	NetServerUDP.$(OBJEXT) NetServerUDPDestination.$(OBJEXT) \
-	XMLFile.$(OBJEXT) XMLNode.$(OBJEXT) xmlparse.$(OBJEXT) \
-	XMLParser.$(OBJEXT) xmlrole.$(OBJEXT) \
-	XMLStringBuffer.$(OBJEXT) xmltok.$(OBJEXT) Action.$(OBJEXT) \
+	XMLFile.$(OBJEXT) XMLNode.$(OBJEXT) XMLParser.$(OBJEXT) \
+	XMLStringBuffer.$(OBJEXT) Action.$(OBJEXT) \
 	ActionController.$(OBJEXT) ActionReferenced.$(OBJEXT) \
 	EventContainer.$(OBJEXT) GameState.$(OBJEXT) \
 	GameStateI.$(OBJEXT) GameStateStimulusI.$(OBJEXT) \
@@ -511,7 +510,6 @@ scorched3ds_SOURCES = \
 	../common/ProgressCounter.h \
 	../common/RandomGenerator.cpp \
 	../common/RandomGenerator.h \
-	../common/snprintf.c \
 	../common/SplineCurve.cpp \
 	../common/SplineCurve.h \
 	../common/SplinePath.cpp \
@@ -745,29 +743,14 @@ scorched3ds_SOURCES = \
 	../net/NetServerUDP.h \
 	../net/NetServerUDPDestination.cpp \
 	../net/NetServerUDPDestination.h \
-	../XML/ascii.h \
-	../XML/asciitab.h \
-	../XML/expat.h \
-	../XML/expat_config.h \
-	../XML/iasciitab.h \
-	../XML/internal.h \
-	../XML/latin1tab.h \
-	../XML/nametab.h \
-	../XML/utf8tab.h \
-	../XML/winconfig.h \
 	../XML/XMLFile.cpp \
 	../XML/XMLFile.h \
 	../XML/XMLNode.cpp \
 	../XML/XMLNode.h \
-	../XML/xmlparse.c \
 	../XML/XMLParser.cpp \
 	../XML/XMLParser.h \
-	../XML/xmlrole.c \
-	../XML/xmlrole.h \
 	../XML/XMLStringBuffer.cpp \
 	../XML/XMLStringBuffer.h \
-	../XML/xmltok.c \
-	../XML/xmltok.h \
 	../engine/Action.cpp \
 	../engine/Action.h \
 	../engine/ActionController.cpp \
@@ -1188,7 +1171,7 @@ scorched3ds_SOURCES = \
 	../movement/TargetMovementEntrySpline.h
 
 AM_CPPFLAGS = -I../porting -I.. -DS3D_SERVER=1 @SDL_CFLAGS@ @MYSQL_CFLAGS@
-LDADD = @SDL_LIBS@ @MYSQL_LIBS@
+LDADD = @SDL_LIBS@ @MYSQL_LIBS@ -lexpat
 all: all-am
 
 .SUFFIXES:
@@ -1639,10 +1622,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aseFile.tab.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fixed.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/snprintf.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlparse.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlrole.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmltok.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -1658,62 +1637,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
-snprintf.o: ../common/snprintf.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT snprintf.o -MD -MP -MF $(DEPDIR)/snprintf.Tpo -c -o snprintf.o `test -f '../common/snprintf.c' || echo '$(srcdir)/'`../common/snprintf.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/snprintf.Tpo $(DEPDIR)/snprintf.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../common/snprintf.c' object='snprintf.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o snprintf.o `test -f '../common/snprintf.c' || echo '$(srcdir)/'`../common/snprintf.c
-
-snprintf.obj: ../common/snprintf.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT snprintf.obj -MD -MP -MF $(DEPDIR)/snprintf.Tpo -c -o snprintf.obj `if test -f '../common/snprintf.c'; then $(CYGPATH_W) '../common/snprintf.c'; else $(CYGPATH_W) '$(srcdir)/../common/snprintf.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/snprintf.Tpo $(DEPDIR)/snprintf.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../common/snprintf.c' object='snprintf.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o snprintf.obj `if test -f '../common/snprintf.c'; then $(CYGPATH_W) '../common/snprintf.c'; else $(CYGPATH_W) '$(srcdir)/../common/snprintf.c'; fi`
-
-xmlparse.o: ../XML/xmlparse.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmlparse.o -MD -MP -MF $(DEPDIR)/xmlparse.Tpo -c -o xmlparse.o `test -f '../XML/xmlparse.c' || echo '$(srcdir)/'`../XML/xmlparse.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xmlparse.Tpo $(DEPDIR)/xmlparse.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../XML/xmlparse.c' object='xmlparse.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmlparse.o `test -f '../XML/xmlparse.c' || echo '$(srcdir)/'`../XML/xmlparse.c
-
-xmlparse.obj: ../XML/xmlparse.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmlparse.obj -MD -MP -MF $(DEPDIR)/xmlparse.Tpo -c -o xmlparse.obj `if test -f '../XML/xmlparse.c'; then $(CYGPATH_W) '../XML/xmlparse.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmlparse.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xmlparse.Tpo $(DEPDIR)/xmlparse.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../XML/xmlparse.c' object='xmlparse.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmlparse.obj `if test -f '../XML/xmlparse.c'; then $(CYGPATH_W) '../XML/xmlparse.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmlparse.c'; fi`
-
-xmlrole.o: ../XML/xmlrole.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmlrole.o -MD -MP -MF $(DEPDIR)/xmlrole.Tpo -c -o xmlrole.o `test -f '../XML/xmlrole.c' || echo '$(srcdir)/'`../XML/xmlrole.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xmlrole.Tpo $(DEPDIR)/xmlrole.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../XML/xmlrole.c' object='xmlrole.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmlrole.o `test -f '../XML/xmlrole.c' || echo '$(srcdir)/'`../XML/xmlrole.c
-
-xmlrole.obj: ../XML/xmlrole.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmlrole.obj -MD -MP -MF $(DEPDIR)/xmlrole.Tpo -c -o xmlrole.obj `if test -f '../XML/xmlrole.c'; then $(CYGPATH_W) '../XML/xmlrole.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmlrole.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xmlrole.Tpo $(DEPDIR)/xmlrole.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../XML/xmlrole.c' object='xmlrole.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmlrole.obj `if test -f '../XML/xmlrole.c'; then $(CYGPATH_W) '../XML/xmlrole.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmlrole.c'; fi`
-
-xmltok.o: ../XML/xmltok.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmltok.o -MD -MP -MF $(DEPDIR)/xmltok.Tpo -c -o xmltok.o `test -f '../XML/xmltok.c' || echo '$(srcdir)/'`../XML/xmltok.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xmltok.Tpo $(DEPDIR)/xmltok.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../XML/xmltok.c' object='xmltok.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmltok.o `test -f '../XML/xmltok.c' || echo '$(srcdir)/'`../XML/xmltok.c
-
-xmltok.obj: ../XML/xmltok.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmltok.obj -MD -MP -MF $(DEPDIR)/xmltok.Tpo -c -o xmltok.obj `if test -f '../XML/xmltok.c'; then $(CYGPATH_W) '../XML/xmltok.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmltok.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xmltok.Tpo $(DEPDIR)/xmltok.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../XML/xmltok.c' object='xmltok.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmltok.obj `if test -f '../XML/xmltok.c'; then $(CYGPATH_W) '../XML/xmltok.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmltok.c'; fi`
-
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
diff -up scorched/src/scorched/Makefile.am.syslibs scorched/src/scorched/Makefile.am
--- scorched/src/scorched/Makefile.am.syslibs	2007-10-14 23:05:52.000000000 +0200
+++ scorched/src/scorched/Makefile.am	2007-10-31 20:45:00.000000000 +0100
@@ -63,7 +63,6 @@ scorched3d_SOURCES = \
 	../common/ProgressCounter.h \
 	../common/RandomGenerator.cpp \
 	../common/RandomGenerator.h \
-	../common/snprintf.c \
 	../common/Vector.cpp \
 	../common/Vector.h \
 	../common/Vector4.cpp \
@@ -78,29 +77,14 @@ scorched3d_SOURCES = \
 	../net/NetInterface.h \
 	../net/UniqueIdStore.cpp \
 	../net/UniqueIdStore.h \
-	../XML/ascii.h \
-	../XML/asciitab.h \
-	../XML/expat.h \
-	../XML/expat_config.h \
-	../XML/iasciitab.h \
-	../XML/internal.h \
-	../XML/latin1tab.h \
-	../XML/nametab.h \
-	../XML/utf8tab.h \
-	../XML/winconfig.h \
 	../XML/XMLFile.cpp \
 	../XML/XMLFile.h \
 	../XML/XMLNode.cpp \
 	../XML/XMLNode.h \
-	../XML/xmlparse.c \
 	../XML/XMLParser.cpp \
 	../XML/XMLParser.h \
-	../XML/xmlrole.c \
-	../XML/xmlrole.h \
 	../XML/XMLStringBuffer.cpp \
 	../XML/XMLStringBuffer.h \
-	../XML/xmltok.c \
-	../XML/xmltok.h \
 	../tankai/TankAINames.cpp \
 	../tankai/TankAINames.h \
 	../landscapedef/LandscapeDefinitionsBase.cpp \
@@ -122,5 +106,5 @@ scorched3d_SOURCES = \
 	../wxdialogs/SettingsDialog.h
 
 AM_CPPFLAGS = -I../porting -I.. @WX_CFLAGS@ @FT2_CFLAGS@ @SDL_CFLAGS@
-LDADD = @WX_LIBS@ @FT2_LIBS@ @SDL_LIBS@
+LDADD = @WX_LIBS@ @FT2_LIBS@ @SDL_LIBS@ -lexpat
 
diff -up scorched/src/scorched/Makefile.in.syslibs scorched/src/scorched/Makefile.in
--- scorched/src/scorched/Makefile.in.syslibs	2007-10-31 11:20:47.000000000 +0100
+++ scorched/src/scorched/Makefile.in	2007-10-31 20:45:00.000000000 +0100
@@ -62,12 +62,11 @@ am_scorched3d_OBJECTS = main.$(OBJEXT) S
 	OptionEntry.$(OBJEXT) OptionsGame.$(OBJEXT) \
 	OptionsMasterListServer.$(OBJEXT) OptionsParameters.$(OBJEXT) \
 	ProgressCounter.$(OBJEXT) RandomGenerator.$(OBJEXT) \
-	snprintf.$(OBJEXT) Vector.$(OBJEXT) Vector4.$(OBJEXT) \
+	Vector.$(OBJEXT) Vector4.$(OBJEXT) \
 	VectorLib.$(OBJEXT) NetBuffer.$(OBJEXT) \
 	NetBufferPool.$(OBJEXT) NetInterface.$(OBJEXT) \
 	UniqueIdStore.$(OBJEXT) XMLFile.$(OBJEXT) XMLNode.$(OBJEXT) \
-	xmlparse.$(OBJEXT) XMLParser.$(OBJEXT) xmlrole.$(OBJEXT) \
-	XMLStringBuffer.$(OBJEXT) xmltok.$(OBJEXT) \
+	XMLParser.$(OBJEXT) XMLStringBuffer.$(OBJEXT) \
 	TankAINames.$(OBJEXT) LandscapeDefinitionsBase.$(OBJEXT) \
 	CreateDialogs.$(OBJEXT) DialogUtils.$(OBJEXT) \
 	DisplayDialog.$(OBJEXT) KeyDialog.$(OBJEXT) \
@@ -289,7 +288,6 @@ scorched3d_SOURCES = \
 	../common/ProgressCounter.h \
 	../common/RandomGenerator.cpp \
 	../common/RandomGenerator.h \
-	../common/snprintf.c \
 	../common/Vector.cpp \
 	../common/Vector.h \
 	../common/Vector4.cpp \
@@ -304,29 +302,14 @@ scorched3d_SOURCES = \
 	../net/NetInterface.h \
 	../net/UniqueIdStore.cpp \
 	../net/UniqueIdStore.h \
-	../XML/ascii.h \
-	../XML/asciitab.h \
-	../XML/expat.h \
-	../XML/expat_config.h \
-	../XML/iasciitab.h \
-	../XML/internal.h \
-	../XML/latin1tab.h \
-	../XML/nametab.h \
-	../XML/utf8tab.h \
-	../XML/winconfig.h \
 	../XML/XMLFile.cpp \
 	../XML/XMLFile.h \
 	../XML/XMLNode.cpp \
 	../XML/XMLNode.h \
-	../XML/xmlparse.c \
 	../XML/XMLParser.cpp \
 	../XML/XMLParser.h \
-	../XML/xmlrole.c \
-	../XML/xmlrole.h \
 	../XML/XMLStringBuffer.cpp \
 	../XML/XMLStringBuffer.h \
-	../XML/xmltok.c \
-	../XML/xmltok.h \
 	../tankai/TankAINames.cpp \
 	../tankai/TankAINames.h \
 	../landscapedef/LandscapeDefinitionsBase.cpp \
@@ -348,7 +331,7 @@ scorched3d_SOURCES = \
 	../wxdialogs/SettingsDialog.h
 
 AM_CPPFLAGS = -I../porting -I.. @WX_CFLAGS@ @FT2_CFLAGS@ @SDL_CFLAGS@
-LDADD = @WX_LIBS@ @FT2_LIBS@ @SDL_LIBS@
+LDADD = @WX_LIBS@ @FT2_LIBS@ @SDL_LIBS@ -lexpat
 all: all-am
 
 .SUFFIXES:
@@ -466,10 +449,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XMLStringBuffer.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fixed.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/snprintf.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlparse.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlrole.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmltok.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -485,62 +464,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
-snprintf.o: ../common/snprintf.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT snprintf.o -MD -MP -MF $(DEPDIR)/snprintf.Tpo -c -o snprintf.o `test -f '../common/snprintf.c' || echo '$(srcdir)/'`../common/snprintf.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/snprintf.Tpo $(DEPDIR)/snprintf.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../common/snprintf.c' object='snprintf.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o snprintf.o `test -f '../common/snprintf.c' || echo '$(srcdir)/'`../common/snprintf.c
-
-snprintf.obj: ../common/snprintf.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT snprintf.obj -MD -MP -MF $(DEPDIR)/snprintf.Tpo -c -o snprintf.obj `if test -f '../common/snprintf.c'; then $(CYGPATH_W) '../common/snprintf.c'; else $(CYGPATH_W) '$(srcdir)/../common/snprintf.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/snprintf.Tpo $(DEPDIR)/snprintf.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../common/snprintf.c' object='snprintf.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o snprintf.obj `if test -f '../common/snprintf.c'; then $(CYGPATH_W) '../common/snprintf.c'; else $(CYGPATH_W) '$(srcdir)/../common/snprintf.c'; fi`
-
-xmlparse.o: ../XML/xmlparse.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmlparse.o -MD -MP -MF $(DEPDIR)/xmlparse.Tpo -c -o xmlparse.o `test -f '../XML/xmlparse.c' || echo '$(srcdir)/'`../XML/xmlparse.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xmlparse.Tpo $(DEPDIR)/xmlparse.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../XML/xmlparse.c' object='xmlparse.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmlparse.o `test -f '../XML/xmlparse.c' || echo '$(srcdir)/'`../XML/xmlparse.c
-
-xmlparse.obj: ../XML/xmlparse.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmlparse.obj -MD -MP -MF $(DEPDIR)/xmlparse.Tpo -c -o xmlparse.obj `if test -f '../XML/xmlparse.c'; then $(CYGPATH_W) '../XML/xmlparse.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmlparse.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xmlparse.Tpo $(DEPDIR)/xmlparse.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../XML/xmlparse.c' object='xmlparse.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmlparse.obj `if test -f '../XML/xmlparse.c'; then $(CYGPATH_W) '../XML/xmlparse.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmlparse.c'; fi`
-
-xmlrole.o: ../XML/xmlrole.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmlrole.o -MD -MP -MF $(DEPDIR)/xmlrole.Tpo -c -o xmlrole.o `test -f '../XML/xmlrole.c' || echo '$(srcdir)/'`../XML/xmlrole.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xmlrole.Tpo $(DEPDIR)/xmlrole.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../XML/xmlrole.c' object='xmlrole.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmlrole.o `test -f '../XML/xmlrole.c' || echo '$(srcdir)/'`../XML/xmlrole.c
-
-xmlrole.obj: ../XML/xmlrole.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmlrole.obj -MD -MP -MF $(DEPDIR)/xmlrole.Tpo -c -o xmlrole.obj `if test -f '../XML/xmlrole.c'; then $(CYGPATH_W) '../XML/xmlrole.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmlrole.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xmlrole.Tpo $(DEPDIR)/xmlrole.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../XML/xmlrole.c' object='xmlrole.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmlrole.obj `if test -f '../XML/xmlrole.c'; then $(CYGPATH_W) '../XML/xmlrole.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmlrole.c'; fi`
-
-xmltok.o: ../XML/xmltok.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmltok.o -MD -MP -MF $(DEPDIR)/xmltok.Tpo -c -o xmltok.o `test -f '../XML/xmltok.c' || echo '$(srcdir)/'`../XML/xmltok.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xmltok.Tpo $(DEPDIR)/xmltok.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../XML/xmltok.c' object='xmltok.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmltok.o `test -f '../XML/xmltok.c' || echo '$(srcdir)/'`../XML/xmltok.c
-
-xmltok.obj: ../XML/xmltok.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmltok.obj -MD -MP -MF $(DEPDIR)/xmltok.Tpo -c -o xmltok.obj `if test -f '../XML/xmltok.c'; then $(CYGPATH_W) '../XML/xmltok.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmltok.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xmltok.Tpo $(DEPDIR)/xmltok.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../XML/xmltok.c' object='xmltok.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmltok.obj `if test -f '../XML/xmltok.c'; then $(CYGPATH_W) '../XML/xmltok.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmltok.c'; fi`
-
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
diff -up scorched/src/scorchedc/Makefile.am.syslibs scorched/src/scorchedc/Makefile.am
--- scorched/src/scorchedc/Makefile.am.syslibs	2007-10-31 11:12:14.000000000 +0100
+++ scorched/src/scorchedc/Makefile.am	2007-10-31 20:45:00.000000000 +0100
@@ -123,7 +123,6 @@ scorched3dc_SOURCES = \
 	../common/RandomGenerator.h \
 	../common/sha2.cpp \
 	../common/sha2.h \
-	../common/snprintf.c \
 	../common/SplineCurve.cpp \
 	../common/SplineCurve.h \
 	../common/SplinePath.cpp \
@@ -358,29 +357,14 @@ scorched3dc_SOURCES = \
 	../net/SecureID.h \
 	../net/UniqueIdStore.cpp \
 	../net/UniqueIdStore.h \
-	../XML/ascii.h \
-	../XML/asciitab.h \
-	../XML/expat.h \
-	../XML/expat_config.h \
-	../XML/iasciitab.h \
-	../XML/internal.h \
-	../XML/latin1tab.h \
-	../XML/nametab.h \
-	../XML/utf8tab.h \
-	../XML/winconfig.h \
 	../XML/XMLFile.cpp \
 	../XML/XMLFile.h \
 	../XML/XMLNode.cpp \
 	../XML/XMLNode.h \
-	../XML/xmlparse.c \
 	../XML/XMLParser.cpp \
 	../XML/XMLParser.h \
-	../XML/xmlrole.c \
-	../XML/xmlrole.h \
 	../XML/XMLStringBuffer.cpp \
 	../XML/XMLStringBuffer.h \
-	../XML/xmltok.c \
-	../XML/xmltok.h \
 	../engine/Action.cpp \
 	../engine/Action.h \
 	../engine/ActionController.cpp \
@@ -776,7 +760,6 @@ scorched3dc_SOURCES = \
 	../GLEXT/GLConsoleRules.h \
 	../GLEXT/GLDynamicVertexArray.cpp \
 	../GLEXT/GLDynamicVertexArray.h \
-	../GLEXT/glew.c \
 	../GLEXT/GLFont2d.cpp \
 	../GLEXT/GLFont2d.h \
 	../GLEXT/GLFrameBufferObject.cpp \
@@ -1346,5 +1329,5 @@ scorched3dc_SOURCES = \
 	../GLSL/GLSLShaderSetup.h
 
 AM_CPPFLAGS = -I../porting -I.. @FFTW_CFLAGS@ @AL_CFLAGS@ @FT2_CFLAGS@ @OGG_CFLAGS@ @SDL_CFLAGS@
-LDADD = @FFTW_LIBS@ @AL_LIBS@ @FT2_LIBS@ @GL_LIBS@ @OGG_LIBS@ @SDL_LIBS@
+LDADD = @FFTW_LIBS@ @AL_LIBS@ @FT2_LIBS@ @GL_LIBS@ @OGG_LIBS@ @SDL_LIBS@ -lGLEW -lexpat
 
diff -up scorched/src/scorchedc/Makefile.in.syslibs scorched/src/scorchedc/Makefile.in
--- scorched/src/scorchedc/Makefile.in.syslibs	2007-10-31 11:20:51.000000000 +0100
+++ scorched/src/scorchedc/Makefile.in	2007-10-31 20:47:06.000000000 +0100
@@ -74,7 +74,7 @@ am_scorched3dc_OBJECTS = AddTarget.$(OBJ
 	OptionsGame.$(OBJEXT) OptionsMasterListServer.$(OBJEXT) \
 	OptionsParameters.$(OBJEXT) OptionsScorched.$(OBJEXT) \
 	OptionsTransient.$(OBJEXT) ProgressCounter.$(OBJEXT) \
-	RandomGenerator.$(OBJEXT) sha2.$(OBJEXT) snprintf.$(OBJEXT) \
+	RandomGenerator.$(OBJEXT) sha2.$(OBJEXT) \
 	SplineCurve.$(OBJEXT) SplinePath.$(OBJEXT) \
 	StatsLogger.$(OBJEXT) StatsLoggerFile.$(OBJEXT) \
 	ToolTip.$(OBJEXT) Triangle.$(OBJEXT) Vector.$(OBJEXT) \
@@ -142,8 +142,7 @@ am_scorched3dc_OBJECTS = AddTarget.$(OBJ
 	NetServerTCPProtocol.$(OBJEXT) NetServerTCPRead.$(OBJEXT) \
 	NetServerUDP.$(OBJEXT) NetServerUDPDestination.$(OBJEXT) \
 	SecureID.$(OBJEXT) UniqueIdStore.$(OBJEXT) XMLFile.$(OBJEXT) \
-	XMLNode.$(OBJEXT) xmlparse.$(OBJEXT) XMLParser.$(OBJEXT) \
-	xmlrole.$(OBJEXT) XMLStringBuffer.$(OBJEXT) xmltok.$(OBJEXT) \
+	XMLNode.$(OBJEXT) XMLParser.$(OBJEXT) XMLStringBuffer.$(OBJEXT) \
 	Action.$(OBJEXT) ActionController.$(OBJEXT) \
 	ActionReferenced.$(OBJEXT) EventContainer.$(OBJEXT) \
 	GameState.$(OBJEXT) GameStateI.$(OBJEXT) \
@@ -241,7 +240,7 @@ am_scorched3dc_OBJECTS = AddTarget.$(OBJ
 	GLConsoleRuleFnIAdapter.$(OBJEXT) \
 	GLConsoleRuleMethod.$(OBJEXT) \
 	GLConsoleRuleMethodIAdapter.$(OBJEXT) GLConsoleRules.$(OBJEXT) \
-	GLDynamicVertexArray.$(OBJEXT) glew.$(OBJEXT) \
+	GLDynamicVertexArray.$(OBJEXT) \
 	GLFont2d.$(OBJEXT) GLFrameBufferObject.$(OBJEXT) \
 	GLGlobalState.$(OBJEXT) GLImage.$(OBJEXT) \
 	GLImageFactory.$(OBJEXT) GLImageHandle.$(OBJEXT) \
@@ -656,7 +655,6 @@ scorched3dc_SOURCES = \
 	../common/RandomGenerator.h \
 	../common/sha2.cpp \
 	../common/sha2.h \
-	../common/snprintf.c \
 	../common/SplineCurve.cpp \
 	../common/SplineCurve.h \
 	../common/SplinePath.cpp \
@@ -891,29 +889,14 @@ scorched3dc_SOURCES = \
 	../net/SecureID.h \
 	../net/UniqueIdStore.cpp \
 	../net/UniqueIdStore.h \
-	../XML/ascii.h \
-	../XML/asciitab.h \
-	../XML/expat.h \
-	../XML/expat_config.h \
-	../XML/iasciitab.h \
-	../XML/internal.h \
-	../XML/latin1tab.h \
-	../XML/nametab.h \
-	../XML/utf8tab.h \
-	../XML/winconfig.h \
 	../XML/XMLFile.cpp \
 	../XML/XMLFile.h \
 	../XML/XMLNode.cpp \
 	../XML/XMLNode.h \
-	../XML/xmlparse.c \
 	../XML/XMLParser.cpp \
 	../XML/XMLParser.h \
-	../XML/xmlrole.c \
-	../XML/xmlrole.h \
 	../XML/XMLStringBuffer.cpp \
 	../XML/XMLStringBuffer.h \
-	../XML/xmltok.c \
-	../XML/xmltok.h \
 	../engine/Action.cpp \
 	../engine/Action.h \
 	../engine/ActionController.cpp \
@@ -1309,7 +1292,6 @@ scorched3dc_SOURCES = \
 	../GLEXT/GLConsoleRules.h \
 	../GLEXT/GLDynamicVertexArray.cpp \
 	../GLEXT/GLDynamicVertexArray.h \
-	../GLEXT/glew.c \
 	../GLEXT/GLFont2d.cpp \
 	../GLEXT/GLFont2d.h \
 	../GLEXT/GLFrameBufferObject.cpp \
@@ -1879,7 +1861,7 @@ scorched3dc_SOURCES = \
 	../GLSL/GLSLShaderSetup.h
 
 AM_CPPFLAGS = -I../porting -I.. @FFTW_CFLAGS@ @AL_CFLAGS@ @FT2_CFLAGS@ @OGG_CFLAGS@ @SDL_CFLAGS@
-LDADD = @FFTW_LIBS@ @AL_LIBS@ @FT2_LIBS@ @GL_LIBS@ @OGG_LIBS@ @SDL_LIBS@
+LDADD = @FFTW_LIBS@ @AL_LIBS@ @FT2_LIBS@ @GL_LIBS@ @OGG_LIBS@ @SDL_LIBS@ -lGLEW -lexpat
 all: all-am
 
 .SUFFIXES:
@@ -2603,13 +2585,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aseFile.lex.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aseFile.tab.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fixed.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glew.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha2.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/snprintf.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlparse.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlrole.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmltok.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -2625,76 +2602,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
-snprintf.o: ../common/snprintf.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT snprintf.o -MD -MP -MF $(DEPDIR)/snprintf.Tpo -c -o snprintf.o `test -f '../common/snprintf.c' || echo '$(srcdir)/'`../common/snprintf.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/snprintf.Tpo $(DEPDIR)/snprintf.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../common/snprintf.c' object='snprintf.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o snprintf.o `test -f '../common/snprintf.c' || echo '$(srcdir)/'`../common/snprintf.c
-
-snprintf.obj: ../common/snprintf.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT snprintf.obj -MD -MP -MF $(DEPDIR)/snprintf.Tpo -c -o snprintf.obj `if test -f '../common/snprintf.c'; then $(CYGPATH_W) '../common/snprintf.c'; else $(CYGPATH_W) '$(srcdir)/../common/snprintf.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/snprintf.Tpo $(DEPDIR)/snprintf.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../common/snprintf.c' object='snprintf.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o snprintf.obj `if test -f '../common/snprintf.c'; then $(CYGPATH_W) '../common/snprintf.c'; else $(CYGPATH_W) '$(srcdir)/../common/snprintf.c'; fi`
-
-xmlparse.o: ../XML/xmlparse.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmlparse.o -MD -MP -MF $(DEPDIR)/xmlparse.Tpo -c -o xmlparse.o `test -f '../XML/xmlparse.c' || echo '$(srcdir)/'`../XML/xmlparse.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xmlparse.Tpo $(DEPDIR)/xmlparse.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../XML/xmlparse.c' object='xmlparse.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmlparse.o `test -f '../XML/xmlparse.c' || echo '$(srcdir)/'`../XML/xmlparse.c
-
-xmlparse.obj: ../XML/xmlparse.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmlparse.obj -MD -MP -MF $(DEPDIR)/xmlparse.Tpo -c -o xmlparse.obj `if test -f '../XML/xmlparse.c'; then $(CYGPATH_W) '../XML/xmlparse.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmlparse.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xmlparse.Tpo $(DEPDIR)/xmlparse.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../XML/xmlparse.c' object='xmlparse.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmlparse.obj `if test -f '../XML/xmlparse.c'; then $(CYGPATH_W) '../XML/xmlparse.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmlparse.c'; fi`
-
-xmlrole.o: ../XML/xmlrole.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmlrole.o -MD -MP -MF $(DEPDIR)/xmlrole.Tpo -c -o xmlrole.o `test -f '../XML/xmlrole.c' || echo '$(srcdir)/'`../XML/xmlrole.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xmlrole.Tpo $(DEPDIR)/xmlrole.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../XML/xmlrole.c' object='xmlrole.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmlrole.o `test -f '../XML/xmlrole.c' || echo '$(srcdir)/'`../XML/xmlrole.c
-
-xmlrole.obj: ../XML/xmlrole.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmlrole.obj -MD -MP -MF $(DEPDIR)/xmlrole.Tpo -c -o xmlrole.obj `if test -f '../XML/xmlrole.c'; then $(CYGPATH_W) '../XML/xmlrole.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmlrole.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xmlrole.Tpo $(DEPDIR)/xmlrole.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../XML/xmlrole.c' object='xmlrole.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmlrole.obj `if test -f '../XML/xmlrole.c'; then $(CYGPATH_W) '../XML/xmlrole.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmlrole.c'; fi`
-
-xmltok.o: ../XML/xmltok.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmltok.o -MD -MP -MF $(DEPDIR)/xmltok.Tpo -c -o xmltok.o `test -f '../XML/xmltok.c' || echo '$(srcdir)/'`../XML/xmltok.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xmltok.Tpo $(DEPDIR)/xmltok.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../XML/xmltok.c' object='xmltok.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmltok.o `test -f '../XML/xmltok.c' || echo '$(srcdir)/'`../XML/xmltok.c
-
-xmltok.obj: ../XML/xmltok.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmltok.obj -MD -MP -MF $(DEPDIR)/xmltok.Tpo -c -o xmltok.obj `if test -f '../XML/xmltok.c'; then $(CYGPATH_W) '../XML/xmltok.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmltok.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xmltok.Tpo $(DEPDIR)/xmltok.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../XML/xmltok.c' object='xmltok.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmltok.obj `if test -f '../XML/xmltok.c'; then $(CYGPATH_W) '../XML/xmltok.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmltok.c'; fi`
-
-glew.o: ../GLEXT/glew.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT glew.o -MD -MP -MF $(DEPDIR)/glew.Tpo -c -o glew.o `test -f '../GLEXT/glew.c' || echo '$(srcdir)/'`../GLEXT/glew.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/glew.Tpo $(DEPDIR)/glew.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../GLEXT/glew.c' object='glew.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glew.o `test -f '../GLEXT/glew.c' || echo '$(srcdir)/'`../GLEXT/glew.c
-
-glew.obj: ../GLEXT/glew.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT glew.obj -MD -MP -MF $(DEPDIR)/glew.Tpo -c -o glew.obj `if test -f '../GLEXT/glew.c'; then $(CYGPATH_W) '../GLEXT/glew.c'; else $(CYGPATH_W) '$(srcdir)/../GLEXT/glew.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/glew.Tpo $(DEPDIR)/glew.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../GLEXT/glew.c' object='glew.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glew.obj `if test -f '../GLEXT/glew.c'; then $(CYGPATH_W) '../GLEXT/glew.c'; else $(CYGPATH_W) '$(srcdir)/../GLEXT/glew.c'; fi`
-
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
diff -up scorched/src/GLEXT/GLState.h.syslibs scorched/src/GLEXT/GLState.h
--- scorched/src/GLEXT/GLState.h.syslibs	2007-10-20 19:54:40.000000000 +0200
+++ scorched/src/GLEXT/GLState.h	2007-10-31 20:45:00.000000000 +0100
@@ -24,7 +24,7 @@
 #define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
 #undef __MACH__
 
-#include "glew.h"
+#include <GL/glew.h>
 
 class GLState  
 {
Powered by Pagure 5.14.1
Documentation • File an Issue • About this Instance • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.