[iortcw] 474/497: All: Only link against internal SDL libs when cross-compiling on Linux

[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 0af5a8b5612ca942ea74a7b5d841867532872db7
Author: MAN-AT-ARMS <M4N4T4RMS at gmail.com>
Date:   Sat Dec 12 08:25:52 2015 -0500

    All: Only link against internal SDL libs when cross-compiling on Linux
---
 MP/Makefile | 16 +++++++++-------
 SP/Makefile | 16 +++++++++-------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/MP/Makefile b/MP/Makefile
index 2abbc2a..9732628 100644
--- a/MP/Makefile
+++ b/MP/Makefile
@@ -418,13 +418,15 @@ ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" "gnu")
   endif
 
   ifeq ($(USE_INTERNAL_LIBS),1)
-    ifeq ($(ARCH),x86)
-    SDL_LIBS = $(LIBSDIR)/linux32/libSDL2main.a \
-               $(LIBSDIR)/linux32/libSDL2.so
-    endif
-    ifeq ($(ARCH),x86_64)
-    SDL_LIBS = $(LIBSDIR)/linux64/libSDL2main.a \
-               $(LIBSDIR)/linux64/libSDL2.so
+    ifeq ($(CROSS_COMPILING),1)
+      ifeq ($(ARCH),x86)
+      SDL_LIBS = $(LIBSDIR)/linux32/libSDL2main.a \
+                 $(LIBSDIR)/linux32/libSDL2.so
+      endif
+      ifeq ($(ARCH),x86_64)
+      SDL_LIBS = $(LIBSDIR)/linux64/libSDL2main.a \
+                 $(LIBSDIR)/linux64/libSDL2.so
+      endif
     endif
   endif
 
diff --git a/SP/Makefile b/SP/Makefile
index 0ae5334..7a0fc62 100644
--- a/SP/Makefile
+++ b/SP/Makefile
@@ -407,13 +407,15 @@ ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" "gnu")
   endif
 
   ifeq ($(USE_INTERNAL_LIBS),1)
-    ifeq ($(ARCH),x86)
-    SDL_LIBS = $(LIBSDIR)/linux32/libSDL2main.a \
-               $(LIBSDIR)/linux32/libSDL2.so
-    endif
-    ifeq ($(ARCH),x86_64)
-    SDL_LIBS = $(LIBSDIR)/linux64/libSDL2main.a \
-               $(LIBSDIR)/linux64/libSDL2.so
+    ifeq ($(CROSS_COMPILING),1)
+      ifeq ($(ARCH),x86)
+      SDL_LIBS = $(LIBSDIR)/linux32/libSDL2main.a \
+                 $(LIBSDIR)/linux32/libSDL2.so
+      endif
+      ifeq ($(ARCH),x86_64)
+      SDL_LIBS = $(LIBSDIR)/linux64/libSDL2main.a \
+                 $(LIBSDIR)/linux64/libSDL2.so
+      endif
     endif
   endif
 

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