diff options
| -rw-r--r-- | Makefile | 34 | ||||
| -rw-r--r-- | code/sdl/sdl_glimp.c | 6 | ||||
| -rw-r--r-- | code/sys/sys_main.c | 8 |
3 files changed, 18 insertions, 30 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 diff --git a/code/sdl/sdl_glimp.c b/code/sdl/sdl_glimp.c index c5954ac..a1e1a27 100644 --- a/code/sdl/sdl_glimp.c +++ b/code/sdl/sdl_glimp.c @@ -396,9 +396,9 @@ static void GLimp_InitExtensions( void ) { if ( r_ext_multitexture->value ) { - qglMultiTexCoord2fARB = ( PFNGLMULTITEXCOORD2FARBPROC ) SDL_GL_GetProcAddress( "glMultiTexCoord2fARB" ); - qglActiveTextureARB = ( PFNGLACTIVETEXTUREARBPROC ) SDL_GL_GetProcAddress( "glActiveTextureARB" ); - qglClientActiveTextureARB = ( PFNGLCLIENTACTIVETEXTUREARBPROC ) SDL_GL_GetProcAddress( "glClientActiveTextureARB" ); + qglMultiTexCoord2fARB = SDL_GL_GetProcAddress( "glMultiTexCoord2fARB" ); + qglActiveTextureARB = SDL_GL_GetProcAddress( "glActiveTextureARB" ); + qglClientActiveTextureARB = SDL_GL_GetProcAddress( "glClientActiveTextureARB" ); if ( qglActiveTextureARB ) { diff --git a/code/sys/sys_main.c b/code/sys/sys_main.c index 30039d7..bf0eb94 100644 --- a/code/sys/sys_main.c +++ b/code/sys/sys_main.c @@ -587,6 +587,14 @@ int main( int argc, char **argv ) char commandLine[ MAX_STRING_CHARS ] = { 0 }; #ifndef DEDICATED + // SDL version check + + // Compile time +# if !SDL_VERSION_ATLEAST(MINSDL_MAJOR,MINSDL_MINOR,MINSDL_PATCH) +# error A more recent version of SDL is required +# endif + + // Run time const SDL_version *ver = SDL_Linked_Version( ); #define STRING(s) #s |