From 56902c5a9b6b59341f71098566f2d84a4af4b572 Mon Sep 17 00:00:00 2001 From: tma Date: Fri, 2 Nov 2007 23:36:23 +0000 Subject: * (bug 3393) Blank user names still possible (Michael Jard ) * (bug 3363) Download percentage overflow (Martin Doucha ) * (bug 3390) MSVC project (Julian Priestley ) * For OS X and MinGW ports, don't -I code/SDL when USE_LOCAL_HEADERS is 0 git-svn-id: svn://svn.icculus.org/quake3/trunk@1204 edf5b092-35ff-0310-97b2-ce42778d08ea --- Makefile | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 6911165..9ac119d 100644 --- a/Makefile +++ b/Makefile @@ -366,7 +366,12 @@ ifeq ($(PLATFORM),darwin) CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg endif - BASE_CFLAGS += -D_THREAD_SAFE=1 -I$(SDLHDIR)/include + BASE_CFLAGS += -D_THREAD_SAFE=1 + + ifeq ($(USE_LOCAL_HEADERS),1) + BASE_CFLAGS += -I$(SDLHDIR)/include + endif + # We copy sdlmain before ranlib'ing it so that subversion doesn't think # the file has been modified by each build. LIBSDLMAIN=$(B)/libSDLmain.a @@ -408,7 +413,11 @@ endif ARCH=x86 BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \ - -DUSE_ICON -I$(SDLHDIR)/include + -DUSE_ICON + + ifeq ($(USE_LOCAL_HEADERS),1) + BASE_CFLAGS += -I$(SDLHDIR)/include + endif ifeq ($(USE_OPENAL),1) BASE_CFLAGS += -DUSE_OPENAL=1 -DUSE_OPENAL_DLOPEN -- cgit v1.2.3