diff OLDMODULES/FindOpenAL.cmake MYCMAKEMODULES/FindOpenAL.cmake
11,12c11
< # Created by Eric Wing. This was influenced by the FindSDL.cmake 
< # module, but with modifications to recognize OS X frameworks.
---
> # Created by Eric Wing. This was influenced by the FindSDL.cmake module.
21,32c20,42
<   ~/Library/Frameworks/OpenAL.framework/Headers
<   /Library/Frameworks/OpenAL.framework/Headers
<   /System/Library/Frameworks/OpenAL.framework/Headers
<   $ENV{OPENALDIR}/include
<   /usr/include
<   /usr/include/AL
<   /usr/include/OpenAL
<   /usr/local/include/AL
<   /usr/local/include/OpenAL
<   /sw/include
<   /sw/include/AL
<   )
---
> 	$ENV{OPENALDIR}/include
> 	~/Library/Frameworks/OpenAL.framework/Headers
> 	/Library/Frameworks/OpenAL.framework/Headers
> 	/System/Library/Frameworks/OpenAL.framework/Headers # Tiger
> 	/usr/local/include/AL
> 	/usr/local/include/OpenAL
> 	/usr/local/include
> 	/usr/include/AL
> 	/usr/include/OpenAL
> 	/usr/include
> 	/sw/include/AL # Fink
> 	/sw/include/OpenAL 
> 	/sw/include
> 	/opt/local/include/AL # DarwinPorts
> 	/opt/local/include/OpenAL
> 	/opt/local/include
> 	/opt/csw/include/AL # Blastwave
> 	/opt/csw/include/OpenAL
> 	/opt/csw/include
> 	/opt/include/AL
> 	/opt/include/OpenAL
> 	/opt/include
> )
38c48,64
<   SET (OPENAL_LIBRARY "-framework OpenAL" CACHE STRING "OpenAL framework for OSX")
---
> 	STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" OPENAL_FRAMEWORK_PATH_TMP ${OPENAL_INCLUDE_DIR})
> 	IF("${OPENAL_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 		OR "${OPENAL_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	)
> 		# String is in default search path, don't need to use -F
> 		SET (OPENAL_LIBRARY "-framework OpenAL" CACHE STRING "OpenAL framework for OSX")
> 	ELSE("${OPENAL_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 		OR "${OPENAL_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	)
> 		# String is not /Library/Frameworks, need to use -F
> 		SET(OPENAL_LIBRARY "-F${OPENAL_FRAMEWORK_PATH_TMP} -framework OpenAL" CACHE STRING "OpenAL framework for OSX")
> 	ENDIF("${OPENAL_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 		OR "${OPENAL_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	)
> 	# Clear the temp variable so nobody can see it
> 	SET(OPENAL_FRAMEWORK_PATH_TMP "" CACHE INTERNAL "")
> 
40,48c66,77
<   FIND_LIBRARY(OPENAL_LIBRARY 
<     NAMES openal al OpenAL32
<     PATHS
<     $ENV{OPENALDIR}/lib
<     $ENV{OPENALDIR}/libs
<     /usr/lib
<     /usr/local/lib
<     /sw/lib
<     )
---
> 	FIND_LIBRARY(OPENAL_LIBRARY 
> 		NAMES openal al OpenAL32
> 		PATHS
> 		$ENV{OPENALDIR}/lib
> 		$ENV{OPENALDIR}/libs
> 	    /usr/local/lib
> 	    /usr/lib
> 	    /sw/lib
> 		/opt/local/lib
> 		/opt/csw/lib
> 		/opt/lib
> 	)
53c82
<   SET(OPENAL_FOUND "YES")
---
>         SET(OPENAL_FOUND "YES")
diff OLDMODULES/FindPhysFS.cmake MYCMAKEMODULES/FindPhysFS.cmake
18,26c18,33
<   ~/Library/Frameworks/PhysFS.framework/Headers
<   /Library/Frameworks/PhysFS.framework/Headers
<   $ENV{PHYSFSDIR}/include
<   /usr/include
<   /usr/include/physfs
<   /usr/local/include/physfs
<   /sw/include
<   /sw/include/physfs
<   )
---
> 	$ENV{PHYSFSDIR}/include
> 	~/Library/Frameworks/PhysFS.framework/Headers
> 	/Library/Frameworks/PhysFS.framework/Headers
> 	/usr/local/include/physfs
> 	/usr/local/include
> 	/usr/include/physfs
> 	/usr/include
> 	/sw/include/physfs # Fink
> 	/sw/include
> 	/opt/local/include/physfs # DarwinPorts
> 	/opt/local/include
> 	/opt/csw/include/physfs # Blastwave
> 	/opt/csw/include
> 	/opt/include/physfs
> 	/opt/include
> )
32c39,55
<   SET (PHYSFS_LIBRARY "-framework PhysFS" CACHE STRING "PhysFS framework for OSX")
---
> 	STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" PHYSFS_FRAMEWORK_PATH_TMP ${PHYSFS_INCLUDE_DIR})
> 	IF("${PHYSFS_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 		OR "${PHYSFS_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	)
> 		# String is in default search path, don't need to use -F
> 		SET(PHYSFS_LIBRARY "-framework PhysFS" CACHE STRING "PhysFS framework for OSX")
> 	ELSE("${PHYSFS_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 		OR "${PHYSFS_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	)
> 		# String is not /Library/Frameworks, need to use -F
> 		SET(PHYSFS_LIBRARY "-F${PHYSFS_FRAMEWORK_PATH_TMP} -framework PhysFS" CACHE STRING "PhysFS framework for OSX")
> 	ENDIF("${PHYSFS_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 		OR "${PHYSFS_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	)
> 	# Clear the temp variable so nobody can see it
> 	SET(PHYSFS_FRAMEWORK_PATH_TMP "" CACHE INTERNAL "")
> 
34,41c57,67
<   FIND_LIBRARY(PHYSFS_LIBRARY 
<     NAMES physfs PhysFS
<     PATHS
<     $ENV{PHYSFSDIR}/lib
<     /usr/lib
<     /usr/local/lib
<     /sw/lib
<     )
---
> 	FIND_LIBRARY(PHYSFS_LIBRARY 
> 		NAMES physfs PhysFS
> 		PATHS
> 		$ENV{PHYSFSDIR}/lib
> 	    /usr/local/lib
> 	    /usr/lib
> 	    /sw/lib
> 		/opt/local/lib
> 		/opt/csw/lib
> 		/opt/lib
> )
46c72
<   SET(PHYSFS_FOUND "YES")
---
> 	SET(PHYSFS_FOUND "YES")
diff OLDMODULES/FindSDL.cmake MYCMAKEMODULES/FindSDL.cmake
10,12c10
< # module will automatically add the -framework Cocoa on your behalf
< # though it is not necessarily visible in the UI. (Maybe somebody else
< # can fix this.)
---
> # module will automatically add the -framework Cocoa on your behalf.
36,48c34,53
<   ~/Library/Frameworks/SDL.framework/Headers
<   /Library/Frameworks/SDL.framework/Headers
<   $ENV{SDLDIR}/include
<   /usr/include/SDL
<   /usr/include/SDL12
<   /usr/include/SDL11
<   /usr/include
<   /usr/local/include/SDL
<   /usr/local/include/SDL12
<   /usr/local/include/SDL11
<   /usr/local/include
<   /sw/include
<   )
---
> 	$ENV{SDLDIR}/include
> 	~/Library/Frameworks/SDL.framework/Headers
> 	/Library/Frameworks/SDL.framework/Headers
> 	/usr/local/include/SDL
> 	/usr/include/SDL
> 	/usr/local/include/SDL12
> 	/usr/local/include/SDL11 # FreeBSD ports
> 	/usr/include/SDL12
> 	/usr/include/SDL11
> 	/usr/local/include
> 	/usr/include
> 	/sw/include/SDL # Fink
> 	/sw/include
> 	/opt/local/include/SDL # DarwinPorts
> 	/opt/local/include
> 	/opt/csw/include/SDL # Blastwave
> 	/opt/csw/include 
> 	/opt/include/SDL
> 	/opt/include
> )
54,59c59,82
<   # The Cocoa framework must be linked into SDL because SDL is Cocoa based.
<   # Remember that the OS X framework version expects you to drop in
<   # SDLmain.h and SDLmain.m directly into your project.
<   # (Cocoa link moved to bottom of this script.)
<   # SET (SDL_LIBRARY "-framework SDL -framework Cocoa" CACHE STRING "SDL framework for OSX")
<   SET(SDL_LIBRARY "-framework SDL" CACHE STRING "SDL framework for OSX")
---
> 	# The Cocoa framework must be linked into SDL because SDL is Cocoa based.
> 	# Remember that the OS X framework version expects you to drop in
> 	# SDLmain.h and SDLmain.m directly into your project.
> 	# (Cocoa link moved to bottom of this script.)
> 	# SET (SDL_LIBRARY "-framework SDL -framework Cocoa" CACHE STRING "SDL framework for OSX")
>     # SET(SDL_LIBRARY "-framework SDL" CACHE STRING "SDL framework for OSX")
> 	# Extract the path the framework resides in so we can use it for the -F flag
> 	STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" SDL_FRAMEWORK_PATH_TEMP ${SDL_INCLUDE_DIR})
> 	IF("${SDL_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
> 		OR "${SDL_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
> 	)
> 		# String is in default search path, don't need to use -F
> 		SET(SDL_LIBRARY_TEMP "-framework SDL")
> 	ELSE("${SDL_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
> 		OR "${SDL_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
> 	)
> 		# String is not /Library/Frameworks, need to use -F
> 		SET(SDL_LIBRARY_TEMP "-F${SDL_FRAMEWORK_PATH_TEMP} -framework SDL")
> 	ENDIF("${SDL_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
> 		OR "${SDL_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
> 	)
> 	# Clear the temp variable so nobody can see it
> 	SET(SDL_FRAMEWORK_PATH_TEMP "" CACHE INTERNAL "")
> 
61,82c84,111
<   # SDL-1.1 is the name used by FreeBSD ports...
<   # don't confuse it for the version number.
<   FIND_LIBRARY(SDL_LIBRARY 
<     NAMES SDL SDL-1.1
<     PATHS
<     $ENV{SDLDIR}/lib
<     /usr/lib
<     /usr/local/lib
<     /sw/lib
<     )
<   # Non-OS X framework versions expect you to also dynamically link to 
<   # SDLmain. This is mainly for Windows and OS X. Other platforms 
<   # seem to provide SDLmain for compatibility even though they don't
<   # necessarily need it.
<   FIND_LIBRARY(SDLMAIN_LIBRARY 
<     NAMES SDLmain SDLmain-1.1
<     PATHS
<     $ENV{SDLDIR}/lib
<     /usr/lib
<     /usr/local/lib
<     /sw/lib
<     )
---
> 	# SDL-1.1 is the name used by FreeBSD ports...
> 	# don't confuse it for the version number.
> 	FIND_LIBRARY(SDL_LIBRARY_TEMP 
> 		NAMES SDL SDL-1.1
> 	PATHS
> 		$ENV{SDLDIR}/lib
> 		/usr/local/lib
> 		/usr/lib
> 		/sw/lib
> 		/opt/local/lib
> 		/opt/csw/lib
> 		/opt/lib
> 	)
> 	# Non-OS X framework versions expect you to also dynamically link to 
> 	# SDLmain. This is mainly for Windows and OS X. Other platforms 
> 	# seem to provide SDLmain for compatibility even though they don't
> 	# necessarily need it.
> 	FIND_LIBRARY(SDLMAIN_LIBRARY 
> 		NAMES SDLmain SDLmain-1.1
> 		PATHS
> 		$ENV{SDLDIR}/lib
> 		/usr/local/lib
> 		/usr/lib
> 		/sw/lib
> 		/opt/local/lib
> 		/opt/csw/lib
> 		/opt/lib
> 	)
90c119
<   FIND_PACKAGE(Threads)
---
> 	FIND_PACKAGE(Threads)
97c126
<   SET(MINGW32_LIBRARY mingw32 CACHE STRING "mwindows for MinGW")
---
> 	SET(MINGW32_LIBRARY mingw32 CACHE STRING "mwindows for MinGW")
101,126c130,158
< IF(SDL_LIBRARY)
<   # For SDLmain
<   IF(SDLMAIN_LIBRARY)
<     SET(SDL_LIBRARY ${SDLMAIN_LIBRARY} ${SDL_LIBRARY})
<   ENDIF(SDLMAIN_LIBRARY)
< 
<   # For OS X, SDL uses Cocoa as a backend so it must link to Cocoa.
<   # CMake doesn't display the -framework Cocoa string in the UI even 
<   # though it actually is there. I think it has something to do 
<   # with the CACHE STRING. Maybe somebody else knows how to fix this.
<   # The problem is mainly cosmetic, and not a functional issue.
<   IF(APPLE)
<     SET(SDL_LIBRARY ${SDL_LIBRARY} "-framework Cocoa")
<   ENDIF(APPLE)
<   
<   # For threads, as mentioned Apple doesn't need this.
<   # In fact, there seems to be a problem if Find the threads package
<   # and try using this line, so I'm just skipping it entirely for OS X.
<   IF(NOT APPLE)
<     SET(SDL_LIBRARY ${SDL_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
<   ENDIF(NOT APPLE)
< 
<   # For MinGW library
<   IF(MINGW)
<     SET(SDL_LIBRARY ${MINGW32_LIBRARY} ${SDL_LIBRARY})
<   ENDIF(MINGW)
---
> IF(SDL_LIBRARY_TEMP)
> 	# For SDLmain
> 	IF(SDLMAIN_LIBRARY)
> 		SET(SDL_LIBRARY_TEMP ${SDLMAIN_LIBRARY} ${SDL_LIBRARY_TEMP})
> 	ENDIF(SDLMAIN_LIBRARY)
> 
> 	# For OS X, SDL uses Cocoa as a backend so it must link to Cocoa.
> 	# CMake doesn't display the -framework Cocoa string in the UI even 
> 	# though it actually is there. I think it has something to do 
> 	# with the CACHE STRING. Maybe somebody else knows how to fix this.
> 	# The problem is mainly cosmetic, and not a functional issue.
> 	IF(APPLE)
> 		SET(SDL_LIBRARY_TEMP ${SDL_LIBRARY_TEMP} "-framework Cocoa")
> 	ENDIF(APPLE)
> 		
> 	# For threads, as mentioned Apple doesn't need this.
> 	# In fact, there seems to be a problem if Find the threads package
> 	# and try using this line, so I'm just skipping it entirely for OS X.
> 	IF(NOT APPLE)
> 		SET(SDL_LIBRARY_TEMP ${SDL_LIBRARY_TEMP} ${CMAKE_THREAD_LIBS_INIT})
> 	ENDIF(NOT APPLE)
> 
> 	# For MinGW library
> 	IF(MINGW)
> 		SET(SDL_LIBRARY_TEMP ${MINGW32_LIBRARY} ${SDL_LIBRARY_TEMP})
> 	ENDIF(MINGW)
> 
> 	# Set the final string here so the GUI reflects the final state.
> 	SET(SDL_LIBRARY ${SDL_LIBRARY_TEMP} CACHE STRING "Where the SDL Library can be found")
128,129c160,161
<   SET(SDL_FOUND "YES")
< ENDIF(SDL_LIBRARY)
---
> 	SET(SDL_FOUND "YES")
> ENDIF(SDL_LIBRARY_TEMP)
diff OLDMODULES/FindSDL_image.cmake MYCMAKEMODULES/FindSDL_image.cmake
19,32c19,39
<   ~/Library/Frameworks/SDL_image.framework/Headers
<   /Library/Frameworks/SDL_image.framework/Headers
<   $ENV{SDLDIR}/include
<   $ENV{SDLIMAGEDIR}/include
<   /usr/include/SDL
<   /usr/include/SDL12
<   /usr/include/SDL11
<   /usr/include
<   /usr/local/include/SDL
<   /usr/local/include/SDL12
<   /usr/local/include/SDL11
<   /usr/local/include
<   /sw/include
<   )
---
> 	$ENV{SDLIMAGEDIR}/include
> 	$ENV{SDLDIR}/include
> 	~/Library/Frameworks/SDL_image.framework/Headers
> 	/Library/Frameworks/SDL_image.framework/Headers
> 	/usr/local/include/SDL
> 	/usr/include/SDL
> 	/usr/local/include/SDL12
> 	/usr/local/include/SDL11 # FreeBSD ports
> 	/usr/include/SDL12
> 	/usr/include/SDL11
> 	/usr/local/include
> 	/usr/include
> 	/sw/include/SDL # Fink
> 	/sw/include
> 	/opt/local/include/SDL # DarwinPorts
> 	/opt/local/include
> 	/opt/csw/include/SDL # Blastwave
> 	/opt/csw/include 
> 	/opt/include/SDL
> 	/opt/include
> )
38c45,62
<   SET (SDLIMAGE_LIBRARY "-framework SDL_image" CACHE STRING "SDL_image framework for OSX")
---
> 	# Extract the path the framework resides in so we can use it for the -F flag
> 	STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" SDLIMAGE_FRAMEWORK_PATH_TEMP ${SDLIMAGE_INCLUDE_DIR})
> 	IF("${SDLIMAGE_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
> 		OR "${SDLIMAGE_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
> 	)
> 		# String is in default search path, don't need to use -F
> 		SET(SDLIMAGE_LIBRARY "-framework SDL_image" CACHE STRING "SDL_image framework for OSX")
> 	ELSE("${SDLIMAGE_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
> 		OR "${SDLIMAGE_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
> 	)
> 		# String is not /Library/Frameworks, need to use -F
> 		SET(SDLIMAGE_LIBRARY "-F${SDLIMAGE_FRAMEWORK_PATH_TEMP} -framework SDL_image" CACHE STRING "SDL_image framework for OSX")
> 	ENDIF("${SDLIMAGE_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
> 		OR "${SDLIMAGE_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
> 	)
> 	# Clear the temp variable so nobody can see it
> 	SET(SDLIMAGE_FRAMEWORK_PATH_TEMP "" CACHE INTERNAL "")
> 
40,48c64,75
<   FIND_LIBRARY(SDLIMAGE_LIBRARY 
<     NAMES SDL_image
<     PATHS
<     $ENV{SDLDIR}/lib
<     $ENV{SDLIMAGEDIR}/lib
<     /usr/lib
<     /usr/local/lib
<     /sw/lib
<     )
---
> 	FIND_LIBRARY(SDLIMAGE_LIBRARY 
> 		NAMES SDL_image
> 		PATHS
> 		$ENV{SDLIMAGEDIR}/lib
> 		$ENV{SDLDIR}/lib
> 		/usr/local/lib
> 		/usr/lib
> 		/sw/lib
> 		/opt/local/lib
> 		/opt/csw/lib
> 		/opt/lib
> 	)
53c80
<   SET(SDLIMAGE_FOUND "YES")
---
> 	SET(SDLIMAGE_FOUND "YES")
diff OLDMODULES/FindSDL_mixer.cmake MYCMAKEMODULES/FindSDL_mixer.cmake
19,32c19,39
<   ~/Library/Frameworks/SDL_mixer.framework/Headers
<   /Library/Frameworks/SDL_mixer.framework/Headers
<   $ENV{SDLDIR}/include
<   $ENV{SDLMIXERDIR}/include
<   /usr/include/SDL
<   /usr/include/SDL12
<   /usr/include/SDL11
<   /usr/include
<   /usr/local/include/SDL
<   /usr/local/include/SDL12
<   /usr/local/include/SDL11
<   /usr/local/include
<   /sw/include
<   )
---
> 	$ENV{SDLMIXERDIR}/include
> 	$ENV{SDLDIR}/include
> 	~/Library/Frameworks/SDL_mixer.framework/Headers
> 	/Library/Frameworks/SDL_mixer.framework/Headers
> 	/usr/local/include/SDL
> 	/usr/include/SDL
> 	/usr/local/include/SDL12
> 	/usr/local/include/SDL11 # FreeBSD ports
> 	/usr/include/SDL12
> 	/usr/include/SDL11
> 	/usr/local/include
> 	/usr/include
> 	/sw/include/SDL # Fink
> 	/sw/include
> 	/opt/local/include/SDL # DarwinPorts
> 	/opt/local/include
> 	/opt/csw/include/SDL # Blastwave
> 	/opt/csw/include 
> 	/opt/include/SDL
> 	/opt/include
> )
38c45,62
<   SET (SDLMIXER_LIBRARY "-framework SDL_mixer" CACHE STRING "SDL_mixer framework for OSX")
---
> 	# Extract the path the framework resides in so we can use it for the -F flag
> 	STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" SDLMIXER_FRAMEWORK_PATH_TEMP ${SDLMIXER_INCLUDE_DIR})
> 	IF("${SDLMIXER_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
> 		OR "${SDLMIXER_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
> 	)
> 		# String is in default search path, don't need to use -F
> 		SET(SDLMIXER_LIBRARY "-framework SDL_mixer" CACHE STRING "SDL_mixer framework for OSX")
> 	ELSE("${SDLMIXER_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
> 		OR "${SDLMIXER_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
> 	)
> 		# String is not /Library/Frameworks, need to use -F
> 		SET(SDLMIXER_LIBRARY "-F${SDLMIXER_FRAMEWORK_PATH_TEMP} -framework SDL_mixer" CACHE STRING "SDL_mixer framework for OSX")
> 	ENDIF("${SDLMIXER_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
> 		OR "${SDLMIXER_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
> 	)
> 	# Clear the temp variable so nobody can see it
> 	SET(SDLMIXER_FRAMEWORK_PATH_TEMP "" CACHE INTERNAL "")
> 
40,48c64,75
<   FIND_LIBRARY(SDLMIXER_LIBRARY 
<     NAMES SDL_mixer
<     PATHS
<     $ENV{SDLDIR}/lib
<     $ENV{SDLMIXERDIR}/lib
<     /usr/lib
<     /usr/local/lib
<     /sw/lib
<     )
---
> 	FIND_LIBRARY(SDLMIXER_LIBRARY 
> 		NAMES SDL_mixer
> 		PATHS
> 		$ENV{SDLMIXERDIR}/lib
> 		$ENV{SDLDIR}/lib
> 		/usr/local/lib
> 		/usr/lib
> 		/sw/lib
> 		/opt/local/lib
> 		/opt/csw/lib
> 		/opt/lib
> 	)
53c80
<   SET(SDLMIXER_FOUND "YES")
---
> 	SET(SDLMIXER_FOUND "YES")
diff OLDMODULES/FindSDL_net.cmake MYCMAKEMODULES/FindSDL_net.cmake
19,32c19,39
<   ~/Library/Frameworks/SDL_net.framework/Headers
<   /Library/Frameworks/SDL_net.framework/Headers
<   $ENV{SDLDIR}/include
<   $ENV{SDLNETDIR}/include
<   /usr/include/SDL
<   /usr/include/SDL12
<   /usr/include/SDL11
<   /usr/include
<   /usr/local/include/SDL
<   /usr/local/include/SDL12
<   /usr/local/include/SDL11
<   /usr/local/include
<   /sw/include
<   )
---
> 	$ENV{SDLNETDIR}/include
> 	$ENV{SDLDIR}/include
> 	~/Library/Frameworks/SDL_net.framework/Headers
> 	/Library/Frameworks/SDL_net.framework/Headers
> 	/usr/local/include/SDL
> 	/usr/include/SDL
> 	/usr/local/include/SDL12
> 	/usr/local/include/SDL11 # FreeBSD ports
> 	/usr/include/SDL12
> 	/usr/include/SDL11
> 	/usr/local/include
> 	/usr/include
> 	/sw/include/SDL # Fink
> 	/sw/include
> 	/opt/local/include/SDL # DarwinPorts
> 	/opt/local/include
> 	/opt/csw/include/SDL # Blastwave
> 	/opt/csw/include 
> 	/opt/include/SDL
> 	/opt/include
> )
38c45,62
<   SET (SDLNET_LIBRARY "-framework SDL_net" CACHE STRING "SDL_net framework for OSX")
---
> 	# Extract the path the framework resides in so we can use it for the -F flag
> 	STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" SDLNET_FRAMEWORK_PATH_TEMP ${SDLNET_INCLUDE_DIR})
> 	IF("${SDLNET_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
> 		OR "${SDLNET_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
> 	)
> 		# String is in default search path, don't need to use -F
> 		SET(SDLNET_LIBRARY "-framework SDL_net" CACHE STRING "SDL_net framework for OSX")
> 	ELSE("${SDLNET_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
> 		OR "${SDLNET_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
> 	)
> 		# String is not /Library/Frameworks, need to use -F
> 		SET(SDLNET_LIBRARY "-F${SDLNET_FRAMEWORK_PATH_TEMP} -framework SDL_net" CACHE STRING "SDL_net framework for OSX")
> 	ENDIF("${SDLNET_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
> 		OR "${SDLNET_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
> 	)
> 	# Clear the temp variable so nobody can see it
> 	SET(SDLNET_FRAMEWORK_PATH_TEMP "" CACHE INTERNAL "")
> 
40,48c64,75
<   FIND_LIBRARY(SDLNET_LIBRARY 
<     NAMES SDL_net
<     PATHS
<     $ENV{SDLDIR}/lib
<     $ENV{SDLNET}/lib
<     /usr/lib
<     /usr/local/lib
<     /sw/lib
<     )
---
> 	FIND_LIBRARY(SDLNET_LIBRARY 
> 		NAMES SDL_net
> 		PATHS
> 		$ENV{SDLNET}/lib
> 		$ENV{SDLDIR}/lib
> 		/usr/local/lib
> 		/usr/lib
> 		/sw/lib
> 		/opt/local/lib
> 		/opt/csw/lib
> 		/opt/lib
> 	)
53c80
<   SET(SDLNET_FOUND "YES")
---
> 	SET(SDLNET_FOUND "YES")
diff OLDMODULES/FindSDL_sound.cmake MYCMAKEMODULES/FindSDL_sound.cmake
9c9,15
< # SDL_SOUND_LIBRARIES, this contains the list of libraries that you need to link against
---
> # SDL_SOUND_LIBRARIES, this contains the list of libraries that you need 
> # to link against. This is a read-only variable and is marked INTERNAL.
> # SDL_SOUND_EXTRAS, this is an optional variable for you to add your own
> # flags to SDL_SOUND_LIBRARIES. This is prepended to SDL_SOUND_LIBRARIES.
> # This is available mostly for cases this module failed to anticipate for
> # and you must add additional flags. This is marked as ADVANCED.
>  
12c18,19
< # SDL_SOUND_LIBRARY, the name of just the SDL_sound library you would link against.
---
> # SDL_SOUND_LIBRARY, the name of just the SDL_sound library you would link
> # against. Use SDL_SOUND_LIBRARIES for you link instructions and not this one.
31,32c38,41
< # MikMod, FLAC, Speex, and potentially others. Some platforms or compilers seem to 
< # require that dependent libraries of libraries you use must also be explicitly 
---
> # MikMod, FLAC, Speex, and potentially others. 
> # Under some circumstances which I don't fully understand, 
> # there seems to be a requirement
> # that dependent libraries of libraries you use must also be explicitly 
36c45
< # libraries are required for building.
---
> # libraries are required for building (if any).
48a58,61
> 
> SET(SDL_SOUND_EXTRAS "" CACHE STRING "SDL_sound extra flags")
> MARK_AS_ADVANCED(SDL_SOUND_EXTRAS)
> 
51,53d63
<   ~/Library/Frameworks/SDL_sound.framework/Headers
<   /Library/Frameworks/SDL_sound.framework/Headers
<   $ENV{SDLDIR}/include
54a65,68
>   $ENV{SDLDIR}/include
>   ~/Library/Frameworks/SDL_sound.framework/Headers
>   /Library/Frameworks/SDL_sound.framework/Headers # OS X
>   /usr/local/include/SDL
55a70,71
>   /usr/local/include/SDL12
>   /usr/local/include/SDL11 # FreeBSD ports
58,61d73
<   /usr/include
<   /usr/local/include/SDL
<   /usr/local/include/SDL12
<   /usr/local/include/SDL11
62a75,76
>   /usr/include
>   /sw/include/SDL # Fink
63a78,83
>   /opt/local/include/SDL # DarwinPorts
>   /opt/local/include
>   /opt/csw/include/SDL # Blastwave
>   /opt/csw/include 
>   /opt/include/SDL
>   /opt/include
67c87,104
<   SET (SDL_SOUND_LIBRARY "-framework SDL_sound" CACHE STRING "SDL_sound framework for OSX")
---
>   # Extract the path the framework resides in so we can use it for the -F flag
>   STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" SDL_SOUND_FRAMEWORK_PATH_TMP ${SDL_SOUND_INCLUDE_DIR})
>   IF("${SDL_SOUND_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 	  OR "${SDL_SOUND_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	  )
>     # String is in default search path, don't need to use -F
>     SET (SDL_SOUND_LIBRARY "-framework SDL_sound" CACHE STRING "SDL_sound framework for OSX")
>   ELSE("${SDL_SOUND_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 	  OR "${SDL_SOUND_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	  )
>     # String is not /Library/Frameworks, need to use -F
>     SET(SDL_SOUND_LIBRARY "-F${SDL_SOUND_FRAMEWORK_PATH_TMP} -framework SDL_sound" CACHE STRING "SDL_sound framework for OSX")
>   ENDIF("${SDL_SOUND_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 	  OR "${SDL_SOUND_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	  )
>    # Clear the temp variable so nobody can see it
>    SET(SDL_SOUND_FRAMEWORK_PATH_TMP "" CACHE INTERNAL "")
> 
72d108
<     $ENV{SDLDIR}/lib
74c110
<     /usr/lib
---
>     $ENV{SDLDIR}/lib
75a112
>     /usr/lib
76a114,116
> 	/opt/local/lib
> 	/opt/csw/lib
> 	/opt/lib
173c213,230
<          SET(MIKMOD_LIBRARY "-framework libmikmod-coreaudio" CACHE STRING "MikMod framework for OSX")
---
>          # Extract the path the framework resides in so we can use it for the -F flag
>          STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" TEMP_SDLSOUND_MIKMOD_FRAMEWORK_PATH_TMP ${TEMP_SDLSOUND_FIND_MIKMOD_FRAMEWORK})
>          IF("${TEMP_SDLSOUND_MIKMOD_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
>       	    OR "${TEMP_SDLSOUND_MIKMOD_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	     )
>            # It's in the default search path so I don't need to use -F
>            SET(MIKMOD_LIBRARY "-framework libmikmod-coreaudio" CACHE STRING "MikMod framework for OSX")
>          ELSE("${TEMP_SDLSOUND_MIKMOD_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 	          OR "${TEMP_SDLSOUND_MIKMOD_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	     )
>            # It's not in the default search path so I need to use -F
>            SET(MIKMOD_LIBRARY "-F${TEMP_SDLSOUND_MIKMOD_FRAMEWORK_PATH_TMP} -framework libmikmod-coreaudio" CACHE STRING "MikMod framework for OSX")
>          ENDIF("${TEMP_SDLSOUND_MIKMOD_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 	           OR "${TEMP_SDLSOUND_MIKMOD_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	     )
>          # Clear the temp variable so nobody can see it
>          SET(TEMP_SDLSOUND_MIKMOD_FRAMEWORK_PATH_TMP "" CACHE INTERNAL "")
> 
179d235
<            $ENV{SDLDIR}/lib
181c237
<            /usr/lib
---
>            $ENV{SDLDIR}/lib
182a239
>            /usr/lib
184c241,244
<            )
---
>            /opt/local/lib
>            /opt/csw/lib
> 	       /opt/lib
>          )
196c256
<          libmikmod-coreaudio 
---
>          modplug
201c261,279
<          SET(MIKMOD_LIBRARY "-framework modplug" CACHE STRING "MODPLUG framework for OSX")
---
> 		 # Extract the path the framework resides in so we can use it for the -F flag
>          STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" TEMP_SDLSOUND_MODPLUG_FRAMEWORK_PATH_TMP ${TEMP_SDLSOUND_FIND_MODPLUG_FRAMEWORK})
> 		 MESSAGE("HELLO")
>          IF("${TEMP_SDLSOUND_MODPLUG_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
>       	    OR "${TEMP_SDLSOUND_MODPLUG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	     )
>            # It's in the default search path so I don't need to use -F
>            SET(MODPLUG_LIBRARY "-framework modplug" CACHE STRING "MODPLUG framework for OSX")
>          ELSE("${TEMP_SDLSOUND_MODPLUG_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 	          OR "${TEMP_SDLSOUND_MODPLUG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	     )
>            # It's not in the default search path so I need to use -F
>            SET(MODPLUG_LIBRARY "-F${TEMP_SDLSOUND_MODPLUG_FRAMEWORK_PATH_TMP} -framework modplug" CACHE STRING "MODPLUG framework for OSX")
>          ENDIF("${TEMP_SDLSOUND_MODPLUG_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 	           OR "${TEMP_SDLSOUND_MODPLUG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	     )
>          # Clear the temp variable so nobody can see it
>          SET(TEMP_SDLSOUND_MODPLUG_FRAMEWORK_PATH_TMP "" CACHE INTERNAL "")
> 		 
207d284
<            $ENV{SDLDIR}/lib
209c286
<            /usr/lib
---
>            $ENV{SDLDIR}/lib
210a288
>            /usr/lib
212c290,293
<            )
---
>            /opt/local/lib
>            /opt/csw/lib
> 	       /opt/lib
>          )
230c311,328
<          SET(VORBIS_LIBRARY "-framework Vorbis" CACHE STRING "Vorbis framework for OSX")
---
> 		 # Extract the path the framework resides in so we can use it for the -F flag
>          STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" TEMP_SDLSOUND_VORBIS_FRAMEWORK_PATH_TMP ${TEMP_SDLSOUND_FIND_VORBIS_FRAMEWORK})
>          IF("${TEMP_SDLSOUND_VORBIS_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
>       	    OR "${TEMP_SDLSOUND_VORBIS_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	     )
>            # It's in the default search path so I don't need to use -F
>            SET(VORBIS_LIBRARY "-framework Vorbis" CACHE STRING "Vorbis framework for OSX")
>          ELSE("${TEMP_SDLSOUND_VORBIS_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 	          OR "${TEMP_SDLSOUND_VORBIS_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	     )
>            # It's not in the default search path so I need to use -F
>            SET(VORBIS_LIBRARY "-F${TEMP_SDLSOUND_VORBIS_FRAMEWORK_PATH_TMP} -framework Vorbis" CACHE STRING "Vorbis framework for OSX")
>          ENDIF("${TEMP_SDLSOUND_VORBIS_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 	           OR "${TEMP_SDLSOUND_VORBIS_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	     )
>          # Clear the temp variable so nobody can see it
>          SET(TEMP_SDLSOUND_VORBIS_FRAMEWORK_PATH_TMP "" CACHE INTERNAL "")
> 
235d332
<            $ENV{OGGDIR}/lib
237c334
<            $ENV{SDLDIR}/lib
---
>            $ENV{OGGDIR}/lib
239c336
<            /usr/lib
---
>            $ENV{SDLDIR}/lib
240a338
>            /usr/lib
241a340,342
>            /opt/local/lib
>            /opt/csw/lib
> 	       /opt/lib
256c357,374
<          SET(OGG_LIBRARY "-framework Ogg" CACHE STRING "Ogg framework for OSX")
---
> 		 # Extract the path the framework resides in so we can use it for the -F flag
>          STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP ${TEMP_SDLSOUND_FIND_OGG_FRAMEWORK})
>          IF("${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
>       	    OR "${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	     )
>            # It's in the default search path so I don't need to use -F
>            SET(OGG_LIBRARY "-framework Ogg" CACHE STRING "Ogg framework for OSX")
>          ELSE("${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 	          OR "${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	     )
>            # It's not in the default search path so I need to use -F
>            SET(OGG_LIBRARY "-F${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP} -framework Ogg" CACHE STRING "Ogg framework for OSX")
>          ENDIF("${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 	           OR "${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	     )
>          # Clear the temp variable so nobody can see it
>          SET(TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP "" CACHE INTERNAL "")
> 
263d380
<            $ENV{SDLDIR}/lib
265c382
<            /usr/lib
---
>            $ENV{SDLDIR}/lib
266a384
>            /usr/lib
267a386,388
>            /opt/local/lib
>            /opt/csw/lib
> 	       /opt/lib
286c407,424
<          SET(SMPEG_LIBRARY "-framework smpeg" CACHE STRING "SMPEG framework for OSX")
---
> 		 # Extract the path the framework resides in so we can use it for the -F flag
>          STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" TEMP_SDLSOUND_SMPEG_FRAMEWORK_PATH_TMP ${TEMP_SDLSOUND_FIND_SMPEG_FRAMEWORK})
>          IF("${TEMP_SDLSOUND_SMPEG_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
>       	    OR "${TEMP_SDLSOUND_SMPEG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	     )
>            # It's in the default search path so I don't need to use -F
>            SET(SMPEG_LIBRARY "-framework smpeg" CACHE STRING "SMPEG framework for OSX")
>          ELSE("${TEMP_SDLSOUND_SMPEG_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 	          OR "${TEMP_SDLSOUND_SMPEG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	     )
>            # It's not in the default search path so I need to use -F
>            SET(SMPEG_LIBRARY "-F${TEMP_SDLSOUND_SMPEG_FRAMEWORK_PATH_TMP} -framework smpeg" CACHE STRING "SMPEG framework for OSX")
>          ENDIF("${TEMP_SDLSOUND_SMPEG_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 	           OR "${TEMP_SDLSOUND_SMPEG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	     )
>          # Clear the temp variable so nobody can see it
>          SET(TEMP_SDLSOUND_SMPEG_FRAMEWORK_PATH_TMP "" CACHE INTERNAL "")
> 
292,293d429
<            $ENV{SDLDIR}/lib
<            $ENV{SDLDIR}/lib
295c431
<            /usr/lib
---
>            $ENV{SDLDIR}/lib
296a433
>            /usr/lib
297a435,437
>            /opt/local/lib
>            /opt/csw/lib
> 	       /opt/lib
316c456,473
<          SET(FLAC_LIBRARY "-framework FLAC" CACHE STRING "FLAC framework for OSX")
---
> 		 # Extract the path the framework resides in so we can use it for the -F flag
>          STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" TEMP_SDLSOUND_FLAC_FRAMEWORK_PATH_TMP ${TEMP_SDLSOUND_FIND_FLAC_FRAMEWORK})
>          IF("${TEMP_SDLSOUND_FLAC_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
>       	    OR "${TEMP_SDLSOUND_FLAC_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	     )
>            # It's in the default search path so I don't need to use -F
>            SET(FLAC_LIBRARY "-framework FLAC" CACHE STRING "FLAC framework for OSX")
>          ELSE("${TEMP_SDLSOUND_FLAC_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 	          OR "${TEMP_SDLSOUND_FLAC_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	     )
>            # It's not in the default search path so I need to use -F
>            SET(FLAC_LIBRARY "-F${TEMP_SDLSOUND_FLAC_FRAMEWORK_PATH_TMP} -framework FLAC" CACHE STRING "FLAC framework for OSX")
>          ENDIF("${TEMP_SDLSOUND_FLAC_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 	           OR "${TEMP_SDLSOUND_FLAC_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	     )
>          # Clear the temp variable so nobody can see it
>          SET(TEMP_SDLSOUND_FLAC_FRAMEWORK_PATH_TMP "" CACHE INTERNAL "")
> 
322d478
<            $ENV{SDLDIR}/lib
324c480
<            /usr/lib
---
>            $ENV{SDLDIR}/lib
325a482
>            /usr/lib
326a484,486
>            /opt/local/lib
>            /opt/csw/lib
> 	       /opt/lib
348c508,525
<          SET(FLAC_LIBRARY "-framework speex" CACHE STRING "SPEEX framework for OSX")
---
> 		 # Extract the path the framework resides in so we can use it for the -F flag
>          STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" TEMP_SDLSOUND_SPEEX_FRAMEWORK_PATH_TMP ${TEMP_SDLSOUND_FIND_SPEEX_FRAMEWORK})
>          IF("${TEMP_SDLSOUND_SPEEX_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
>       	    OR "${TEMP_SDLSOUND_SPEEX_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	     )
>            # It's in the default search path so I don't need to use -F
>            SET(SPEEX_LIBRARY "-framework speex" CACHE STRING "SPEEX framework for OSX")
>          ELSE("${TEMP_SDLSOUND_SPEEX_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 	          OR "${TEMP_SDLSOUND_SPEEX_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	     )
>            # It's not in the default search path so I need to use -F
>            SET(SPEEX_LIBRARY "-F${TEMP_SDLSOUND_SPEEX_FRAMEWORK_PATH_TMP} -framework speex" CACHE STRING "SPEEX framework for OSX")
>          ENDIF("${TEMP_SDLSOUND_SPEEX_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 	           OR "${TEMP_SDLSOUND_SPEEX_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	     )
>          # Clear the temp variable so nobody can see it
>          SET(TEMP_SDLSOUND_SPEEX_FRAMEWORK_PATH_TMP "" CACHE INTERNAL "")
> 
354d530
<            $ENV{SDLDIR}/lib
356c532
<            /usr/lib
---
>            $ENV{SDLDIR}/lib
357a534
>            /usr/lib
358a536,538
>            /opt/local/lib
>            /opt/csw/lib
> 	       /opt/lib
372c552,569
<          SET(OGG_LIBRARY "-framework Ogg" CACHE STRING "Ogg framework for OSX")
---
> 		 # Extract the path the framework resides in so we can use it for the -F flag
>          STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP ${TEMP_SDLSOUND_FIND_OGG_FRAMEWORK})
>          IF("${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
>       	    OR "${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	     )
>            # It's in the default search path so I don't need to use -F
>            SET(OGG_LIBRARY "-framework Ogg" CACHE STRING "Ogg framework for OSX")
>          ELSE("${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 	          OR "${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	     )
>            # It's not in the default search path so I need to use -F
>            SET(OGG_LIBRARY "-F${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP} -framework Ogg" CACHE STRING "Ogg framework for OSX")
>          ENDIF("${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 	           OR "${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	     )
>          # Clear the temp variable so nobody can see it
>          SET(TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP "" CACHE INTERNAL "")
> 		 
380d576
<            $ENV{SDLDIR}/lib
382c578
<            /usr/lib
---
>            $ENV{SDLDIR}/lib
383a580
>            /usr/lib
384a582,584
>            /opt/local/lib
>            /opt/csw/lib
> 	       /opt/lib
397c597
<      SET(SDL_SOUND_LIBRARIES ${SDL_SOUND_LIBRARY} CACHE STRING "SDL_sound and dependent libraries")
---
>      SET(SDL_SOUND_LIBRARIES "${SDL_SOUND_EXTRAS} ${SDL_SOUND_LIBRARY}" CACHE INTERNAL "SDL_sound and dependent libraries")
400c600
<    SET(SDL_SOUND_LIBRARIES ${SDL_SOUND_LIBRARIES_TMP} CACHE STRING "SDL_sound and dependent libraries")
---
>    SET(SDL_SOUND_LIBRARIES "${SDL_SOUND_EXTRAS} ${SDL_SOUND_LIBRARIES_TMP}" CACHE INTERNAL "SDL_sound and dependent libraries")
402a603,605
> 
> # MESSAGE("SDL_SOUND_LIBRARIES is ${SDL_SOUND_LIBRARIES}")
> 
diff OLDMODULES/FindSDL_ttf.cmake MYCMAKEMODULES/FindSDL_ttf.cmake
19,32c19,39
<   ~/Library/Frameworks/SDL_ttf.framework/Headers
<   /Library/Frameworks/SDL_ttf.framework/Headers
<   $ENV{SDLDIR}/include
<   $ENV{SDLTTFDIR}/include
<   /usr/include/SDL
<   /usr/include/SDL12
<   /usr/include/SDL11
<   /usr/include
<   /usr/local/include/SDL
<   /usr/local/include/SDL12
<   /usr/local/include/SDL11
<   /usr/local/include
<   /sw/include
<   )
---
> 	$ENV{SDLTTFDIR}/include
> 	$ENV{SDLDIR}/include
> 	~/Library/Frameworks/SDL_ttf.framework/Headers
> 	/Library/Frameworks/SDL_ttf.framework/Headers
> 	/usr/local/include/SDL
> 	/usr/include/SDL
> 	/usr/local/include/SDL12
> 	/usr/local/include/SDL11 # FreeBSD ports
> 	/usr/include/SDL12
> 	/usr/include/SDL11
> 	/usr/local/include
> 	/usr/include
> 	/sw/include/SDL # Fink
> 	/sw/include
> 	/opt/local/include/SDL # DarwinPorts
> 	/opt/local/include
> 	/opt/csw/include/SDL # Blastwave
> 	/opt/csw/include 
> 	/opt/include/SDL
> 	/opt/include
> )
38c45,62
<   SET (SDLTTF_LIBRARY "-framework SDL_ttf" CACHE STRING "SDL_ttf framework for OSX")
---
> 	# Extract the path the framework resides in so we can use it for the -F flag
> 	STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" SDLTTF_FRAMEWORK_PATH_TEMP ${SDLTTF_INCLUDE_DIR})
> 	IF("${SDLTTF_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
> 		OR "${SDLTTF_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
> 	)
> 		# String is in default search path, don't need to use -F
> 		SET(SDLTTF_LIBRARY "-framework SDL_ttf" CACHE STRING "SDL_ttf framework for OSX")
> 	ELSE("${SDLTTF_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
> 		OR "${SDLTTF_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
> 	)
> 		# String is not /Library/Frameworks, need to use -F
> 		SET(SDLTTF_LIBRARY "-F${SDLTTF_FRAMEWORK_PATH_TEMP} -framework SDL_ttf" CACHE STRING "SDL_ttf framework for OSX")
> 	ENDIF("${SDLTTF_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
> 		OR "${SDLTTF_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
> 	)
> 	# Clear the temp variable so nobody can see it
> 	SET(SDLTTF_FRAMEWORK_PATH_TEMP "" CACHE INTERNAL "")
> 
40,48c64,75
<   FIND_LIBRARY(SDLTTF_LIBRARY 
<     NAMES SDL_ttf
<     PATHS
<     $ENV{SDLDIR}/lib
<     $ENV{SDLTTFDIR}/lib
<     /usr/lib
<     /usr/local/lib
<     /sw/lib
<     )
---
> 	FIND_LIBRARY(SDLTTF_LIBRARY 
> 		NAMES SDL_ttf
> 		PATHS
> 		$ENV{SDLTTFDIR}/lib
> 		$ENV{SDLDIR}/lib
> 		/usr/local/lib
> 		/usr/lib
> 		/sw/lib
> 		/opt/local/lib
> 		/opt/csw/lib
> 		/opt/lib
> 	)
53c80
<   SET(SDLTTF_FOUND "YES")
---
> 	SET(SDLTTF_FOUND "YES")