Remove vcpkg

.github/workflows/build_check.yaml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: ubuntu-20.04
+          - os: ubuntu-latest
           - os: windows-latest
             cc: cl.exe
             cxx: cl.exe
@@ -29,47 +29,81 @@ jobs:
         with:
           submodules: 'true'
 
-      - name: install ninja-build tool
-        uses: mondradiko/gha-setup-ninja@v3
+      - uses: actions/checkout@v2
+        with:
+          repository: 'KhronosGroup/OpenXR-SDK'
+          path: 'OpenXR-SDK'
 
       - name: setup VsDev environment
         if: runner.os == 'Windows'
         uses: mondradiko/gha-setup-vsdevenv@v3
 
-      - name: apt
-        if: runner.os == 'Linux'
-        run: sudo apt install libwayland-dev libxrandr-dev
+      - uses: mondradiko/gha-setup-ninja@v3
+      - name: Build OpenXR SDK
+        working-directory: 'OpenXR-SDK'
+        run: |
+          mkdir build
+          pushd build
+          cmake -GNinja ..
+          cmake --build .
 
-      - name: cached vcpkg runtime
+      - name: Install OpenXR SDK (Linux)
         if: runner.os == 'Linux'
-        uses: actions/cache@v2
+        working-directory: 'OpenXR-SDK/build'
+        run: sudo cmake --install .
+
+      - name: Install OpenXR SDK (Windows)
+        if: runner.os == 'Windows'
+        working-directory: 'OpenXR-SDK/build'
+        run: cmake --install .
+
+      - name: Checkout SDL2 (Windows only)
+        uses: actions/checkout@v2
+        if: runner.os == 'Windows'
         with:
-          key: ${{ runner.os }}-${{ hashFiles('.git/modules/vcpkg/HEAD') }}
-          restore-keys: ${{ runner.os }}-${{ hashFiles('vcpkg/.git/HEAD') }}
-          path: vcpkg/vcpkg
+          repository: 'libsdl-org/SDL'
+          ref: 'release-2.0.10'
+          path: 'SDL2'
 
-      - name: setup environment vars
+      - name: Build and Install SDL2 (Windows only)
+        if: runner.os == 'Windows'
+        working-directory: 'SDL2'
         run: |
-          CACHE_KEY=$(echo "${{ runner.os }}-${{ github.head_ref }}" | tr -cd '[a-zA-Z0-9]._-')
-          echo "CACHE_KEY=$CACHE_KEY" | tee -a $GITHUB_ENV
-          if [ "${{ runner.os }}" == "Linux" ]; then
-            echo "ci_vcpkg_cache_dir=/home/runner/.cache/vcpkg" >> $GITHUB_ENV
-          else
-            echo "ci_vcpkg_cache_dir=$LOCALAPPDATA/vcpkg" >> $GITHUB_ENV
-          fi
+          mkdir build
+          pushd build
+          cmake -GNinja ..
+          cmake --build .
+          cmake --install .
 
-      - name: dependency binary cache
-        uses: actions/cache@v2
+      - name: Checkout Vulkan-Headers (Windows only)
+        uses: actions/checkout@v2
+        if: runner.os == 'Windows'
         with:
-          path: ${{ env.ci_vcpkg_cache_dir }}
-          key: ${{ env.CACHE_KEY }}-vcpkg-binarycache4
-          restore-keys: ${{ env.CACHE_KEY }}-vcpkg-binarycache3
+          repository: 'KhronosGroup/Vulkan-Headers'
+          path: 'Vulkan-Headers'
+
+      - name: Install Vulkan-Headers (Windows only)
+        if: runner.os == 'Windows'
+        working-directory: 'Vulkan-Headers'
+        run: |
+          mkdir build
+          pushd build
+          cmake -GNinja ..
+          cmake --build .
+          cmake --install .
+
+      - name: apt
+        if: runner.os == 'Linux'
+        run: |
+          sudo apt update
+          sudo apt install libvulkan-dev libsdl2-dev
 
-      - name: configure
+      - uses: mondradiko/gha-setup-ninja@v3
+      - name: Configure
         run: |
           mkdir build
-          cd build
-          cmake -GNinja -DTRACY_ENABLE=ON ..
+          pushd build
+          cmake -GNinja -DTRACY_ENABLE=ON -DCOMPILE_SHADERS=OFF ..
 
       - name: compile
         run: ninja -C build

.gitmodules

@@ -1,6 +1,9 @@
 [submodule "lib/Tracy"]
 	path = lib/Tracy
 	url = https://github.com/wolfpld/Tracy
-[submodule "vcpkg"]
-	path = vcpkg
-	url = https://github.com/Microsoft/vcpkg
+[submodule "lib/cglm"]
+	path = lib/cglm
+	url = https://github.com/recp/cglm
+[submodule "lib/libuv"]
+	path = lib/libuv
+	url = https://github.com/libuv/libuv

