Updated revs
This commit is contained in:
		
							parent
							
								
									dfc3e08681
								
							
						
					
					
						commit
						45fc96603e
					
				| @ -1 +1 @@ | |||||||
| Subproject commit 3e59efc291a1cd64cd520ae82fca71f7aafcbe90 | Subproject commit 8bbac44210cbf28c1a867a80b3fb3a0c7ed8cc88 | ||||||
| @ -2,8 +2,8 @@ | |||||||
| 
 | 
 | ||||||
| cd $(dirname $0) | cd $(dirname $0) | ||||||
| 
 | 
 | ||||||
| export tearoot_cmake_config="`pwd`/cmake/config/tearoot-client.cmake" | export tearoot_cmake_config="`pwd`/build-helpers/cmake/config/tearoot-client.cmake" | ||||||
| export tearoot_cmake_module="`pwd`/cmake/" | export tearoot_cmake_module="`pwd`/build-helpers/cmake/" | ||||||
| export traroot_library="`pwd`/third_party" | export traroot_library="`pwd`/third_party" | ||||||
| 
 | 
 | ||||||
| source scripts/build_helper.sh | source scripts/build_helper.sh | ||||||
| @ -12,4 +12,4 @@ begin_task "build_client" "Building client" | |||||||
| ./client/jenkins/create_build.sh | ./client/jenkins/create_build.sh | ||||||
| check_err_exit "__build_client" "Failed to build client!" | check_err_exit "__build_client" "Failed to build client!" | ||||||
| 
 | 
 | ||||||
| end_task "build_client" "Client build finished" | end_task "build_client" "Client build finished" | ||||||
|  | |||||||
| @ -3,8 +3,8 @@ | |||||||
| cd $(dirname $0) | cd $(dirname $0) | ||||||
| #Depends on a lot so rebuild as soon anything changed! We still have to implement that dependecy stuff! | #Depends on a lot so rebuild as soon anything changed! We still have to implement that dependecy stuff! | ||||||
| 
 | 
 | ||||||
| tearoot_cmake_config="`pwd`/cmake/config/tearoot-client.cmake" | tearoot_cmake_config="`pwd`/build-helpers/cmake/config/tearoot-client.cmake" | ||||||
| tearoot_cmake_module="`pwd`/cmake/" | tearoot_cmake_module="`pwd`/build-helpers/cmake/" | ||||||
| traroot_library="`pwd`/third_party" | traroot_library="`pwd`/third_party" | ||||||
| 
 | 
 | ||||||
| shared_path="shared" | shared_path="shared" | ||||||
|  | |||||||
							
								
								
									
										2
									
								
								client
									
									
									
									
									
								
							
							
								
								
								
								
								
								
									
									
								
							
						
						
									
										2
									
								
								client
									
									
									
									
									
								
							| @ -1 +1 @@ | |||||||
| Subproject commit 86640da6959fd961a9112fc5682e61f328fe2ef6 | Subproject commit 25173d57451d2e261cb149e43753b20cb9dbaca6 | ||||||
| @ -1,69 +0,0 @@ | |||||||
| # - Try to find breakpad include dirs and libraries |  | ||||||
| # |  | ||||||
| # Usage of this module as follows: |  | ||||||
| # |  | ||||||
| #     find_package(breakpad) |  | ||||||
| # |  | ||||||
| # Variables used by this module, they can change the default behaviour and need |  | ||||||
| # to be set before calling find_package: |  | ||||||
| # |  | ||||||
| #  breakpad_ROOT_DIR          Set this variable to the root installation of |  | ||||||
| #                            breakpad if the module has problems finding the |  | ||||||
| #                            proper installation path. |  | ||||||
| # |  | ||||||
| # Variables defined by this module: |  | ||||||
| # |  | ||||||
| #  breakpad_FOUND             System has breakpad, include and library dirs found |  | ||||||
| #  breakpad_INCLUDE_DIR       The breakpad include directories. |  | ||||||
| #  breakpad_SOURCE_FILES      The source files which have to be included. |  | ||||||
| #  breakpad_HEADER_FIOLES     Header files which might be included. |  | ||||||
| 
 |  | ||||||
| 
 |  | ||||||
| include(tearoot-helper) |  | ||||||
| include(FindPackageHandleStandardArgs) |  | ||||||
| 
 |  | ||||||
