Linux; Do not build with OpenAL unless really requested.
parent
2672518740
commit
ae2644535b
|
|
@ -6,6 +6,6 @@ if( LINUX )
|
|||
set(GLIB_FOUND ON CACHE BOOL "Build against glib 2")
|
||||
set(GLIB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/glib-2.0 ${LIBS_PREBUILT_DIR}/lib/release/glib-2.0/include )
|
||||
set(GLIB_LIBRARIES libgobject-2.0.a libglib-2.0.a libffi.a libpcre.a)
|
||||
set(GIO_LIBRARIES libgio-2.0.a libgmodule-2.0.a -lresolv)
|
||||
set(GIO_LIBRARIES libgio-2.0.a libgmodule-2.0.a -lresolv ${GLIB_LIBRARIES} )
|
||||
add_definitions(-DLL_GLIB=1)
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -3,7 +3,8 @@ include(Linking)
|
|||
include(Prebuilt)
|
||||
|
||||
if (LINUX)
|
||||
set(OPENAL ON CACHE BOOL "Enable OpenAL")
|
||||
use_prebuilt_binary(openal) #Always need the .so for voice
|
||||
set(OPENAL OFF CACHE BOOL "Enable OpenAL")
|
||||
else (LINUX)
|
||||
set(OPENAL OFF CACHE BOOL "Enable OpenAL")
|
||||
endif (LINUX)
|
||||
|
|
|
|||
|
|
@ -528,7 +528,6 @@ if [ $WANTS_CONFIG -eq $TRUE ] ; then
|
|||
if [ $TARGET_PLATFORM == "darwin" ] ; then
|
||||
TARGET="Xcode"
|
||||
elif [ \( $TARGET_PLATFORM == "linux" \) ] ; then
|
||||
OPENAL="-DOPENAL:BOOL=ON"
|
||||
TARGET="Unix Makefiles"
|
||||
if [ $WANTS_VSCODE -eq $TRUE ] ; then
|
||||
VSCODE_FLAGS="-DCMAKE_EXPORT_COMPILE_COMMANDS=On"
|
||||
|
|
|
|||
Loading…
Reference in New Issue