[iortcw] 12/497: All: Rename the SDL2 libraries so that x86 and x64 can coexist in the same directory
Simon McVittie
smcv at debian.org
Wed Sep 21 19:46:55 UTC 2016
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 de879bfd7cf496f85ec083a52299b3ada5bf0979
Author: M4N4T4RMS at gmail.com <M4N4T4RMS at gmail.com@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a>
Date: Sun Jan 19 17:51:41 2014 +0000
All: Rename the SDL2 libraries so that x86 and x64 can coexist in the same directory
---
MP/Makefile | 10 +++++-----
MP/code/libs/win64/{libSDL2.dll => SDL264.dll} | Bin
MP/code/libs/win64/{libSDL2.dll.a => libSDL264.dll.a} | Bin
SP/Makefile | 10 +++++-----
SP/code/libs/win64/{libSDL2.dll => SDL264.dll} | Bin
SP/code/libs/win64/{libSDL2.dll.a => libSDL264.dll.a} | Bin
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/MP/Makefile b/MP/Makefile
index ed72ce1..eae22a4 100644
--- a/MP/Makefile
+++ b/MP/Makefile
@@ -654,19 +654,19 @@ ifeq ($(PLATFORM),mingw32)
$(LIBSDIR)/win32/libSDL2.dll.a
RENDERER_LIBS += $(LIBSDIR)/win32/libSDL2main.a \
$(LIBSDIR)/win32/libSDL2.dll.a
- SDLDLL=libSDL2.dll
+ SDLDLL=SDL2.dll
else
CLIENT_LIBS += $(LIBSDIR)/win64/libSDL2main.a \
- $(LIBSDIR)/win64/libSDL2.dll.a
+ $(LIBSDIR)/win64/libSDL264.dll.a
RENDERER_LIBS += $(LIBSDIR)/win64/libSDL2main.a \
- $(LIBSDIR)/win64/libSDL2.dll.a
- SDLDLL=libSDL2.dll
+ $(LIBSDIR)/win64/libSDL264.dll.a
+ SDLDLL=SDL264.dll
endif
else
CLIENT_CFLAGS += $(SDL_CFLAGS)
CLIENT_LIBS += $(SDL_LIBS)
RENDERER_LIBS += $(SDL_LIBS)
- SDLDLL=libSDL2.dll
+ SDLDLL=SDL2.dll
endif
else # ifeq mingw32
diff --git a/MP/code/libs/win64/libSDL2.dll b/MP/code/libs/win64/SDL264.dll
similarity index 100%
rename from MP/code/libs/win64/libSDL2.dll
rename to MP/code/libs/win64/SDL264.dll
diff --git a/MP/code/libs/win64/libSDL2.dll.a b/MP/code/libs/win64/libSDL264.dll.a
similarity index 100%
rename from MP/code/libs/win64/libSDL2.dll.a
rename to MP/code/libs/win64/libSDL264.dll.a
diff --git a/SP/Makefile b/SP/Makefile
index a55662f..a61fa92 100644
--- a/SP/Makefile
+++ b/SP/Makefile
@@ -667,19 +667,19 @@ ifeq ($(PLATFORM),mingw32)
$(LIBSDIR)/win32/libSDL2.dll.a
RENDERER_LIBS += $(LIBSDIR)/win32/libSDL2main.a \
$(LIBSDIR)/win32/libSDL2.dll.a
- SDLDLL=libSDL2.dll
+ SDLDLL=SDL2.dll
else
CLIENT_LIBS += $(LIBSDIR)/win64/libSDL2main.a \
- $(LIBSDIR)/win64/libSDL2.dll.a
+ $(LIBSDIR)/win64/libSDL264.dll.a
RENDERER_LIBS += $(LIBSDIR)/win64/libSDL2main.a \
- $(LIBSDIR)/win64/libSDL2.dll.a
- SDLDLL=libSDL2.dll
+ $(LIBSDIR)/win64/libSDL264.dll.a
+ SDLDLL=SDL264.dll
endif
else
CLIENT_CFLAGS += $(SDL_CFLAGS)
CLIENT_LIBS += $(SDL_LIBS)
RENDERER_LIBS += $(SDL_LIBS)
- SDLDLL=libSDL2.dll
+ SDLDLL=SDL2.dll
endif
else # ifeq mingw32
diff --git a/SP/code/libs/win64/libSDL2.dll b/SP/code/libs/win64/SDL264.dll
similarity index 100%
rename from SP/code/libs/win64/libSDL2.dll
rename to SP/code/libs/win64/SDL264.dll
diff --git a/SP/code/libs/win64/libSDL2.dll.a b/SP/code/libs/win64/libSDL264.dll.a
similarity index 100%
rename from SP/code/libs/win64/libSDL2.dll.a
rename to SP/code/libs/win64/libSDL264.dll.a
--
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