some sdl related stuff:

* moved references to libSDL out of ifeq($(INTERNATIONAL), true) (win32)
and  ifeq($(WITH_FREETYPE2),true) (irix) conditionals in source/Makefile

* look for sdl in $(LCGDIR)/sdl if sdl-config isn't found

thanks to LarstiQ for doing most of the work

4 files changed, 55 insertions, 12 deletions

diff --git a/source/Makefile b/source/Makefile
index b0dac12dfce..53ee13fc2f0 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -147,8 +147,7 @@ PYPLAYERLIB ?= $(PYLIB)
     else
       ifeq ($(OS), irix)
         COMLIB += $(NAN_FREETYPE)/lib32/libfreetype.a
-        COMLIB += $(NAN_SDL)/lib/libSDL.a
-      else
+       else
         COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a
       endif
     endif
@@ -159,14 +158,12 @@ ifeq ($(INTERNATIONAL), true)
         ifeq ($(FREE_WINDOWS), true)
           COMLIB += $(NAN_GETTEXT)/lib/freegettext.a
           COMLIB += $(NAN_FTGL)/lib/libftgl.a
-		  COMLIB += $(NAN_SDL)/lib/libSDL.a
           #COMLIB += $(NAN_ICONV)/lib/freeiconv.a
         else
           COMLIB += $(NAN_GETTEXT)/lib/gnu_gettext.lib
           COMLIB += $(NAN_FTGL)/lib/ftgl_static_ST.lib
           COMLIB += $(NAN_FREETYPE)/lib/freetype2ST.lib
           COMLIB += $(NAN_ICONV)/lib/iconv.lib
-		  COMLIB += $(NAN_SDL)/lib/SDL.lib
         endif
     else
         COMLIB += $(NAN_FTGL)/lib/libftgl.a
@@ -182,6 +179,17 @@ ifeq ($(INTERNATIONAL), true)
 	endif
 endif
 
+ifeq ($(OS), irix)
+	COMLIB += $(NAN_SDL)/lib/libSDL.a
+endif
+ifeq ($(OS), windows)
+    ifeq ($(FREE_WINDOWS), true)
+	    COMLIB += $(NAN_SDL)/lib/libSDL.a
+    else
+	    COMLIB += $(NAN_SDL)/lib/SDL.lib
+    endif
+endif
+
     PULIB = $(NAN_IKSOLVER)/lib/libiksolver.a
     PULIB += $(NAN_MOTO)/lib/libmoto.a
     PULIB += $(OCGDIR)/blender/readblenfile/$(DEBUG_DIR)libreadblenfile.a
diff --git a/source/blender/src/Makefile b/source/blender/src/Makefile
index 7bf75126752..16813367fbc 100644
--- a/source/blender/src/Makefile
+++ b/source/blender/src/Makefile
@@ -87,7 +87,6 @@ CPPFLAGS += -I$(NAN_BSP)/include
 
 CPPFLAGS += -I../readstreamglue
 CPPFLAGS += -I../include
-CPPFLAGS += -I$(NAN_SDL)/include/SDL
 
 ifdef NAN_BUILDINFO
     CPPFLAGS += -DNAN_BUILDINFO
diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk
index f18bb574ddc..a05c530b442 100644
--- a/source/nan_definitions.mk
+++ b/source/nan_definitions.mk
@@ -82,6 +82,7 @@ all debug::
       export NAN_FTGL ?= $(LCGDIR)/ftgl
 	  export NAN_SDL ?= $(LCGDIR)/sdl
     endif
+	export NAN_SDL ?= $(shell sdl-config --prefix)
 	export NAN_SDLLIBS ?= $(shell sdl-config --libs)
 	export NAN_SDLCFLAGS ?= $(shell sdl-config --cflags)
 
@@ -107,6 +108,9 @@ all debug::
     export NAN_NSPR ?= $(LCGDIR)/nspr
     export NAN_FREETYPE ?= $(LCGDIR)/freetype
     export NAN_GETTEXT ?= $(LCGDIR)/gettext	
