[iortcw] 440/497: All: Add internal x86/x64 SDL libs for Linux & Linux cross-compiling / Some Makefile cleanup
Simon McVittie
smcv at debian.org
Fri Sep 8 10:37:46 UTC 2017
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 599b64f2506799f5c66897a79f1647de9a285f00
Author: MAN-AT-ARMS <M4N4T4RMS at gmail.com>
Date: Tue Nov 24 09:56:26 2015 -0500
All: Add internal x86/x64 SDL libs for Linux & Linux cross-compiling / Some Makefile cleanup
---
MP/Makefile | 40 +++++++++++++++++++++++++++----------
MP/code/libs/linux32/libSDL2.so | Bin 0 -> 3673017 bytes
MP/code/libs/linux32/libSDL2main.a | Bin 0 -> 4424 bytes
MP/code/libs/linux64/libSDL2.so | Bin 0 -> 4638734 bytes
MP/code/libs/linux64/libSDL2main.a | Bin 0 -> 6324 bytes
SP/Makefile | 38 ++++++++++++++++++++++++++---------
SP/code/libs/linux32/libSDL2.so | Bin 0 -> 3673017 bytes
SP/code/libs/linux32/libSDL2main.a | Bin 0 -> 4424 bytes
SP/code/libs/linux64/libSDL2.so | Bin 0 -> 4638734 bytes
SP/code/libs/linux64/libSDL2main.a | Bin 0 -> 6324 bytes
10 files changed, 59 insertions(+), 19 deletions(-)
diff --git a/MP/Makefile b/MP/Makefile
index e55be20..988668f 100644
--- a/MP/Makefile
+++ b/MP/Makefile
@@ -410,6 +410,21 @@ ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" "gnu")
THREAD_LIBS=-lpthread
LIBS=-ldl -lm
+ ifeq ($(USE_LOCAL_HEADERS),1)
+ CLIENT_CFLAGS += -I$(SDLHDIR)/include
+ 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
+ endif
+ endif
+
ifeq ($(USE_OPENGLES),1)
ifeq ($(RASPBERRY_PI),1)
BUILD_RENDERER_REND2 = 0
@@ -426,8 +441,9 @@ ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" "gnu")
SERVER_LIBS =
endif
else
- CLIENT_LIBS = $(SDL_LIBS)
- RENDERER_LIBS = $(SDL_LIBS) -lGL
+ CLIENT_CFLAGS += $(SDL_CFLAGS)
+ CLIENT_LIBS += $(SDL_LIBS)
+ RENDERER_LIBS += $(SDL_LIBS) -lGL
SERVER_LIBS =
endif
@@ -526,9 +542,9 @@ ifeq ($(PLATFORM),darwin)
BASE_CFLAGS += -D_THREAD_SAFE=1
ifeq ($(USE_LOCAL_HEADERS),1)
- BASE_CFLAGS += -I$(SDLHDIR)/include
+ CLIENT_CFLAGS += -I$(SDLHDIR)/include
else
- BASE_CFLAGS += $(SDL_CFLAGS)
+ CLIENT_CFLAGS += $(SDL_CFLAGS)
endif
# We copy sdlmain before ranlib'ing it so that subversion doesn't think
@@ -692,18 +708,22 @@ ifdef MINGW
ifeq ($(USE_LOCAL_HEADERS),1)
CLIENT_CFLAGS += -I$(SDLHDIR)/include
+ endif
+
+ ifeq ($(USE_INTERNAL_LIBS),1)
ifeq ($(ARCH),x86)
CLIENT_LIBS += $(LIBSDIR)/win32/libSDL2main.a \
- $(LIBSDIR)/win32/libSDL2.dll.a
+ $(LIBSDIR)/win32/libSDL2.dll.a
RENDERER_LIBS += $(LIBSDIR)/win32/libSDL2main.a \
- $(LIBSDIR)/win32/libSDL2.dll.a
+ $(LIBSDIR)/win32/libSDL2.dll.a
SDLDLL=SDL2.dll
CLIENT_EXTRA_FILES += $(LIBSDIR)/win32/SDL2.dll $(LIBSDIR)/win32/OpenAL32.dll
- else
+ endif
+ ifeq ($(ARCH),x86_64)
CLIENT_LIBS += $(LIBSDIR)/win64/libSDL264main.a \
- $(LIBSDIR)/win64/libSDL264.dll.a
+ $(LIBSDIR)/win64/libSDL264.dll.a
RENDERER_LIBS += $(LIBSDIR)/win64/libSDL264main.a \
- $(LIBSDIR)/win64/libSDL264.dll.a
+ $(LIBSDIR)/win64/libSDL264.dll.a
SDLDLL=SDL264.dll
CLIENT_EXTRA_FILES += $(LIBSDIR)/win64/SDL264.dll $(LIBSDIR)/win64/OpenAL64.dll
endif
@@ -931,7 +951,7 @@ else # ifeq sunos
#############################################################################
# SETUP AND BUILD -- GENERIC
#############################################################################
- BASE_CFLAGS=
+ BASE_CFLAGS =
OPTIMIZE = -O3
SHLIBEXT=so
diff --git a/MP/code/libs/linux32/libSDL2.so b/MP/code/libs/linux32/libSDL2.so
new file mode 100755
index 0000000..2db0a36
Binary files /dev/null and b/MP/code/libs/linux32/libSDL2.so differ
diff --git a/MP/code/libs/linux32/libSDL2main.a b/MP/code/libs/linux32/libSDL2main.a
new file mode 100644
index 0000000..341b2b4
Binary files /dev/null and b/MP/code/libs/linux32/libSDL2main.a differ
diff --git a/MP/code/libs/linux64/libSDL2.so b/MP/code/libs/linux64/libSDL2.so
new file mode 100755
index 0000000..3a04cfc
Binary files /dev/null and b/MP/code/libs/linux64/libSDL2.so differ
diff --git a/MP/code/libs/linux64/libSDL2main.a b/MP/code/libs/linux64/libSDL2main.a
new file mode 100644
index 0000000..a5b55cb
Binary files /dev/null and b/MP/code/libs/linux64/libSDL2main.a differ
diff --git a/SP/Makefile b/SP/Makefile
index 87e72ec..3b7c315 100644
--- a/SP/Makefile
+++ b/SP/Makefile
@@ -402,6 +402,21 @@ ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" "gnu")
THREAD_LIBS=-lpthread
LIBS=-ldl -lm
+ ifeq ($(USE_LOCAL_HEADERS),1)
+ CLIENT_CFLAGS += -I$(SDLHDIR)/include
+ 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
+ endif
+ endif
+
ifeq ($(USE_OPENGLES),1)
ifeq ($(RASPBERRY_PI),1)
BUILD_RENDERER_REND2 = 0
@@ -418,8 +433,9 @@ ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" "gnu")
SERVER_LIBS =
endif
else
- CLIENT_LIBS = $(SDL_LIBS)
- RENDERER_LIBS = $(SDL_LIBS) -lGL
+ CLIENT_CFLAGS += $(SDL_CFLAGS)
+ CLIENT_LIBS += $(SDL_LIBS)
+ RENDERER_LIBS += $(SDL_LIBS) -lGL
SERVER_LIBS =
endif
@@ -518,9 +534,9 @@ ifeq ($(PLATFORM),darwin)
BASE_CFLAGS += -D_THREAD_SAFE=1
ifeq ($(USE_LOCAL_HEADERS),1)
- BASE_CFLAGS += -I$(SDLHDIR)/include
+ CLIENT_CFLAGS += -I$(SDLHDIR)/include
else
- BASE_CFLAGS += $(SDL_CFLAGS)
+ CLIENT_CFLAGS += $(SDL_CFLAGS)
endif
# We copy sdlmain before ranlib'ing it so that subversion doesn't think
@@ -684,18 +700,22 @@ ifdef MINGW
ifeq ($(USE_LOCAL_HEADERS),1)
CLIENT_CFLAGS += -I$(SDLHDIR)/include
+ endif
+
+ ifeq ($(USE_INTERNAL_LIBS),1)
ifeq ($(ARCH),x86)
CLIENT_LIBS += $(LIBSDIR)/win32/libSDL2main.a \
- $(LIBSDIR)/win32/libSDL2.dll.a
+ $(LIBSDIR)/win32/libSDL2.dll.a
RENDERER_LIBS += $(LIBSDIR)/win32/libSDL2main.a \
- $(LIBSDIR)/win32/libSDL2.dll.a
+ $(LIBSDIR)/win32/libSDL2.dll.a
SDLDLL=SDL2.dll
CLIENT_EXTRA_FILES += $(LIBSDIR)/win32/SDL2.dll $(LIBSDIR)/win32/OpenAL32.dll
- else
+ endif
+ ifeq ($(ARCH),x86_64)
CLIENT_LIBS += $(LIBSDIR)/win64/libSDL264main.a \
- $(LIBSDIR)/win64/libSDL264.dll.a
+ $(LIBSDIR)/win64/libSDL264.dll.a
RENDERER_LIBS += $(LIBSDIR)/win64/libSDL264main.a \
- $(LIBSDIR)/win64/libSDL264.dll.a
+ $(LIBSDIR)/win64/libSDL264.dll.a
SDLDLL=SDL264.dll
CLIENT_EXTRA_FILES += $(LIBSDIR)/win64/SDL264.dll $(LIBSDIR)/win64/OpenAL64.dll
endif
diff --git a/SP/code/libs/linux32/libSDL2.so b/SP/code/libs/linux32/libSDL2.so
new file mode 100755
index 0000000..2db0a36
Binary files /dev/null and b/SP/code/libs/linux32/libSDL2.so differ
diff --git a/SP/code/libs/linux32/libSDL2main.a b/SP/code/libs/linux32/libSDL2main.a
new file mode 100644
index 0000000..341b2b4
Binary files /dev/null and b/SP/code/libs/linux32/libSDL2main.a differ
diff --git a/SP/code/libs/linux64/libSDL2.so b/SP/code/libs/linux64/libSDL2.so
new file mode 100755
index 0000000..3a04cfc
Binary files /dev/null and b/SP/code/libs/linux64/libSDL2.so differ
diff --git a/SP/code/libs/linux64/libSDL2main.a b/SP/code/libs/linux64/libSDL2main.a
new file mode 100644
index 0000000..a5b55cb
Binary files /dev/null and b/SP/code/libs/linux64/libSDL2main.a differ
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git
More information about the Pkg-games-commits
mailing list