diff --git a/scorched3d-freetype-buildfix.patch b/scorched3d-freetype-buildfix.patch new file mode 100644 index 0000000..51eda71 --- /dev/null +++ b/scorched3d-freetype-buildfix.patch @@ -0,0 +1,36 @@ +diff -up scorched/src/launcher/wxdialogs/TrueTypeFont.h~ scorched/src/launcher/wxdialogs/TrueTypeFont.h +--- scorched/src/launcher/wxdialogs/TrueTypeFont.h~ 2014-08-01 18:47:32.000000000 +0200 ++++ scorched/src/launcher/wxdialogs/TrueTypeFont.h 2014-08-29 14:04:55.726042013 +0200 +@@ -25,10 +25,10 @@ + #include + #include + #include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include + + class TrueTypeFont + { +diff -up scorched/src/client/GLEXT/GLFont2dFreeType.h~ scorched/src/client/GLEXT/GLFont2dFreeType.h +--- scorched/src/client/GLEXT/GLFont2dFreeType.h~ 2014-08-01 18:47:31.000000000 +0200 ++++ scorched/src/client/GLEXT/GLFont2dFreeType.h 2014-08-29 14:08:10.327083878 +0200 +@@ -23,10 +23,10 @@ + + #include + #include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include + #include + + class GLFont2dFreeType diff --git a/scorched3d-gcc47.patch b/scorched3d-gcc47.patch deleted file mode 100644 index 4115e70..0000000 --- a/scorched3d-gcc47.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up scorched/src/client/client/SecureID.cpp~ scorched/src/client/client/SecureID.cpp ---- scorched/src/client/client/SecureID.cpp~ 2010-07-20 02:28:59.000000000 +0200 -+++ scorched/src/client/client/SecureID.cpp 2012-01-17 20:26:20.632511395 +0100 -@@ -75,6 +75,7 @@ std::string SecureID::GetPrivateKey(void - - #include - #include -+#include - - std::string SecureID::GetPrivateKey(void) - { diff --git a/scorched3d-libpng15.patch b/scorched3d-libpng15.patch deleted file mode 100644 index c743370..0000000 --- a/scorched3d-libpng15.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- src/common/image/ImagePngFactory.cpp.libpng 2011-11-06 09:48:54.631066973 -0600 -+++ src/common/image/ImagePngFactory.cpp 2011-11-06 09:51:06.381811813 -0600 -@@ -104,7 +104,7 @@ - - static void user_png_error(png_structp png_ptr, png_const_charp msg) - { -- longjmp(png_ptr->jmpbuf,1); -+ longjmp(png_jmpbuf(png_ptr),1); - } - - static void user_png_warning(png_structp png_ptr, png_const_charp msg) ---- src/client/client/LoadPNG.cpp.libpng 2010-08-15 18:26:36.000000000 -0500 -+++ src/client/client/LoadPNG.cpp 2011-11-06 13:38:16.082076630 -0600 -@@ -24,6 +24,8 @@ - Uint32 Bmask; - Uint32 Amask; - SDL_Palette *palette; -+ int num_palette = 0; -+ png_colorp tmp_palette = NULL; - png_bytep *volatile row_pointers; - int row, i; - volatile int ckey = -1; -@@ -58,7 +60,7 @@ - * the normal method of doing things with libpng). REQUIRED unless you - * set up your own error handlers in png_create_read_struct() earlier. - */ -- if ( setjmp(png_ptr->jmpbuf) ) { -+ if ( setjmp(png_jmpbuf(png_ptr)) ) { - error = "Error reading the PNG file."; - goto done; - } -@@ -127,9 +129,9 @@ - Rmask = 0x000000FF; - Gmask = 0x0000FF00; - Bmask = 0x00FF0000; -- Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0; -+ Amask = (png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF000000 : 0; - } else { -- int s = (info_ptr->channels == 4) ? 0 : 8; -+ int s = (png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8; - Rmask = 0xFF000000 >> s; - Gmask = 0x00FF0000 >> s; - Bmask = 0x0000FF00 >> s; -@@ -137,7 +139,7 @@ - } - } - surface = SDL_AllocSurface(SDL_SWSURFACE, width, height, -- bit_depth*info_ptr->channels, Rmask,Gmask,Bmask,Amask); -+ bit_depth*png_get_channels(png_ptr, info_ptr), Rmask,Gmask,Bmask,Amask); - if ( surface == NULL ) { - error = "Out of memory"; - goto done; -@@ -185,12 +187,15 @@ - palette->colors[i].g = i; - palette->colors[i].b = i; - } -- } else if (info_ptr->num_palette > 0 ) { -- palette->ncolors = info_ptr->num_palette; -- for( i=0; inum_palette; ++i ) { -- palette->colors[i].b = info_ptr->palette[i].blue; -- palette->colors[i].g = info_ptr->palette[i].green; -- palette->colors[i].r = info_ptr->palette[i].red; -+ } else { -+ png_get_PLTE(png_ptr, info_ptr, &tmp_palette, &num_palette); -+ if (num_palette > 0 ) { -+ palette->ncolors = num_palette; -+ for( i=0; icolors[i].b = tmp_palette[i].blue; -+ palette->colors[i].g = tmp_palette[i].green; -+ palette->colors[i].r = tmp_palette[i].red; -+ } - } - } - } diff --git a/scorched3d-sys-lua.patch b/scorched3d-sys-lua.patch new file mode 100644 index 0000000..a540bb2 --- /dev/null +++ b/scorched3d-sys-lua.patch @@ -0,0 +1,295 @@ +diff -up scorched/src/client/scorchedc/Makefile.am~ scorched/src/client/scorchedc/Makefile.am +--- scorched/src/client/scorchedc/Makefile.am~ 2014-08-29 14:20:29.000000000 +0200 ++++ scorched/src/client/scorchedc/Makefile.am 2014-08-30 08:52:17.803527748 +0200 +@@ -178,42 +178,12 @@ scorched3dc_SOURCES = \ + ../../common/landscapemap/MovementMap.cpp \ + ../../common/landscapemap/NapalmMap.cpp \ + ../../common/landscapemap/RoofMaps.cpp \ +- ../../common/lua/lapi.cpp \ +- ../../common/lua/lauxlib.cpp \ +- ../../common/lua/lbaselib.cpp \ +- ../../common/lua/lcode.cpp \ +- ../../common/lua/ldblib.cpp \ +- ../../common/lua/ldebug.cpp \ +- ../../common/lua/ldo.cpp \ +- ../../common/lua/ldump.cpp \ +- ../../common/lua/lfixed.cpp \ +- ../../common/lua/lfunc.cpp \ +- ../../common/lua/lgc.cpp \ +- ../../common/lua/linit.cpp \ +- ../../common/lua/liolib.cpp \ +- ../../common/lua/llex.cpp \ +- ../../common/lua/lmathlib.cpp \ +- ../../common/lua/lmem.cpp \ +- ../../common/lua/loadlib.cpp \ +- ../../common/lua/lobject.cpp \ +- ../../common/lua/lopcodes.cpp \ +- ../../common/lua/loslib.cpp \ +- ../../common/lua/lparser.cpp \ +- ../../common/lua/lstate.cpp \ +- ../../common/lua/lstring.cpp \ +- ../../common/lua/lstrlib.cpp \ +- ../../common/lua/ltable.cpp \ +- ../../common/lua/ltablib.cpp \ +- ../../common/lua/ltm.cpp \ + ../../common/lua/LUAS3DLib.cpp \ + ../../common/lua/LUAS3DWeaponLib.cpp \ + ../../common/lua/LUAScript.cpp \ + ../../common/lua/LUAScriptFactory.cpp \ + ../../common/lua/LUAScriptHook.cpp \ + ../../common/lua/LUAUtil.cpp \ +- ../../common/lua/lundump.cpp \ +- ../../common/lua/lvm.cpp \ +- ../../common/lua/lzio.cpp \ + ../../common/movement/Boid2.cpp \ + ../../common/movement/TargetMovement.cpp \ + ../../common/movement/TargetMovementEntry.cpp \ +@@ -933,35 +903,12 @@ scorched3dc_SOURCES = \ + ../../common/landscapemap/MovementMap.h \ + ../../common/landscapemap/NapalmMap.h \ + ../../common/landscapemap/RoofMaps.h \ +- ../../common/lua/lapi.h \ +- ../../common/lua/lauxlib.h \ +- ../../common/lua/lcode.h \ +- ../../common/lua/ldebug.h \ +- ../../common/lua/ldo.h \ +- ../../common/lua/lfixed.h \ +- ../../common/lua/lfunc.h \ +- ../../common/lua/lgc.h \ +- ../../common/lua/llex.h \ +- ../../common/lua/llimits.h \ +- ../../common/lua/lmem.h \ +- ../../common/lua/lobject.h \ +- ../../common/lua/lopcodes.h \ +- ../../common/lua/lparser.h \ +- ../../common/lua/lstate.h \ +- ../../common/lua/lstring.h \ +- ../../common/lua/ltable.h \ +- ../../common/lua/ltm.h \ +- ../../common/lua/luaconf.h \ +- ../../common/lua/lualib.h \ + ../../common/lua/LUAS3DLib.h \ + ../../common/lua/LUAS3DWeaponLib.h \ + ../../common/lua/LUAScript.h \ + ../../common/lua/LUAScriptFactory.h \ + ../../common/lua/LUAScriptHook.h \ + ../../common/lua/LUAUtil.h \ +- ../../common/lua/lundump.h \ +- ../../common/lua/lvm.h \ +- ../../common/lua/lzio.h \ + ../../common/movement/Boid2.h \ + ../../common/movement/TargetMovement.h \ + ../../common/movement/TargetMovementEntry.h \ +@@ -1450,5 +1450,5 @@ scorched3dc_SOURCES = \ + ../../common/simactions/TankTeamBallanceSimAction.h + + AM_CPPFLAGS = -I../../common/porting -I../../common -I../../client -I../../server @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@ -llua + +diff -up scorched/src/server/scorcheds/Makefile.am~ scorched/src/server/scorcheds/Makefile.am +--- scorched/src/server/scorcheds/Makefile.am~ 2014-08-29 14:20:29.000000000 +0200 ++++ scorched/src/server/scorcheds/Makefile.am 2014-08-30 08:51:55.790113979 +0200 +@@ -361,42 +361,12 @@ scorched3ds_SOURCES = \ + ../../common/landscapemap/MovementMap.cpp \ + ../../common/landscapemap/NapalmMap.cpp \ + ../../common/landscapemap/RoofMaps.cpp \ +- ../../common/lua/lapi.cpp \ +- ../../common/lua/lauxlib.cpp \ +- ../../common/lua/lbaselib.cpp \ +- ../../common/lua/lcode.cpp \ +- ../../common/lua/ldblib.cpp \ +- ../../common/lua/ldebug.cpp \ +- ../../common/lua/ldo.cpp \ +- ../../common/lua/ldump.cpp \ +- ../../common/lua/lfixed.cpp \ +- ../../common/lua/lfunc.cpp \ +- ../../common/lua/lgc.cpp \ +- ../../common/lua/linit.cpp \ +- ../../common/lua/liolib.cpp \ +- ../../common/lua/llex.cpp \ +- ../../common/lua/lmathlib.cpp \ +- ../../common/lua/lmem.cpp \ +- ../../common/lua/loadlib.cpp \ +- ../../common/lua/lobject.cpp \ +- ../../common/lua/lopcodes.cpp \ +- ../../common/lua/loslib.cpp \ +- ../../common/lua/lparser.cpp \ +- ../../common/lua/lstate.cpp \ +- ../../common/lua/lstring.cpp \ +- ../../common/lua/lstrlib.cpp \ +- ../../common/lua/ltable.cpp \ +- ../../common/lua/ltablib.cpp \ +- ../../common/lua/ltm.cpp \ + ../../common/lua/LUAS3DLib.cpp \ + ../../common/lua/LUAS3DWeaponLib.cpp \ + ../../common/lua/LUAScript.cpp \ + ../../common/lua/LUAScriptFactory.cpp \ + ../../common/lua/LUAScriptHook.cpp \ + ../../common/lua/LUAUtil.cpp \ +- ../../common/lua/lundump.cpp \ +- ../../common/lua/lvm.cpp \ +- ../../common/lua/lzio.cpp \ + ../../common/movement/Boid2.cpp \ + ../../common/movement/TargetMovement.cpp \ + ../../common/movement/TargetMovementEntry.cpp \ +@@ -840,35 +810,12 @@ scorched3ds_SOURCES = \ + ../../common/landscapemap/MovementMap.h \ + ../../common/landscapemap/NapalmMap.h \ + ../../common/landscapemap/RoofMaps.h \ +- ../../common/lua/lapi.h \ +- ../../common/lua/lauxlib.h \ +- ../../common/lua/lcode.h \ +- ../../common/lua/ldebug.h \ +- ../../common/lua/ldo.h \ +- ../../common/lua/lfixed.h \ +- ../../common/lua/lfunc.h \ +- ../../common/lua/lgc.h \ +- ../../common/lua/llex.h \ +- ../../common/lua/llimits.h \ +- ../../common/lua/lmem.h \ +- ../../common/lua/lobject.h \ +- ../../common/lua/lopcodes.h \ +- ../../common/lua/lparser.h \ +- ../../common/lua/lstate.h \ +- ../../common/lua/lstring.h \ +- ../../common/lua/ltable.h \ +- ../../common/lua/ltm.h \ +- ../../common/lua/luaconf.h \ +- ../../common/lua/lualib.h \ + ../../common/lua/LUAS3DLib.h \ + ../../common/lua/LUAS3DWeaponLib.h \ + ../../common/lua/LUAScript.h \ + ../../common/lua/LUAScriptFactory.h \ + ../../common/lua/LUAScriptHook.h \ + ../../common/lua/LUAUtil.h \ +- ../../common/lua/lundump.h \ +- ../../common/lua/lvm.h \ +- ../../common/lua/lzio.h \ + ../../common/movement/Boid2.h \ + ../../common/movement/TargetMovement.h \ + ../../common/movement/TargetMovementEntry.h \ +@@ -896,5 +896,5 @@ scorched3ds_SOURCES = \ + ../../common/simactions/TankTeamBallanceSimAction.h + + AM_CPPFLAGS = -I../../common/porting -I../../common -I../../server -DS3D_SERVER=1 @SDL_CFLAGS@ @MYSQL_CFLAGS@ +-LDADD = @SDL_LIBS@ @MYSQL_LIBS@ ++LDADD = @SDL_LIBS@ @MYSQL_LIBS@ -llua + +diff -up scorched/src/common/lua/LUAS3DLib.cpp~ scorched/src/common/lua/LUAS3DLib.cpp +--- scorched/src/common/lua/LUAS3DLib.cpp~ 2014-08-01 18:47:31.000000000 +0200 ++++ scorched/src/common/lua/LUAS3DLib.cpp 2014-08-30 09:33:00.096184004 +0200 +@@ -34,6 +34,8 @@ + #include + #include + ++extern "C" { ++ + #define LUA_LIB + + #include "lua.h" +@@ -350,3 +352,5 @@ LUALIB_API int luaopen_s3d (lua_State *L + luaL_register(L, LUA_S3DLIBNAME, s3dlib); + return 1; + } ++ ++} /* end of extern "C" */ +diff -up scorched/src/common/lua/LUAS3DLib.h~ scorched/src/common/lua/LUAS3DLib.h +--- scorched/src/common/lua/LUAS3DLib.h~ 2014-08-01 18:47:31.000000000 +0200 ++++ scorched/src/common/lua/LUAS3DLib.h 2014-08-30 09:34:59.244191281 +0200 +@@ -21,9 +21,13 @@ + #if !defined(__INCLUDE_LUAS3DLib_INCLUDE__) + #define __INCLUDE_LUAS3DLib_INCLUDE__ + ++extern "C" { ++ + #include "lua.h" + + #define LUA_S3DLIBNAME "s3d" + LUALIB_API int (luaopen_s3d) (lua_State *L); + ++} ++ + #endif // __INCLUDE_LUAS3DLib_INCLUDE__ +diff -up scorched/src/common/lua/LUAS3DWeaponLib.cpp~ scorched/src/common/lua/LUAS3DWeaponLib.cpp +--- scorched/src/common/lua/LUAS3DWeaponLib.cpp~ 2014-08-01 18:47:31.000000000 +0200 ++++ scorched/src/common/lua/LUAS3DWeaponLib.cpp 2014-08-30 09:32:55.503299589 +0200 +@@ -30,6 +30,8 @@ + #include + #include + ++extern "C" { ++ + #define LUA_LIB + + #include "lua.h" +@@ -157,3 +159,5 @@ LUALIB_API int luaopen_s3dweapon (lua_St + luaL_register(L, LUA_S3DWEAPONLIBNAME, s3dweaponlib); + return 1; + } ++ ++} /* end of extern "C" */ +diff -up scorched/src/common/lua/LUAS3DWeaponLib.h~ scorched/src/common/lua/LUAS3DWeaponLib.h +--- scorched/src/common/lua/LUAS3DWeaponLib.h~ 2014-08-01 18:47:31.000000000 +0200 ++++ scorched/src/common/lua/LUAS3DWeaponLib.h 2014-08-30 09:35:00.875150821 +0200 +@@ -21,9 +21,13 @@ + #if !defined(__INCLUDE_LUAWeaponFns_INCLUDE__) + #define __INCLUDE_LUAWeaponFns_INCLUDE__ + ++extern "C" { ++ + #include "lua.h" + + #define LUA_S3DWEAPONLIBNAME "s3dweapon" + LUALIB_API int (luaopen_s3dweapon) (lua_State *L); + ++} ++ + #endif // __INCLUDE_LUAWeaponFns_INCLUDE__ +diff -up scorched/src/common/lua/LUAScript.cpp~ scorched/src/common/lua/LUAScript.cpp +--- scorched/src/common/lua/LUAScript.cpp~ 2014-08-30 09:28:33.000000000 +0200 ++++ scorched/src/common/lua/LUAScript.cpp 2014-08-30 09:30:41.267677817 +0200 +@@ -24,15 +24,14 @@ + #include + #include + +-#include "lauxlib.h" +-#include "lualib.h" ++#include "lua.hpp" + + LUAScript::LUAScript(ScorchedContext *context) : + context_(context), + L_(0), + weapon_(0) + { +- L_ = lua_open(); ++ L_ = luaL_newstate(); + + // Load the available libraries + luaopen_base(L_); +diff -up scorched/src/common/lua/LUAScript.h~ scorched/src/common/lua/LUAScript.h +--- scorched/src/common/lua/LUAScript.h~ 2014-08-01 18:47:31.000000000 +0200 ++++ scorched/src/common/lua/LUAScript.h 2014-08-30 09:33:56.397767096 +0200 +@@ -24,7 +24,7 @@ + #include + #include + +-#include "lua.h" ++#include "lua.hpp" + + class Weapon; + class ScorchedContext; +diff -up scorched/src/common/lua/LUAUtil.h~ scorched/src/common/lua/LUAUtil.h +--- scorched/src/common/lua/LUAUtil.h~ 2014-08-01 18:47:31.000000000 +0200 ++++ scorched/src/common/lua/LUAUtil.h 2014-08-30 09:34:14.652307697 +0200 +@@ -24,9 +24,7 @@ + #include + #include + +-#include "lua.h" +-#include "lauxlib.h" +-#include "lualib.h" ++#include "lua.hpp" + + class LUAUtil + { diff --git a/scorched3d-syslibs.patch b/scorched3d-syslibs.patch index fb8b433..794f3ee 100644 --- a/scorched3d-syslibs.patch +++ b/scorched3d-syslibs.patch @@ -1,161 +1,18 @@ ---- 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 @@ +diff -up scorched/src/client/scorchedc/Makefile.am~ scorched/src/client/scorchedc/Makefile.am +--- scorched/src/client/scorchedc/Makefile.am~ 2014-08-01 18:47:59.000000000 +0200 ++++ scorched/src/client/scorchedc/Makefile.am 2014-08-29 13:46:18.225526804 +0200 +@@ -41,7 +41,6 @@ scorched3dc_SOURCES = \ ../../common/common/RandomGenerator.cpp \ ../../common/common/RollingAverage.cpp \ ../../common/common/sha2.cpp \ - ../../common/common/snprintf.c \ ../../common/common/SplineCurve.cpp \ ../../common/common/SplinePath.cpp \ - ../../common/common/StatsLogger.cpp \ -@@ -431,7 +430,6 @@ - ../dialogs/TutorialDialog.cpp \ - ../GLEXT/GLCamera.cpp \ - ../GLEXT/GLCameraFrustum.cpp \ -- ../GLEXT/glew.c \ - ../GLEXT/GLFont2d.cpp \ - ../GLEXT/GLFont2dFreeType.cpp \ - ../GLEXT/GLFont2dStorage.cpp \ -@@ -1168,7 +1166,6 @@ - ../dialogs/TutorialDialog.h \ - ../GLEXT/GLCamera.h \ - ../GLEXT/GLCameraFrustum.h \ -- ../GLEXT/glew.h \ - ../GLEXT/GLFont2d.h \ - ../GLEXT/GLFont2dFreeType.h \ - ../GLEXT/GLFont2dStorage.h \ -@@ -1194,8 +1191,6 @@ - ../GLEXT/GLTextureStore.h \ - ../GLEXT/GLVertexBufferObject.h \ - ../GLEXT/GLViewPort.h \ -- ../GLEXT/glxew.h \ -- ../GLEXT/wglew.h \ - ../GLSL/GLSLProgram.h \ - ../GLSL/GLSLShader.h \ - ../GLSL/GLSLShaderSetup.h \ -@@ -1482,5 +1477,5 @@ - ../../common/simactions/TankTeamBallanceSimAction.h - - AM_CPPFLAGS = -I../../common/porting -I../../common -I../../client -I../../server @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 - ---- 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) \ - OptionsTransient.$(OBJEXT) ProgressCounter.$(OBJEXT) \ - RandomGenerator.$(OBJEXT) RollingAverage.$(OBJEXT) \ -- sha2.$(OBJEXT) snprintf.$(OBJEXT) SplineCurve.$(OBJEXT) \ -+ sha2.$(OBJEXT) SplineCurve.$(OBJEXT) \ - SplinePath.$(OBJEXT) StatsLogger.$(OBJEXT) \ - StatsLoggerDatabase.$(OBJEXT) StatsLoggerFile.$(OBJEXT) \ - StatsLoggerMySQL.$(OBJEXT) StatsLoggerPGSQL.$(OBJEXT) \ -@@ -259,7 +259,7 @@ - SkipDialog.$(OBJEXT) SoundDialog.$(OBJEXT) \ - StartDialog.$(OBJEXT) TextBoxDialog.$(OBJEXT) \ - TipDialog.$(OBJEXT) TutorialDialog.$(OBJEXT) \ -- GLCamera.$(OBJEXT) GLCameraFrustum.$(OBJEXT) glew.$(OBJEXT) \ -+ GLCamera.$(OBJEXT) GLCameraFrustum.$(OBJEXT) \ - GLFont2d.$(OBJEXT) GLFont2dFreeType.$(OBJEXT) \ - GLFont2dStorage.$(OBJEXT) GLFrameBufferObject.$(OBJEXT) \ - GLGlobalState.$(OBJEXT) GLImageItterator.$(OBJEXT) \ -@@ -611,7 +611,6 @@ - ../../common/common/RandomGenerator.cpp \ - ../../common/common/RollingAverage.cpp \ - ../../common/common/sha2.cpp \ -- ../../common/common/snprintf.c \ - ../../common/common/SplineCurve.cpp \ - ../../common/common/SplinePath.cpp \ - ../../common/common/StatsLogger.cpp \ -@@ -1005,7 +1004,6 @@ - ../dialogs/TutorialDialog.cpp \ - ../GLEXT/GLCamera.cpp \ - ../GLEXT/GLCameraFrustum.cpp \ -- ../GLEXT/glew.c \ - ../GLEXT/GLFont2d.cpp \ - ../GLEXT/GLFont2dFreeType.cpp \ - ../GLEXT/GLFont2dStorage.cpp \ -@@ -1742,7 +1740,6 @@ - ../dialogs/TutorialDialog.h \ - ../GLEXT/GLCamera.h \ - ../GLEXT/GLCameraFrustum.h \ -- ../GLEXT/glew.h \ - ../GLEXT/GLFont2d.h \ - ../GLEXT/GLFont2dFreeType.h \ - ../GLEXT/GLFont2dStorage.h \ -@@ -1768,8 +1765,6 @@ - ../GLEXT/GLTextureStore.h \ - ../GLEXT/GLVertexBufferObject.h \ - ../GLEXT/GLViewPort.h \ -- ../GLEXT/glxew.h \ -- ../GLEXT/wglew.h \ - ../GLSL/GLSLProgram.h \ - ../GLSL/GLSLShader.h \ - ../GLSL/GLSLShaderSetup.h \ -@@ -2056,7 +2051,7 @@ - ../../common/simactions/TankTeamBallanceSimAction.h - - AM_CPPFLAGS = -I../../common/porting -I../../common -I../../client -I../../server @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 - all: all-am - - .SUFFIXES: -@@ -2840,7 +2835,6 @@ - @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)/igd.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lapi.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lauxlib.Po@am__quote@ -@@ -2874,7 +2868,6 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzio.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@ - - .c.o: - @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@@ -2890,34 +2883,6 @@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - --snprintf.o: ../../common/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/common/snprintf.c' || echo '$(srcdir)/'`../../common/common/snprintf.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/snprintf.Tpo $(DEPDIR)/snprintf.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../../common/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/common/snprintf.c' || echo '$(srcdir)/'`../../common/common/snprintf.c -- --snprintf.obj: ../../common/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/common/snprintf.c'; then $(CYGPATH_W) '../../common/common/snprintf.c'; else $(CYGPATH_W) '$(srcdir)/../../common/common/snprintf.c'; fi` --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/snprintf.Tpo $(DEPDIR)/snprintf.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../../common/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/common/snprintf.c'; then $(CYGPATH_W) '../../common/common/snprintf.c'; else $(CYGPATH_W) '$(srcdir)/../../common/common/snprintf.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@ $(am__mv) $(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@ $(am__mv) $(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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ---- 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/ToolTip.cpp \ +diff -up scorched/src/launcher/scorched/Makefile.am~ scorched/src/launcher/scorched/Makefile.am +--- scorched/src/launcher/scorched/Makefile.am~ 2014-08-01 18:47:59.000000000 +0200 ++++ scorched/src/launcher/scorched/Makefile.am 2014-08-29 13:46:14.017634121 +0200 +@@ -36,7 +36,6 @@ scorched3d_SOURCES = \ ../../common/common/OptionsGame.cpp \ ../../common/common/OptionsParameters.cpp \ ../../common/common/ProgressCounter.cpp \ @@ -163,120 +20,14 @@ ../../common/common/Vector.cpp \ ../../common/common/Vector4.cpp \ ../../common/common/VectorLib.cpp \ ---- 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) \ - LoggerI.$(OBJEXT) NumberParser.$(OBJEXT) OptionEntry.$(OBJEXT) \ - OptionsGame.$(OBJEXT) OptionsParameters.$(OBJEXT) \ -- ProgressCounter.$(OBJEXT) snprintf.$(OBJEXT) Vector.$(OBJEXT) \ -+ ProgressCounter.$(OBJEXT) Vector.$(OBJEXT) \ - Vector4.$(OBJEXT) VectorLib.$(OBJEXT) XMLFile.$(OBJEXT) \ - XMLNode.$(OBJEXT) XMLParser.$(OBJEXT) \ - XMLStringBuffer.$(OBJEXT) OptionsDisplay.$(OBJEXT) \ -@@ -271,7 +271,6 @@ - ../../common/common/OptionsGame.cpp \ - ../../common/common/OptionsParameters.cpp \ - ../../common/common/ProgressCounter.cpp \ -- ../../common/common/snprintf.c \ - ../../common/common/Vector.cpp \ - ../../common/common/Vector4.cpp \ - ../../common/common/VectorLib.cpp \ -@@ -521,7 +520,6 @@ - @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@ - - .c.o: - @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@@ -537,20 +535,6 @@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - --snprintf.o: ../../common/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/common/snprintf.c' || echo '$(srcdir)/'`../../common/common/snprintf.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/snprintf.Tpo $(DEPDIR)/snprintf.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../../common/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/common/snprintf.c' || echo '$(srcdir)/'`../../common/common/snprintf.c -- --snprintf.obj: ../../common/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/common/snprintf.c'; then $(CYGPATH_W) '../../common/common/snprintf.c'; else $(CYGPATH_W) '$(srcdir)/../../common/common/snprintf.c'; fi` --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/snprintf.Tpo $(DEPDIR)/snprintf.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../../common/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/common/snprintf.c'; then $(CYGPATH_W) '../../common/common/snprintf.c'; else $(CYGPATH_W) '$(srcdir)/../../common/common/snprintf.c'; fi` -- - .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.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 \ - ../../common/common/RollingAverage.cpp \ - ../../common/common/sha2.cpp \ -- ../../common/common/snprintf.c \ - ../../common/common/SplineCurve.cpp \ - ../../common/common/SplinePath.cpp \ - ../../common/common/StatsLogger.cpp \ ---- 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) \ - OptionsScorched.$(OBJEXT) OptionsTransient.$(OBJEXT) \ - ProgressCounter.$(OBJEXT) RandomGenerator.$(OBJEXT) \ -- RollingAverage.$(OBJEXT) sha2.$(OBJEXT) snprintf.$(OBJEXT) \ -+ RollingAverage.$(OBJEXT) sha2.$(OBJEXT) \ - SplineCurve.$(OBJEXT) SplinePath.$(OBJEXT) \ - StatsLogger.$(OBJEXT) StatsLoggerDatabase.$(OBJEXT) \ - StatsLoggerFile.$(OBJEXT) StatsLoggerMySQL.$(OBJEXT) \ -@@ -489,7 +489,6 @@ +diff -up scorched/src/server/scorcheds/Makefile.am~ scorched/src/server/scorcheds/Makefile.am +--- scorched/src/server/scorcheds/Makefile.am~ 2014-08-01 18:47:59.000000000 +0200 ++++ scorched/src/server/scorcheds/Makefile.am 2014-08-29 13:46:36.993048162 +0200 +@@ -105,7 +105,6 @@ scorched3ds_SOURCES = \ ../../common/common/RandomGenerator.cpp \ ../../common/common/RollingAverage.cpp \ ../../common/common/sha2.cpp \ - ../../common/common/snprintf.c \ ../../common/common/SplineCurve.cpp \ ../../common/common/SplinePath.cpp \ - ../../common/common/StatsLogger.cpp \ -@@ -1902,7 +1901,6 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzio.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@ - - .c.o: - @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@@ -1918,20 +1916,6 @@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - --snprintf.o: ../../common/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/common/snprintf.c' || echo '$(srcdir)/'`../../common/common/snprintf.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/snprintf.Tpo $(DEPDIR)/snprintf.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../../common/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/common/snprintf.c' || echo '$(srcdir)/'`../../common/common/snprintf.c -- --snprintf.obj: ../../common/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/common/snprintf.c'; then $(CYGPATH_W) '../../common/common/snprintf.c'; else $(CYGPATH_W) '$(srcdir)/../../common/common/snprintf.c'; fi` --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/snprintf.Tpo $(DEPDIR)/snprintf.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../../common/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/common/snprintf.c'; then $(CYGPATH_W) '../../common/common/snprintf.c'; else $(CYGPATH_W) '$(srcdir)/../../common/common/snprintf.c'; fi` -- - .cpp.o: - @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ---- src/client/GLEXT/GLState.h.orig 2011-06-20 23:07:59.000000000 -0500 -+++ src/client/GLEXT/GLState.h 2011-06-20 23:08:30.000000000 -0500 -@@ -22,7 +22,7 @@ - #define AFX_GLSTATE_H__32B0E2D0_566D_4438_94E4_B12FE82430B1__INCLUDED_ - - #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers --#include "glew.h" -+#include "GL/glew.h" - - class GLState - { + ../../common/common/ToolTip.cpp \ diff --git a/scorched3d.spec b/scorched3d.spec index c6f8a88..5654dfa 100644 --- a/scorched3d.spec +++ b/scorched3d.spec @@ -1,32 +1,22 @@ Name: scorched3d -Version: 43.3d -Release: 12%{?dist} +Version: 44 +Release: 1%{?dist} Summary: Game based loosely on the classic DOS game Scorched Earth Group: Amusements/Games -License: GPLv2+ +License: GPLv2+ and CC-BY-SA URL: http://www.scorched3d.co.uk/ -# this is -# http://downloads.sourceforge.net/%{name}/Scorched3D-%{version}-src.tar.gz -# with the included glew removed as that contains files under the non free -# SGI Free license B. Instead the system version is used, which has the -# troublesome glew parts replaced -# rm scorched/src/client/GLEXT/glew.c -# rm scorched/src/client/GLEXT/glew.h -# rm scorched/src/client/GLEXT/glxew.h -# rm scorched/src/client/GLEXT/wglew.h -# This isn't needed, so remove it as well as long as we are changing things -# rm -r scorched-dep-osx -Source0: Scorched3D-%{version}-src-clean.tar.xz +Source0: http://downloads.sourceforge.net/%{name}/Scorched3D-%{version}-src.tar.gz Source1: %{name}.desktop # Fake openal-config as openal-soft doesn't have it Source2: openal-config Patch1: %{name}-syslibs.patch Patch2: %{name}-help.patch -Patch3: %{name}-libpng15.patch -Patch4: %{name}-gcc47.patch +Patch3: %{name}-freetype-buildfix.patch +Patch4: %{name}-sys-lua.patch BuildRequires: wxGTK-devel SDL_net-devel libGLU-devel BuildRequires: expat-devel libvorbis-devel glew-devel fftw-devel libjpeg-devel -BuildRequires: openal-soft-devel freealut-devel >= 1.1.0-10 +BuildRequires: freetype-devel openal-soft-devel freealut-devel >= 1.1.0-10 +BuildRequires: lua-devel libtool autoconf automake BuildRequires: ImageMagick desktop-file-utils Requires: hicolor-icon-theme opengl-games-utils Requires: dejavu-sans-fonts dejavu-sans-mono-fonts @@ -49,20 +39,27 @@ conditions and terrains to be dealt with. %prep -%setup -q -n scorched -rm `find . -name Makefile` -%patch1 -p0 -z .syslibs -%patch2 -p1 -z .help -%patch3 -z .libpng +%setup -q -c +pushd scorched +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 %patch4 -p1 +touch NEWS AUTHORS ChangeLog +autoreconf -ivf install -m 755 %{SOURCE2} . -# stop autoxxx from running -touch aclocal.m4 -touch configure -touch `find -name Makefile.in` +# for %%doc +mkdir apoc +cp -a data/globalmods/apoc/*.txt apoc +# ensure we use the system versions of these +rm src/common/common/snprintf.c +rm src/common/lua/l*.{cpp,h} +rm src/common/lua/print.cpp +popd %build +pushd scorched export OPENAL_CONFIG=$PWD/openal-config %configure --disable-dependency-tracking --datadir=%{_datadir}/%{name} make %{?_smp_mflags} @@ -70,10 +67,12 @@ make %{?_smp_mflags} # Note that tank2.ico has 48x48 and 32x32 icons embedded in it. # The 48x48 icon ends up in tank2-0.png convert data/images/tank2.ico tank2.png +popd %install -make install DESTDIR=$RPM_BUILD_ROOT +pushd scorched +%make_install ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper ln -f -s ../../../fonts/dejavu/DejaVuSans.ttf \ @@ -91,6 +90,7 @@ desktop-file-install \ mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps install -p -m 644 tank2-0.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png +popd %post @@ -107,7 +107,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files -%doc CHANGELOG +%doc scorched/COPYING scorched/apoc %{_bindir}/%{name}* %{_datadir}/%{name} %{_datadir}/applications/%{name}.desktop @@ -115,6 +115,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Sat Aug 30 2014 Hans de Goede - 44-1 +- Update to 44 release +- Fix FTBFS (rhbz#1107285) +- Use system lua (rhbz#1077728) + * Mon Aug 18 2014 Fedora Release Engineering - 43.3d-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index b472b21..a176c96 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d77e673d5372932c40d46a05f4483819 Scorched3D-43.3d-src-clean.tar.xz +c395d54a7a43cf91166d2cc0f7dec83e Scorched3D-44-src.tar.gz