Merged personal fork with upstream

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.16)
 
 set(PREMAKE_BUILD_TYPES "dbg" "rel")
 get_property(multi_config GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)

CMakePresets.json

@@ -0,0 +1,25 @@
+{
+  "version": 3,
+  "configurePresets": [
+    {
+      "name": "mingw",
+      "generator": "Ninja",
+      "binaryDir": "${sourceDir}/build/mingw-x64",
+      "cacheVariables": {
+        "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
+        "VCPKG_DEFAULT_TRIPLET": "x64-windows-mingw",
+        "VCPKG_INSTALL_OPTIONS": "--x-buildtrees-root=I:/btree"
+      }
+    },
+    {
+      "name": "MSVC",
+      "generator": "Ninja",
+      "binaryDir": "${sourceDir}/build/msvc-x64",
+      "cacheVariables": {
+        "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
+        "VCPKG_DEFAULT_TRIPLET": "x64-windows",
+        "VCPKG_INSTALL_OPTIONS": "--x-buildtrees-root=I:/btree"
+      }
+    }
+  ]
+}

Sandbox/CMakeLists.txt

@@ -1,17 +1,34 @@
-cmake_minimum_required(VERSION 3.24)
-project(Sandbox)
-
-message("Loading Sandbox...")
-
-
-add_executable(Sandbox
-    main.cpp
-)
-
-target_include_directories(Sandbox
-    PRIVATE ${CMAKE_SOURCE_DIR}/Vane
-)
-
-target_link_libraries(Sandbox PRIVATE
-    Vane
+cmake_minimum_required(VERSION 3.24)
+project(Sandbox)
+
+message("Loading Sandbox...")
+
+
+add_executable(Sandbox
+    main.cpp
+)
+
+target_include_directories(Sandbox
+    PRIVATE ${CMAKE_SOURCE_DIR}/Vane
+)
+
+target_link_libraries(Sandbox PRIVATE
+    Vane
+)
+cmake_minimum_required(VERSION 3.24)
+project(Sandbox)
+
+message("Loading Sandbox...")
+
+
+add_executable(Sandbox
+    main.cpp
+)
+
+target_include_directories(Sandbox
+    PRIVATE ${CMAKE_SOURCE_DIR}/Vane
+)
+
+target_link_libraries(Sandbox PRIVATE
+    Vane
 )

Vane/CMakeLists.txt

@@ -0,0 +1,34 @@
+cmake_minimum_required(VERSION 3.24)
+project(Vane CXX)
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_STANDARD_REQUIRED ON)
+
+find_package(Vulkan REQUIRED)
+find_package(VulkanHeaders CONFIG)
+# find_package(VulkanMemoryAllocator CONFIG REQUIRED)
+find_package(fmt CONFIG REQUIRED)
+find_package(SDL2 CONFIG REQUIRED)
+find_package(glfw3 CONFIG REQUIRED)
+find_package(glm CONFIG REQUIRED)
+find_package(glad CONFIG REQUIRED)
+
+add_library(Vane STATIC
+        entry.cpp
+        entry.h
+)
+
+set_target_properties(Vane PROPERTIES LINKER_LANGUAGE CXX)
+
+target_link_libraries(Vane PRIVATE
+    fmt::fmt
+
+    Vulkan::Vulkan
+    Vulkan::Headers
+    # GPUOpen::VulkanMemoryAllocator
+
+    $<TARGET_NAME_IF_EXISTS:SDL2::SDL2main>
+    $<IF:$<TARGET_EXISTS:SDL2::SDL2>,SDL2::SDL2,SDL2::SDL2-static>
+)
+
+message("Loading Vane...")

VaneEditor/CMakeLists.txt

@@ -0,0 +1,50 @@
+cmake_minimum_required(VERSION 3.24)
+project(VaneEditor LANGUAGES CXX)
+
+message("Loading Vane Editor...")
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+find_package(Qt6 REQUIRED COMPONENTS
+    Widgets
+)
+
+qt_standard_project_setup()
+
+qt_add_executable(VaneEditor 
+#    MACOSX_BUNDLE WIN32
+    main.cpp    
+)
+
+target_include_directories(VaneEditor
+    PRIVATE ${CMAKE_SOURCE_DIR}/Vane
+)
+
+target_link_libraries(
+    VaneEditor PRIVATE
+    Vane
+    Qt6::Widgets
+)
+
+if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+    find_program(TOOL_WINDEPLOYQT NAMES windeployqt.debug.bat)
+else()
+    find_program(TOOL_WINDEPLOYQT NAMES windeployqt)
+endif()
+
+add_custom_command(TARGET VaneEditor POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E echo "Configuring Qt6 platform..."
+        COMMAND ${TOOL_WINDEPLOYQT}
+        $<TARGET_FILE:VaneEditor>
+        COMMENT "Running windeployqt..."
+)
+
+#set_target_properties(VaneEditor PROPERTIES
+#    WIN32_EXECUTABLE ON
+#    MACOSX_BUNDLE ON
+#)
+

cmake/.cmake-format.yaml

@@ -0,0 +1,45 @@
+format:
+  command_case: lower
+  dangle_parens: true
+  line_ending: windows
+  line_width: 120
+  max_pargs_hwrap: 3
+  separate_ctrl_name_with_space: false
+  separate_fn_name_with_space: false
+  tab_size: 4
+  use_tabchars: false
+
+parse:
+  additional_commands:
+    file:
+      pargs:
+        flags: [
+          'ARCHIVE_EXTRACT'
+        ]
+      kwargs:
+        INPUT: 1
+        DESTINATION: 1
+
+markup:
+  bullet_char: "*"
+  enable_markup: false
+  enum_char: .
+
+lint:
+  argument_var_pattern: '([A-Z][A-Z0-9_]+|[a-z_][a-z0-9_]+)'
+  local_var_pattern: '[A-Z][A-Z0-9_]+'
+  max_statements: 60
+  disabled_codes:
+    # Disable "Line too long", the current documentation tables have long lines.
+    - C0301
+
+    # Disable "Wrong line ending (unix)". See https://github.com/cheshirekow/cmake_format/issues/273
+    - C0327
+
+    # Disable "Empty docstring on function or macro declaration". CMakeLang doesn't appear to handle bracket comments
+    - C0112
+
+encode:
+  emit_byteorder_mark: false
+  input_encoding: utf-8
+  output_encoding: utf-8