From 2f30943c5025931e5ab0ad97e70648119a7751c6 Mon Sep 17 00:00:00 2001 From: Thilo Schulz Date: Mon, 13 Jun 2011 15:47:43 +0000 Subject: - mingw64 now links against SDL64.dll to allow for 32 and 64 bit version in the same directory - Add library files for MinGW64 --- Makefile | 3 +-- src/libs/win64/libSDL64.dll.a | Bin 0 -> 125328 bytes src/libs/win64/libSDLmain.a | Bin 0 -> 4850 bytes 3 files changed, 1 insertion(+), 2 deletions(-) create mode 100644 src/libs/win64/libSDL64.dll.a create mode 100644 src/libs/win64/libSDLmain.a 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 Binary files /dev/null and b/src/libs/win64/libSDL64.dll.a differ diff --git a/src/libs/win64/libSDLmain.a b/src/libs/win64/libSDLmain.a new file mode 100644 index 00000000..deffe49e Binary files /dev/null and b/src/libs/win64/libSDLmain.a differ -- cgit