all static

Author: MathewBensonCode

.github/workflows/job-cmakebuild-linux.yml

@@ -34,7 +34,7 @@ jobs:
     - name: Update the list of packages after we added packages.microsoft.com
       run: sudo apt-get update
     - name: Install development library
-      run: sudo apt-get install libasound2-dev libgl1-mesa-dev libpulse-dev libdbus-1-dev libx11-dev libxcursor-dev libxext-dev libxi-dev libxinerama-dev libxrandr-dev libxss-dev libxt-dev libxxf86vm-dev cmake apt-transport-https software-properties-common gcc g++ powershell clang-format-20 libwayland-dev libxkbcommon-dev libassimp-dev libfmt-dev libstb-dev libglfw3-dev libspdlog-dev libyaml-cpp-dev nlohmann-json3-dev libcli11-dev libspirv-cross-c-shared-dev spirv-tools glslang-dev glslang-tools dotnet-runtime-8.0 libgtest-dev
+      run: sudo apt-get install libasound2-dev libgl1-mesa-dev libpulse-dev libdbus-1-dev libx11-dev libxcursor-dev libxext-dev libxi-dev libxinerama-dev libxrandr-dev libxss-dev libxt-dev libxxf86vm-dev cmake apt-transport-https software-properties-common gcc g++ powershell clang-format-20 libwayland-dev libxkbcommon-dev dotnet-sdk-8.0
 
     - name: CMake Build
       run: .\Scripts\BuildEngine.ps1 -Configurations ${{inputs.configuration}}

.github/workflows/job-cmakebuild-macOS.yml

@@ -23,9 +23,6 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Install Dependencies
-        run: brew install vulkan-headers vulkan-loader assimp spirv-headers spirv-tools spirv-cross glslang glfw glew yaml-cpp spdlog googletest
-
       - name: CMake Build
         run: .\Scripts\BuildEngine.ps1 -Configurations ${{inputs.configuration}} -Architecture ${{inputs.architecture}} -RunClangFormat 0
         shell: pwsh

.github/workflows/job-cmakebuild-windows.yml

@@ -5,14 +5,6 @@ name: Windows Build Workflow
 permissions:
   packages: write
 
-env: 
-  USERNAME: mathewbensoncode
-  VCPKG_EXE: ${{ github.workspace }}/vcpkg/vcpkg
-  FEED_URL: https://nuget.pkg.github.com/mathewbensoncode/index.json
-  VCPKG_BINARY_SOURCES: "clear;nuget,https://nuget.pkg.github.com/mathewbensoncode/index.json,readwrite"
-  VCPKG_ROOT: ${{ github.workspace }}/vcpkg
-  CMAKE_TOOLCHAIN_FILE: ${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake
-
 on:
   workflow_call:
     inputs:
@@ -31,28 +23,6 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Install vcpkg
-        shell: pwsh
-        run: git clone --depth=1 https://github.com/Microsoft/vcpkg ${{github.workspace}}/vcpkg
-
-      - name: Bootstrap vcpkg
-        shell: pwsh
-        run: ${{ github.workspace }}/vcpkg/bootstrap-vcpkg.bat
-
-      - name: Add NuGet sources
-        shell: pwsh
-        run: |
-          .$(${{ env.VCPKG_EXE }} fetch nuget) `
-          sources add `
-          -Source "${{ env.FEED_URL }}" `
-          -StorePasswordInClearText `
-          -Name GitHubPackages `
-          -UserName "${{ env.USERNAME }}" `
-          -Password "${{ secrets.GITHUB_TOKEN }}"
-          .$(${{ env.VCPKG_EXE }} fetch nuget) `
-          setapikey "${{ secrets.GITHUB_TOKEN }}" `
-          -Source "${{ env.FEED_URL }}"
-
       - name: CMake Build
         run: .\Scripts\BuildEngine.ps1 -Configurations ${{inputs.configuration}} -RunClangFormat 0
         shell: pwsh

CMakePresets.json

@@ -13,6 +13,7 @@
                 "CMAKE_CXX_STANDARD": "20",
                 "CMAKE_CXX_STANDARD_REQUIRED": "ON",
                 "CMAKE_CXX_EXTENSIONS": "OFF",
+                "BUILD_SHARED_LIBS": "OFF",
                 "FETCHCONTENT_QUIET": "OFF",
 
                 "VULKAN_HEADERS_ENABLE_INSTALL": "ON",
@@ -52,7 +53,8 @@
                 "GLSLANG_ENABLE_INSTALL": "ON",
                 "ALLOW_EXTERNAL_SPIRV_TOOLS": "ON",
 
-                "SPIRV_CROSS_ENABLE_TESTS": "OFF"
+                "SPIRV_CROSS_ENABLE_TESTS": "OFF",
+                "CMAKE_POLICY_VERSION_MINIMUM": "3.5"
             }
         },
         {
@@ -63,6 +65,7 @@
             "binaryDir": "Result.Windows.x64.MultiConfig",
             "architecture": "x64",
             "cacheVariables": {
+                "CMAKE_INSTALL_PREFIX": "Result.Windows.x64.MultiConfig",
                 "CMAKE_CONFIGURATION_TYPES": "Debug"
             }
 
@@ -84,6 +87,7 @@
             "generator": "Xcode",
             "cacheVariables": {
                 "BUILD_FRAMEWORK": "ON",
+                "CMAKE_INSTALL_PREFIX": "Result.Darwin.x64.Debug",
                 "CMAKE_CONFIGURATION_TYPES": "Debug"
             }
         },
