Squash project setup refactor

openVulkanoCpp/Base/Version.hpp

@@ -8,6 +8,7 @@
 
 #include <cstdint>
 #include <string>
+#include <string_view>
 #include <vector>
 
 namespace OpenVulkano

openVulkanoCpp/CMakeLists.txt

@@ -0,0 +1,89 @@
+cmake_minimum_required(VERSION 3.28 FATAL_ERROR)
+
+if(NOT IOS)
+    SetOutputDirs("${CMAKE_SOURCE_DIR}/bin")
+endif()
+
+set(BASH_EXECUTABLE "" CACHE FILEPATH "Path to bash executable")
+if ("${BASH_EXECUTABLE}" STREQUAL "")
+    find_program(BASH_PROGRAM bash NO_CACHE REQUIRED)
+    set(BASH_EXECUTABLE ${BASH_PROGRAM} CACHE FILEPATH "Path to bash executable" FORCE)
+endif()
+set(ROOT_FOLDER ${CMAKE_SOURCE_DIR})
+set(SHADER_OUTPUT_DEST ${CMAKE_BINARY_DIR}/GeneratedShaderData)
+configure_file(${CMAKE_SOURCE_DIR}/cmake/TryCompileShaders.cmake.in ${CMAKE_BINARY_DIR}/TryCompileShaders.cmake @ONLY)
+execute_process(COMMAND ${BASH_EXECUTABLE} CompileShaders.sh "${SHADER_OUTPUT_DEST}" WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/Scripts)
+file(GLOB GENERATED_SHADER_SOURCES "${SHADER_OUTPUT_DEST}/*")
+
+if(IOS)
+    set(CMAKE_Swift_LANGUAGE_VERSION 5.0)
+    enable_language(Swift)
+    file(GLOB_RECURSE sources CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/*.mm" "${CMAKE_CURRENT_SOURCE_DIR}/*.m" "${CMAKE_CURRENT_SOURCE_DIR}/*.c" "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/*.swift")
+
+    add_library(openVulkanoCpp STATIC main.m ${resources} ${GENERATED_SHADER_SOURCES})
+else()
+    file(GLOB_RECURSE sources CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/*.h" "${CMAKE_CURRENT_SOURCE_DIR}/*.c" "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp" "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp")
+    file(GLOB SHADER_SRC_FILES ${CMAKE_CURRENT_SOURCE_DIR}/Shader/*)
+    list(FILTER SHADER_SRC_FILES EXCLUDE REGEX ".*\\.(hpp|cpp)$")
+    add_library(openVulkanoCpp STATIC main.cpp ${SHADER_SRC_FILES} ${GENERATED_SHADER_SOURCES})
+    if (MSVC)
+        set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+        source_group("Shaders" FILES ${SHADER_SRC_FILES})
+    endif()
+endif()
+
+FilterPlatformPaths(sources)
+SetWarningSettings(openVulkanoCpp)
+SetGlmDefines(openVulkanoCpp)
+
+target_sources(openVulkanoCpp PRIVATE ${sources})
+target_include_directories(openVulkanoCpp PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${SHADER_OUTPUT_DEST})
+
+# Setup IOS
+if(IOS)
+    set(APP_BUNDLE_IDENTIFIER "eu.georgh93.openVulkano")
+    set(MACOSX_BUNDLE_INFO_STRING ${APP_BUNDLE_IDENTIFIER})
+    set(MACOSX_BUNDLE_GUI_IDENTIFIER ${APP_BUNDLE_IDENTIFIER})
+    set(MACOSX_BUNDLE_BUNDLE_NAME ${APP_BUNDLE_IDENTIFIER})
+
+    set(CMAKE_OSX_DEPLOYMENT_TARGET "14.1") # The used ARKit features are only available starting with iOS 14
+
+    LinkAppleFrameworks(openVulkanoCpp)
+endif ()
+
+if (WIN32)
+    # Ws2
+    target_link_libraries(openVulkanoCpp PRIVATE Ws2_32)
+    
+    set(CURL_STATIC_LIBS ${CMAKE_BINARY_DIR}/deps_curl/deps_curl)
+    file(GLOB_RECURSE LIBS "${CURL_STATIC_LIBS}/*.lib")
+    target_link_libraries(openVulkanoCpp PRIVATE ${LIBS})
+endif ()
+
+SetupVulkan(openVulkanoCpp)
+SetShaderDependency(openVulkanoCpp 
+                    ${CMAKE_CURRENT_SOURCE_DIR}/Shader
+                    ${SHADER_OUTPUT_DEST})
+
+if (NOT ANDROID AND NOT IOS)
+    target_link_libraries(openVulkanoCpp PUBLIC glfw pugixml)
+    target_link_libraries(openVulkanoCpp PUBLIC ftxui::screen ftxui::dom ftxui::component)
+endif()
+
+list(APPEND CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR}/deps/INSTALL)
+
+target_link_libraries(openVulkanoCpp PUBLIC magic_enum yaml-cpp fmt spdlog glm pugixml stb eigen utf8cpp imgui_internal TracyClient stud-uuid ryml unordered_dense Boost::regex)
+LinkCurl(openVulkanoCpp)
+
+add_compile_definitions(LIBARCHIVE_STATIC)
+add_compile_definitions(NOMINMAX)
+
+add_compile_definitions("DEBUG=$<CONFIG:Debug>")
+
+SetGlmDefines(openVulkanoCpp)
+
+LinkAssimp(openVulkanoCpp)
+LinkLibArchive(openVulkanoCpp)
+LinkLibJpegTurbo(openVulkanoCpp)
+
+set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT openVulkanoCpp)

openVulkanoCpp/Host/GLFW/WindowGLFW.cpp

@@ -18,6 +18,7 @@ namespace OpenVulkano::GLFW
 	{
 		if (window)
 		{
+			inputProvider.Close();
 			Close();
 		}
 	}