Commit 97e43d64 authored by Bill Hoffman's avatar Bill Hoffman

ENH: add Eric Wings FindSDL updates

parent 5f132ab3
......@@ -38,9 +38,10 @@ IF(${OPENAL_INCLUDE_DIR} MATCHES ".framework")
SET (OPENAL_LIBRARY "-framework OpenAL" CACHE STRING "OpenAL framework for OSX")
ELSE(${OPENAL_INCLUDE_DIR} MATCHES ".framework")
FIND_LIBRARY(OPENAL_LIBRARY
NAMES openal al
NAMES openal al OpenAL32
PATHS
$ENV{OPENALDIR}/lib
$ENV{OPENALDIR}/libs
/usr/lib
/usr/local/lib
/sw/lib
......
......@@ -73,7 +73,7 @@ ELSE(${SDL_INCLUDE_DIR} MATCHES ".framework")
# seem to provide SDLmain for compatibility even though they don't
# necessarily need it.
FIND_LIBRARY(SDLMAIN_LIBRARY
NAMES SDLmain
NAMES SDLmain SDLmain-1.1
PATHS
$ENV{SDLDIR}/lib
/usr/lib
......
......@@ -19,6 +19,7 @@ FIND_PATH(SDLIMAGE_INCLUDE_DIR SDL_image.h
~/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
......@@ -40,6 +41,7 @@ ELSE(${SDLIMAGE_INCLUDE_DIR} MATCHES ".framework")
NAMES SDL_image
PATHS
$ENV{SDLDIR}/lib
$ENV{SDLIMAGEDIR}/lib
/usr/lib
/usr/local/lib
/sw/lib
......
......@@ -19,6 +19,7 @@ FIND_PATH(SDLMIXER_INCLUDE_DIR SDL_mixer.h
~/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
......@@ -40,6 +41,7 @@ ELSE(${SDLMIXER_INCLUDE_DIR} MATCHES ".framework")
NAMES SDL_mixer
PATHS
$ENV{SDLDIR}/lib
$ENV{SDLMIXERDIR}/lib
/usr/lib
/usr/local/lib
/sw/lib
......
......@@ -19,6 +19,7 @@ FIND_PATH(SDLNET_INCLUDE_DIR SDL_net.h
~/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
......@@ -40,6 +41,7 @@ ELSE(${SDLNET_INCLUDE_DIR} MATCHES ".framework")
NAMES SDL_net
PATHS
$ENV{SDLDIR}/lib
$ENV{SDLNET}/lib
/usr/lib
/usr/local/lib
/sw/lib
......
This diff is collapsed.
......@@ -19,6 +19,7 @@ FIND_PATH(SDLTTF_INCLUDE_DIR SDL_ttf.h
~/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
......@@ -40,6 +41,7 @@ ELSE(${SDLTTF_INCLUDE_DIR} MATCHES ".framework")
NAMES SDL_ttf
PATHS
$ENV{SDLDIR}/lib
$ENV{SDLTTFDIR}/lib
/usr/lib
/usr/local/lib
/sw/lib
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment