This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit f0effe8e7ccc56b0109faaf279e2afd80f3a5ad8
Author: m4n4t4...@gmail.com 
<m4n4t4...@gmail.com@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a>
Date:   Mon Aug 25 17:24:07 2014 +0000

    All: Some OSX related "fixes"
---
 MP/Makefile                         | 7 ++++---
 MP/code/opus-1.1/src/opus_decoder.c | 2 +-
 MP/code/rend2/qgl.h                 | 4 ++--
 MP/code/rend2/tr_extensions.c       | 2 +-
 MP/code/renderer/qgl.h              | 4 ++--
 SP/Makefile                         | 7 ++++---
 SP/code/opus-1.1/src/opus_decoder.c | 2 +-
 SP/code/rend2/qgl.h                 | 4 ++--
 SP/code/rend2/tr_extensions.c       | 2 +-
 SP/code/renderer/qgl.h              | 4 ++--
 10 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/MP/Makefile b/MP/Makefile
index e326ad7..6107963 100644
--- a/MP/Makefile
+++ b/MP/Makefile
@@ -462,14 +462,15 @@ ifeq ($(PLATFORM),darwin)
   RENDERER_LIBS=
   OPTIMIZEVM=
 
-  BASE_CFLAGS = -Wall -Wimplicit -Wstrict-prototypes
+  BASE_CFLAGS = -Wall -Wimplicit -Wstrict-prototypes -mmacosx-version-min=10.5 
\
+    -DMAC_OS_X_VERSION_MIN_REQUIRED=1050
 
   ifeq ($(ARCH),ppc)
-    BASE_CFLAGS += -arch ppc -faltivec -mmacosx-version-min=10.2
+    BASE_CFLAGS += -arch ppc -faltivec
     OPTIMIZEVM += -O3
   endif
   ifeq ($(ARCH),ppc64)
-    BASE_CFLAGS += -arch ppc64 -faltivec -mmacosx-version-min=10.2
+    BASE_CFLAGS += -arch ppc64 -faltivec
   endif
   ifeq ($(ARCH),x86)
     OPTIMIZEVM += -march=prescott -mfpmath=sse
diff --git a/MP/code/opus-1.1/src/opus_decoder.c 
b/MP/code/opus-1.1/src/opus_decoder.c
index 919ba52..4d03770 100644
--- a/MP/code/opus-1.1/src/opus_decoder.c
+++ b/MP/code/opus-1.1/src/opus_decoder.c
@@ -33,7 +33,7 @@
 # error "OPUS_BUILD _MUST_ be defined to build Opus. This probably means you 
need other defines as well, as in a config.h. See the included build files for 
details."
 #endif
 
-#if defined(__GNUC__) && (__GNUC__ >= 2) && !defined(__OPTIMIZE__)
+#if defined(__GNUC__) && (__GNUC__ >= 2) && !defined(__OPTIMIZE__) && 
!defined(__APPLE__)
 # pragma message "You appear to be compiling without optimization, if so opus 
will be very slow."
 #endif
 
