|
 |
82f832a |
--- src/client/scorchedc/Makefile.am.orig 2010-12-04 15:07:41.000000000 -0600
|
|
|
443c9ee |
+++ src/client/scorchedc/Makefile.am 2011-06-20 22:42:29.000000000 -0500
|
|
|
443c9ee |
@@ -37,7 +37,6 @@
|
|
|
443c9ee |
../../common/common/RandomGenerator.cpp \
|
|
|
443c9ee |
../../common/common/RollingAverage.cpp \
|
|
 |
5f6a6e8 |
../../common/common/sha2.cpp \
|
|
|
5f6a6e8 |
- ../../common/common/snprintf.c \
|
|
|
5f6a6e8 |
../../common/common/SplineCurve.cpp \
|
|
|
5f6a6e8 |
../../common/common/SplinePath.cpp \
|
|
|
443c9ee |
../../common/common/StatsLogger.cpp \
|
|
|
443c9ee |
@@ -431,7 +430,6 @@
|
|
|
443c9ee |
../dialogs/TutorialDialog.cpp \
|
|
|
443c9ee |
../GLEXT/GLCamera.cpp \
|
|
|
5f6a6e8 |
../GLEXT/GLCameraFrustum.cpp \
|
|
|
29e776c |
- ../GLEXT/glew.c \
|
|
|
29e776c |
../GLEXT/GLFont2d.cpp \
|
|
|
5f6a6e8 |
../GLEXT/GLFont2dFreeType.cpp \
|
|
|
443c9ee |
../GLEXT/GLFont2dStorage.cpp \
|
|
|
443c9ee |
@@ -1168,7 +1166,6 @@
|
|
|
443c9ee |
../dialogs/TutorialDialog.h \
|
|
|
443c9ee |
../GLEXT/GLCamera.h \
|
|
|
443c9ee |
../GLEXT/GLCameraFrustum.h \
|
|
|
443c9ee |
- ../GLEXT/glew.h \
|
|
|
443c9ee |
../GLEXT/GLFont2d.h \
|
|
|
443c9ee |
../GLEXT/GLFont2dFreeType.h \
|
|
|
443c9ee |
../GLEXT/GLFont2dStorage.h \
|
|
|
443c9ee |
@@ -1194,8 +1191,6 @@
|
|
|
443c9ee |
../GLEXT/GLTextureStore.h \
|
|
|
5f6a6e8 |
../GLEXT/GLVertexBufferObject.h \
|
|
|
5f6a6e8 |
../GLEXT/GLViewPort.h \
|
|
|
5f6a6e8 |
- ../GLEXT/glxew.h \
|
|
|
5f6a6e8 |
- ../GLEXT/wglew.h \
|
|
|
5f6a6e8 |
../GLSL/GLSLProgram.h \
|
|
|
443c9ee |
../GLSL/GLSLShader.h \
|
|
|
443c9ee |
../GLSL/GLSLShaderSetup.h \
|
|
|
443c9ee |
@@ -1482,5 +1477,5 @@
|
|
|
443c9ee |
../../common/simactions/TankTeamBallanceSimAction.h
|
|
|
c414640 |
|
|
|
5f6a6e8 |
AM_CPPFLAGS = -I../../common/porting -I../../common -I../../client -I../../server @FFTW_CFLAGS@ @AL_CFLAGS@ @FT2_CFLAGS@ @OGG_CFLAGS@ @SDL_CFLAGS@
|
|
|
29e776c |
-LDADD = @FFTW_LIBS@ @AL_LIBS@ @FT2_LIBS@ @GL_LIBS@ @OGG_LIBS@ @SDL_LIBS@
|
|
|
5f6a6e8 |
+LDADD = @FFTW_LIBS@ @AL_LIBS@ @FT2_LIBS@ @GL_LIBS@ @OGG_LIBS@ @SDL_LIBS@ -lGLEW
|
|
|
8880161 |
|
|
|
82f832a |
--- src/client/scorchedc/Makefile.in.orig 2010-12-04 15:07:49.000000000 -0600
|
|
|
443c9ee |
+++ src/client/scorchedc/Makefile.in 2011-06-20 22:48:10.000000000 -0500
|
|
|
443c9ee |
@@ -67,7 +67,7 @@
|
|
|
29e776c |
OptionsParameters.$(OBJEXT) OptionsScorched.$(OBJEXT) \
|
|
|
29e776c |
OptionsTransient.$(OBJEXT) ProgressCounter.$(OBJEXT) \
|
|
|
443c9ee |
RandomGenerator.$(OBJEXT) RollingAverage.$(OBJEXT) \
|
|
|
443c9ee |
- sha2.$(OBJEXT) snprintf.$(OBJEXT) SplineCurve.$(OBJEXT) \
|
|
|
443c9ee |
+ sha2.$(OBJEXT) SplineCurve.$(OBJEXT) \
|
|
|
443c9ee |
SplinePath.$(OBJEXT) StatsLogger.$(OBJEXT) \
|
|
|
443c9ee |
StatsLoggerDatabase.$(OBJEXT) StatsLoggerFile.$(OBJEXT) \
|
|
|
443c9ee |
StatsLoggerMySQL.$(OBJEXT) StatsLoggerPGSQL.$(OBJEXT) \
|
|
|
443c9ee |
@@ -259,7 +259,7 @@
|
|
|
5f6a6e8 |
SkipDialog.$(OBJEXT) SoundDialog.$(OBJEXT) \
|
|
|
443c9ee |
StartDialog.$(OBJEXT) TextBoxDialog.$(OBJEXT) \
|
|
|
443c9ee |
TipDialog.$(OBJEXT) TutorialDialog.$(OBJEXT) \
|
|
|
443c9ee |
- GLCamera.$(OBJEXT) GLCameraFrustum.$(OBJEXT) glew.$(OBJEXT) \
|
|
|
443c9ee |
+ GLCamera.$(OBJEXT) GLCameraFrustum.$(OBJEXT) \
|
|
|
443c9ee |
GLFont2d.$(OBJEXT) GLFont2dFreeType.$(OBJEXT) \
|
|
|
443c9ee |
GLFont2dStorage.$(OBJEXT) GLFrameBufferObject.$(OBJEXT) \
|
|
|
443c9ee |
GLGlobalState.$(OBJEXT) GLImageItterator.$(OBJEXT) \
|
|
|
443c9ee |
@@ -611,7 +611,6 @@
|
|
|
443c9ee |
../../common/common/RandomGenerator.cpp \
|
|
|
443c9ee |
../../common/common/RollingAverage.cpp \
|
|
|
5f6a6e8 |
../../common/common/sha2.cpp \
|
|
|
5f6a6e8 |
- ../../common/common/snprintf.c \
|
|
|
5f6a6e8 |
../../common/common/SplineCurve.cpp \
|
|
|
5f6a6e8 |
../../common/common/SplinePath.cpp \
|
|
|
443c9ee |
../../common/common/StatsLogger.cpp \
|
|
|
443c9ee |
@@ -1005,7 +1004,6 @@
|
|
|
443c9ee |
../dialogs/TutorialDialog.cpp \
|
|
|
443c9ee |
../GLEXT/GLCamera.cpp \
|
|
|
5f6a6e8 |
../GLEXT/GLCameraFrustum.cpp \
|
|
|
29e776c |
- ../GLEXT/glew.c \
|
|
|
29e776c |
../GLEXT/GLFont2d.cpp \
|
|
|
5f6a6e8 |
../GLEXT/GLFont2dFreeType.cpp \
|
|
|
443c9ee |
../GLEXT/GLFont2dStorage.cpp \
|
|
|
443c9ee |
@@ -1742,7 +1740,6 @@
|
|
|
443c9ee |
../dialogs/TutorialDialog.h \
|
|
|
443c9ee |
../GLEXT/GLCamera.h \
|
|
|
443c9ee |
../GLEXT/GLCameraFrustum.h \
|
|
|
443c9ee |
- ../GLEXT/glew.h \
|
|
|
443c9ee |
../GLEXT/GLFont2d.h \
|
|
|
443c9ee |
../GLEXT/GLFont2dFreeType.h \
|
|
|
443c9ee |
../GLEXT/GLFont2dStorage.h \
|
|
|
443c9ee |
@@ -1768,8 +1765,6 @@
|
|
|
443c9ee |
../GLEXT/GLTextureStore.h \
|
|
|
5f6a6e8 |
../GLEXT/GLVertexBufferObject.h \
|
|
|
5f6a6e8 |
../GLEXT/GLViewPort.h \
|
|
|
5f6a6e8 |
- ../GLEXT/glxew.h \
|
|
|
5f6a6e8 |
- ../GLEXT/wglew.h \
|
|
|
5f6a6e8 |
../GLSL/GLSLProgram.h \
|
|
|
443c9ee |
../GLSL/GLSLShader.h \
|
|
|
443c9ee |
../GLSL/GLSLShaderSetup.h \
|
|
|
443c9ee |
@@ -2056,7 +2051,7 @@
|
|
|
443c9ee |
../../common/simactions/TankTeamBallanceSimAction.h
|
|
|
8880161 |
|
|
|
5f6a6e8 |
AM_CPPFLAGS = -I../../common/porting -I../../common -I../../client -I../../server @FFTW_CFLAGS@ @AL_CFLAGS@ @FT2_CFLAGS@ @OGG_CFLAGS@ @SDL_CFLAGS@
|
|
|
29e776c |
-LDADD = @FFTW_LIBS@ @AL_LIBS@ @FT2_LIBS@ @GL_LIBS@ @OGG_LIBS@ @SDL_LIBS@
|
|
|
5f6a6e8 |
+LDADD = @FFTW_LIBS@ @AL_LIBS@ @FT2_LIBS@ @GL_LIBS@ @OGG_LIBS@ @SDL_LIBS@ -lGLEW
|
|
|
8880161 |
all: all-am
|
|
|
8880161 |
|
|
|
8880161 |
.SUFFIXES:
|
|
|
443c9ee |
@@ -2840,7 +2835,6 @@
|
|
|
29e776c |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aseFile.lex.Po@am__quote@
|
|
|
29e776c |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aseFile.tab.Po@am__quote@
|
|
|
8880161 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fixed.Po@am__quote@
|
|
|
29e776c |
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glew.Po@am__quote@
|
|
|
443c9ee |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/igd.Po@am__quote@
|
|
|
5f6a6e8 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lapi.Po@am__quote@
|
|
|
5f6a6e8 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lauxlib.Po@am__quote@
|
|
|
443c9ee |
@@ -2874,7 +2868,6 @@
|
|
|
5f6a6e8 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzio.Po@am__quote@
|
|
|
8880161 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
|
|
|
29e776c |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha2.Po@am__quote@
|
|
|
8880161 |
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/snprintf.Po@am__quote@
|
|
|
8880161 |
|
|
|
8880161 |
.c.o:
|
|
|
8880161 |
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
|
|
443c9ee |
@@ -2890,34 +2883,6 @@
|
|
|
8880161 |
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
|
8880161 |
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
|
|
|
8880161 |
|
|
|
5f6a6e8 |
-snprintf.o: ../../common/common/snprintf.c
|
|
|
5f6a6e8 |
-@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/common/snprintf.c' || echo '$(srcdir)/'`../../common/common/snprintf.c
|
|
|
443c9ee |
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/snprintf.Tpo $(DEPDIR)/snprintf.Po
|
|
|
5f6a6e8 |
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../../common/common/snprintf.c' object='snprintf.o' libtool=no @AMDEPBACKSLASH@
|
|
|
8880161 |
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
|
5f6a6e8 |
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o snprintf.o `test -f '../../common/common/snprintf.c' || echo '$(srcdir)/'`../../common/common/snprintf.c
|
|
|
c414640 |
-
|
|
|
5f6a6e8 |
-snprintf.obj: ../../common/common/snprintf.c
|
|
|
5f6a6e8 |
-@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/common/snprintf.c'; then $(CYGPATH_W) '../../common/common/snprintf.c'; else $(CYGPATH_W) '$(srcdir)/../../common/common/snprintf.c'; fi`
|
|
|
443c9ee |
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/snprintf.Tpo $(DEPDIR)/snprintf.Po
|
|
|
5f6a6e8 |
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../../common/common/snprintf.c' object='snprintf.obj' libtool=no @AMDEPBACKSLASH@
|
|
|
8880161 |
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
|
5f6a6e8 |
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o snprintf.obj `if test -f '../../common/common/snprintf.c'; then $(CYGPATH_W) '../../common/common/snprintf.c'; else $(CYGPATH_W) '$(srcdir)/../../common/common/snprintf.c'; fi`
|
|
|
c414640 |
-
|
|
|
29e776c |
-glew.o: ../GLEXT/glew.c
|
|
|
29e776c |
-@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
|
|
|
443c9ee |
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/glew.Tpo $(DEPDIR)/glew.Po
|
|
|
29e776c |
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../GLEXT/glew.c' object='glew.o' libtool=no @AMDEPBACKSLASH@
|
|
|
29e776c |
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
|
29e776c |
-@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
|
|
|
29e776c |
-
|
|
|
29e776c |
-glew.obj: ../GLEXT/glew.c
|
|
|
29e776c |
-@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`
|
|
|
443c9ee |
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/glew.Tpo $(DEPDIR)/glew.Po
|
|
|
29e776c |
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../GLEXT/glew.c' object='glew.obj' libtool=no @AMDEPBACKSLASH@
|
|
|
29e776c |
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
|
29e776c |
-@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`
|
|
|
29e776c |
-
|
|
|
8880161 |
.cpp.o:
|
|
|
8880161 |
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
|
|
443c9ee |
@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
|
82f832a |
--- src/launcher/scorched/Makefile.am.orig 2010-12-04 15:07:41.000000000 -0600
|
|
|
443c9ee |
+++ src/launcher/scorched/Makefile.am 2011-06-20 22:49:47.000000000 -0500
|
|
|
443c9ee |
@@ -35,7 +35,6 @@
|
|
|
443c9ee |
../../common/common/OptionsGame.cpp \
|
|
|
443c9ee |
../../common/common/OptionsParameters.cpp \
|
|
|
443c9ee |
../../common/common/ProgressCounter.cpp \
|
|
|
5f6a6e8 |
- ../../common/common/snprintf.c \
|
|
|
5f6a6e8 |
../../common/common/Vector.cpp \
|
|
|
5f6a6e8 |
../../common/common/Vector4.cpp \
|
|
|
443c9ee |
../../common/common/VectorLib.cpp \
|
|
|
82f832a |
--- src/launcher/scorched/Makefile.in.orig 2010-12-04 15:07:49.000000000 -0600
|
|
|
443c9ee |
+++ src/launcher/scorched/Makefile.in 2011-06-20 22:50:55.000000000 -0500
|
|
|
443c9ee |
@@ -66,7 +66,7 @@
|
|
|
443c9ee |
Keyboard.$(OBJEXT) KeyboardKey.$(OBJEXT) Logger.$(OBJEXT) \
|
|
|
5f6a6e8 |
LoggerI.$(OBJEXT) NumberParser.$(OBJEXT) OptionEntry.$(OBJEXT) \
|
|
|
5f6a6e8 |
OptionsGame.$(OBJEXT) OptionsParameters.$(OBJEXT) \
|
|
|
443c9ee |
- ProgressCounter.$(OBJEXT) snprintf.$(OBJEXT) Vector.$(OBJEXT) \
|
|
|
443c9ee |
+ ProgressCounter.$(OBJEXT) Vector.$(OBJEXT) \
|
|
|
443c9ee |
Vector4.$(OBJEXT) VectorLib.$(OBJEXT) XMLFile.$(OBJEXT) \
|
|
|
443c9ee |
XMLNode.$(OBJEXT) XMLParser.$(OBJEXT) \
|
|
|
443c9ee |
XMLStringBuffer.$(OBJEXT) OptionsDisplay.$(OBJEXT) \
|
|
|
443c9ee |
@@ -271,7 +271,6 @@
|
|
|
443c9ee |
../../common/common/OptionsGame.cpp \
|
|
|
443c9ee |
../../common/common/OptionsParameters.cpp \
|
|
|
443c9ee |
../../common/common/ProgressCounter.cpp \
|
|
|
5f6a6e8 |
- ../../common/common/snprintf.c \
|
|
|
5f6a6e8 |
../../common/common/Vector.cpp \
|
|
|
5f6a6e8 |
../../common/common/Vector4.cpp \
|
|
|
443c9ee |
../../common/common/VectorLib.cpp \
|
|
|
443c9ee |
@@ -521,7 +520,6 @@
|
|
|
5f6a6e8 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XMLStringBuffer.Po@am__quote@
|
|
|
5f6a6e8 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fixed.Po@am__quote@
|
|
|
5f6a6e8 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
|
|
|
5f6a6e8 |
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/snprintf.Po@am__quote@
|
|
|
8880161 |
|
|
|
5f6a6e8 |
.c.o:
|
|
|
5f6a6e8 |
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
|
|
443c9ee |
@@ -537,20 +535,6 @@
|
|
|
5f6a6e8 |
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
|
5f6a6e8 |
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
|
|
|
8880161 |
|
|
|
5f6a6e8 |
-snprintf.o: ../../common/common/snprintf.c
|
|
|
5f6a6e8 |
-@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/common/snprintf.c' || echo '$(srcdir)/'`../../common/common/snprintf.c
|
|
|
443c9ee |
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/snprintf.Tpo $(DEPDIR)/snprintf.Po
|
|
|
5f6a6e8 |
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../../common/common/snprintf.c' object='snprintf.o' libtool=no @AMDEPBACKSLASH@
|
|
|
5f6a6e8 |
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
|
5f6a6e8 |
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o snprintf.o `test -f '../../common/common/snprintf.c' || echo '$(srcdir)/'`../../common/common/snprintf.c
|
|
|
5f6a6e8 |
-
|
|
|
5f6a6e8 |
-snprintf.obj: ../../common/common/snprintf.c
|
|
|
5f6a6e8 |
-@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/common/snprintf.c'; then $(CYGPATH_W) '../../common/common/snprintf.c'; else $(CYGPATH_W) '$(srcdir)/../../common/common/snprintf.c'; fi`
|
|
|
443c9ee |
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/snprintf.Tpo $(DEPDIR)/snprintf.Po
|
|
|
5f6a6e8 |
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../../common/common/snprintf.c' object='snprintf.obj' libtool=no @AMDEPBACKSLASH@
|
|
|
5f6a6e8 |
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
|
5f6a6e8 |
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o snprintf.obj `if test -f '../../common/common/snprintf.c'; then $(CYGPATH_W) '../../common/common/snprintf.c'; else $(CYGPATH_W) '$(srcdir)/../../common/common/snprintf.c'; fi`
|
|
|
5f6a6e8 |
-
|
|
|
5f6a6e8 |
.cpp.o:
|
|
|
5f6a6e8 |
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
|
|
443c9ee |
@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
|
82f832a |
--- src/server/scorcheds/Makefile.am.orig 2010-12-04 15:07:41.000000000 -0600
|
|
|
443c9ee |
+++ src/server/scorcheds/Makefile.am 2011-06-20 22:52:03.000000000 -0500
|
|
|
443c9ee |
@@ -53,7 +53,6 @@
|
|
|
443c9ee |
../../common/common/RandomGenerator.cpp \
|
|
|
443c9ee |
../../common/common/RollingAverage.cpp \
|
|
|
5f6a6e8 |
../../common/common/sha2.cpp \
|
|
|
5f6a6e8 |
- ../../common/common/snprintf.c \
|
|
|
5f6a6e8 |
../../common/common/SplineCurve.cpp \
|
|
|
5f6a6e8 |
../../common/common/SplinePath.cpp \
|
|
|
443c9ee |
../../common/common/StatsLogger.cpp \
|
|
|
82f832a |
--- src/server/scorcheds/Makefile.in.orig 2010-12-04 15:07:52.000000000 -0600
|
|
|
443c9ee |
+++ src/server/scorcheds/Makefile.in 2011-06-20 22:52:25.000000000 -0500
|
|
|
443c9ee |
@@ -74,7 +74,7 @@
|
|
|
443c9ee |
OptionsMasterListServer.$(OBJEXT) OptionsParameters.$(OBJEXT) \
|
|
|
443c9ee |
OptionsScorched.$(OBJEXT) OptionsTransient.$(OBJEXT) \
|
|
|
443c9ee |
ProgressCounter.$(OBJEXT) RandomGenerator.$(OBJEXT) \
|
|
|
443c9ee |
- RollingAverage.$(OBJEXT) sha2.$(OBJEXT) snprintf.$(OBJEXT) \
|
|
|
443c9ee |
+ RollingAverage.$(OBJEXT) sha2.$(OBJEXT) \
|
|
|
8880161 |
SplineCurve.$(OBJEXT) SplinePath.$(OBJEXT) \
|
|
|
29e776c |
StatsLogger.$(OBJEXT) StatsLoggerDatabase.$(OBJEXT) \
|
|
|
29e776c |
StatsLoggerFile.$(OBJEXT) StatsLoggerMySQL.$(OBJEXT) \
|
|
|
443c9ee |
@@ -489,7 +489,6 @@
|
|
|
443c9ee |
../../common/common/RandomGenerator.cpp \
|
|
|
443c9ee |
../../common/common/RollingAverage.cpp \
|
|
|
5f6a6e8 |
../../common/common/sha2.cpp \
|
|
|
5f6a6e8 |
- ../../common/common/snprintf.c \
|
|
|
5f6a6e8 |
../../common/common/SplineCurve.cpp \
|
|
|
5f6a6e8 |
../../common/common/SplinePath.cpp \
|
|
|
443c9ee |
../../common/common/StatsLogger.cpp \
|
|
|
443c9ee |
@@ -1902,7 +1901,6 @@
|
|
|
5f6a6e8 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzio.Po@am__quote@
|
|
|
8880161 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
|
|
|
5f6a6e8 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha2.Po@am__quote@
|
|
|
8880161 |
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/snprintf.Po@am__quote@
|
|
|
8880161 |
|
|
|
8880161 |
.c.o:
|
|
|
8880161 |
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
|
|
443c9ee |
@@ -1918,20 +1916,6 @@
|
|
|
8880161 |
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
|
8880161 |
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
|
|
|
8880161 |
|
|
|
5f6a6e8 |
-snprintf.o: ../../common/common/snprintf.c
|
|
|
5f6a6e8 |
-@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/common/snprintf.c' || echo '$(srcdir)/'`../../common/common/snprintf.c
|
|
|
443c9ee |
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/snprintf.Tpo $(DEPDIR)/snprintf.Po
|
|
|
5f6a6e8 |
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../../common/common/snprintf.c' object='snprintf.o' libtool=no @AMDEPBACKSLASH@
|
|
|
8880161 |
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
|
5f6a6e8 |
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o snprintf.o `test -f '../../common/common/snprintf.c' || echo '$(srcdir)/'`../../common/common/snprintf.c
|
|
|
c414640 |
-
|
|
|
5f6a6e8 |
-snprintf.obj: ../../common/common/snprintf.c
|
|
|
5f6a6e8 |
-@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/common/snprintf.c'; then $(CYGPATH_W) '../../common/common/snprintf.c'; else $(CYGPATH_W) '$(srcdir)/../../common/common/snprintf.c'; fi`
|
|
|
443c9ee |
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/snprintf.Tpo $(DEPDIR)/snprintf.Po
|
|
|
5f6a6e8 |
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../../common/common/snprintf.c' object='snprintf.obj' libtool=no @AMDEPBACKSLASH@
|
|
|
8880161 |
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
|
5f6a6e8 |
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o snprintf.obj `if test -f '../../common/common/snprintf.c'; then $(CYGPATH_W) '../../common/common/snprintf.c'; else $(CYGPATH_W) '$(srcdir)/../../common/common/snprintf.c'; fi`
|
|
|
8880161 |
-
|
|
|
8880161 |
.cpp.o:
|
|
|
8880161 |
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
|
|
443c9ee |
@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
|
|
f914d8f |
--- src/client/GLEXT/GLState.h.orig 2011-06-20 23:07:59.000000000 -0500
|
|
|
f914d8f |
+++ src/client/GLEXT/GLState.h 2011-06-20 23:08:30.000000000 -0500
|
|
|
f914d8f |
@@ -22,7 +22,7 @@
|
|
|
f914d8f |
#define AFX_GLSTATE_H__32B0E2D0_566D_4438_94E4_B12FE82430B1__INCLUDED_
|
|
|
f914d8f |
|
|
|
f914d8f |
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
|
|
|
f914d8f |
-#include "glew.h"
|
|
|
f914d8f |
+#include "GL/glew.h"
|
|
|
f914d8f |
|
|
|
f914d8f |
class GLState
|
|
|
f914d8f |
{
|