CMakeLists.txt

@@ -1,9 +1,8 @@
 cmake_minimum_required(VERSION 3.13)
-include(cmake/prelude.cmake)
 project(mdo-core VERSION 0.0.0)
 
 # options
-option(COMPILE_SHADERS "Compile shaders in bulid tree.")
+option(COMPILE_SHADERS "Enable shader compilation." ON)
 option(TRACY_ENABLE "Enable Tracy profiling.")
 
 if(MSVC)
@@ -14,52 +13,32 @@ if(MSVC)
 include_directories(include)
 
 # dependencies
-#include(FindVulkan)
+include(FindVulkan)
 #if(NOT Vulkan_FOUND)
-# message(FATAL_ERROR "Vulkan not found.")
+#  message(FATAL_ERROR "Vulkan not found.")
 #endif()
-#if(NOT Vulkan_GLSLC_EXECUTABLE)
-#  message(FATAL_ERROR "glslc not found.")
-#endif()
-
-add_subdirectory(lib)
-
-find_mondradiko_dependency(
-  mondradiko::vulkan "Vulkan" NOCONFIG
-  INSTALL "vulkan-sdk"
-  Vulkan::Vulkan
-)
 
-find_mondradiko_dependency(
-  mondradiko::sdl2 "SDL2" SDL2::SDL2main
-  INSTALL "sdl2[vulkan]"
-  UNIX SDL2::SDL2-static
-  # UNIX SDL2::SDL2
-  WIN32 SDL2::SDL2
-)
+find_program(GLSL_COMPILER glslc NO_CACHE)
+if(GLSL_COMPILER) # glslc args
+  set(GLSL_ARGS "-O")
+else() # glslangValidator args
+  message(WARNING "glslc not found, using slower glslangValidator instead")
+  find_program(GLSL_COMPILER glslangValidator NO_CACHE)
+  set(GLSL_ARGS "-V")
+endif()
 
-find_mondradiko_dependency(
-  mondradiko::libuv "unofficial-libuv" unofficial::libuv::libuv
-  INSTALL "libuv"
-)
+if(COMPILE_SHADERS AND NOT GLSL_COMPILER)
+  message(FATAL_ERROR "Suitable shader compiler not found.")
+endif()
 
-find_mondradiko_dependency(
-  mondradiko::openxr "OpenXR"
-  INSTALL "openxr-loader"
-  OpenXR::headers
-  OpenXR::openxr_loader
-  OpenXR::openxr-all-supported
-)
+add_subdirectory(lib)
 
-find_mondradiko_dependency(
-  mondradiko::flecs "flecs" flecs::flecs_static
-  INSTALL "flecs"
-)
+find_package(SDL2 REQUIRED)
+if(TARGET SDL2::SDL2)  # support targeted SDL2 distributions
+  set(SDL2_LIBRARIES SDL2::SDL2 SDL2::SDL2main)
+endif()
 
-find_mondradiko_dependency(
-  mondradiko::cglm "cglm" cglm::cglm
-  INSTALL "cglm"
-)
+find_package(OpenXR REQUIRED)
 
 # shaders
 function(spirv_shader ret GLSL VAR)
@@ -68,7 +47,7 @@ function(spirv_shader ret GLSL VAR)
 
   add_custom_command(
     OUTPUT ${SPIRV}
-    COMMAND Vulkan::glslc -O -o ${SPIRV} ${GLSL}
+    COMMAND ${GLSL_COMPILER} ${GLSL_ARGS} ${GLSL} -o ${SPIRV}
     DEPENDS ${GLSL}
   )
 
@@ -93,9 +72,6 @@ set(SHADERS_SRC
 if(COMPILE_SHADERS)
   spirv_shaders(SHADERS_BIN ${SHADERS_SRC})
   add_library(mdo-shaders INTERFACE ${SHADERS_BIN})
-else()
-  message(WARNING "Shader compilation is disabled.")
-  message(WARNING "Ask Marceline on Discord for a .zip of the current shaders.")
 endif()
 
 # main library
@@ -118,13 +94,13 @@ set(MDO_CORE_SRC
 add_library(mdo-core SHARED ${MDO_CORE_SRC})
 
 target_link_libraries(mdo-core
-  mondradiko::sdl2
-  mondradiko::vulkan
-  mondradiko::libuv
-  mondradiko::openxr
-  mondradiko::cglm
+  ${SDL2_LIBRARIES}
+  OpenXR::openxr_loader
   flecs
+  cglm
   tracy
+  uv_a
+  volk
 )
 
 add_executable(mdo-cli cli/main.c)

cli/main.c

@@ -1,7 +1,6 @@
 #include <signal.h>
 #include <stdio.h>
 #include <string.h>
-#include <vulkan/vulkan_core.h>
 
 #include "displays/display.h"
 #include "displays/sdl/sdl_display.h"