diff options
| author | Tim Angus <tim@ngus.net> | 2013-01-21 22:40:05 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2014-08-28 11:01:50 +0100 |
| commit | 0319df4301e9eca103f35ce2ff7e8f4c7b450c03 (patch) | |
| tree | 87334b592f52f1a00c638641e2620cae85870059 /Makefile | |
| parent | 9cbe2c1a320b30d7d8178123aea01396a996bef4 (diff) | |
Update bundled SDL headers/libs
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 26 |
1 files changed, 13 insertions, 13 deletions
@@ -242,7 +242,7 @@ LBURGDIR=$(MOUNT_DIR)/tools/lcc/lburg Q3CPPDIR=$(MOUNT_DIR)/tools/lcc/cpp Q3LCCETCDIR=$(MOUNT_DIR)/tools/lcc/etc Q3LCCSRCDIR=$(MOUNT_DIR)/tools/lcc/src -SDLHDIR=$(MOUNT_DIR)/SDL12 +SDLHDIR=$(MOUNT_DIR)/SDL2 LIBSDIR=$(MOUNT_DIR)/libs MASTERDIR=$(MOUNT_DIR)/master TEMPDIR=/tmp @@ -604,24 +604,24 @@ ifeq ($(PLATFORM),mingw32) ifeq ($(USE_LOCAL_HEADERS),1) CLIENT_CFLAGS += -I$(SDLHDIR)/include - ifeq ($(ARCH),x86) - CLIENT_LIBS += $(LIBSDIR)/win32/libSDLmain.a \ - $(LIBSDIR)/win32/libSDL.dll.a - RENDERER_LIBS += $(LIBSDIR)/win32/libSDLmain.a \ - $(LIBSDIR)/win32/libSDL.dll.a - SDLDLL=SDL.dll + ifeq ($(ARCH), x86) + CLIENT_LIBS += $(LIBSDIR)/win32/libSDL2main.a \ + $(LIBSDIR)/win32/libSDL2.dll.a + RENDERER_LIBS += $(LIBSDIR)/win32/libSDL2main.a \ + $(LIBSDIR)/win32/libSDL2.dll.a + SDLDLL=libSDL2.dll else - CLIENT_LIBS += $(LIBSDIR)/win64/libSDL64main.a \ - $(LIBSDIR)/win64/libSDL64.dll.a - RENDERER_LIBS += $(LIBSDIR)/win64/libSDL64main.a \ - $(LIBSDIR)/win64/libSDL64.dll.a - SDLDLL=SDL64.dll + CLIENT_LIBS += $(LIBSDIR)/win64/libSDL2main.a \ + $(LIBSDIR)/win64/libSDL2.dll.a + RENDERER_LIBS += $(LIBSDIR)/win64/libSDL2main.a \ + $(LIBSDIR)/win64/libSDL2.dll.a + SDLDLL=libSDL2.dll endif else CLIENT_CFLAGS += $(SDL_CFLAGS) CLIENT_LIBS += $(SDL_LIBS) RENDERER_LIBS += $(SDL_LIBS) - SDLDLL=SDL.dll + SDLDLL=libSDL2.dll endif else # ifeq mingw32 |