[iortcw] 330/497: All: Fix copying the libraries to build dir 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 779d00dd37fbcd8499182abdad346c10e0c9f0fa
Author: Donny Springer <M4N4T4RMS at gmail.com>
Date:   Wed Mar 25 22:48:54 2015 -0400

    All: Fix copying the libraries to build dir on OSX
---
 MP/Makefile | 6 ++++--
 SP/Makefile | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/MP/Makefile b/MP/Makefile
index fc67cc5..2853d57 100644
--- a/MP/Makefile
+++ b/MP/Makefile
@@ -529,7 +529,6 @@ ifeq ($(PLATFORM),darwin)
         CLIENT_LIBS += $(THREAD_LIBS) $(OPENAL_LIBS)
       else
         CLIENT_LIBS += -framework OpenAL
-        CLIENT_EXTRA_FILES += $(LIBSDIR)/macosx/libopenal.dylib
       endif
     endif
   endif
@@ -556,12 +555,15 @@ ifeq ($(PLATFORM),darwin)
     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
 
+  ifeq ($(USE_INTERNAL_LIBS),1)
+    CLIENT_EXTRA_FILES += $(LIBSDIR)/macosx/libSDL2-2.0.0.dylib $(LIBSDIR)/macosx/libopenal.dylib
+  endif
+
   OPTIMIZE = $(OPTIMIZEVM) -ffast-math
 
   SHLIBEXT=dylib
diff --git a/SP/Makefile b/SP/Makefile
index 35f2754..1aa856a 100644
--- a/SP/Makefile
+++ b/SP/Makefile
@@ -521,7 +521,6 @@ ifeq ($(PLATFORM),darwin)
         CLIENT_LIBS += $(THREAD_LIBS) $(OPENAL_LIBS)
       else
         CLIENT_LIBS += -framework OpenAL
-        CLIENT_EXTRA_FILES += $(LIBSDIR)/macosx/libopenal.dylib
       endif
     endif
   endif
@@ -548,12 +547,15 @@ ifeq ($(PLATFORM),darwin)
     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
 
+  ifeq ($(USE_INTERNAL_LIBS),1)
+    CLIENT_EXTRA_FILES += $(LIBSDIR)/macosx/libSDL2-2.0.0.dylib $(LIBSDIR)/macosx/libopenal.dylib
+  endif
+
   OPTIMIZE = $(OPTIMIZEVM) -ffast-math
 
   SHLIBEXT=dylib

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