+	export NAN_SDLLIBS ?= $(shell sdl-config --libs)
+	export NAN_SDLCFLAGS ?= $(shell sdl-config --cflags)
+
 
     # Uncomment the following line to use Mozilla inplace of netscape
     # CPPFLAGS +=-DMOZ_NOT_NET
@@ -146,6 +150,11 @@ all debug::
     export NAN_NSPR ?= $(LCGDIR)/nspr
     export NAN_FREETYPE ?= /sw
     export NAN_GETTEXT ?= $(LCGDIR)/gettext
+	ifndef NAN_SDL
+		export NAN_SDL = $(LCGDIR)/sdl
+		export NAN_SDLCFLAGS = -I$(NAN_SDL)/include
+		export NAN_SDLLIBS = $(NAN_SDL)/lib/libSDL.a -framework Cocoa
+	endif
 
     # Uncomment the following line to use Mozilla inplace of netscape
     # CPPFLAGS +=-DMOZ_NOT_NET
@@ -188,6 +197,8 @@ all debug::
     export NAN_NSPR ?= /usr/local
     export NAN_FREETYPE ?= $(LCGDIR)/freetype
     export NAN_GETTEXT ?= $(LCGDIR)/gettext
+	export NAN_SDLLIBS ?= $(shell sdl-config --libs)
+	export NAN_SDLCFLAGS ?= $(shell sdl-config --cflags)
 
     # Uncomment the following line to use Mozilla inplace of netscape
     # CPPFLAGS +=-DMOZ_NOT_NET
@@ -227,6 +238,8 @@ all debug::
     export NAN_NSPR ?= /usr/local/apps/openblender/nspr/target/dist
     export NAN_FREETYPE ?= /usr/freeware
     export NAN_GETTEXT ?= /usr/freeware
+	export NAN_SDLLIBS ?= $(shell sdl-config --libs)
+	export NAN_SDLCFLAGS ?= $(shell sdl-config --cflags)
 
     # Uncomment the following line to use Mozilla inplace of netscape
     # CPPFLAGS +=-DMOZ_NOT_NET
@@ -258,7 +271,7 @@ all debug::
     export NAN_FMOD ?= $(LCGDIR)/fmod
     export NAN_JPEG ?= /usr
     export NAN_PNG ?= /usr
-    export NAN_SDL ?= /usr
+#    export NAN_SDL ?= /usr
     export NAN_ODE ?= $(LCGDIR)/ode
     export NAN_TERRAPLAY ?= $(LCGDIR)/terraplay
     export NAN_MESA ?= /usr
@@ -266,6 +279,11 @@ all debug::
     export NAN_NSPR ?= $(LCGDIR)/nspr
     export NAN_FREETYPE ?= /usr
     export NAN_GETTEXT ?= /usr
+	ifndef NAN_SDL
+		export NAN_SDL = $(LCGDIR)/sdl
+		export NAN_SDLCFLAGS = -I$(NAN_SDL)/include/SDL
+		export NAN_SDLLIBS = -L$(NAN_SDL)/lib -lSDL
+	endif
 
     # Uncomment the following line to use Mozilla inplace of netscape
     export CPPFLAGS += -DMOZ_NOT_NET
@@ -306,6 +324,13 @@ all debug::
     export NAN_NSPR ?= $(LCGDIR)/nspr
     export NAN_FREETYPE ?= $(LCGDIR)/freetype
     export NAN_GETTEXT ?= $(LCGDIR)/gettext
+	export NAN_SDLLIBS ?= $(shell sdl-config --libs)
+	export NAN_SDLCFLAGS ?= $(shell sdl-config --cflags)
+	ifndef NAN_SDL
+		export NAN_SDL = $(LCGDIR)/sdl
+		export NAN_SDLCFLAGS = -I$(NAN_SDL)/include/SDL
+		export NAN_SDLLIBS = -L$(NAN_SDL)/lib -lSDL
+	endif
 
     # Uncomment the following line to use Mozilla inplace of netscape
     # CPPFLAGS +=-DMOZ_NOT_NET