| find_path(breakpad_ROOT_DIR |  | ||||||
|         NAMES src/client/minidump_file_writer.h src/common/language.h |  | ||||||
|         HINTS ${breakpad_ROOT_DIR} |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| find_path(breakpad_INCLUDE_DIR |  | ||||||
|         NAMES client/minidump_file_writer.h common/language.h |  | ||||||
|         HINTS ${breakpad_ROOT_DIR}/src/ |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| set(breakpad_SOURCE_FILES "") |  | ||||||
| set(breakpad_HEADER_FIOLES "") |  | ||||||
| 
 |  | ||||||
| #https://blog.inventic.eu/2012/08/qt-and-google-breakpad/ |  | ||||||
| if(WIN32) |  | ||||||
| 	set(breakpad_SOURCE_FILES ${breakpad_SOURCE_FILES} |  | ||||||
| 		${breakpad_ROOT_DIR}/src/client/windows/handler/exception_handler.cc |  | ||||||
| 		${breakpad_ROOT_DIR}/src/common/windows/string_utils.cc |  | ||||||
| 		${breakpad_ROOT_DIR}/src/common/windows/guid_string.cc |  | ||||||
| 		${breakpad_ROOT_DIR}/src/client/windows/crash_generation/crash_generation_client.cc  |  | ||||||
| 	) |  | ||||||
| 	set(breakpad_HEADER_FIOLES ${breakpad_HEADER_FIOLES} |  | ||||||
| 		${breakpad_ROOT_DIR}/src/common/windows/string_utils-inl.h |  | ||||||
| 		${breakpad_ROOT_DIR}/src/common/windows/guid_string.h |  | ||||||
| 		${breakpad_ROOT_DIR}/src/client/windows/handler/exception_handler.h |  | ||||||
| 		${breakpad_ROOT_DIR}/src/client/windows/common/ipc_protocol.h |  | ||||||
| 		${breakpad_ROOT_DIR}/src/google_breakpad/common/minidump_format.h  |  | ||||||
| 		${breakpad_ROOT_DIR}/src/google_breakpad/common/breakpad_types.h  |  | ||||||
| 		${breakpad_ROOT_DIR}/src/client/windows/crash_generation/crash_generation_client.h  |  | ||||||
| 		${breakpad_ROOT_DIR}/src/processor/scoped_ptr.h |  | ||||||
| 	) |  | ||||||
| else() |  | ||||||
| 	message(FATAL_ERROR "Unknown system") |  | ||||||
| endif() |  | ||||||
| 
 |  | ||||||
| find_package_handle_standard_args(breakpad DEFAULT_MSG |  | ||||||
|         breakpad_INCLUDE_DIR |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| mark_as_advanced( |  | ||||||
|         breakpad_ROOT_DIR |  | ||||||
|         breakpad_INCLUDE_DIR |  | ||||||
|         breakpad_SOURCE_FILES |  | ||||||
| 		breakpad_HEADER_FIOLES |  | ||||||
| ) |  | ||||||
| @ -1,53 +0,0 @@ | |||||||
| # - Try to find DataPipes include dirs and libraries |  | ||||||
| # |  | ||||||
| # Usage of this module as follows: |  | ||||||
| # |  | ||||||
| #     find_package(DataPipes) |  | ||||||
| # |  | ||||||
| # Variables used by this module, they can change the default behaviour and need |  | ||||||
| # to be set before calling find_package: |  | ||||||
| # |  | ||||||
| #  DataPipes_ROOT_DIR          Set this variable to the root installation of |  | ||||||
| #                            DataPipes if the module has problems finding the |  | ||||||
| #                            proper installation path. |  | ||||||
| # |  | ||||||
| # Variables defined by this module: |  | ||||||
| # |  | ||||||
| #  DataPipes_FOUND             System has DataPipes, include and library dirs found |  | ||||||
| #  DataPipes_INCLUDE_DIR       The DataPipes include directories. |  | ||||||
| #  DataPipes_LIBRARIES_STATIC  The DataPipes libraries. |  | ||||||
| #  DataPipes_LIBRARIES_SHARED  The DataPipes libraries. |  | ||||||
| 
 |  | ||||||
| include(tearoot-helper) |  | ||||||
| include(FindPackageHandleStandardArgs) |  | ||||||
| 
 |  | ||||||
| find_path(DataPipes_ROOT_DIR |  | ||||||
|         NAMES include/buffer.h include/pipeline.h CMakeLists.txt |  | ||||||
|         HINTS ${DataPipes_ROOT_DIR} ${DataPipes_ROOT_DIR}/${BUILD_OUTPUT} |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| find_path(DataPipes_INCLUDE_DIR |  | ||||||
|         NAMES pipes/pipeline.h pipes/buffer.h |  | ||||||
|         HINTS ${DataPipes_ROOT_DIR}/include/ |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| find_library(DataPipes_LIBRARIES_STATIC |  | ||||||
|         NAMES DataPipes.lib libDataPipes.a |  | ||||||
|         HINTS ${DataPipes_ROOT_DIR} ${DataPipes_ROOT_DIR}/lib |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| find_library(DataPipes_LIBRARIES_SHARED |  | ||||||
|         NAMES DataPipes.dll libDataPipes.so |  | ||||||
| 		HINTS ${DataPipes_ROOT_DIR} ${DataPipes_ROOT_DIR}/lib |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| find_package_handle_standard_args(DataPipes DEFAULT_MSG |  | ||||||
|         DataPipes_INCLUDE_DIR |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| mark_as_advanced( |  | ||||||
|         DataPipes_ROOT_DIR |  | ||||||
|         DataPipes_INCLUDE_DIR |  | ||||||
|         DataPipes_LIBRARIES_STATIC |  | ||||||
|         DataPipes_LIBRARIES_SHARED |  | ||||||
| ) |  | ||||||
| @ -1,53 +0,0 @@ | |||||||
| # - Try to find ed25519 include dirs and libraries |  | ||||||
| # |  | ||||||
| # Usage of this module as follows: |  | ||||||
| # |  | ||||||
| #     find_package(ed25519) |  | ||||||
| # |  | ||||||
| # Variables used by this module, they can change the default behaviour and need |  | ||||||
| # to be set before calling find_package: |  | ||||||
| # |  | ||||||
| #  ed25519_ROOT_DIR          Set this variable to the root installation of |  | ||||||
| #                            ed25519 if the module has problems finding the |  | ||||||
| #                            proper installation path. |  | ||||||
| # |  | ||||||
| # Variables defined by this module: |  | ||||||
| # |  | ||||||
| #  ed25519_FOUND             System has ed25519, include and library dirs found |  | ||||||
| #  ed25519_INCLUDE_DIR       The ed25519 include directories. |  | ||||||
| #  ed25519_LIBRARIES_STATIC  The ed25519 libraries. |  | ||||||
| #  ed25519_LIBRARIES_SHARED  The ed25519 libraries. |  | ||||||
| 
 |  | ||||||
| include(tearoot-helper) |  | ||||||
| include(FindPackageHandleStandardArgs) |  | ||||||
| 
 |  | ||||||
| find_path(ed25519_ROOT_DIR |  | ||||||
|         NAMES include/ed25519/ed25519 |  | ||||||
| 		HINTS ${ed25519_ROOT_DIR} ${ed25519_ROOT_DIR}/${BUILD_OUTPUT} |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| find_path(ed25519_INCLUDE_DIR |  | ||||||
|         NAMES ed25519/ed25519.h |  | ||||||
| 		HINTS ${ed25519_ROOT_DIR} ${ed25519_ROOT_DIR}/include/ |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| find_library(ed25519_LIBRARIES_STATIC |  | ||||||
|         NAMES ed25519.lib ed25519.a libed25519.a |  | ||||||
| 		HINTS ${ed25519_ROOT_DIR} ${ed25519_ROOT_DIR}/lib |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| find_library(ed25519_LIBRARIES_SHARED |  | ||||||
|         NAMES ed25519.dll ed25519.so |  | ||||||
| 		HINTS ${ed25519_ROOT_DIR} ${ed25519_ROOT_DIR}/lib |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| find_package_handle_standard_args(ed25519 DEFAULT_MSG |  | ||||||
|         ed25519_INCLUDE_DIR |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| mark_as_advanced( |  | ||||||
|         ed25519_ROOT_DIR |  | ||||||
|         ed25519_INCLUDE_DIR |  | ||||||
|         ed25519_LIBRARIES_STATIC |  | ||||||
|         ed25519_LIBRARIES_SHARED |  | ||||||
| ) |  | ||||||
| @ -1,66 +0,0 @@ | |||||||
| # - Try to find opus include dirs and libraries |  | ||||||
| # |  | ||||||
| # Usage of this module as follows: |  | ||||||
| # |  | ||||||
| #     find_package(opus) |  | ||||||
| # |  | ||||||
| # Variables used by this module, they can change the default behaviour and need |  | ||||||
| # to be set before calling find_package: |  | ||||||
| # |  | ||||||
| #  opus_ROOT_DIR          Set this variable to the root installation of |  | ||||||
| #                            opus if the module has problems finding the |  | ||||||
| #                            proper installation path. |  | ||||||
| # |  | ||||||
| # Variables defined by this module: |  | ||||||
| # |  | ||||||
| #  opus_FOUND             System has opus, include and library dirs found |  | ||||||
| #  opus_INCLUDE_DIR       The opus include directories. |  | ||||||
| #  opus_LIBRARIES_STATIC  The opus libraries. |  | ||||||
| #  opus_LIBRARIES_SHARED  The opus libraries. |  | ||||||
| 
 |  | ||||||
| include(tearoot-helper) |  | ||||||
| include(FindPackageHandleStandardArgs) |  | ||||||
| 
 |  | ||||||
| function(resolve_opus) |  | ||||||
| 	find_path(opus_ROOT_DIR |  | ||||||
| 			NAMES include/opus/opus.h |  | ||||||
| 			HINTS ${opus_ROOT_DIR} ${opus_ROOT_DIR}/${BUILD_OUTPUT} |  | ||||||
| 	) |  | ||||||
| 
 |  | ||||||
| 	find_path(opus_INCLUDE_DIR |  | ||||||
| 			NAMES opus/opus.h opus/opus_defines.h |  | ||||||
| 			HINTS ${opus_ROOT_DIR} ${opus_ROOT_DIR}/include/ |  | ||||||
| 	) |  | ||||||
| 
 |  | ||||||
| 	find_library(opus_LIBRARIES_STATIC |  | ||||||
| 			NAMES libopus.a opus.a opus.lib |  | ||||||
| 			HINTS ${opus_ROOT_DIR} ${opus_ROOT_DIR}/lib |  | ||||||
| 	) |  | ||||||
| 	 |  | ||||||
| 	if(opus_LIBRARIES_STATIC) |  | ||||||
| 		add_library(opus::static SHARED IMPORTED) |  | ||||||
| 		set_target_properties(opus::static PROPERTIES |  | ||||||
| 			IMPORTED_LOCATION ${opus_LIBRARIES_STATIC} |  | ||||||
| 			INTERFACE_INCLUDE_DIRECTORIES ${opus_INCLUDE_DIR} |  | ||||||
| 		) |  | ||||||
| 	endif() |  | ||||||
| 
 |  | ||||||
| 	find_library(opus_LIBRARIES_SHARED |  | ||||||
| 			NAMES opus.dll libopus.so opus.so |  | ||||||
| 			HINTS ${opus_ROOT_DIR} ${opus_ROOT_DIR}/lib |  | ||||||
| 	) |  | ||||||
| 	 |  | ||||||
| 	if(opus_LIBRARIES_SHARED) |  | ||||||
| 		add_library(opus::shared SHARED IMPORTED) |  | ||||||
| 		set_target_properties(opus::shared PROPERTIES |  | ||||||
| 			IMPORTED_LOCATION ${opus_LIBRARIES_SHARED} |  | ||||||
| 			INTERFACE_INCLUDE_DIRECTORIES ${opus_INCLUDE_DIR} |  | ||||||
| 		) |  | ||||||
| 	endif() |  | ||||||
| 	 |  | ||||||
| 	find_package_handle_standard_args(opus DEFAULT_MSG |  | ||||||
| 			opus_INCLUDE_DIR |  | ||||||
| 	) |  | ||||||
| endfunction() |  | ||||||
| resolve_opus() |  | ||||||
| 
 |  | ||||||
| @ -1,53 +0,0 @@ | |||||||
| # - Try to find PortAudio include dirs and libraries |  | ||||||
| # |  | ||||||
| # Usage of this module as follows: |  | ||||||
| # |  | ||||||
| #     find_package(PortAudio) |  | ||||||
| # |  | ||||||
| # Variables used by this module, they can change the default behaviour and need |  | ||||||
| # to be set before calling find_package: |  | ||||||
| # |  | ||||||
| #  PortAudio_ROOT_DIR          Set this variable to the root installation of |  | ||||||
| #                            PortAudio if the module has problems finding the |  | ||||||
| #                            proper installation path. |  | ||||||
| # |  | ||||||
| # Variables defined by this module: |  | ||||||
| # |  | ||||||
| #  PortAudio_FOUND             System has PortAudio, include and library dirs found |  | ||||||
| #  PortAudio_INCLUDE_DIR       The PortAudio include directories. |  | ||||||
| #  PortAudio_LIBRARIES_STATIC  The PortAudio libraries. |  | ||||||
| #  PortAudio_LIBRARIES_SHARED  The PortAudio libraries. |  | ||||||
| 
 |  | ||||||
| include(tearoot-helper) |  | ||||||
| include(FindPackageHandleStandardArgs) |  | ||||||
| 
 |  | ||||||
| find_path(PortAudio_ROOT_DIR |  | ||||||
|         NAMES include/portaudio.h |  | ||||||
| 		HINTS ${PortAudio_ROOT_DIR} ${PortAudio_ROOT_DIR}/${BUILD_OUTPUT} |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| find_path(PortAudio_INCLUDE_DIR |  | ||||||
|         NAMES portaudio.h |  | ||||||
| 		HINTS ${PortAudio_ROOT_DIR} ${PortAudio_ROOT_DIR}/include/ |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| find_library(PortAudio_LIBRARIES_STATIC |  | ||||||
|         NAMES libportaudio.a libportaudio_static.a portaudio_static_x64.a portaudio_static_x64.lib |  | ||||||
| 		HINTS ${PortAudio_ROOT_DIR} ${PortAudio_ROOT_DIR}/lib |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| find_library(PortAudio_LIBRARIES_SHARED |  | ||||||
|         NAMES libportaudio.so portaudio_shared_x64.dll portaudio_shared_x64.so |  | ||||||
| 		HINTS ${PortAudio_ROOT_DIR} ${PortAudio_ROOT_DIR}/lib |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| find_package_handle_standard_args(PortAudio DEFAULT_MSG |  | ||||||
|         PortAudio_INCLUDE_DIR |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| mark_as_advanced( |  | ||||||
|         PortAudio_ROOT_DIR |  | ||||||
|         PortAudio_INCLUDE_DIR |  | ||||||
|         PortAudio_LIBRARIES_STATIC |  | ||||||
|         PortAudio_LIBRARIES_SHARED |  | ||||||
| ) |  | ||||||
| @ -1,53 +0,0 @@ | |||||||
| # - Try to find soxr include dirs and libraries |  | ||||||
| # |  | ||||||
| # Usage of this module as follows: |  | ||||||
| # |  | ||||||
| #     find_package(soxr) |  | ||||||
| # |  | ||||||
| # Variables used by this module, they can change the default behaviour and need |  | ||||||
| # to be set before calling find_package: |  | ||||||
| # |  | ||||||
| #  soxr_ROOT_DIR          Set this variable to the root installation of |  | ||||||
| #                            soxr if the module has problems finding the |  | ||||||
| #                            proper installation path. |  | ||||||
| # |  | ||||||
| # Variables defined by this module: |  | ||||||
| # |  | ||||||
| #  soxr_FOUND             System has soxr, include and library dirs found |  | ||||||
| #  soxr_INCLUDE_DIR       The soxr include directories. |  | ||||||
| #  soxr_LIBRARIES_STATIC  The soxr libraries. |  | ||||||
| #  soxr_LIBRARIES_SHARED  The soxr libraries. |  | ||||||
| 
 |  | ||||||
| include(tearoot-helper) |  | ||||||
| include(FindPackageHandleStandardArgs) |  | ||||||
| 
 |  | ||||||
| find_path(soxr_ROOT_DIR |  | ||||||
|         NAMES include/soxr.h |  | ||||||
| 		HINTS ${soxr_ROOT_DIR} ${soxr_ROOT_DIR}/${BUILD_OUTPUT} |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| find_path(soxr_INCLUDE_DIR |  | ||||||
|         NAMES soxr.h |  | ||||||
| 		HINTS ${soxr_ROOT_DIR} ${soxr_ROOT_DIR}/include/ |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| find_library(soxr_LIBRARIES_STATIC |  | ||||||
|         NAMES libsoxr.a soxr.a soxr.lib |  | ||||||
| 		HINTS ${soxr_ROOT_DIR} ${soxr_ROOT_DIR}/lib |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| find_library(soxr_LIBRARIES_SHARED |  | ||||||
|         NAMES soxr.dll libsoxr.so soxr.so |  | ||||||
| 		HINTS ${soxr_ROOT_DIR} ${soxr_ROOT_DIR}/lib |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| find_package_handle_standard_args(soxr DEFAULT_MSG |  | ||||||
|         soxr_INCLUDE_DIR |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| mark_as_advanced( |  | ||||||
|         soxr_ROOT_DIR |  | ||||||
|         soxr_INCLUDE_DIR |  | ||||||
|         soxr_LIBRARIES_STATIC |  | ||||||
|         soxr_LIBRARIES_SHARED |  | ||||||
| ) |  | ||||||
| @ -1,53 +0,0 @@ | |||||||
| # - Try to find StringVariable include dirs and libraries |  | ||||||
| # |  | ||||||
| # Usage of this module as follows: |  | ||||||
| # |  | ||||||
| #     find_package(StringVariable) |  | ||||||
| # |  | ||||||
| # Variables used by this module, they can change the default behaviour and need |  | ||||||
| # to be set before calling find_package: |  | ||||||
| # |  | ||||||
| #  StringVariable_ROOT_DIR          Set this variable to the root installation of |  | ||||||
| #                            StringVariable if the module has problems finding the |  | ||||||
| #                            proper installation path. |  | ||||||
| # |  | ||||||
| # Variables defined by this module: |  | ||||||
| # |  | ||||||
| #  StringVariable_FOUND             System has StringVariable, include and library dirs found |  | ||||||
| #  StringVariable_INCLUDE_DIR       The StringVariable include directories. |  | ||||||
| #  StringVariable_LIBRARIES_STATIC  The StringVariable libraries. |  | ||||||
| #  StringVariable_LIBRARIES_SHARED  The StringVariable libraries. |  | ||||||
| 
 |  | ||||||
| include(tearoot-helper) |  | ||||||
| include(FindPackageHandleStandardArgs) |  | ||||||
| 
 |  | ||||||
| find_path(StringVariable_ROOT_DIR |  | ||||||
|         NAMES include/StringVariable.h CMakeLists.txt |  | ||||||
| 		HINTS ${StringVariable_ROOT_DIR} ${StringVariable_ROOT_DIR}/${BUILD_OUTPUT} |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| find_path(StringVariable_INCLUDE_DIR |  | ||||||
|         NAMES StringVariable.h |  | ||||||
| 		HINTS ${StringVariable_ROOT_DIR} ${StringVariable_ROOT_DIR}/include/ |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| find_library(StringVariable_LIBRARIES_STATIC |  | ||||||
|         NAMES StringVariablesStatic.lib libStringVariablesStatic.a StringVariablesStatic.a |  | ||||||
| 		HINTS ${StringVariable_ROOT_DIR} ${StringVariable_ROOT_DIR}/lib |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| find_library(StringVariable_LIBRARIES_SHARED |  | ||||||
|         NAMES StringVariable.dll libStringVariable.so StringVariable.so |  | ||||||
| 		HINTS ${StringVariable_ROOT_DIR} ${StringVariable_ROOT_DIR}/lib |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| find_package_handle_standard_args(StringVariable DEFAULT_MSG |  | ||||||
|         StringVariable_INCLUDE_DIR |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| mark_as_advanced( |  | ||||||
|         StringVariable_ROOT_DIR |  | ||||||
|         StringVariable_INCLUDE_DIR |  | ||||||
|         StringVariable_LIBRARIES_STATIC |  | ||||||
|         StringVariable_LIBRARIES_SHARED |  | ||||||
| ) |  | ||||||
| @ -1,54 +0,0 @@ | |||||||
| # - Try to find TeaSpeak_SharedLib include dirs and libraries |  | ||||||
| # |  | ||||||
| # Usage of this module as follows: |  | ||||||
| # |  | ||||||
| #     find_package(TeaSpeak_SharedLib) |  | ||||||
| # |  | ||||||
| # Variables used by this module, they can change the default behaviour and need |  | ||||||
| # to be set before calling find_package: |  | ||||||
| # |  | ||||||
| #  TeaSpeak_SharedLib_ROOT_DIR          Set this variable to the root installation of |  | ||||||
| #                            TeaSpeak_SharedLib if the module has problems finding the |  | ||||||
| #                            proper installation path. |  | ||||||
| # |  | ||||||
| # Variables defined by this module: |  | ||||||
| # |  | ||||||
| #  TeaSpeak_SharedLib_FOUND             System has TeaSpeak_SharedLib, include and library dirs found |  | ||||||
| #  TeaSpeak_SharedLib_INCLUDE_DIR       The TeaSpeak_SharedLib include directories. |  | ||||||
| #  TeaSpeak_SharedLib_LIBRARIES_STATIC  The TeaSpeak_SharedLib libraries. |  | ||||||
| #  TeaSpeak_SharedLib_LIBRARIES_SHARED  The TeaSpeak_SharedLib libraries. |  | ||||||
| 
 |  | ||||||
| include(tearoot-helper) |  | ||||||
| include(FindPackageHandleStandardArgs) |  | ||||||
| 
 |  | ||||||
| find_path(TeaSpeak_SharedLib_ROOT_DIR |  | ||||||
|         NAMES src/Definitions.h CMakeLists.txt |  | ||||||
|         HINTS ${TeaSpeak_SharedLib_ROOT_DIR} |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| #This NEEDS a fix! |  | ||||||
| find_path(TeaSpeak_SharedLib_INCLUDE_DIR |  | ||||||
|         NAMES Definitions.h |  | ||||||
|         HINTS ${TeaSpeak_SharedLib_ROOT_DIR}/src |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| find_library(TeaSpeak_SharedLib_LIBRARIES_STATIC |  | ||||||
|         NAMES libTeaSpeak.a TeaSpeak.a TeaSpeak.lib |  | ||||||
| 		HINTS ${TeaSpeak_SharedLib_ROOT_DIR}/cmake-build-debug/ ${TeaSpeak_SharedLib_ROOT_DIR}/cmake-build-relwithdebinfo/ ${TeaSpeak_SharedLib_ROOT_DIR}/${BUILD_OUTPUT}/lib |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| find_library(TeaSpeak_SharedLib_LIBRARIES_SHARED |  | ||||||
|         NAMES TeaSpeak.dll libTeaSpeak.so TeaSpeak.so |  | ||||||
| 		HINTS ${TeaSpeak_SharedLib_ROOT_DIR}/cmake-build-debug/ ${TeaSpeak_SharedLib_ROOT_DIR}/cmake-build-relwithdebinfo/ ${TeaSpeak_SharedLib_ROOT_DIR}/${BUILD_OUTPUT}/lib |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| find_package_handle_standard_args(TeaSpeak_SharedLib DEFAULT_MSG |  | ||||||
|         TeaSpeak_SharedLib_INCLUDE_DIR |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| mark_as_advanced( |  | ||||||
|         TeaSpeak_SharedLib_ROOT_DIR |  | ||||||
|         TeaSpeak_SharedLib_INCLUDE_DIR |  | ||||||
|         TeaSpeak_SharedLib_LIBRARIES_STATIC |  | ||||||
|         TeaSpeak_SharedLib_LIBRARIES_SHARED |  | ||||||
| ) |  | ||||||
| @ -1,54 +0,0 @@ | |||||||
| # - Try to find ThreadPool include dirs and libraries |  | ||||||
| # |  | ||||||
| # Usage of this module as follows: |  | ||||||
| # |  | ||||||
| #     find_package(ThreadPool) |  | ||||||
| # |  | ||||||
| # Variables used by this module, they can change the default behaviour and need |  | ||||||
| # to be set before calling find_package: |  | ||||||
| # |  | ||||||
| #  ThreadPool_ROOT_DIR          Set this variable to the root installation of |  | ||||||
| #                            ThreadPool if the module has problems finding the |  | ||||||
| #                            proper installation path. |  | ||||||
| # |  | ||||||
| # Variables defined by this module: |  | ||||||
| # |  | ||||||
| #  ThreadPool_FOUND             System has ThreadPool, include and library dirs found |  | ||||||
| #  ThreadPool_INCLUDE_DIR       The ThreadPool include directories. |  | ||||||
| #  ThreadPool_LIBRARIES_STATIC  The ThreadPool libraries. |  | ||||||
| #  ThreadPool_LIBRARIES_SHARED  The ThreadPool libraries. |  | ||||||
| 
 |  | ||||||
| include(tearoot-helper) |  | ||||||
| include(FindPackageHandleStandardArgs) |  | ||||||
| 
 |  | ||||||
| find_path(ThreadPool_ROOT_DIR |  | ||||||
|         NAMES include/ThreadPool.h CMakeLists.txt |  | ||||||
| 		HINTS ${ThreadPool_ROOT_DIR} ${ThreadPool_ROOT_DIR}/${BUILD_OUTPUT} |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| #This NEEDS a fix! |  | ||||||
| find_path(ThreadPool_INCLUDE_DIR |  | ||||||
|         NAMES ThreadPool/ThreadPool.h |  | ||||||
| 		HINTS ${ThreadPool_ROOT_DIR} ${ThreadPool_ROOT_DIR}/include/ |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| find_library(ThreadPool_LIBRARIES_STATIC |  | ||||||
|         NAMES ThreadPoolStatic.lib ThreadPoolStatic.a libThreadPoolStatic.a |  | ||||||
| 		HINTS ${ThreadPool_ROOT_DIR} ${ThreadPool_ROOT_DIR}/lib |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| find_library(ThreadPool_LIBRARIES_SHARED |  | ||||||
|         NAMES ThreadPool.dll ThreadPool.so |  | ||||||
| 		HINTS ${ThreadPool_ROOT_DIR} ${ThreadPool_ROOT_DIR}/lib |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| find_package_handle_standard_args(ThreadPool DEFAULT_MSG |  | ||||||
|         ThreadPool_INCLUDE_DIR |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| mark_as_advanced( |  | ||||||
|         ThreadPool_ROOT_DIR |  | ||||||
|         ThreadPool_INCLUDE_DIR |  | ||||||
|         ThreadPool_LIBRARIES_STATIC |  | ||||||
|         ThreadPool_LIBRARIES_SHARED |  | ||||||
| ) |  | ||||||
| @ -1,53 +0,0 @@ | |||||||
| # - Try to find tomcrypt include dirs and libraries |  | ||||||
| # |  | ||||||
| # Usage of this module as follows: |  | ||||||
| # |  | ||||||
| #     find_package(TomCrypt) |  | ||||||
| # |  | ||||||
| # Variables used by this module, they can change the default behaviour and need |  | ||||||
| # to be set before calling find_package: |  | ||||||
| # |  | ||||||
| #  TomCrypt_ROOT_DIR          Set this variable to the root installation of |  | ||||||
| #                            TomCrypt if the module has problems finding the |  | ||||||
| #                            proper installation path. |  | ||||||
| # |  | ||||||
| # Variables defined by this module: |  | ||||||
| # |  | ||||||
| #  TomCrypt_FOUND             System has TomCrypt, include and library dirs found |  | ||||||
| #  TomCrypt_INCLUDE_DIR       The TomCrypt include directories. |  | ||||||
| #  TomCrypt_LIBRARIES_STATIC  The TomCrypt libraries. |  | ||||||
| #  TomCrypt_LIBRARIES_SHARED  The TomCrypt libraries. |  | ||||||
| 
 |  | ||||||
| include(tearoot-helper) |  | ||||||
| include(FindPackageHandleStandardArgs) |  | ||||||
| 
 |  | ||||||
| find_path(TomCrypt_ROOT_DIR |  | ||||||
|         NAMES include/tomcrypt.h |  | ||||||
| 		HINTS ${TomCrypt_ROOT_DIR} ${TomCrypt_ROOT_DIR}/${BUILD_OUTPUT} |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| find_path(TomCrypt_INCLUDE_DIR |  | ||||||
|         NAMES tomcrypt.h tomcrypt_cfg.h |  | ||||||
| 		HINTS ${TomCrypt_ROOT_DIR} ${TomCrypt_ROOT_DIR}/include/ |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| find_library(TomCrypt_LIBRARIES_STATIC |  | ||||||
|         NAMES tomcrypt.lib libtomcrypt.lib libtomcrypt.a |  | ||||||
| 		HINTS ${TomCrypt_ROOT_DIR} ${TomCrypt_ROOT_DIR}/lib |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| find_library(TomCrypt_LIBRARIES_SHARED |  | ||||||
|         NAMES tomcrypt.dll libtomcrypt.dll libtomcrypt.so |  | ||||||
| 		HINTS ${TomCrypt_ROOT_DIR} ${TomCrypt_ROOT_DIR}/lib |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| find_package_handle_standard_args(TomCrypt DEFAULT_MSG |  | ||||||
|         TomCrypt_INCLUDE_DIR |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| mark_as_advanced( |  | ||||||
|         TomCrypt_ROOT_DIR |  | ||||||
|         TomCrypt_INCLUDE_DIR |  | ||||||
|         TomCrypt_LIBRARIES_STATIC |  | ||||||
|         TomCrypt_LIBRARIES_SHARED |  | ||||||
| ) |  | ||||||
| @ -1,48 +0,0 @@ | |||||||
| # - Try to find tommath include dirs and libraries |  | ||||||
| # |  | ||||||
| # Usage of this module as follows: |  | ||||||
| # |  | ||||||
| #     find_package(TomMath) |  | ||||||
| # |  | ||||||
| # Variables used by this module, they can change the default behaviour and need |  | ||||||
| # to be set before calling find_package: |  | ||||||
| # |  | ||||||
| #  TomMath_ROOT_DIR          Set this variable to the root installation of |  | ||||||
| #                            TomMath if the module has problems finding the |  | ||||||
| #                            proper installation path. |  | ||||||
| # |  | ||||||
| # Variables defined by this module: |  | ||||||
| # |  | ||||||
| #  TomMath_FOUND             System has TomMath, include and library dirs found |  | ||||||
| #  TomMath_INCLUDE_DIR       The TomMath include directories. |  | ||||||
| #  TomMath_LIBRARIES_STATIC  The TomMath libraries. |  | ||||||
| #  TomMath_LIBRARIES_SHARED  The TomMath libraries. |  | ||||||
| 
 |  | ||||||
| include(tearoot-helper) |  | ||||||
| include(FindPackageHandleStandardArgs) |  | ||||||
| 
 |  | ||||||
| find_path(TomMath_INCLUDE_DIR |  | ||||||
|         NAMES tommath.h tommath_private.h |  | ||||||
| 		HINTS ${TomMath_ROOT_DIR}/ ${TomMath_ROOT_DIR}/include/ |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| find_library(TomMath_LIBRARIES_STATIC |  | ||||||
|         NAMES tommathStatic.lib tommath.lib tommath.a libtommath.a libtommathStatic.a |  | ||||||
| 		HINTS ${TomMath_ROOT_DIR} ${TomMath_ROOT_DIR}/${BUILD_OUTPUT} ${TomMath_ROOT_DIR}/lib |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| find_library(TomMath_LIBRARIES_SHARED |  | ||||||
|         NAMES tommath.dll libtommath.so tommath.so libtommathShared.so |  | ||||||
| 		HINTS ${TomMath_ROOT_DIR} ${TomMath_ROOT_DIR}/${BUILD_OUTPUT} ${TomMath_ROOT_DIR} ${TomMath_ROOT_DIR}/lib |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| find_package_handle_standard_args(TomMath DEFAULT_MSG |  | ||||||
|         TomMath_INCLUDE_DIR |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| mark_as_advanced( |  | ||||||
|         TomMath_ROOT_DIR |  | ||||||
|         TomMath_INCLUDE_DIR |  | ||||||
|         TomMath_LIBRARIES_STATIC |  | ||||||
|         TomMath_LIBRARIES_SHARED |  | ||||||
| ) |  | ||||||
| @ -1,53 +0,0 @@ | |||||||
| # - Try to find fvad include dirs and libraries |  | ||||||
| # |  | ||||||
| # Usage of this module as follows: |  | ||||||
| # |  | ||||||
| #     find_package(fvad) |  | ||||||
| # |  | ||||||
| # Variables used by this module, they can change the default behaviour and need |  | ||||||
| # to be set before calling find_package: |  | ||||||
| # |  | ||||||
| #  fvad_ROOT_DIR          Set this variable to the root installation of |  | ||||||
| #                            fvad if the module has problems finding the |  | ||||||
| #                            proper installation path. |  | ||||||
| # |  | ||||||
| # Variables defined by this module: |  | ||||||
| # |  | ||||||
| #  fvad_FOUND             System has fvad, include and library dirs found |  | ||||||
| #  fvad_INCLUDE_DIR       The fvad include directories. |  | ||||||
| #  fvad_LIBRARIES_STATIC  The fvad libraries. |  | ||||||
| #  fvad_LIBRARIES_SHARED  The fvad libraries. |  | ||||||
| 
 |  | ||||||
| include(tearoot-helper) |  | ||||||
| include(FindPackageHandleStandardArgs) |  | ||||||
| 
 |  | ||||||
| find_path(fvad_ROOT_DIR |  | ||||||
|         NAMES include/fvad.h |  | ||||||
| 		HINTS ${fvad_ROOT_DIR} ${fvad_ROOT_DIR}/${BUILD_OUTPUT} |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| find_path(fvad_INCLUDE_DIR |  | ||||||
|         NAMES fvad.h |  | ||||||
| 		HINTS ${fvad_ROOT_DIR} ${fvad_ROOT_DIR}/include/ |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| find_library(fvad_LIBRARIES_STATIC |  | ||||||
|         NAMES fvad.lib libfvad.a libfvad.lib |  | ||||||
| 		HINTS ${fvad_ROOT_DIR} ${fvad_ROOT_DIR}/lib |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| find_library(fvad_LIBRARIES_SHARED |  | ||||||
|         NAMES libfvad.dll libfvad.so |  | ||||||
| 		HINTS ${fvad_ROOT_DIR} ${fvad_ROOT_DIR}/lib |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| find_package_handle_standard_args(fvad DEFAULT_MSG |  | ||||||
|         fvad_INCLUDE_DIR |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| mark_as_advanced( |  | ||||||
|         fvad_ROOT_DIR |  | ||||||
|         fvad_INCLUDE_DIR |  | ||||||
|         fvad_LIBRARIES_STATIC |  | ||||||
|         fvad_LIBRARIES_SHARED |  | ||||||
| ) |  | ||||||
| @ -1,67 +0,0 @@ | |||||||
| # - Try to find unbound include dirs and libraries |  | ||||||
| # |  | ||||||
| # Usage of this module as follows: |  | ||||||
| # |  | ||||||
| #     find_package(unbound) |  | ||||||
| # |  | ||||||
| # Variables used by this module, they can change the default behaviour and need |  | ||||||
| # to be set before calling find_package: |  | ||||||
| # |  | ||||||
| #  unbound_ROOT_DIR          Set this variable to the root installation of |  | ||||||
| #                            unbound if the module has problems finding the |  | ||||||
| #                            proper installation path. |  | ||||||
| # |  | ||||||
| # Variables defined by this module: |  | ||||||
| # |  | ||||||
| #  unbound_FOUND             System has unbound, include and library dirs found |  | ||||||
| #  unbound_INCLUDE_DIR       The unbound include directories. |  | ||||||
| #  unbound_LIBRARIES_STATIC  The unbound libraries. |  | ||||||
| #  unbound_LIBRARIES_SHARED  The unbound libraries. |  | ||||||
| 
 |  | ||||||
| include(tearoot-helper) |  | ||||||
| include(FindPackageHandleStandardArgs) |  | ||||||
| 
 |  | ||||||
| function(resolve_unbound) |  | ||||||
| 	find_path(unbound_ROOT_DIR |  | ||||||
| 			NAMES include/unbound.h include/unbound-event.h |  | ||||||
| 			HINTS ${unbound_ROOT_DIR} ${unbound_ROOT_DIR}/${BUILD_OUTPUT} |  | ||||||
| 	) |  | ||||||
| 
 |  | ||||||
| 	find_path(unbound_INCLUDE_DIR |  | ||||||
| 			NAMES include/unbound.h include/unbound-event.h |  | ||||||
| 			HINTS ${unbound_ROOT_DIR} |  | ||||||
| 	) |  | ||||||
| 
 |  | ||||||
| 	find_library(unbound_LIBRARIES_STATIC |  | ||||||
| 			NAMES libunbound.a unbound.a unbound.lib |  | ||||||
| 			HINTS ${unbound_ROOT_DIR} ${unbound_ROOT_DIR}/lib |  | ||||||
| 	) |  | ||||||
| 	 |  | ||||||
| 	if(unbound_LIBRARIES_STATIC) |  | ||||||
| 		add_library(unbound::static SHARED IMPORTED) |  | ||||||
| 		set_target_properties(unbound::static PROPERTIES |  | ||||||
| 			IMPORTED_LOCATION ${unbound_LIBRARIES_STATIC} |  | ||||||
| 			INTERFACE_INCLUDE_DIRECTORIES ${unbound_INCLUDE_DIR} |  | ||||||
| 		) |  | ||||||
| 	endif() |  | ||||||
| 
 |  | ||||||
| 	find_library(unbound_LIBRARIES_SHARED |  | ||||||
| 			NAMES unbound.dll libunbound.so unbound.so |  | ||||||
| 			HINTS ${unbound_ROOT_DIR} ${unbound_ROOT_DIR}/lib |  | ||||||
| 	) |  | ||||||
| 	 |  | ||||||
| 	if(unbound_LIBRARIES_SHARED) |  | ||||||
| 		add_library(unbound::shared SHARED IMPORTED) |  | ||||||
| 		set_target_properties(unbound::shared PROPERTIES |  | ||||||
| 			IMPORTED_LOCATION ${unbound_LIBRARIES_SHARED} |  | ||||||
| 			INTERFACE_INCLUDE_DIRECTORIES ${unbound_INCLUDE_DIR} |  | ||||||
| 		) |  | ||||||
| 	endif() |  | ||||||
| 	 |  | ||||||
| 	find_package_handle_standard_args(unbound DEFAULT_MSG |  | ||||||
| 			unbound_INCLUDE_DIR |  | ||||||
| 	) |  | ||||||
| endfunction() |  | ||||||
| resolve_unbound() |  | ||||||
| 
 |  | ||||||
| 
 |  | ||||||
| @ -1,19 +0,0 @@ | |||||||
| set(BUILD_OS_TYPE "win32") |  | ||||||
| set(BUILD_OS_ARCH "amd64") |  | ||||||
| 
 |  | ||||||
| SET(TomMath_ROOT_DIR "C:/Users/WolverinDEV/TeaSpeak/third_party/tommath") |  | ||||||
| SET(TomCrypt_ROOT_DIR "C:/Users/WolverinDEV/TeaSpeak/third_party/tomcrypt") |  | ||||||
| SET(DataPipes_ROOT_DIR "C:/Users/WolverinDEV/TeaSpeak/third_party/DataPipes") |  | ||||||
| SET(StringVariable_ROOT_DIR "C:/Users/WolverinDEV/TeaSpeak/third_party/StringVariable") |  | ||||||
| SET(ThreadPool_ROOT_DIR "C:/Users/WolverinDEV/TeaSpeak/third_party/Thread-Pool") |  | ||||||
| SET(ed25519_ROOT_DIR "C:/Users/WolverinDEV/TeaSpeak/third_party/ed25519") |  | ||||||
| SET(Libevent_DIR "C:/Users/WolverinDEV/TeaSpeak/third_party/libevent/out/win32_amd64/cmake") |  | ||||||
| SET(soxr_ROOT_DIR "C:/Users/WolverinDEV/TeaSpeak/third_party/soxr/out/win32_amd64") |  | ||||||
| SET(PortAudio_ROOT_DIR "C:/Users/WolverinDEV/TeaSpeak/third_party/portaudio/out/win32_amd64") |  | ||||||
| SET(fvad_ROOT_DIR "C:/Users/WolverinDEV/TeaSpeak/third_party/libfvad/out/win32_amd64") |  | ||||||
| SET(opus_ROOT_DIR "C:/Users/WolverinDEV/TeaSpeak/third_party/opus/out/win32_amd64") |  | ||||||
| SET(breakpad_ROOT_DIR "C:/Users/WolverinDEV/TeaSpeak/third_party/breakpad") |  | ||||||
| 
 |  | ||||||
| SET(TeaSpeak_SharedLib_ROOT_DIR "C:/Users/WolverinDEV/TeaSpeak/TeaSpeak-SharedLib") |  | ||||||
| 
 |  | ||||||
| set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "C:/Users/WolverinDEV/TeaSpeak/third_party/spdlog/out/win32_amd64") |  | ||||||
| @ -1,33 +0,0 @@ | |||||||
| if (WIN32) |  | ||||||
| 	set(BUILD_OS_TYPE "win32") |  | ||||||
| 	set(BUILD_OS_ARCH "amd64") |  | ||||||
| else() |  | ||||||
| 	set(BUILD_OS_TYPE "linux") |  | ||||||
| 	set(BUILD_OS_ARCH "amd64") |  | ||||||
| endif () |  | ||||||
| 
 |  | ||||||
| if(NOT LIBRARY_PATH OR LIBRARY_PATH STREQUAL "") |  | ||||||
| 	message(FATAL_ERROR "Missing library path") |  | ||||||
| endif() |  | ||||||
| 
 |  | ||||||
| include(tearoot-helper) |  | ||||||
| SET(TomMath_ROOT_DIR "${LIBRARY_PATH}/tommath/${BUILD_OUTPUT}") |  | ||||||
| SET(TomCrypt_ROOT_DIR "${LIBRARY_PATH}/tomcrypt/${BUILD_OUTPUT}") |  | ||||||
| SET(DataPipes_ROOT_DIR "${LIBRARY_PATH}/DataPipes/${BUILD_OUTPUT}") |  | ||||||
| SET(StringVariable_ROOT_DIR "${LIBRARY_PATH}/StringVariable/${BUILD_OUTPUT}") |  | ||||||
| SET(ThreadPool_ROOT_DIR "${LIBRARY_PATH}/Thread-Pool/${BUILD_OUTPUT}") |  | ||||||
| SET(ed25519_ROOT_DIR "${LIBRARY_PATH}/ed25519/${BUILD_OUTPUT}") |  | ||||||
| if(BUILD_OS_TYPE STREQUAL "win32") |  | ||||||
| 	SET(Libevent_DIR "${LIBRARY_PATH}/libevent/${BUILD_OUTPUT}/cmake") |  | ||||||
| else() |  | ||||||
| 	SET(Libevent_DIR "${LIBRARY_PATH}/libevent/${BUILD_OUTPUT}/lib/cmake/libevent/") |  | ||||||
| endif() |  | ||||||
| SET(soxr_ROOT_DIR "${LIBRARY_PATH}/soxr/${BUILD_OUTPUT}") |  | ||||||
| SET(PortAudio_ROOT_DIR "${LIBRARY_PATH}/portaudio/${BUILD_OUTPUT}") |  | ||||||
| SET(fvad_ROOT_DIR "${LIBRARY_PATH}/libfvad/${BUILD_OUTPUT}") |  | ||||||
| SET(opus_ROOT_DIR "${LIBRARY_PATH}/opus/${BUILD_OUTPUT}") |  | ||||||
| SET(breakpad_ROOT_DIR "${LIBRARY_PATH}/breakpad/${BUILD_OUTPUT}") |  | ||||||
| SET(unbound_ROOT_DIR "${LIBRARY_PATH}/unbound/${BUILD_OUTPUT}") |  | ||||||
| SET(TeaSpeak_SharedLib_ROOT_DIR "${LIBRARY_PATH}/../shared/") |  | ||||||
| 
 |  | ||||||
| set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${LIBRARY_PATH}/spdlog/${BUILD_OUTPUT}") |  | ||||||
| @ -1,34 +0,0 @@ | |||||||
| macro(initialize_build_paths) |  | ||||||
| 	if(NOT BUILD_OS_TYPE OR BUILD_OS_TYPE STREQUAL "") |  | ||||||
| 		message(FATAL_ERROR "Missing os build type (BUILD_OS_TYPE). Please define it!") |  | ||||||
| 	endif() |  | ||||||
| 	if(NOT BUILD_OS_ARCH OR BUILD_OS_ARCH STREQUAL "") |  | ||||||
| 		message(FATAL_ERROR "Missing os build arch (BUILD_OS_ARCH). Please define it!") |  | ||||||
| 	endif() |  | ||||||
| 
 |  | ||||||
| 	# Test for valid values |  | ||||||
| 	if(BUILD_OS_TYPE STREQUAL "win32") |  | ||||||
| 		if(BUILD_OS_ARCH STREQUAL "x86") |  | ||||||
| 			message(FATAL_ERROR "We currently not support windows x86") |  | ||||||
| 		elseif(BUILD_OS_ARCH STREQUAL "amd64") |  | ||||||
| 
 |  | ||||||
| 		else() |  | ||||||
| 			message(FATAL_ERROR "Invalid os build arch (${BUILD_OS_ARCH}). Supported OS archs are: amd64, x86") |  | ||||||
| 		endif() |  | ||||||
| 	elseif(BUILD_OS_TYPE STREQUAL "linux") |  | ||||||
| 		if(BUILD_OS_ARCH STREQUAL "x86") |  | ||||||
| 
 |  | ||||||
| 		elseif(BUILD_OS_ARCH STREQUAL "amd64") |  | ||||||
| 
 |  | ||||||
| 		else() |  | ||||||
| 			message(FATAL_ERROR "Invalid os build arch (${BUILD_OS_ARCH}). Supported OS archs are: amd64, x86") |  | ||||||
| 		endif() |  | ||||||
| 	else() |  | ||||||
| 		message(FATAL_ERROR "Invalid os build type (${BUILD_OS_TYPE}). Supported OS types are: linux, win32") |  | ||||||
| 	endif() |  | ||||||
| 
 |  | ||||||
| 	if(NOT BUILD_OUTPUT OR BUILD_OUTPUT STREQUAL "") |  | ||||||
| 		set(BUILD_OUTPUT "/out/${BUILD_OS_TYPE}_${BUILD_OS_ARCH}") |  | ||||||
| 	endif() |  | ||||||
| endmacro() |  | ||||||
| initialize_build_paths() |  | ||||||
							
								
								
									
										3
									
								
								package-lock.json
									
									
									
										generated
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								package-lock.json
									
									
									
										generated
									
									
									
										Normal file
									
								
							| @ -0,0 +1,3 @@ | |||||||
|  | { | ||||||
|  |   "lockfileVersion": 1 | ||||||
|  | } | ||||||
							
								
								
									
										2
									
								
								shared
									
									
									
									
									
								
							
							
								
								
								
								
								
								
									
									
								
							
						
						
									
										2
									
								
								shared
									
									
									
									
									
								
							| @ -1 +1 @@ | |||||||
| Subproject commit c532266cb8b1ba577e063c6ed14a810374c8c84f | Subproject commit 28531523c483ce2d4dd9bfbde8121957c0124f19 | ||||||
							
								
								
									
										5
									
								
								third_party/build.sh
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										5
									
								
								third_party/build.sh
									
									
									
									
										vendored
									
									
								
							| @ -17,8 +17,9 @@ function exec_script() { | |||||||
| 
 | 
 | ||||||
| 	echo -e "Building library with script $color_green${1}$color_normal" | 	echo -e "Building library with script $color_green${1}$color_normal" | ||||||
| 	./${1} | 	./${1} | ||||||
| 	if [[ $? -ne 0 ]]; then | 	_code=$? | ||||||
| 		echo "Failed to build library $name. Status code: $?" | 	if [[ $_code -ne 0 ]]; then | ||||||
|  | 		echo "Failed to build library $name. Status code: $_code" | ||||||
| 		exit 1 | 		exit 1 | ||||||
| 	fi | 	fi | ||||||
| 
 | 
 | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user