The following commit has been merged in the experimental branch:
commit dfaf84dc45cf1b0092ce01e4efaf7a26b11d8e9d
Author: Jan Dittberner <[email protected]>
Date: Sun Aug 15 16:16:02 2010 +0200
refresh debian/patches/0005-fix-sdl-build.patch
diff --git a/debian/patches/0005-fix-sdl-build.patch
b/debian/patches/0005-fix-sdl-build.patch
index 4d2c8a0..a4d436e 100644
--- a/debian/patches/0005-fix-sdl-build.patch
+++ b/debian/patches/0005-fix-sdl-build.patch
@@ -1,28 +1,6 @@
Author: Jan Dittberner <[email protected]>
Subject: Use Debian version of SDL headers instead of missing included
---- a/rts/builds/DS/CMakeLists.txt
-+++ b/rts/builds/DS/CMakeLists.txt
-@@ -24,17 +24,8 @@
- LIST(APPEND engineDedicatedLibraries dl)
- ENDIF (UNIX)
-
--IF (MINGW)
-- # We still need these header files,
-- # even if we are not going to link with SDL.
-- # We have them available anyway (mingwlibs).
-- FIND_PACKAGE(SDL REQUIRED)
-- INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR})
--ELSE (MINGW)
-- # Use a direct copy of the GL and SDL headers,
-- # as these may not be available on headless systems.
-- INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include/SDL)
--ENDIF (MINGW)
-+FIND_PACKAGE(SDL REQUIRED)
-+INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR})
-
-
- ### Assemble the incude dirs
--- a/rts/lib/headlessStubs/CMakeLists.txt
+++ b/rts/lib/headlessStubs/CMakeLists.txt
@@ -12,18 +12,8 @@
@@ -60,53 +38,85 @@ Subject: Use Debian version of SDL headers instead of
missing included
if (WIN32)
FIND_PACKAGE(Windres)
endif (WIN32)
---- a/rts/builds/HL/CMakeLists.txt
-+++ b/rts/builds/HL/CMakeLists.txt
-@@ -11,20 +11,10 @@
- ADD_DEFINITIONS(-DNO_SOUND)
- REMOVE_DEFINITIONS(-DAVI_CAPTURING)
+--- a/tools/unitsync/CMakeLists.txt
++++ b/tools/unitsync/CMakeLists.txt
+@@ -12,18 +12,8 @@
+ LIST(APPEND unitsync_libs 7zip minizip lua)
+ LIST(APPEND unitsync_libs headlessStubs)
-IF (MINGW)
- # We still need these header files,
-- # even if we are not going to link with gl, glu and SDL.
+- # even if we are not going to link with SDL.
- # We have them available anyway (mingwlibs).
-- FIND_PACKAGE(OpenGL REQUIRED)
-- FIND_PACKAGE(GLU REQUIRED)
- FIND_PACKAGE(SDL REQUIRED)
- INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR})
-ELSE (MINGW)
- # Use a direct copy of the GL and SDL headers,
- # as these may not be available on headless systems.
-- INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
- INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include/SDL)
-ENDIF (MINGW)
-+FIND_PACKAGE(OpenGL REQUIRED)
-+FIND_PACKAGE(GLU REQUIRED)
+-
+FIND_PACKAGE(SDL REQUIRED)
+INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR})
+ ADD_DEFINITIONS(-DUNITSYNC)
+ ADD_DEFINITIONS(-DBITMAP_NO_OPENGL)
+--- a/rts/builds/DS/CMakeLists.txt
++++ b/rts/builds/DS/CMakeLists.txt
+@@ -24,22 +24,8 @@
+ LIST(APPEND engineDedicatedLibraries dl)
+ ENDIF (UNIX)
- # headlessstubs are our stubs that replace libGL, libGLU, libGLEW, libSDL
(yes really!)
---- a/tools/unitsync/CMakeLists.txt
-+++ b/tools/unitsync/CMakeLists.txt
-@@ -12,18 +12,8 @@
- LIST(APPEND unitsync_libs 7zip minizip lua)
- LIST(APPEND unitsync_libs headlessStubs)
-
--IF (MINGW)
+-IF (MINGW OR APPLE)
+- # Windows:
- # We still need these header files,
- # even if we are not going to link with SDL.
- # We have them available anyway (mingwlibs).
+- # OS X:
+- # Cocoa requires the SDL libary, whenever the SDL headers are used,
+- # due to some #define magic, which is practically impossible to
workaround.
- FIND_PACKAGE(SDL REQUIRED)
- INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR})
--ELSE (MINGW)
+-ELSE (MINGW OR APPLE)
- # Use a direct copy of the GL and SDL headers,
- # as these may not be available on headless systems.
- INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include/SDL)
--ENDIF (MINGW)
+-ENDIF (MINGW OR APPLE)
-
++FIND_PACKAGE(SDL_REQUIRED)
++INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR})
+
+ ### Assemble the incude dirs
+ INCLUDE_DIRECTORIES(${ENGINE_SRC_ROOT_DIR}/)
+--- a/rts/builds/HL/CMakeLists.txt
++++ b/rts/builds/HL/CMakeLists.txt
+@@ -11,25 +11,10 @@
+ ADD_DEFINITIONS(-DNO_SOUND)
+ REMOVE_DEFINITIONS(-DAVI_CAPTURING)
+
+-IF (MINGW OR APPLE)
+- # Windows:
+- # We still need these header files,
+- # even if we are not going to link with gl, glu and SDL.
+- # We have them available anyway (mingwlibs).
+- # OS X:
+- # Cocoa requires the SDL libary, whenever the SDL headers are used,
+- # due to some #define magic, which is practically impossible to
workaround.
+- FIND_PACKAGE(OpenGL REQUIRED)
+- FIND_PACKAGE(GLU REQUIRED)
+- FIND_PACKAGE(SDL REQUIRED)
+- INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR})
+-ELSE (MINGW OR APPLE)
+- # Use a direct copy of the GL and SDL headers,
+- # as these may not be available on headless systems.
+- INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+- INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include/SDL)
+-ENDIF (MINGW OR APPLE)
+-
++FIND_PACKAGE(OpenGL REQUIRED)
++FIND_PACKAGE(GLU REQUIRED)
+FIND_PACKAGE(SDL REQUIRED)
+INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR})
- ADD_DEFINITIONS(-DUNITSYNC)
- ADD_DEFINITIONS(-DBITMAP_NO_OPENGL)
+ # headlessstubs are our stubs that replace libGL, libGLU, libGLEW, libSDL
(yes really!)
+ LIST(APPEND engineHeadlessLibraries headlessStubs)
--
advanced 3D real time strategy game engine
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
