[scorched3d: 5/12] Adjust base files for patch.

Bruno Wolff III bruno at fedoraproject.org
Tue Jun 21 05:18:25 UTC 2011


commit 82f832aeebdf6160c6c83c0fbc4248e64951f21c
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Mon Jun 20 23:00:13 2011 -0500

    Adjust base files for patch.

 scorched3d-syslibs.patch |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/scorched3d-syslibs.patch b/scorched3d-syslibs.patch
index 1a9cd09..fea1a9c 100644
--- a/scorched3d-syslibs.patch
+++ b/scorched3d-syslibs.patch
@@ -1,4 +1,4 @@
---- src/client/scorchedc/Makefile.am.syslibs	2010-12-04 15:07:41.000000000 -0600
+--- src/client/scorchedc/Makefile.am.orig	2010-12-04 15:07:41.000000000 -0600
 +++ src/client/scorchedc/Makefile.am	2011-06-20 22:42:29.000000000 -0500
 @@ -37,7 +37,6 @@
  	../../common/common/RandomGenerator.cpp \
@@ -40,7 +40,7 @@
 -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
  
---- src/client/scorchedc/Makefile.in.syslibs	2010-12-04 15:07:49.000000000 -0600
+--- src/client/scorchedc/Makefile.in.orig	2010-12-04 15:07:49.000000000 -0600
 +++ src/client/scorchedc/Makefile.in	2011-06-20 22:48:10.000000000 -0500
 @@ -67,7 +67,7 @@
  	OptionsParameters.$(OBJEXT) OptionsScorched.$(OBJEXT) \
@@ -153,7 +153,7 @@
  .cpp.o:
  @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
  @am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
---- src/launcher/scorched/Makefile.am.syslibs	2010-12-04 15:07:41.000000000 -0600
+--- src/launcher/scorched/Makefile.am.orig	2010-12-04 15:07:41.000000000 -0600
 +++ src/launcher/scorched/Makefile.am	2011-06-20 22:49:47.000000000 -0500
 @@ -35,7 +35,6 @@
  	../../common/common/OptionsGame.cpp \
@@ -163,7 +163,7 @@
  	../../common/common/Vector.cpp \
  	../../common/common/Vector4.cpp \
  	../../common/common/VectorLib.cpp \
---- src/launcher/scorched/Makefile.in.syslibs	2010-12-04 15:07:49.000000000 -0600
+--- src/launcher/scorched/Makefile.in.orig	2010-12-04 15:07:49.000000000 -0600
 +++ src/launcher/scorched/Makefile.in	2011-06-20 22:50:55.000000000 -0500
 @@ -66,7 +66,7 @@
  	Keyboard.$(OBJEXT) KeyboardKey.$(OBJEXT) Logger.$(OBJEXT) \
@@ -211,7 +211,7 @@
  .cpp.o:
  @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
  @am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
---- src/server/scorcheds/Makefile.am.syslibs	2010-12-04 15:07:41.000000000 -0600
+--- src/server/scorcheds/Makefile.am.orig	2010-12-04 15:07:41.000000000 -0600
 +++ src/server/scorcheds/Makefile.am	2011-06-20 22:52:03.000000000 -0500
 @@ -53,7 +53,6 @@
  	../../common/common/RandomGenerator.cpp \
@@ -221,7 +221,7 @@
  	../../common/common/SplineCurve.cpp \
  	../../common/common/SplinePath.cpp \
  	../../common/common/StatsLogger.cpp \
---- src/server/scorcheds/Makefile.in.syslibs	2010-12-04 15:07:52.000000000 -0600
+--- src/server/scorcheds/Makefile.in.orig	2010-12-04 15:07:52.000000000 -0600
 +++ src/server/scorcheds/Makefile.in	2011-06-20 22:52:25.000000000 -0500
 @@ -74,7 +74,7 @@
  	OptionsMasterListServer.$(OBJEXT) OptionsParameters.$(OBJEXT) \


More information about the scm-commits mailing list