diff --git a/MP/code/rend2/qgl.h b/MP/code/rend2/qgl.h
index 1179198..bbd7a4b 100644
--- a/MP/code/rend2/qgl.h
+++ b/MP/code/rend2/qgl.h
@@ -122,8 +122,8 @@ extern void     (APIENTRY * qglDrawRangeElementsEXT) 
(GLenum mode, GLuint start,
 // rend2
 
 // GL_EXT_multi_draw_arrays
-void (APIENTRY * qglMultiDrawArraysEXT) (GLenum mode, const GLint *first, 
const GLsizei *count, GLsizei primcount);
-extern void (APIENTRY * qglMultiDrawElementsEXT) (GLenum mode, const GLsizei 
*count, GLenum type, const void *const*indices, GLsizei primcount);
+extern void (APIENTRY * qglMultiDrawArraysEXT) (GLenum mode, const GLint 
*first, const GLsizei *count, GLsizei primcount);
+extern void (APIENTRY * qglMultiDrawElementsEXT) (GLenum mode, const GLsizei 
*count, GLenum type, const GLvoid* *indices, GLsizei primcount);
 
 // GL_ARB_shading_language_100
 #ifndef GL_ARB_shading_language_100
diff --git a/MP/code/rend2/tr_extensions.c b/MP/code/rend2/tr_extensions.c
index 3af283e..5c58341 100644
--- a/MP/code/rend2/tr_extensions.c
+++ b/MP/code/rend2/tr_extensions.c
@@ -34,7 +34,7 @@ void            (APIENTRY * qglDrawRangeElementsEXT) (GLenum 
mode, GLuint start,
 
 // GL_EXT_multi_draw_arrays
 void (APIENTRY * qglMultiDrawArraysEXT) (GLenum mode, const GLint *first, 
const GLsizei *count, GLsizei primcount);
-void (APIENTRY * qglMultiDrawElementsEXT) (GLenum mode, const GLsizei *count, 
GLenum type, const void *const*indices, GLsizei primcount);
+void (APIENTRY * qglMultiDrawElementsEXT) (GLenum mode, const GLsizei *count, 
GLenum type, const GLvoid* *indices, GLsizei primcount);
 
 // GL_ARB_vertex_shader
 void            (APIENTRY * qglBindAttribLocationARB) (GLhandleARB programObj, 
GLuint index, const GLcharARB * name);
diff --git a/MP/code/renderer/qgl.h b/MP/code/renderer/qgl.h
index b284a92..1628a6b 100644
--- a/MP/code/renderer/qgl.h
+++ b/MP/code/renderer/qgl.h
@@ -139,8 +139,8 @@ extern void     (APIENTRY * qglDrawRangeElementsEXT) 
(GLenum mode, GLuint start,
 // rend2
 
 // GL_EXT_multi_draw_arrays
-void (APIENTRY * qglMultiDrawArraysEXT) (GLenum mode, const GLint *first, 
const GLsizei *count, GLsizei primcount);
-extern void (APIENTRY * qglMultiDrawElementsEXT) (GLenum mode, const GLsizei 
*count, GLenum type, const void *const*indices, GLsizei primcount);
+extern void (APIENTRY * qglMultiDrawArraysEXT) (GLenum mode, const GLint 
*first, const GLsizei *count, GLsizei primcount);
+extern void (APIENTRY * qglMultiDrawElementsEXT) (GLenum mode, const GLsizei 
*count, GLenum type, const GLvoid* *indices, GLsizei primcount);
 
 // GL_ARB_shading_language_100
 #ifndef GL_ARB_shading_language_100
diff --git a/SP/Makefile b/SP/Makefile
index 038e115..07f4d8c 100644
--- a/SP/Makefile
+++ b/SP/Makefile
@@ -459,14 +459,15 @@ ifeq ($(PLATFORM),darwin)
   RENDERER_LIBS=
   OPTIMIZEVM=
 
-  BASE_CFLAGS = -Wall
+  BASE_CFLAGS = -Wall -mmacosx-version-min=10.5 \
+    -DMAC_OS_X_VERSION_MIN_REQUIRED=1050
 
   ifeq ($(ARCH),ppc)
-    BASE_CFLAGS += -arch ppc -faltivec -mmacosx-version-min=10.2
+    BASE_CFLAGS += -arch ppc -faltivec
     OPTIMIZEVM += -O3
   endif
   ifeq ($(ARCH),ppc64)
-    BASE_CFLAGS += -arch ppc64 -faltivec -mmacosx-version-min=10.2
+    BASE_CFLAGS += -arch ppc64 -faltivec
   endif
   ifeq ($(ARCH),x86)
     OPTIMIZEVM += -march=prescott -mfpmath=sse
diff --git a/SP/code/opus-1.1/src/opus_decoder.c 
b/SP/code/opus-1.1/src/opus_decoder.c
index 919ba52..4d03770 100644
--- a/SP/code/opus-1.1/src/opus_decoder.c
+++ b/SP/code/opus-1.1/src/opus_decoder.c
@@ -33,7 +33,7 @@
 # error "OPUS_BUILD _MUST_ be defined to build Opus. This probably means you 
need other defines as well, as in a config.h. See the included build files for 
details."
 #endif
 
-#if defined(__GNUC__) && (__GNUC__ >= 2) && !defined(__OPTIMIZE__)
+#if defined(__GNUC__) && (__GNUC__ >= 2) && !defined(__OPTIMIZE__) && 
!defined(__APPLE__)
 # pragma message "You appear to be compiling without optimization, if so opus 
will be very slow."
 #endif
 
diff --git a/SP/code/rend2/qgl.h b/SP/code/rend2/qgl.h
index 1179198..bbd7a4b 100644
--- a/SP/code/rend2/qgl.h
+++ b/SP/code/rend2/qgl.h
@@ -122,8 +122,8 @@ extern void     (APIENTRY * qglDrawRangeElementsEXT) 
(GLenum mode, GLuint start,
 // rend2
 
 // GL_EXT_multi_draw_arrays
-void (APIENTRY * qglMultiDrawArraysEXT) (GLenum mode, const GLint *first, 
const GLsizei *count, GLsizei primcount);
-extern void (APIENTRY * qglMultiDrawElementsEXT) (GLenum mode, const GLsizei 
*count, GLenum type, const void *const*indices, GLsizei primcount);
+extern void (APIENTRY * qglMultiDrawArraysEXT) (GLenum mode, const GLint 
*first, const GLsizei *count, GLsizei primcount);
+extern void (APIENTRY * qglMultiDrawElementsEXT) (GLenum mode, const GLsizei 
*count, GLenum type, const GLvoid* *indices, GLsizei primcount);
 
 // GL_ARB_shading_language_100
 #ifndef GL_ARB_shading_language_100
diff --git a/SP/code/rend2/tr_extensions.c b/SP/code/rend2/tr_extensions.c
index 3af283e..5c58341 100644
--- a/SP/code/rend2/tr_extensions.c
+++ b/SP/code/rend2/tr_extensions.c
@@ -34,7 +34,7 @@ void            (APIENTRY * qglDrawRangeElementsEXT) (GLenum 
mode, GLuint start,
 
 // GL_EXT_multi_draw_arrays
 void (APIENTRY * qglMultiDrawArraysEXT) (GLenum mode, const GLint *first, 
const GLsizei *count, GLsizei primcount);
-void (APIENTRY * qglMultiDrawElementsEXT) (GLenum mode, const GLsizei *count, 
GLenum type, const void *const*indices, GLsizei primcount);
+void (APIENTRY * qglMultiDrawElementsEXT) (GLenum mode, const GLsizei *count, 
GLenum type, const GLvoid* *indices, GLsizei primcount);
 
 // GL_ARB_vertex_shader
 void            (APIENTRY * qglBindAttribLocationARB) (GLhandleARB programObj, 
GLuint index, const GLcharARB * name);
diff --git a/SP/code/renderer/qgl.h b/SP/code/renderer/qgl.h
index b284a92..1628a6b 100644
--- a/SP/code/renderer/qgl.h
+++ b/SP/code/renderer/qgl.h
@@ -139,8 +139,8 @@ extern void     (APIENTRY * qglDrawRangeElementsEXT) 
(GLenum mode, GLuint start,
 // rend2
 
 // GL_EXT_multi_draw_arrays
-void (APIENTRY * qglMultiDrawArraysEXT) (GLenum mode, const GLint *first, 
const GLsizei *count, GLsizei primcount);
-extern void (APIENTRY * qglMultiDrawElementsEXT) (GLenum mode, const GLsizei 
*count, GLenum type, const void *const*indices, GLsizei primcount);
+extern void (APIENTRY * qglMultiDrawArraysEXT) (GLenum mode, const GLint 
*first, const GLsizei *count, GLsizei primcount);
+extern void (APIENTRY * qglMultiDrawElementsEXT) (GLenum mode, const GLsizei 
*count, GLenum type, const GLvoid* *indices, GLsizei primcount);
 
 // GL_ARB_shading_language_100
 #ifndef GL_ARB_shading_language_100

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

Reply via email to