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

Remove explicit gpu-gl dependencies

Browse source
This commit is contained in:
Brad Davis 2018-01-13 12:19:07 -08:00
parent 24b83aa0f1
commit c924cbf2a7
9 changed files with 37 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/app/CMakeLists.txt
View file

@ -1,6 +1,6 @@
set(TARGET_NAME native-lib) set(TARGET_NAME native-lib)
setup_hifi_library() setup_hifi_library()
link_hifi_libraries(shared networking gl gpu gpu-gles image fbx render-utils physics entities octree) link_hifi_libraries(shared networking gl gpu image fbx render-utils physics entities octree ${PLATFORM_GL_BACKEND})
target_opengl() target_opengl()
target_bullet() target_bullet()

3
plugins/oculus/CMakeLists.txt
View file

@ -19,9 +19,10 @@ if (WIN32 AND (NOT USE_GLES))
set(TARGET_NAME oculus) set(TARGET_NAME oculus)
setup_hifi_plugin(Multimedia) setup_hifi_plugin(Multimedia)
link_hifi_libraries( link_hifi_libraries(
shared gl gpu gpu-gl controllers ui shared gl gpu controllers ui
plugins ui-plugins display-plugins input-plugins plugins ui-plugins display-plugins input-plugins
audio-client networking render-utils audio-client networking render-utils
${PLATFORM_GL_BACKEND}
) )
include_hifi_library_headers(octree) include_hifi_library_headers(octree)

2
plugins/oculusLegacy/CMakeLists.txt
View file

@ -13,7 +13,7 @@ if (APPLE)
set(TARGET_NAME oculusLegacy) set(TARGET_NAME oculusLegacy)
setup_hifi_plugin() setup_hifi_plugin()
link_hifi_libraries(shared gl gpu gpu-gl plugins ui ui-plugins display-plugins input-plugins midi) link_hifi_libraries(shared gl gpu plugins ui ui-plugins display-plugins input-plugins midi ${PLATFORM_GL_BACKEND})
include_hifi_library_headers(octree) include_hifi_library_headers(octree)

2
plugins/openvr/CMakeLists.txt
View file

@ -13,7 +13,7 @@ if (WIN32 AND (NOT USE_GLES))
setup_hifi_plugin(OpenGL Script Qml Widgets Multimedia) setup_hifi_plugin(OpenGL Script Qml Widgets Multimedia)
link_hifi_libraries(shared gl networking controllers ui link_hifi_libraries(shared gl networking controllers ui
plugins display-plugins ui-plugins input-plugins script-engine plugins display-plugins ui-plugins input-plugins script-engine
audio-client render-utils model gpu gpu-gl render model-networking fbx ktx image procedural) audio-client render-utils model gpu render model-networking fbx ktx image procedural ${PLATFORM_GL_BACKEND})
include_hifi_library_headers(octree) include_hifi_library_headers(octree)

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

@ -4,7 +4,13 @@ AUTOSCRIBE_SHADER_LIB(gpu model render-utils)
setup_hifi_project(Quick Gui OpenGL Script Widgets) setup_hifi_project(Quick Gui OpenGL Script Widgets)
setup_memory_debugger() setup_memory_debugger()
set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/") 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) link_hifi_libraries(
shared networking gl
ktx gpu procedural octree image
model model-networking fbx animation
script-engine render render-utils
${PLATFORM_GL_BACKEND}
)
if (WIN32) if (WIN32)
add_dependency_external_projects(wasapi) add_dependency_external_projects(wasapi)

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

@ -12,7 +12,15 @@ setup_hifi_project(Quick Gui OpenGL)
set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/") set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
# link in the shared libraries # link in the shared libraries
link_hifi_libraries(shared networking model fbx ktx image octree gl gpu gpu-gl render model-networking networking render-utils entities entities-renderer animation audio avatars script-engine physics procedural midi ui) link_hifi_libraries(
shared networking animation
ktx image octree gl gpu
render render-utils
model fbx model-networking
entities entities-renderer audio avatars script-engine
physics procedural midi ui
${PLATFORM_GL_BACKEND}
)
if (WIN32) if (WIN32)
target_link_libraries(${TARGET_NAME} Winmm.lib) target_link_libraries(${TARGET_NAME} Winmm.lib)

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

@ -12,7 +12,15 @@ setup_hifi_project(Quick Gui OpenGL)
set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/") set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
# link in the shared libraries # link in the shared libraries
link_hifi_libraries(shared octree gl gpu gpu-gl render model model-networking networking render-utils fbx entities entities-renderer animation audio avatars script-engine physics ktx image) link_hifi_libraries(
shared networking octree
gl gpu render ktx image animation
model fbx model-networking
render-utils
entities entities-renderer audio avatars
script-engine physics
${PLATFORM_GL_BACKEND}
)
package_libraries_for_deployment() package_libraries_for_deployment()

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

@ -8,7 +8,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
setup_memory_debugger() setup_memory_debugger()
# link in the shared libraries # link in the shared libraries
link_hifi_libraries(render-utils gl gpu gpu-gl shared) link_hifi_libraries(render-utils gl gpu shared ${PLATFORM_GL_BACKEND})
target_link_libraries(${TARGET_NAME} ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(${TARGET_NAME} ${CMAKE_THREAD_LIBS_INIT})
if (WIN32) if (WIN32)

7
tests/shaders/CMakeLists.txt
View file

@ -8,9 +8,12 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
setup_memory_debugger() setup_memory_debugger()
# link in the shared libraries # link in the shared libraries
link_hifi_libraries(shared octree gl gpu gpu-gl model render fbx networking entities link_hifi_libraries(
shared octree gl gpu model render fbx networking entities
script-engine physics script-engine physics
render-utils entities-renderer) render-utils entities-renderer
${PLATFORM_GL_BACKEND}
)
include_directories("${PROJECT_BINARY_DIR}/../../libraries/gpu/") include_directories("${PROJECT_BINARY_DIR}/../../libraries/gpu/")
include_directories("${PROJECT_BINARY_DIR}/../../libraries/render-utils/") include_directories("${PROJECT_BINARY_DIR}/../../libraries/render-utils/")