okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update bundled SDL headers/libs

Browse source
This commit is contained in:
Tim Angus 2013-01-21 22:40:05 +00:00
parent 42586b782b
commit b43f766141
128 changed files with 25304 additions and 12388 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Makefile
View file

@ -240,7 +240,7 @@ Q3LCCETCDIR=$(MOUNT_DIR)/tools/lcc/etc
Q3LCCSRCDIR=$(MOUNT_DIR)/tools/lcc/src
LOKISETUPDIR=misc/setup
NSISDIR=misc/nsis
SDLHDIR=$(MOUNT_DIR)/SDL12
SDLHDIR=$(MOUNT_DIR)/SDL2
LIBSDIR=$(MOUNT_DIR)/libs
bin_path=$(shell which $(1) 2> /dev/null)
@ -567,23 +567,23 @@ 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
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/libSDLmain.a \
$(LIBSDIR)/win64/libSDL64.dll.a
RENDERER_LIBS += $(LIBSDIR)/win64/libSDLmain.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
BUILD_CLIENT_SMP = 0