diff options
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | src/opus-1.1/src/opus_decoder.c | 2 | ||||
| -rw-r--r-- | src/renderercommon/qgl.h | 4 | ||||
| -rw-r--r-- | src/renderergl2/tr_extensions.c | 2 |
4 files changed, 8 insertions, 7 deletions
@@ -401,14 +401,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/src/opus-1.1/src/opus_decoder.c b/src/opus-1.1/src/opus_decoder.c index 919ba521..4d03770d 100644 --- a/src/opus-1.1/src/opus_decoder.c +++ b/src/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/src/renderercommon/qgl.h b/src/renderercommon/qgl.h index a0306897..cc6540d6 100644 --- a/src/renderercommon/qgl.h +++ b/src/renderercommon/qgl.h @@ -632,8 +632,8 @@ extern void (APIENTRY * qglGetQueryObjectuivARB)(GLuint id, GLenum pname, GLuint extern void (APIENTRY * qglDrawRangeElementsEXT) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices); // 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/src/renderergl2/tr_extensions.c b/src/renderergl2/tr_extensions.c index bcc904af..70bdd7a7 100644 --- a/src/renderergl2/tr_extensions.c +++ b/src/renderergl2/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); |