diff options
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/linux.conf | 1 | ||||
| -rw-r--r-- | mkspecs/common/msvc-desktop.conf | 1 | ||||
| -rw-r--r-- | mkspecs/common/windows-vulkan.conf | 5 | ||||
| -rw-r--r-- | mkspecs/win32-g++/qmake.conf | 1 | ||||
| -rw-r--r-- | mkspecs/win32-icc/qmake.conf | 1 |
5 files changed, 9 insertions, 0 deletions
diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf index 13916a5646..5e2b5b59eb 100644 --- a/mkspecs/common/linux.conf +++ b/mkspecs/common/linux.conf @@ -35,6 +35,7 @@ QMAKE_LIBS_OPENGL = -lGL QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 QMAKE_LIBS_OPENVG = -lOpenVG QMAKE_LIBS_THREAD = -lpthread +QMAKE_LIBS_VULKAN = QMAKE_INCDIR_WAYLAND = QMAKE_LIBS_WAYLAND_CLIENT = -lwayland-client diff --git a/mkspecs/common/msvc-desktop.conf b/mkspecs/common/msvc-desktop.conf index 0ca27fe4ec..bd9098d7f1 100644 --- a/mkspecs/common/msvc-desktop.conf +++ b/mkspecs/common/msvc-desktop.conf @@ -106,3 +106,4 @@ VCSOLUTION_EXTENSION = .sln VCPROJ_KEYWORD = Qt4VSv1.0 include(windows-gles.conf) +include(windows-vulkan.conf) diff --git a/mkspecs/common/windows-vulkan.conf b/mkspecs/common/windows-vulkan.conf new file mode 100644 index 0000000000..c928a8f315 --- /dev/null +++ b/mkspecs/common/windows-vulkan.conf @@ -0,0 +1,5 @@ +# Pick up the VULKAN_SDK env var set by the LunarG SDK so that the Vulkan +# headers are found out-of-the-box on typical Windows setups. + +QMAKE_INCDIR_VULKAN = $(VULKAN_SDK)\\include +QMAKE_LIBS_VULKAN = diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf index 5f98bd1d03..224c81fb4a 100644 --- a/mkspecs/win32-g++/qmake.conf +++ b/mkspecs/win32-g++/qmake.conf @@ -80,6 +80,7 @@ QMAKE_OBJCOPY = $${CROSS_COMPILE}objcopy QMAKE_NM = $${CROSS_COMPILE}nm -P include(../common/windows-gles.conf) +include(../common/windows-vulkan.conf) include(../common/gcc-base.conf) load(qt_config) diff --git a/mkspecs/win32-icc/qmake.conf b/mkspecs/win32-icc/qmake.conf index 9a86407043..171145690e 100644 --- a/mkspecs/win32-icc/qmake.conf +++ b/mkspecs/win32-icc/qmake.conf @@ -59,5 +59,6 @@ QMAKE_LIB = xilib /NOLOGO DSP_EXTENSION = .dsp include(../common/windows-gles.conf) +include(../common/windows-vulkan.conf) load(qt_config) |