r1217 - in trunk: . code/sdl code/sys

[DONOTREPLY at icculus.org]

Author: tma
Date: 2007-11-25 18:41:01 -0500 (Sun, 25 Nov 2007)
New Revision: 1217

Modified:
   trunk/Makefile
   trunk/code/sdl/sdl_glimp.c
   trunk/code/sys/sys_main.c
Log:
* 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


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2007-11-23 00:33:13 UTC (rev 1216)
+++ trunk/Makefile	2007-11-25 23:41:01 UTC (rev 1217)
@@ -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 @@
   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 @@
 
 # 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 @@
 
 
 #############################################################################
-# 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 @@
 -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

Modified: trunk/code/sdl/sdl_glimp.c
===================================================================
--- trunk/code/sdl/sdl_glimp.c	2007-11-23 00:33:13 UTC (rev 1216)
+++ trunk/code/sdl/sdl_glimp.c	2007-11-25 23:41:01 UTC (rev 1217)
@@ -396,9 +396,9 @@
 	{
 		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 )
 			{

Modified: trunk/code/sys/sys_main.c
===================================================================
--- trunk/code/sys/sys_main.c	2007-11-23 00:33:13 UTC (rev 1216)
+++ trunk/code/sys/sys_main.c	2007-11-25 23:41:01 UTC (rev 1217)
@@ -587,6 +587,14 @@
 	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