@@ -94,6 +98,7 @@
             "binaryDir": "Result.Darwin.x64.Release",
             "cacheVariables": {
                 "CMAKE_BUILD_TYPE": "Release",
+                "CMAKE_INSTALL_PREFIX": "Result.Darwin.x64.Release",
                 "CMAKE_CONFIGURATION_TYPES": "Release"
             }
         },
@@ -102,22 +107,31 @@
             "name": "Darwin_arm64_Debug",
             "inherits": "Darwin_x64_Debug",
             "binaryDir": "Result.Darwin.arm64.Debug",
-            "displayName": "Darwin ARM XCode Debug"
+            "displayName": "Darwin ARM XCode Debug",
+            "cacheVariables": {
+                "CMAKE_INSTALL_PREFIX": "Result.Darwin.arm64.Debug"
+            }
         },
 
         {
             "name": "Darwin_arm64_Release",
             "inherits": "Darwin_x64_Release",
             "binaryDir": "Result.Darwin.arm64.Release",
-            "displayName": "Darwin ARM XCode Release"
+            "displayName": "Darwin ARM XCode Release",
+            "cacheVariables": {
+                "CMAKE_INSTALL_PREFIX": "Result.Darwin.arm64.Release"
+            }
         },
 
         {
             "name": "Linux_x64_Debug",
             "inherits": "BaseOptions",
             "displayName": "Linux Ninja Debug",
             "binaryDir": "Result.Linux.x64.Debug",
-            "generator": "Ninja"
+            "generator": "Ninja",
+            "cacheVariables": {
+                "CMAKE_INSTALL_PREFIX": "Result.Linux.x64.Debug"
+            }
         },
         {
             "name": "Linux_x64_Release",
@@ -126,6 +140,7 @@
             "binaryDir": "Result.Linux.x64.Release",
             "generator": "Ninja",
             "cacheVariables": {
+                "CMAKE_INSTALL_PREFIX": "Result.Linux.x64.Release",
                 "CMAKE_BUILD_TYPE": "Release"
             }
         }

Obelisk/CMakeLists.txt

