forked from bartvdbraak/blender
Make 'WITH_OPENAL' a configurable option. This is mostly cosmetic
because it gets set to one value or another on most platforms. On windows, only link to DirectX if WITH_OPENAL is set to ON (it isn't needed otherwise). This OpenAL stuff is pretty confusing!
This commit is contained in:
parent
699a3a0c23
commit
f0adb2cd40
@ -65,6 +65,7 @@ OPTION(WITH_ELBEEM "Enable Elbeem (Fluid Simulation)" ON)
|
|||||||
OPTION(WITH_QUICKTIME "Enable Quicktime Support" OFF)
|
OPTION(WITH_QUICKTIME "Enable Quicktime Support" OFF)
|
||||||
OPTION(WITH_OPENEXR "Enable OpenEXR Support (http://www.openexr.com)" OFF)
|
OPTION(WITH_OPENEXR "Enable OpenEXR Support (http://www.openexr.com)" OFF)
|
||||||
OPTION(WITH_FFMPEG "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)" OFF)
|
OPTION(WITH_FFMPEG "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)" OFF)
|
||||||
|
OPTION(WITH_OPENAL "Enable OpenAL Support (http://www.openal.org)" ON)
|
||||||
|
|
||||||
IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
|
IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
|
||||||
MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
|
MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
|
||||||
@ -200,7 +201,7 @@ IF(WIN32)
|
|||||||
SET(PYTHON_LIB python24)
|
SET(PYTHON_LIB python24)
|
||||||
SET(PYTHON_LIBPATH ${PYTHON}/lib)
|
SET(PYTHON_LIBPATH ${PYTHON}/lib)
|
||||||
|
|
||||||
SET(WITH_OPENAL ON)
|
#SET(WITH_OPENAL ON)
|
||||||
SET(OPENAL ${LIBDIR}/openal)
|
SET(OPENAL ${LIBDIR}/openal)
|
||||||
SET(OPENAL_INC ${OPENAL}/include ${OPENAL}/include/AL)
|
SET(OPENAL_INC ${OPENAL}/include ${OPENAL}/include/AL)
|
||||||
SET(OPENAL_LIB openal_static)
|
SET(OPENAL_LIB openal_static)
|
||||||
@ -249,7 +250,10 @@ IF(WIN32)
|
|||||||
SET(FFMPEG_LIB avcodec-51 avformat-51 avutil-49)
|
SET(FFMPEG_LIB avcodec-51 avformat-51 avutil-49)
|
||||||
SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
|
SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
|
||||||
|
|
||||||
SET(LLIBS kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid ws2_32 vfw32 winmm dxguid)
|
SET(LLIBS kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid ws2_32 vfw32 winmm)
|
||||||
|
IF(WITH_OPENAL)
|
||||||
|
SET(LLIBS ${LLIBS} dxguid)
|
||||||
|
ENDIF(WITH_OPENAL)
|
||||||
|
|
||||||
SET(CMAKE_CXX_FLAGS_DEBUG "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /ZI /J" CACHE STRING "MSVC MT flags " FORCE)
|
SET(CMAKE_CXX_FLAGS_DEBUG "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /ZI /J" CACHE STRING "MSVC MT flags " FORCE)
|
||||||
SET(CMAKE_CXX_FLAGS_RELEASE "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O2 /Ob2 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
|
SET(CMAKE_CXX_FLAGS_RELEASE "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O2 /Ob2 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
|
||||||
|
Loading…
Reference in New Issue
Block a user