diff options
| author | ludwig <ludwig@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2008-04-28 07:10:32 +0000 | 
|---|---|---|
| committer | ludwig <ludwig@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2008-04-28 07:10:32 +0000 | 
| commit | 7baf9d65ca93c5747a565e6cde00380e9fd9880b (patch) | |
| tree | 55bf9d4bb39acd0b7b22bc21f75ba03a75a5b15c | |
| parent | a72f6f27c85222d5646a3cd8077de4d5c5817b80 (diff) | |
| download | ioquake3-aero-7baf9d65ca93c5747a565e6cde00380e9fd9880b.tar.gz ioquake3-aero-7baf9d65ca93c5747a565e6cde00380e9fd9880b.zip  | |
mingw32: allow to override cflags and libs for external libraries
git-svn-id: svn://svn.icculus.org/quake3/trunk@1332 edf5b092-35ff-0310-97b2-ce42778d08ea
| -rw-r--r-- | Makefile | 56 | 
1 files changed, 40 insertions, 16 deletions
@@ -102,7 +102,11 @@ USE_OPENAL=1  endif  ifndef USE_OPENAL_DLOPEN -USE_OPENAL_DLOPEN=0 +  ifeq ($(PLATFORM),mingw32) +    USE_OPENAL_DLOPEN=1 +  else +    USE_OPENAL_DLOPEN=0 +  endif  endif  ifndef USE_CURL @@ -154,6 +158,16 @@ SDLHDIR=$(MOUNT_DIR)/SDL12  LIBSDIR=$(MOUNT_DIR)/libs  TEMPDIR=/tmp +# set PKG_CONFIG_PATH to influence this, e.g. +# PKG_CONFIG_PATH=/opt/cross/i386-mingw32msvc/lib/pkgconfig +CURL_CFLAGS=$(shell pkg-config --cflags libcurl) +CURL_LIBS=$(shell pkg-config --libs libcurl) +OPENAL_CFLAGS=$(shell pkg-config --cflags openal) +OPENAL_LIBS=$(shell pkg-config --libs openal) +# FIXME: introduce CLIENT_CFLAGS +SDL_CFLAGS=$(shell pkg-config --cflags sdl|sed 's/-Dmain=SDL_main//') +SDL_LIBS=$(shell pkg-config --libs sdl) +  # extract version info  ifeq ($(BUILD_STANDALONE),1) @@ -391,18 +405,13 @@ endif    # Require Windows XP or later    BASE_CFLAGS += -DWINVER=0x501 -  ifeq ($(USE_LOCAL_HEADERS),1) -    BASE_CFLAGS += -I$(SDLHDIR)/include -  endif -    ifeq ($(USE_OPENAL),1) -    BASE_CFLAGS += -DUSE_OPENAL=1 -DUSE_OPENAL_DLOPEN -  endif - -  ifeq ($(USE_CURL),1) -    BASE_CFLAGS += -DUSE_CURL -    ifneq ($(USE_CURL_DLOPEN),1) -      BASE_CFLAGS += -DCURL_STATICLIB +    BASE_CFLAGS += -DUSE_OPENAL +    BASE_CFLAGS += $(OPENAL_CFLAGS) +    ifeq ($(USE_OPENAL_DLOPEN),1) +      BASE_CFLAGS += -DUSE_OPENAL_DLOPEN +    else +      CLIENT_LDFLAGS += $(OPENAL_LDFLAGS)      endif    endif @@ -426,8 +435,15 @@ endif    CLIENT_LDFLAGS = -mwindows -lgdi32 -lole32 -lopengl32    ifeq ($(USE_CURL),1) +    BASE_CFLAGS += -DUSE_CURL +    BASE_CFLAGS += $(CURL_CFLAGS)      ifneq ($(USE_CURL_DLOPEN),1) -      CLIENT_LDFLAGS += $(LIBSDIR)/win32/libcurl.a +      ifeq ($(USE_LOCAL_HEADERS),1) +        BASE_CFLAGS += -DCURL_STATICLIB +        CLIENT_LDFLAGS += $(LIBSDIR)/win32/libcurl.a +      else +        CLIENT_LDFLAGS += $(CURL_LIBS) +      endif      endif    endif @@ -445,9 +461,17 @@ endif    RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE)    # libmingw32 must be linked before libSDLmain -  CLIENT_LDFLAGS += -lmingw32 \ -                    $(LIBSDIR)/win32/libSDLmain.a \ -                    $(LIBSDIR)/win32/libSDL.dll.a +  CLIENT_LDFLAGS += -lmingw32 +  ifeq ($(USE_LOCAL_HEADERS),1) +    BASE_CFLAGS += -I$(SDLHDIR)/include +    CLIENT_LDFLAGS += $(LIBSDIR)/win32/libSDLmain.a \ +                      $(LIBSDIR)/win32/libSDL.dll.a +  else +    BASE_CFLAGS += $(SDL_CFLAGS) +    CLIENT_LDFLAGS += $(SDL_LIBS) +  endif + +    BUILD_CLIENT_SMP = 0  | 
