diff options
author | Jörg Müller <nexyon@gmail.com> | 2015-06-16 11:03:35 +0300 |
---|---|---|
committer | Jörg Müller <nexyon@gmail.com> | 2015-07-28 15:01:53 +0300 |
commit | a0cbebf404d6c46e59b090e7217ce39d7e760809 (patch) | |
tree | fad66bb8f714c160c3a3f016e1fba1711824e34d /build_files | |
parent | 58956f3b91e581ef7040371dda3e3595902c18d9 (diff) |
Audaspace: fixing problems for the merge to master suggested by Campbell and Sergey.
- rename WITH_EXTERNAL_AUDASPACE to WITH_SYSTEM_AUDASPACE.
- rename C/PYAUDASPACE to AUDASPACE_C/PY
- simplifying cmake defines and includes.
- fixing include paths and enabling WITH_SYSTEM_AUDASPACE for windows.
- fixing scons building.
- other minor build system fixes.
Diffstat (limited to 'build_files')
-rw-r--r-- | build_files/cmake/Modules/FindAudaspace.cmake | 87 | ||||
-rw-r--r-- | build_files/cmake/macros.cmake | 4 | ||||
-rw-r--r-- | build_files/scons/config/darwin-config.py | 2 | ||||
-rw-r--r-- | build_files/scons/config/linux-config.py | 2 | ||||
-rw-r--r-- | build_files/scons/config/win32-mingw-config.py | 2 | ||||
-rw-r--r-- | build_files/scons/config/win32-vc-config.py | 2 | ||||
-rw-r--r-- | build_files/scons/config/win64-mingw-config.py | 2 | ||||
-rw-r--r-- | build_files/scons/config/win64-vc-config.py | 2 | ||||
-rw-r--r-- | build_files/scons/tools/btools.py | 6 |
9 files changed, 79 insertions, 30 deletions
diff --git a/build_files/cmake/Modules/FindAudaspace.cmake b/build_files/cmake/Modules/FindAudaspace.cmake index 361c1bf3ba4..5d0c7651593 100644 --- a/build_files/cmake/Modules/FindAudaspace.cmake +++ b/build_files/cmake/Modules/FindAudaspace.cmake @@ -4,12 +4,24 @@ # AUDASPACE_FOUND - system has audaspace # AUDASPACE_INCLUDE_DIRS - the audaspace include directories # AUDASPACE_LIBRARIES - link these to use audaspace -# CAUDASPACE_FOUND - system has audaspace's C binding -# CAUDASPACE_INCLUDE_DIRS - the audaspace's C binding include directories -# CAUDASPACE_LIBRARIES - link these to use audaspace's C binding -# PYAUDASPACE_FOUND - system has audaspace's python binding -# PYAUDASPACE_INCLUDE_DIRS - the audaspace's python binding include directories -# PYAUDASPACE_LIBRARIES - link these to use audaspace's python binding +# AUDASPACE_C_FOUND - system has audaspace's C binding +# AUDASPACE_C_INCLUDE_DIRS - the audaspace's C binding include directories +# AUDASPACE_C_LIBRARIES - link these to use audaspace's C binding +# AUDASPACE_PY_FOUND - system has audaspace's python binding +# AUDASPACE_PY_INCLUDE_DIRS - the audaspace's python binding include directories +# AUDASPACE_PY_LIBRARIES - link these to use audaspace's python binding + +IF(NOT AUDASPACE_ROOT_DIR AND NOT $ENV{AUDASPACE_ROOT_DIR} STREQUAL "") + SET(AUDASPACE_ROOT_DIR $ENV{AUDASPACE_ROOT_DIR}) +ENDIF() + +SET(_audaspace_SEARCH_DIRS + ${AUDASPACE_ROOT_DIR} + /usr/local + /sw # Fink + /opt/local # DarwinPorts + /opt/csw # Blastwave +) # Use pkg-config to get hints about paths find_package(PkgConfig) @@ -19,58 +31,77 @@ endif(PKG_CONFIG_FOUND) # Include dir find_path(AUDASPACE_INCLUDE_DIR - NAMES audaspace/ISound.h + NAMES ISound.h + HINTS ${_audaspace_SEARCH_DIRS} PATHS ${AUDASPACE_PKGCONF_INCLUDE_DIRS} ) # Library find_library(AUDASPACE_LIBRARY NAMES audaspace + HINTS ${_audaspace_SEARCH_DIRS} PATHS ${AUDASPACE_PKGCONF_LIBRARY_DIRS} ) # Include dir -find_path(CAUDASPACE_INCLUDE_DIR - NAMES audaspace/AUD_Sound.h +find_path(AUDASPACE_C_INCLUDE_DIR + NAMES AUD_Sound.h + HINTS ${_audaspace_SEARCH_DIRS} PATHS ${AUDASPACE_PKGCONF_INCLUDE_DIRS} ) # Library -find_library(CAUDASPACE_LIBRARY - NAMES caudaspace +find_library(AUDASPACE_C_LIBRARY + NAMES audaspace-c + HINTS ${_audaspace_SEARCH_DIRS} PATHS ${AUDASPACE_PKGCONF_LIBRARY_DIRS} ) # Include dir -find_path(PYAUDASPACE_INCLUDE_DIR - NAMES audaspace/python/PyAPI.h +find_path(AUDASPACE_PY_INCLUDE_DIR + NAMES python/PyAPI.h + HINTS ${_audaspace_SEARCH_DIRS} PATHS ${AUDASPACE_PKGCONF_INCLUDE_DIRS} ) # Library -find_library(PYAUDASPACE_LIBRARY - NAMES pyaudaspace +find_library(AUDASPACE_PY_LIBRARY + NAMES audaspace-py + HINTS ${_audaspace_SEARCH_DIRS} PATHS ${AUDASPACE_PKGCONF_LIBRARY_DIRS} ) find_package(PackageHandleStandardArgs) find_package_handle_standard_args(Audaspace DEFAULT_MSG AUDASPACE_LIBRARY AUDASPACE_INCLUDE_DIR) -find_package_handle_standard_args(CAudaspace DEFAULT_MSG CAUDASPACE_LIBRARY CAUDASPACE_INCLUDE_DIR) -find_package_handle_standard_args(PyAudaspace DEFAULT_MSG PYAUDASPACE_LIBRARY PYAUDASPACE_INCLUDE_DIR) +find_package_handle_standard_args(Audaspace_C DEFAULT_MSG AUDASPACE_C_LIBRARY AUDASPACE_C_INCLUDE_DIR) +find_package_handle_standard_args(Audaspace_Py DEFAULT_MSG AUDASPACE_PY_LIBRARY AUDASPACE_PY_INCLUDE_DIR) if(AUDASPACE_FOUND) - set(AUDASPACE_LIBRARIES ${AUDASPACE_LIBRARY}) - set(AUDASPACE_INCLUDE_DIRS ${AUDASPACE_INCLUDE_DIR}) + set(AUDASPACE_LIBRARIES ${AUDASPACE_LIBRARY}) + set(AUDASPACE_INCLUDE_DIRS ${AUDASPACE_INCLUDE_DIR}) endif(AUDASPACE_FOUND) -if(CAUDASPACE_FOUND) - set(CAUDASPACE_LIBRARIES ${CAUDASPACE_LIBRARY}) - set(CAUDASPACE_INCLUDE_DIRS ${CAUDASPACE_INCLUDE_DIR}) -endif(CAUDASPACE_FOUND) +if(AUDASPACE_C_FOUND) + set(AUDASPACE_C_LIBRARIES ${AUDASPACE_C_LIBRARY}) + set(AUDASPACE_C_INCLUDE_DIRS ${AUDASPACE_C_INCLUDE_DIR}) +endif(AUDASPACE_C_FOUND) -if(PYAUDASPACE_FOUND) - set(PYAUDASPACE_LIBRARIES ${PYAUDASPACE_LIBRARY}) - set(PYAUDASPACE_INCLUDE_DIRS ${PYAUDASPACE_INCLUDE_DIR}) -endif(PYAUDASPACE_FOUND) +if(AUDASPACE_PY_FOUND) + set(AUDASPACE_PY_LIBRARIES ${AUDASPACE_PY_LIBRARY}) + set(AUDASPACE_PY_INCLUDE_DIRS ${AUDASPACE_PY_INCLUDE_DIR}) +endif(AUDASPACE_PY_FOUND) -mark_as_advanced(AUDASPACE_LIBRARY AUDASPACE_LIBRARIES AUDASPACE_INCLUDE_DIR AUDASPACE_INCLUDE_DIRS CAUDASPACE_LIBRARY CAUDASPACE_LIBRARIES CAUDASPACE_INCLUDE_DIR CAUDASPACE_INCLUDE_DIRS PYAUDASPACE_LIBRARY PYAUDASPACE_LIBRARIES PYAUDASPACE_INCLUDE_DIR PYAUDASPACE_INCLUDE_DIRS) +mark_as_advanced( + AUDASPACE_LIBRARY + AUDASPACE_LIBRARIES + AUDASPACE_INCLUDE_DIR + AUDASPACE_INCLUDE_DIRS + AUDASPACE_C_LIBRARY + AUDASPACE_C_LIBRARIES + AUDASPACE_C_INCLUDE_DIR + AUDASPACE_C_INCLUDE_DIRS + AUDASPACE_PY_LIBRARY + AUDASPACE_PY_LIBRARIES + AUDASPACE_PY_INCLUDE_DIR + AUDASPACE_PY_INCLUDE_DIRS +) diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index de2109b5a6e..e7fc0ec0a6e 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -343,8 +343,8 @@ function(setup_liblinks if(WITH_BULLET AND WITH_SYSTEM_BULLET) target_link_libraries(${target} ${BULLET_LIBRARIES}) endif() - if(WITH_EXTERNAL_AUDASPACE) - target_link_libraries(${target} ${CAUDASPACE_LIBRARIES} ${PYAUDASPACE_LIBRARIES}) + if(WITH_AUDASPACE AND WITH_SYSTEM_AUDASPACE) + target_link_libraries(${target} ${AUDASPACE_C_LIBRARIES} ${AUDASPACE_PY_LIBRARIES}) endif() if(WITH_OPENAL) target_link_libraries(${target} ${OPENAL_LIBRARY}) diff --git a/build_files/scons/config/darwin-config.py b/build_files/scons/config/darwin-config.py index d3d4afaa6ab..0bf03a46bd2 100644 --- a/build_files/scons/config/darwin-config.py +++ b/build_files/scons/config/darwin-config.py @@ -52,6 +52,8 @@ BF_CXX = '/usr' WITH_BF_STATICCXX = False BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a' +WITH_BF_AUDASPACE = True + # we use simply jack framework WITH_BF_JACK = True BF_JACK = '/Library/Frameworks/Jackmp.framework' diff --git a/build_files/scons/config/linux-config.py b/build_files/scons/config/linux-config.py index 3556c52021a..ff8ecf0aa72 100644 --- a/build_files/scons/config/linux-config.py +++ b/build_files/scons/config/linux-config.py @@ -26,6 +26,8 @@ BF_CXX = '/usr' WITH_BF_STATICCXX = False BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a' +WITH_BF_AUDASPACE = True + WITH_BF_JACK = False BF_JACK = '/usr' BF_JACK_INC = '${BF_JACK}/include/jack' diff --git a/build_files/scons/config/win32-mingw-config.py b/build_files/scons/config/win32-mingw-config.py index 3a4dfcef4c9..552a1a5cec3 100644 --- a/build_files/scons/config/win32-mingw-config.py +++ b/build_files/scons/config/win32-mingw-config.py @@ -23,6 +23,8 @@ BF_FFMPEG_LIBPATH = LIBDIR + '/ffmpeg/lib' BF_FFMPEG_INC = LIBDIR + '/ffmpeg/include' BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-55.dll ${BF_FFMPEG_LIBPATH}/avcodec-55.dll ${BF_FFMPEG_LIBPATH}/avdevice-55.dll ${BF_FFMPEG_LIBPATH}/avutil-52.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll' +WITH_BF_AUDASPACE = True + WITH_BF_JACK = False BF_JACK = LIBDIR + '/jack' BF_JACK_INC = '${BF_JACK}/include' diff --git a/build_files/scons/config/win32-vc-config.py b/build_files/scons/config/win32-vc-config.py index b639621c7d7..94e6cf9c8c4 100644 --- a/build_files/scons/config/win32-vc-config.py +++ b/build_files/scons/config/win32-vc-config.py @@ -42,6 +42,8 @@ BF_ICONV_INC = '${BF_ICONV}/include' BF_ICONV_LIB = 'iconv' BF_ICONV_LIBPATH = '${BF_ICONV}/lib' +WITH_BF_AUDASPACE = True + WITH_BF_JACK = False BF_JACK = LIBDIR + '/jack' BF_JACK_INC = '${BF_JACK}/include ${BF_FFMPEG}/include/msvc' diff --git a/build_files/scons/config/win64-mingw-config.py b/build_files/scons/config/win64-mingw-config.py index 16d859194db..87a9b5e4eac 100644 --- a/build_files/scons/config/win64-mingw-config.py +++ b/build_files/scons/config/win64-mingw-config.py @@ -22,6 +22,8 @@ BF_FFMPEG_LIBPATH = LIBDIR + '/ffmpeg/lib' BF_FFMPEG_INC = LIBDIR + '/ffmpeg/include' BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-53.dll ${BF_FFMPEG_LIBPATH}/avcodec-53.dll ${BF_FFMPEG_LIBPATH}/avdevice-53.dll ${BF_FFMPEG_LIBPATH}/avutil-51.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll ${BF_FFMPEG_LIBPATH}/swresample-0.dll ${BF_FFMPEG_LIBPATH}/xvidcore.dll' +WITH_BF_AUDASPACE = True + WITH_BF_JACK = False BF_JACK = LIBDIR + '/jack' BF_JACK_INC = '${BF_JACK}/include' diff --git a/build_files/scons/config/win64-vc-config.py b/build_files/scons/config/win64-vc-config.py index 7cb6e6a471d..c25b62a756a 100644 --- a/build_files/scons/config/win64-vc-config.py +++ b/build_files/scons/config/win64-vc-config.py @@ -55,6 +55,8 @@ BF_SDL_INC = '${BF_SDL}/include' BF_SDL_LIB = 'SDL2.lib' BF_SDL_LIBPATH = '${BF_SDL}/lib' +WITH_BF_AUDASPACE = True + WITH_BF_JACK = False BF_PTHREADS = LIBDIR + '/pthreads' diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py index 931b557c248..0b85940d024 100644 --- a/build_files/scons/tools/btools.py +++ b/build_files/scons/tools/btools.py @@ -107,6 +107,7 @@ def print_arguments(args, bc): def validate_arguments(args, bc): opts_list = [ 'WITH_BF_FREESTYLE', 'WITH_BF_PYTHON', 'WITH_BF_PYTHON_SAFETY', 'WITH_BF_PYTHON_SECURITY', 'BF_PYTHON', 'BF_PYTHON_VERSION', 'BF_PYTHON_INC', 'BF_PYTHON_BINARY', 'BF_PYTHON_LIB', 'BF_PYTHON_LIBPATH', 'BF_PYTHON_LIBPATH_ARCH', 'WITH_BF_STATICPYTHON', 'WITH_OSX_STATICPYTHON', 'BF_PYTHON_LIB_STATIC', 'BF_PYTHON_DLL', 'BF_PYTHON_ABI_FLAGS', + 'WITH_BF_AUDASPACE', 'BF_AUDASPACE_C_INC', 'BF_AUDASPACE_PY_INC', 'BF_AUDASPACE_DEF', 'WITH_BF_OPENAL', 'BF_OPENAL', 'BF_OPENAL_INC', 'BF_OPENAL_LIB', 'BF_OPENAL_LIBPATH', 'WITH_BF_STATICOPENAL', 'BF_OPENAL_LIB_STATIC', 'WITH_BF_SDL', 'BF_SDL', 'BF_SDL_INC', 'BF_SDL_LIB', 'BF_SDL_LIBPATH', 'WITH_BF_SDL_DYNLOAD', 'WITH_BF_JACK', 'BF_JACK', 'BF_JACK_INC', 'BF_JACK_LIB', 'BF_JACK_LIBPATH', 'WITH_BF_JACK_DYNLOAD', @@ -298,6 +299,11 @@ def read_opts(env, cfg, args): ('BF_OPENAL_LIBPATH', 'Path to OpenAL library', ''), (BoolVariable('WITH_BF_STATICOPENAL', 'Staticly link to openal', False)), + (BoolVariable('WITH_BF_AUDASPACE', 'Build with audaspace if true', True)), + ('BF_AUDASPACE_C_INC', 'audaspace-c include path', ''), + ('BF_AUDASPACE_PY_INC', 'audaspace-py include path', ''), + ('BF_AUDASPACE_DEF', 'audaspace defines', ''), + (BoolVariable('WITH_BF_SDL', 'Use SDL if true', False)), ('BF_SDL', 'SDL base path', ''), ('BF_SDL_INC', 'SDL include path', ''), |