Skip to content
This repository was archived by the owner on Sep 10, 2022. It is now read-only.

Visual Studio 2017 compiler fixes + VulkanSDK 1.0.65.0 lib path #29

Open
gardell wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Visual Studio 2017 compiler fixes + VulkanSDK 1.0.65.0 lib path #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d330e06
Visual C++ 2017 compiler issue
gardell Nov 27, 2017
97e5668
Update path to VulkanSDK .lib files for VulkanSDK 1.0.65.0
gardell Nov 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sample/cube/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ include_directories(../../vcc-image/include)
include_directories(${GLM_SRC_DIR})
if(NOT VULKAN_SDK_DIR STREQUAL "")
include_directories(${VULKAN_SDK_DIR}/include)
link_directories(${VULKAN_SDK_DIR}/bin)
link_directories(${VULKAN_SDK_DIR}/lib)
endif()

set(SAMPLE_CUBE_SRCS
Expand Down
2 changes: 1 addition & 1 deletion sample/heightmap/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ include_directories(${CPP_FRP_SRC_DIR}/cpp-frp/include)
include_directories(${GLM_SRC_DIR})
if(NOT VULKAN_SDK_DIR STREQUAL "")
include_directories(${VULKAN_SDK_DIR}/include)
link_directories(${VULKAN_SDK_DIR}/bin)
link_directories(${VULKAN_SDK_DIR}/lib)
endif()

set(SAMPLE_HEIGHTMAP_SRCS
Expand Down
2 changes: 1 addition & 1 deletion sample/lighting/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ include_directories(${CMAKE_BINARY_DIR}/vcc/include)
include_directories(${GLM_SRC_DIR})
if(NOT VULKAN_SDK_DIR STREQUAL "")
include_directories(${VULKAN_SDK_DIR}/include)
link_directories(${VULKAN_SDK_DIR}/bin)
link_directories(${VULKAN_SDK_DIR}/lib)
endif()

set(SAMPLE_LIGHTING_INCLUDES
Expand Down
2 changes: 1 addition & 1 deletion sample/normal-mapping-and-cube-texture/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ include_directories(../../vcc-image/include)
include_directories(${GLM_SRC_DIR})
if(NOT VULKAN_SDK_DIR STREQUAL "")
include_directories(${VULKAN_SDK_DIR}/include)
link_directories(${VULKAN_SDK_DIR}/bin)
link_directories(${VULKAN_SDK_DIR}/lib)
endif()

set(SAMPLE_NORMAL_MAPPING_AND_CUBE_TEXTURE_SRCS
Expand Down
2 changes: 1 addition & 1 deletion sample/openvr/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ include_directories(${GLM_SRC_DIR})
include_directories(${OPENVR_SOURCE_DIR}/headers)
if(NOT VULKAN_SDK_DIR STREQUAL "")
include_directories(${VULKAN_SDK_DIR}/include)
link_directories(${VULKAN_SDK_DIR}/bin)
link_directories(${VULKAN_SDK_DIR}/lib)
endif()

set(SAMPLE_OPENVR_INCLUDES
Expand Down
11 changes: 6 additions & 5 deletions sample/openvr/src/openvr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,13 +480,13 @@ int main(int argc, char **argv) {

typedef thread_safe_map_with_callback<uint32_t, instance_type>
instance_map_type;
instance_map_type instances([&](const instance_map_type::iterator &begin,
const instance_map_type::iterator &end) {
auto callback = [&](const instance_map_type::iterator &begin,
const instance_map_type::iterator &end) {
std::vector<type::supplier<const vcc::command_buffer::command_buffer_type>>
command_buffers;
command_buffers.reserve(std::distance(begin, end));
std::transform(begin, end, std::back_inserter(command_buffers),
[](instance_map_type::value_type &value) {
[](instance_map_type::value_type &value) {
return std::ref(value.second.command_buffer);
});
shared_command_buffer =
Expand All @@ -496,7 +496,8 @@ int main(int argc, char **argv) {
update_matrix_callback = recalculate_update_matrix_callback(
mat4Projection, begin, end);

});
};
instance_map_type instances(callback);

const VkViewport viewports[] = {
vr_instance.get_viewport(0, 0, 1), vr_instance.get_viewport(1, 0, 1) };
Expand Down Expand Up @@ -544,4 +545,4 @@ int main(int argc, char **argv) {
break;
}
});
}
}
2 changes: 1 addition & 1 deletion sample/teapot/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ include_directories(../../vcc-image/include)
include_directories(${GLM_SRC_DIR})
if(NOT VULKAN_SDK_DIR STREQUAL "")
include_directories(${VULKAN_SDK_DIR}/include)
link_directories(${VULKAN_SDK_DIR}/bin)
link_directories(${VULKAN_SDK_DIR}/lib)
endif()

set(SAMPLE_TEAPOT_INCLUDES
Expand Down
2 changes: 1 addition & 1 deletion vcc-test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ include_directories(${gtest_SOURCE_DIR}/include)
include_directories(${GLM_SRC_DIR})
if(NOT VULKAN_SDK_DIR STREQUAL "")
include_directories(${VULKAN_SDK_DIR}/include)
link_directories(${VULKAN_SDK_DIR}/bin)
link_directories(${VULKAN_SDK_DIR}/lib)
endif()

set(VCC_TEST_SRCS
Expand Down
2 changes: 1 addition & 1 deletion vcc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ include_directories(../types/include)
include_directories(${GLM_SRC_DIR})
if(NOT VULKAN_SDK_DIR STREQUAL "")
include_directories(${VULKAN_SDK_DIR}/include)
link_directories(${VULKAN_SDK_DIR}/bin)
link_directories(${VULKAN_SDK_DIR}/lib)
endif()
if(DEFINED ANDROID_NDK)
include_directories(${ANDROID_NDK}/sources/android/native_app_glue/)
Expand Down