[iortcw] 329/497: MP: Add ability to use system SDL2 and OpenAL libs on OSX

[Simon McVittie]

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 52b3dba8eeb13f5f1bf27be213f09fc8978de489
Author: MAN-AT-ARMS <M4N4T4RMS at gmail.com>
Date:   Wed Mar 25 21:15:51 2015 -0400

    MP: Add ability to use system SDL2 and OpenAL libs on OSX
---
 MP/Makefile | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/MP/Makefile b/MP/Makefile
index 56e1eef..fc67cc5 100644
--- a/MP/Makefile
+++ b/MP/Makefile
@@ -524,7 +524,13 @@ ifeq ($(PLATFORM),darwin)
 
   ifeq ($(USE_OPENAL),1)
     ifneq ($(USE_OPENAL_DLOPEN),1)
-      CLIENT_LIBS += -framework OpenAL
+      ifneq ($(USE_INTERNAL_LIBS),1)
+        CLIENT_CFLAGS += $(OPENAL_CFLAGS)
+        CLIENT_LIBS += $(THREAD_LIBS) $(OPENAL_LIBS)
+      else
+        CLIENT_LIBS += -framework OpenAL
+        CLIENT_EXTRA_FILES += $(LIBSDIR)/macosx/libopenal.dylib
+      endif
     endif
   endif
 
@@ -539,16 +545,22 @@ ifeq ($(PLATFORM),darwin)
 
   ifeq ($(USE_LOCAL_HEADERS),1)
     BASE_CFLAGS += -I$(SDLHDIR)/include
+  else
+    BASE_CFLAGS += $(SDL_CFLAGS)
   endif
 
   # We copy sdlmain before ranlib'ing it so that subversion doesn't think
   #  the file has been modified by each build.
-  LIBSDLMAIN=$(B)/libSDL2main.a
-  LIBSDLMAINSRC=$(LIBSDIR)/macosx/libSDL2main.a
-  CLIENT_LIBS += -framework IOKit \
-    $(LIBSDIR)/macosx/libSDL2-2.0.0.dylib
-  RENDERER_LIBS += -framework OpenGL $(LIBSDIR)/macosx/libSDL2-2.0.0.dylib
-  CLIENT_EXTRA_FILES += $(LIBSDIR)/macosx/libSDL2-2.0.0.dylib $(LIBSDIR)/macosx/libopenal.dylib
+  ifeq ($(USE_INTERNAL_LIBS),1)
+    LIBSDLMAIN=$(B)/libSDL2main.a
+    LIBSDLMAINSRC=$(LIBSDIR)/macosx/libSDL2main.a
+    CLIENT_LIBS += -framework IOKit $(LIBSDIR)/macosx/libSDL2-2.0.0.dylib
+    RENDERER_LIBS += -framework OpenGL $(LIBSDIR)/macosx/libSDL2-2.0.0.dylib
+    CLIENT_EXTRA_FILES += $(LIBSDIR)/macosx/libSDL2-2.0.0.dylib
+  else
+    CLIENT_LIBS += -framework IOKit $(SDL_LIBS)
+    RENDERER_LIBS += -framework OpenGL $(SDL_LIBS)
+  endif
 
   OPTIMIZE = $(OPTIMIZEVM) -ffast-math
 

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