summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThilo Schulz <arny@ats.s.bawue.de>2011-06-13 15:47:43 +0000
committerTim Angus <tim@ngus.net>2013-01-09 23:15:56 +0000
commit2f30943c5025931e5ab0ad97e70648119a7751c6 (patch)
treed5106dfbd0bfeb11b7c6900e693004c3eb99de15
parent53c88ffd28eefc63817e4d177a775df7b076ebae (diff)
- mingw64 now links against SDL64.dll to allow for 32 and 64 bit version in the same directory - Add library files for MinGW64
-rw-r--r--Makefile3
-rw-r--r--src/libs/win64/libSDL64.dll.abin0 -> 125328 bytes
-rw-r--r--src/libs/win64/libSDLmain.abin0 -> 4850 bytes
3 files changed, 1 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index fd4d9c3a..51cb7b55 100644
--- a/Makefile
+++ b/Makefile
@@ -551,8 +551,7 @@ ifeq ($(PLATFORM),mingw32)
$(LIBSDIR)/win32/libSDL.dll.a
else
CLIENT_LIBS += $(LIBSDIR)/win64/libSDLmain.a \
- $(LIBSDIR)/win64/libSDL.dll.a \
- $(LIBSDIR)/win64/libSDL.a
+ $(LIBSDIR)/win64/libSDL64.dll.a
endif
else
CLIENT_CFLAGS += $(SDL_CFLAGS)
diff --git a/src/libs/win64/libSDL64.dll.a b/src/libs/win64/libSDL64.dll.a
new file mode 100644
index 00000000..84200046
--- /dev/null
+++ b/src/libs/win64/libSDL64.dll.a
Binary files differ
diff --git a/src/libs/win64/libSDLmain.a b/src/libs/win64/libSDLmain.a
new file mode 100644
index 00000000..deffe49e
--- /dev/null
+++ b/src/libs/win64/libSDLmain.a
Binary files differ