@@ -9,6 +9,10 @@ project (Obelisk
 set (CMAKE_CXX_STANDARD_REQUIRED ON)
 set	(CMAKE_CXX_STANDARD 20)
 
+
+list( APPEND CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib )
+
+
 set (TARGET_NAME Obelisk)
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
@@ -42,15 +46,12 @@ target_compile_definitions(${TARGET_NAME}
         _UNICODE
 )
 
-target_link_libraries(${TARGET_NAME} PRIVATE
+target_link_libraries(${TARGET_NAME} PUBLIC
     tetragrama
     imported::External_obeliskLibs
 )
 
-install(DIRECTORY ../Resources/Editor DESTINATION bin)
-
 install(TARGETS ${TARGET_NAME} 
-    RUNTIME DESTINATION bin/Editor
+    DESTINATION bin/Editor
 )
 
-install(DIRECTORY ../Resources/Shaders DESTINATION bin/Editor)

dependencies.cmake

@@ -4,8 +4,7 @@ FetchContent_Declare(
   fmt
   GIT_REPOSITORY https://github.com/fmtlib/fmt.git
   GIT_SHALLOW TRUE
-  FIND_PACKAGE_ARGS CONFIG 
-  )
+    )
 
 FetchContent_Declare(
   imgui
@@ -34,42 +33,42 @@ FetchContent_Declare(
   glfw3
   GIT_REPOSITORY https://github.com/glfw/glfw.git
   GIT_SHALLOW TRUE
-  FIND_PACKAGE_ARGS CONFIG 
+   
   )
 
 FetchContent_Declare(
   spdlog
   GIT_REPOSITORY https://github.com/gabime/spdlog.git
   GIT_SHALLOW TRUE
-  FIND_PACKAGE_ARGS CONFIG 
+  GIT_TAG v1.15.3 
   )
 
 FetchContent_Declare(
   EnTT 
   GIT_REPOSITORY https://github.com/skypjack/entt.git
   GIT_SHALLOW TRUE 
-  FIND_PACKAGE_ARGS CONFIG
+  
   )
 
 FetchContent_Declare(
   assimp
   GIT_REPOSITORY https://github.com/assimp/assimp.git
   GIT_SHALLOW TRUE
-  FIND_PACKAGE_ARGS CONFIG 
+   
   )
 
 FetchContent_Declare(
   stduuid
   GIT_REPOSITORY https://github.com/mariusbancila/stduuid.git
   GIT_SHALLOW TRUE
-  FIND_PACKAGE_ARGS CONFIG 
+   
   )
 
 FetchContent_Declare(
   yaml-cpp
   GIT_REPOSITORY https://github.com/jbeder/yaml-cpp
   GIT_SHALLOW TRUE
-  FIND_PACKAGE_ARGS CONFIG 
+   
   )
 
 
@@ -98,8 +97,9 @@ FetchContent_Declare(
     glslang
     GIT_REPOSITORY https://github.com/KhronosGroup/glslang.git
     GIT_SHALLOW TRUE
+    GIT_TAG 14.3.0
     SOURCE_DIR "${FETCHCONTENT_BASE_DIR}/glslang"
-    FIND_PACKAGE_ARGS CONFIG
+    
 )
 
 
@@ -115,22 +115,22 @@ Fetchcontent_Declare(
     GTest
     GIT_REPOSITORY https://github.com/google/googletest.git
     GIT_SHALLOW TRUE
-    FIND_PACKAGE_ARGS CONFIG
+    GIT_TAG main 
 )
 
 Fetchcontent_Declare(
   nlohmann_json
     GIT_REPOSITORY https://github.com/nlohmann/json.git
     GIT_SHALLOW TRUE
-    FIND_PACKAGE_ARGS CONFIG 
+     
 )
 
 Fetchcontent_Declare(
     tlsf
     GIT_REPOSITORY https://github.com/mattconte/tlsf
     GIT_SHALLOW TRUE
     SOURCE_DIR ${FETCHCONTENT_BASE_DIR}/tlsf
-    FIND_PACKAGE_ARGS CONFIG
+    
 )
 
 Fetchcontent_Declare(
@@ -139,7 +139,7 @@ Fetchcontent_Declare(
     GIT_SHALLOW TRUE
     GIT_TAG main
     SOURCE_DIR ${FETCHCONTENT_BASE_DIR}/CLI11
-    FIND_PACKAGE_ARGS CONFIG
+    
 )
 
 
@@ -148,7 +148,7 @@ Fetchcontent_Declare(
     GIT_REPOSITORY https://github.com/Nicoshev/rapidhash
     GIT_SHALLOW TRUE
     SOURCE_DIR ${FETCHCONTENT_BASE_DIR}/rapidhash
-    FIND_PACKAGE_ARGS CONFIG
+    
 )
 
 FetchContent_Declare(Vulkan-Headers
@@ -273,6 +273,7 @@ target_link_libraries(External_obeliskLibs
     INTERFACE 
     CLI11::CLI11
 )
+
 add_library(imported::External_obeliskLibs ALIAS External_obeliskLibs)
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/Scripts/CMake/NuGet.cmake)