diff options
| author | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2007-11-25 23:41:01 +0000 |
|---|---|---|
| committer | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2007-11-25 23:41:01 +0000 |
| commit | daa6b52744a1530591e0717d99976c30e5e8e0a6 (patch) | |
| tree | 6fc4ba29584cf9d2441ef8d64d1d4f8c5e108eaf /Makefile | |
| parent | 75e6bcf119724b1d3db26707da856e48802e59b4 (diff) | |
| download | ioquake3-aero-daa6b52744a1530591e0717d99976c30e5e8e0a6.tar.gz ioquake3-aero-daa6b52744a1530591e0717d99976c30e5e8e0a6.zip | |
* Move SDL library version check to sys_main.c as it's proving difficult to
make the Makefile check sufficiently portable
* Remove unnecessary GL PFN... casts from SDL_GL_GetProcAddress calls
* Replace OS X uname workaround with Solaris workaround, as I believe OS X
uname now behaves the same as GNU name
git-svn-id: svn://svn.icculus.org/quake3/trunk@1217 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 34 |
1 files changed, 7 insertions, 27 deletions
@@ -6,8 +6,8 @@ COMPILE_PLATFORM=$(shell uname|sed -e s/_.*//|tr '[:upper:]' '[:lower:]') -ifeq ($(COMPILE_PLATFORM),darwin) - # Apple does some things a little differently... +ifeq ($(COMPILE_PLATFORM),sunos) + # Solaris uname and GNU uname differ COMPILE_ARCH=$(shell uname -p | sed -e s/i.86/i386/) else COMPILE_ARCH=$(shell uname -m | sed -e s/i.86/i386/) @@ -794,6 +794,9 @@ ifeq ($(USE_SVN),1) BASE_CFLAGS += -DSVN_VERSION=\\\"$(SVN_VERSION)\\\" endif +# Require a minimum version of SDL +BASE_CFLAGS += -DMINSDL_MAJOR=1 -DMINSDL_MINOR=2 -DMINSDL_PATCH=7 + ifeq ($(V),1) echo_cmd=@: Q= @@ -866,7 +869,7 @@ release: # Create the build directories, check libraries and print out # an informational message, then start building -targets: makedirs libversioncheck +targets: makedirs @echo "" @echo "Building ioquake3 in $(B):" @echo " PLATFORM: $(PLATFORM)" @@ -1056,29 +1059,6 @@ $(Q3ASM): $(Q3ASMOBJ) ############################################################################# -# LIBRARY VERSION CHECKS -############################################################################# - -MINSDL_MAJOR = 1 -MINSDL_MINOR = 2 -MINSDL_PATCH = 7 - -BASE_CFLAGS += -DMINSDL_MAJOR=$(MINSDL_MAJOR) \ - -DMINSDL_MINOR=$(MINSDL_MINOR) \ - -DMINSDL_PATCH=$(MINSDL_PATCH) - -libversioncheck: - @/bin/echo -e "#include \"SDL_version.h\"\n" \ - "#if SDL_VERSION_ATLEAST(" \ - "$(MINSDL_MAJOR),$(MINSDL_MINOR),$(MINSDL_PATCH)" \ - ")\nMINSDL_PASSED\n#endif" | \ - $(CC) $(BASE_CFLAGS) -E - | grep -q MINSDL_PASSED || \ - ( /bin/echo "SDL version" \ - "$(MINSDL_MAJOR).$(MINSDL_MINOR).$(MINSDL_PATCH)" \ - "or greater required" && exit 1 ) - - -############################################################################# # CLIENT/SERVER ############################################################################# @@ -1924,6 +1904,6 @@ TOOLSOBJ_D_FILES=$(filter %.d,$(TOOLSOBJ:%.o=%.d)) -include $(OBJ_D_FILES) $(TOOLSOBJ_D_FILES) .PHONY: all clean clean2 clean-debug clean-release copyfiles \ - debug default dist distclean installer libversioncheck makedirs \ + debug default dist distclean installer makedirs \ release targets \ toolsclean toolsclean2 toolsclean-debug toolsclean-release |