Link Qt with statically built ANGLE.
This commit is contained in:
parent
32ec2b8db2
commit
fc4d02573c
2 changed files with 17 additions and 1 deletions
16
external/qt/CMakeLists.txt
vendored
16
external/qt/CMakeLists.txt
vendored
|
|
@ -157,6 +157,22 @@ else()
|
||||||
foreach (lib ${qt_libs})
|
foreach (lib ${qt_libs})
|
||||||
list(APPEND qt_libs_list "${qt_loc}/${lib}${qt_lib_suffix}")
|
list(APPEND qt_libs_list "${qt_loc}/${lib}${qt_lib_suffix}")
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
|
target_include_directories(external_qt
|
||||||
|
INTERFACE
|
||||||
|
${libs_loc}/angle/include
|
||||||
|
)
|
||||||
|
set(angle_libs_loc ${libs_loc}/angle/out/$<IF:$<CONFIG:Debug>,Debug,Release>/obj)
|
||||||
|
target_link_libraries(external_qt
|
||||||
|
INTERFACE
|
||||||
|
${angle_libs_loc}/libANGLE_static.lib
|
||||||
|
${angle_libs_loc}/libGLESv2_static.lib
|
||||||
|
${angle_libs_loc}/libEGL_static.lib
|
||||||
|
d3d9.lib
|
||||||
|
d3d11.lib
|
||||||
|
dxgi.lib
|
||||||
|
dxguid.lib
|
||||||
|
)
|
||||||
elseif (APPLE)
|
elseif (APPLE)
|
||||||
if (NOT build_osx)
|
if (NOT build_osx)
|
||||||
set(qt_libs
|
set(qt_libs
|
||||||
|
|
|
||||||
2
external/qt/package.cmake
vendored
2
external/qt/package.cmake
vendored
|
|
@ -12,7 +12,7 @@ if (NOT DESKTOP_APP_USE_PACKAGED)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
set(qt_loc ${libs_loc}/Qt-${qt_version})
|
set(qt_loc ${libs_loc}/Al-${qt_version})
|
||||||
else()
|
else()
|
||||||
set(qt_loc /usr/local/desktop-app/Qt-${qt_version})
|
set(qt_loc /usr/local/desktop-app/Qt-${qt_version})
|
||||||
endif()
|
endif()
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue