Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-07 10:02:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updating all wasapi dependencies

Browse source
This commit is contained in:
luiscuenca 2017-10-27 13:38:13 -07:00
parent 76223aa06f
commit bda63e38a9
10 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
domain-server/CMakeLists.txt
View file

@ -44,7 +44,6 @@ if (UNIX)
endif ()
if (WIN32)
add_dependency_external_projects(wasapi)
package_libraries_for_deployment()
endif ()

1
tests/controllers/CMakeLists.txt
View file

@ -19,6 +19,7 @@ if (WIN32)
endif()
if (WIN32)
target_link_libraries(${TARGET_NAME} Winmm.lib)
add_dependency_external_projects(wasapi)
endif()
package_libraries_for_deployment()

4
tests/entities/CMakeLists.txt
View file

@ -9,4 +9,8 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
# link in the shared libraries
link_hifi_libraries(entities avatars shared octree gpu model fbx networking animation audio gl)
if (WIN32)
add_dependency_external_projects(wasapi)
endif ()
package_libraries_for_deployment()

5
tests/gpu-test/CMakeLists.txt
View file

@ -5,6 +5,11 @@ setup_hifi_project(Quick Gui OpenGL Script Widgets)
setup_memory_debugger()
set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
link_hifi_libraries(networking gl gpu gpu-gl procedural shared fbx model model-networking animation script-engine render render-utils octree image ktx)
if (WIN32)
add_dependency_external_projects(wasapi)
endif ()
package_libraries_for_deployment()
target_nsight()

5
tests/qt59/CMakeLists.txt
View file

@ -11,7 +11,12 @@ setup_memory_debugger()
setup_hifi_project(Gui)
set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
# link in the shared libraries
link_hifi_libraries(shared networking)
if (WIN32)
add_dependency_external_projects(wasapi)
endif()
package_libraries_for_deployment()

3
tests/recording/CMakeLists.txt
View file

@ -6,6 +6,7 @@ setup_memory_debugger()
link_hifi_libraries(shared recording)
if (WIN32)
target_link_libraries(${TARGET_NAME} Winmm.lib)
add_dependency_external_projects(wasapi)
endif()
package_libraries_for_deployment()
@ -17,4 +18,4 @@ package_libraries_for_deployment()
#
# package_libraries_for_deployment()
#endmacro ()
#setup_hifi_testcase()
#setup_hifi_testcase()

1
tests/render-perf/CMakeLists.txt
View file

@ -16,6 +16,7 @@ link_hifi_libraries(shared networking model fbx ktx image octree gl gpu gpu-gl r
if (WIN32)
target_link_libraries(${TARGET_NAME} Winmm.lib)
add_dependency_external_projects(wasapi)
endif()
package_libraries_for_deployment()

3
tests/render-texture-load/CMakeLists.txt
View file

@ -26,7 +26,8 @@ target_include_directories(${TARGET_NAME} SYSTEM PUBLIC ${QUAZIP_INCLUDE_DIRS})
target_link_libraries(${TARGET_NAME} ${QUAZIP_LIBRARIES})
if (WIN32)
add_paths_to_fixup_libs(${QUAZIP_DLL_PATH})
add_paths_to_fixup_libs(${QUAZIP_DLL_PATH})
add_dependency_external_projects(wasapi)
endif ()

4
tests/render-utils/CMakeLists.txt
View file

@ -11,4 +11,8 @@ setup_memory_debugger()
link_hifi_libraries(render-utils gl gpu gpu-gl shared)
target_link_libraries(${TARGET_NAME} ${CMAKE_THREAD_LIBS_INIT})
if (WIN32)
add_dependency_external_projects(wasapi)
endif ()
package_libraries_for_deployment()

4
tests/shaders/CMakeLists.txt
View file

@ -17,4 +17,8 @@ include_directories("${PROJECT_BINARY_DIR}/../../libraries/render-utils/")
include_directories("${PROJECT_BINARY_DIR}/../../libraries/entities-renderer/")
include_directories("${PROJECT_BINARY_DIR}/../../libraries/model/")
if (WIN32)
add_dependency_external_projects(wasapi)
endif ()
package_libraries_for_deployment()