@@ -345,6 +370,11 @@ all debug::
     export NAN_NSPR ?= $(LCGDIR)/nspr
     export NAN_FREETYPE ?= $(LCGDIR)/freetype
     export NAN_GETTEXT ?= $(LCGDIR)/gettext
+	ifndef NAN_SDL
+		export NAN_SDL = $(LCGDIR)/sdl
+		export NAN_SDLCFLAGS = -I$(NAN_SDL)/include/SDL
+		export NAN_SDLLIBS = -L$(NAN_SDL)/lib -lSDL
+	endif
 
     # Uncomment the following line to use Mozilla inplace of netscape
     # CPPFLAGS +=-DMOZ_NOT_NET
@@ -375,10 +405,13 @@ all debug::
       export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION)
       export NAN_FREETYPE ?= $(LCGDIR)/gcc/freetype
       export NAN_ODE ?= $(LCGDIR)/gcc/ode
+	export NAN_SDLLIBS ?= $(shell sdl-config --libs)
+	export NAN_SDLCFLAGS ?= $(shell sdl-config --cflags)
     else
       export NAN_PYTHON_BINARY ?= python
       export NAN_FREETYPE ?= $(LCGDIR)/freetype
       export NAN_ODE ?= $(LCGDIR)/ode
+	  export NAN_SDLCFLAGS ?= -I$(NAN_SDL)/include
     endif
     export NAN_OPENAL ?= $(LCGDIR)/openal
     export NAN_FMOD ?= $(LCGDIR)/fmod
@@ -398,7 +431,7 @@ all debug::
     export NAN_MOZILLA_LIB ?= $(LCGDIR)/mozilla/lib/
     # Will fall back to look in NAN_MOZILLA_INC/nspr and NAN_MOZILLA_LIB
     # if this is not set.
-export NAN_PYTHON_BINARY ?= python
+	export NAN_PYTHON_BINARY ?= python
     export NAN_BUILDINFO ?= true
     # Be paranoid regarding library creation (do not update archives)
     export NAN_PARANOID ?= true
@@ -429,6 +462,11 @@ export NAN_PYTHON_BINARY ?= python
     export NAN_NSPR ?= $(LCGDIR)/nspr
     export NAN_FREETYPE ?= $(LCGDIR)/freetype
     export NAN_GETTEXT ?= $(LCGDIR)/gettext
+	ifndef NAN_SDL
+		export NAN_SDL = $(LCGDIR)/sdl
+		export NAN_SDLCFLAGS = -I$(NAN_SDL)/include/SDL
+		export NAN_SDLLIBS = -L$(NAN_SDL)/lib -lSDL
+	endif
 
     # Uncomment the following line to use Mozilla inplace of netscape
     # CPPFLAGS +=-DMOZ_NOT_NET
diff --git a/source/nan_link.mk b/source/nan_link.mk
index 73278b51f8a..fdaf44c59d1 100644
--- a/source/nan_link.mk
+++ b/source/nan_link.mk
@@ -57,10 +57,8 @@ endif
 
 ifeq ($(OS),darwin)
     LLIBS    += -lGLU -lGL
-    LLIBS    += -lz -framework Carbon -framework AGL
-    ifeq ($(WITH_QUICKTIME), true)
-		LLIBS += -framework QuickTime
-    endif
+    LLIBS    += -lz -framework Carbon -framework AGL 
+	LLIBS    += -framework QuickTime
     LDFLAGS += -L/System/Library/Frameworks/OpenGL.framework/Libraries
     DBG_LDFLAGS += -L/System/Library/Frameworks/OpenGL.framework/Libraries
 endif
@@ -150,6 +148,6 @@ ifeq ($(OS),windows)
 	endif
 endif
 
-ifneq ($(OS),irix)
+ifneq ($(OS), irix)
    LLIBS += $(NAN_SDLLIBS)
 endif