Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 20:08:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #12639 from SamGondelman/aa

Browse source 
Use correct platform-specific gpu library
This commit is contained in:
Sam Gateau 2018-03-20 14:47:26 -07:00 committed by GitHub
commit 4341347148
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/oculus/CMakeLists.txt
View file

@ -19,7 +19,7 @@ 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 task gl gpu gpu-gl controllers ui qml shared task gl gpu ${PLATFORM_GL_BACKEND} controllers ui qml
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} ${PLATFORM_GL_BACKEND}

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

@ -14,7 +14,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
# link in the shared libraries # link in the shared libraries
link_hifi_libraries( link_hifi_libraries(
shared task networking animation shared task networking animation
ktx image octree gl gpu gpu-gl ktx image octree gl gpu ${PLATFORM_GL_BACKEND}
render render-utils render render-utils
graphics fbx model-networking graphics-scripting graphics fbx model-networking graphics-scripting
entities entities-renderer audio avatars script-engine entities entities-renderer audio avatars script-engine