Vulkan Example: Fix windows build.

This commit is contained in:
Håvard Mathisen 2016-03-09 17:01:38 +01:00
parent 4cbd316f01
commit 0ceddc29ff

View File

@ -9,7 +9,7 @@ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DVK_PROTOTYPES")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVK_PROTOTYPES") set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVK_PROTOTYPES")
# GLFW # GLFW
set(GLFW_DIR ../../../glfw) set(GLFW_DIR ../../../glfw) # Set this to point to a up-to-date GLFW repo
option(GLFW_BUILD_EXAMPLES "Build the GLFW example programs" OFF) option(GLFW_BUILD_EXAMPLES "Build the GLFW example programs" OFF)
option(GLFW_BUILD_TESTS "Build the GLFW test programs" OFF) option(GLFW_BUILD_TESTS "Build the GLFW test programs" OFF)
option(GLFW_BUILD_DOCS "Build the GLFW documentation" OFF) option(GLFW_BUILD_DOCS "Build the GLFW documentation" OFF)
@ -23,12 +23,12 @@ set(IMGUI_DIR ../../)
include_directories(${IMGUI_DIR}) include_directories(${IMGUI_DIR})
# Libraries # Libraries
if(WIN32) find_library(VULKAN_LIBRARY
set(LIBRARIES "glfw;vulkan-${MAJOR}") NAMES vulkan vulkan-1)
elseif(UNIX) set(LIBRARIES "glfw;${VULKAN_LIBRARY}")
set(LIBRARIES "glfw;vulkan")
else() # Use vulkan headers from glfw:
endif() include_directories(${GLFW_DIR}/deps)
file(GLOB sources *.cpp) file(GLOB sources *.cpp)