From: Markus Koschany <apo@gambaru.de>
Date: Sun, 8 Dec 2013 18:05:52 +0100
Subject: glShaderSource

Fix glshaderSource stub signature to match that in <GL/glext.h>.
Thanks to Colin Watson.
---
 rts/lib/headlessStubs/glstub.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rts/lib/headlessStubs/glstub.c b/rts/lib/headlessStubs/glstub.c
index 0d41f15..1ade8a3 100644
--- a/rts/lib/headlessStubs/glstub.c
+++ b/rts/lib/headlessStubs/glstub.c
@@ -130,7 +130,7 @@ GLAPI void APIENTRY glGetShaderSource(GLuint shader, GLsizei bufSize, GLsizei *l
 GLAPI void APIENTRY glCompileShader(GLuint shader) {}
 GLAPI void APIENTRY glGetShaderiv(GLuint shader, GLenum pname, GLint *params) {}
 GLAPI void APIENTRY glGetShaderInfoLog(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog) {}
-GLAPI void APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar* *string, const GLint *length) {}
+GLAPI void APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar *const*string, const GLint *length) {}
 
 GLAPI void APIENTRY glUniform1fARB(GLint location, GLfloat v0) {}
 GLAPI void APIENTRY glUniform2fARB(GLint location, GLfloat v0, GLfloat v1) {}

From: Markus Koschany <apo@gambaru.de>
Date: Sun, 8 Dec 2013 17:30:03 +0100
Subject: fix sdl build

---
 rts/builds/dedicated/CMakeLists.txt  | 18 ++----------------
 rts/builds/headless/CMakeLists.txt   | 21 +++------------------
 rts/lib/headlessStubs/CMakeLists.txt | 14 ++------------
 tools/unitsync/CMakeLists.txt        | 14 ++------------
 4 files changed, 9 insertions(+), 58 deletions(-)

diff --git a/rts/builds/dedicated/CMakeLists.txt b/rts/builds/dedicated/CMakeLists.txt
index ab8fbe8..b74a465 100644
--- a/rts/builds/dedicated/CMakeLists.txt
+++ b/rts/builds/dedicated/CMakeLists.txt
@@ -37,22 +37,8 @@ IF    (UNIX AND NOT MINGW)
 	LIST(APPEND engineDedicatedLibraries dl)
 ENDIF (UNIX AND NOT 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 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 OR APPLE)
-
+FIND_PACKAGE(SDL REQUIRED)
+INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR})
 
 ### Assemble the incude dirs
 INCLUDE_DIRECTORIES(${ENGINE_SRC_ROOT_DIR}/)
diff --git a/rts/builds/headless/CMakeLists.txt b/rts/builds/headless/CMakeLists.txt
index 38fbc64..72e96b5 100644
--- a/rts/builds/headless/CMakeLists.txt
+++ b/rts/builds/headless/CMakeLists.txt
@@ -12,24 +12,9 @@ ADD_DEFINITIONS(-DNO_SOUND)
 ADD_DEFINITIONS(-DBITMAP_NO_OPENGL)
 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(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(SDL REQUIRED)
+INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR})
 
 # headlessstubs are our stubs that replace libGL, libGLU, libGLEW, libSDL (yes really!)
 LIST(APPEND engineHeadlessLibraries headlessStubs)
diff --git a/rts/lib/headlessStubs/CMakeLists.txt b/rts/lib/headlessStubs/CMakeLists.txt
index fa63b41..77eaa20 100644
--- a/rts/lib/headlessStubs/CMakeLists.txt
+++ b/rts/lib/headlessStubs/CMakeLists.txt
@@ -6,18 +6,8 @@ SET(headlessStubsSources
 		"sdlstub_cppbit"
 	)
 
-IF    (WIN32)
-	# 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  (WIN32)
-	# 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 (WIN32)
+FIND_PACKAGE(SDL_REQUIRED)
+INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR})
 
 ADD_LIBRARY(headlessStubs STATIC EXCLUDE_FROM_ALL ${headlessStubsSources})
 TARGET_LINK_LIBRARIES(headlessStubs ${Boost_THREAD_LIBRARY} ${Boost_CHRONO_LIBRARY_WITH_RT})
diff --git a/tools/unitsync/CMakeLists.txt b/tools/unitsync/CMakeLists.txt
index 2027362..a7a1815 100644
--- a/tools/unitsync/CMakeLists.txt
+++ b/tools/unitsync/CMakeLists.txt
@@ -21,18 +21,8 @@ IF (WIN32)
 	LIST(APPEND unitsync_libs ${WINMM_LIBRARY})
 ENDIF (WIN32)
 
-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})
 
 ADD_DEFINITIONS(-DUNITSYNC)
 ADD_DEFINITIONS(${PIC_FLAG})