diff --git a/.gitignore b/.gitignore index e3d76fa..1c91954 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ .vs/ bin/ bin-obj/ +build/ # VS Files **.vcxproj** @@ -25,4 +26,4 @@ Makefile **.ini !**/default_gui_layout.ini -CMake/ \ No newline at end of file +CMake/ diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ef5b52..77c02f8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,9 @@ -cmake_minimum_required(VERSION 3.21.2) +cmake_minimum_required(VERSION 3.14) project(Light VERSION 1.0.0) +set(SPIRV_CROSS_ENABLE_TESTS OFF) + add_subdirectory(Dependencies/ShaderConductor) # <-- this project should not use "cxx_standard 17" # directories @@ -42,4 +44,4 @@ target_link_libraries(Mirror Engine) if(MSVC) set_property(DIRECTORY ${CMAE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT Mirror) -endif() \ No newline at end of file +endif() diff --git a/Dependencies/GLAD/CMakeLists.txt b/Dependencies/GLAD/CMakeLists.txt index 419599b..f09b378 100644 --- a/Dependencies/GLAD/CMakeLists.txt +++ b/Dependencies/GLAD/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.21.2) +cmake_minimum_required(VERSION 3.14) if (CMAKE_COMPILER_IS_GNUCC) add_compile_options(-w) @@ -15,4 +15,4 @@ file(GLOB_RECURSE GLAD_HEADERS true ABSOLUTE ${CMAKE_CURRENT_SOURCE_DIR}/include include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/) -add_library(glad STATIC ${GLAD_SOURCES} ${GLAD_HEADERS}) \ No newline at end of file +add_library(glad STATIC ${GLAD_SOURCES} ${GLAD_HEADERS}) diff --git a/Dependencies/stb_image/CMakeLists.txt b/Dependencies/stb_image/CMakeLists.txt index 251aad5..31367c4 100644 --- a/Dependencies/stb_image/CMakeLists.txt +++ b/Dependencies/stb_image/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.21.2) +cmake_minimum_required(VERSION 3.14) if (CMAKE_COMPILER_IS_GNUCC) add_compile_options(-w) @@ -10,4 +10,4 @@ endif() file(GLOB STB_IMAGES_FILES true ABSOLUTE ${CMAKE_CURRENT_SOURCE_DIR}/*) -add_library(stb_image STATIC ${STB_IMAGES_FILES}) \ No newline at end of file +add_library(stb_image STATIC ${STB_IMAGES_FILES}) diff --git a/Engine/CMakeLists.txt b/Engine/CMakeLists.txt index d5cdc0a..b20f605 100644 --- a/Engine/CMakeLists.txt +++ b/Engine/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.21.2) +cmake_minimum_required(VERSION 3.14) if (CMAKE_COMPILER_IS_GNUCC) add_compile_options(-w) @@ -66,4 +66,4 @@ add_custom_command( TARGET Engine POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_BINARY_DIR}/Dependencies/ShaderConductor/Bin/Debug/ShaderConductor.dll - ${CMAKE_BINARY_DIR}/bin/Debug) \ No newline at end of file + ${CMAKE_BINARY_DIR}/bin/Debug) diff --git a/Mirror/CMakeLists.txt b/Mirror/CMakeLists.txt index e9feab4..24865d9 100644 --- a/Mirror/CMakeLists.txt +++ b/Mirror/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.21.2) +cmake_minimum_required(VERSION 3.14) if (CMAKE_COMPILER_IS_GNUCC) add_compile_options(-w) @@ -26,4 +26,4 @@ ${DEPENDENCIES_DIR}stb_image/ file(GLOB_RECURSE MIRROR_FILES true ABSOLUTE ${CMAKE_CURRENT_SOURCE_DIR}/src/* ${CMAKE_CURRENT_SOURCE_DIR}/res/*) source_group(TREE ${MIRROR_DIR} FILES ${MIRROR_FILES}) -add_executable(Mirror ${MIRROR_FILES}) \ No newline at end of file +add_executable(Mirror ${MIRROR_FILES})