소스 검색

WIP: Linux port
- Fixing runtime .so search paths

Marko Pintera 8 년 전
부모
커밋
419835ffcb
2개의 변경된 파일6개의 추가작업 그리고 3개의 파일을 삭제
  1. 3 0
      Documentation/GitHub/dependencies.md
  2. 3 3
      Source/CMake/Common.cmake

+ 3 - 0
Documentation/GitHub/dependencies.md

@@ -83,6 +83,9 @@ Additionally, if the dependency structure still isn't clear, download one of the
 - OpenAL Soft 1.17.2
 - OpenAL Soft 1.17.2
 - https://github.com/kcat/openal-soft
 - https://github.com/kcat/openal-soft
 - Required by BansheeOpenAudio
 - Required by BansheeOpenAudio
+- **Linux only**
+ - Make sure to get audio backend libraries before compiling: PulseAudio, OSS, ALSA and JACK
+ - On Debian/Ubuntu run: *apt-get install libpulse libasound2-dev libjack-dev* 
 - Compile as a dynamic library
 - Compile as a dynamic library
    
    
 **libogg**
 **libogg**

+ 3 - 3
Source/CMake/Common.cmake

@@ -61,7 +61,7 @@ MACRO(gen_default_lib_search_dirs LIB_NAME)
 ENDMACRO()
 ENDMACRO()
 
 
 MACRO(add_imported_library LIB_NAME RELEASE_NAME DEBUG_NAME IS_SHARED)
 MACRO(add_imported_library LIB_NAME RELEASE_NAME DEBUG_NAME IS_SHARED)
-	if(IS_SHARED)
+	if(${IS_SHARED})
 		add_library(${LIB_NAME} SHARED IMPORTED)
 		add_library(${LIB_NAME} SHARED IMPORTED)
 	else()
 	else()
 		add_library(${LIB_NAME} STATIC IMPORTED)
 		add_library(${LIB_NAME} STATIC IMPORTED)
@@ -91,10 +91,10 @@ MACRO(find_imported_library3 FOLDER_NAME LIB_NAME DEBUG_LIB_NAME IS_SHARED)
 	if(${LIB_NAME}_LIBRARY_RELEASE)
 	if(${LIB_NAME}_LIBRARY_RELEASE)
 		if(${LIB_NAME}_LIBRARY_DEBUG)
 		if(${LIB_NAME}_LIBRARY_DEBUG)
 			add_imported_library(${FOLDER_NAME}::${LIB_NAME} "${${LIB_NAME}_LIBRARY_RELEASE}"
 			add_imported_library(${FOLDER_NAME}::${LIB_NAME} "${${LIB_NAME}_LIBRARY_RELEASE}"
-				"${${LIB_NAME}_LIBRARY_DEBUG}" IS_SHARED)
+				"${${LIB_NAME}_LIBRARY_DEBUG}" ${IS_SHARED})
 		else()
 		else()
 			add_imported_library(${FOLDER_NAME}::${LIB_NAME} "${${LIB_NAME}_LIBRARY_RELEASE}"
 			add_imported_library(${FOLDER_NAME}::${LIB_NAME} "${${LIB_NAME}_LIBRARY_RELEASE}"
-				"${${LIB_NAME}_LIBRARY_RELEASE}" IS_SHARED)
+				"${${LIB_NAME}_LIBRARY_RELEASE}" ${IS_SHARED})
 		endif()
 		endif()
 	else()
 	else()
 		set(${FOLDER_NAME}_FOUND FALSE)
 		set(${FOLDER_NAME}_FOUND FALSE)