From b30508d76ef18de7f05898f4cbc701f2f8f18e12 Mon Sep 17 00:00:00 2001
From: Isaac Brodsky <isaac@isaacbrodsky.com>
Date: Fri, 13 Feb 2026 11:59:02 -0800
Subject: [PATCH 1/2] redo vcpkg integration

---
 .github/workflows/test.yml | 29 +++++------------------------
 .gitignore                 |  4 ++--
 .gitmodules                |  3 +++
 CMakeLists.txt             |  8 ++++----
 stdafx.h                   |  8 +++-----
 vcpkg                      |  1 +
 vcpkg.json                 |  3 +++
 vcpkg_deps.txt             |  1 -
 8 files changed, 21 insertions(+), 36 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 vcpkg
 create mode 100644 vcpkg.json
 delete mode 100644 vcpkg_deps.txt

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index de49c8b..a07a80d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -20,40 +20,21 @@ jobs:
             cxx: g++
 
     steps:
-      - uses: actions/checkout@v2
-
-      - name: Cache vcpkg
-        uses: actions/cache@v2
+      - uses: actions/checkout@v6
         with:
-          path: ~/vcpkg
-          key: ${{ runner.os }}-vcpkg-${{ hashFiles('**/vcpkg_deps.txt') }}
-          restore-keys: ${{ runner.os }}-vcpkg
+          submodules: 'recursive'
 
       - name: Prepare vcpkg
         run: |
-          # Adapted from https://github.com/UnfoldedInc/deck.gl-native/blob/8efa577bcd8ebefbe8a6a996936efaa388a198e4/.travis.yml
-          VCPKG_DEPENDENCIES=$(<vcpkg_deps.txt)
-          # Install vcpkg and dependencies
-          pushd $HOME
-          if [ -d "$HOME/vcpkg/.git" ] ; then echo vcpkg cached ; VCPKG_CACHED=1 ; else rm -rf vcpkg ; git clone https://github.com/Microsoft/vcpkg ; fi
-          cd vcpkg
-          git checkout .
-          CURRENT_VCPKG_REV="$(git rev-parse HEAD)"
-          git pull
-          # Update this to update the vcpkg version
-          NEW_VCPKG_REV=28ab0b15cd7cdc1004cac9a28a5ecab198c161b9
-          # Avoid rebuilding vcpkg itself unless it was not cached, or an update has been pulled.
-          if [ "$VCPKG_CACHED" -a "$NEW_VCPKG_REV" == "$CURRENT_VCPKG_REV" ] ; then echo vcpkg bootstrap skipped ; else ./bootstrap-vcpkg.sh ; fi
-          # Install our C++ dependencies - note that we do not quote here
-          ./vcpkg install $VCPKG_DEPENDENCIES --recurse
-          rm -rf buildtrees
+          ./vcpkg/bootstrap-vcpkg.sh
+          vcpkg install
 
       - name: Configure
         run: |
           # Build out of source
           mkdir build
           cd build
-          cmake -DCMAKE_TOOLCHAIN_FILE=${HOME}/vcpkg/scripts/buildsystems/vcpkg.cmake ..
+          cmake -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake ..
 
       - name: Build
         working-directory: build
diff --git a/.gitignore b/.gitignore
index b8b8fab..1408926 100644
--- a/.gitignore
+++ b/.gitignore
@@ -247,8 +247,6 @@ ModelManifest.xml
 cdgdeck
 build/
 
-vcpkg/
-
 # CMake
 CMakeCache.txt
 CMakeFiles/
@@ -256,3 +254,5 @@ Makefile
 cmake_install.cmake
 
 *.cdg
+
+vcpkg_installed/
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..20cdfd7
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "vcpkg"]
+	path = vcpkg
+	url = http://github.com/Microsoft/vcpkg
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 66777da..6fb711a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,11 +3,11 @@ cmake_minimum_required(VERSION 3.9)
 project(CDGDeck LANGUAGES CXX)
 
 find_package(ZLIB REQUIRED)
-find_package(libpng CONFIG REQUIRED)
+find_package(PNG CONFIG REQUIRED)
 find_package(FLTK CONFIG REQUIRED)
 find_package(SDL2 CONFIG REQUIRED)
-find_package(sdl2-ttf CONFIG REQUIRED)
-find_package(sdl2-mixer CONFIG REQUIRED)
+find_package(SDL2_ttf CONFIG REQUIRED)
+find_package(SDL2_mixer CONFIG REQUIRED)
 
 if(WIN32)
     set(RC_FILE_NAME cdgproj.rc)
@@ -22,7 +22,7 @@ add_executable(cdgdeck
     vera.cpp
     ${RC_FILE_NAME})
 
-target_link_libraries(cdgdeck PRIVATE ZLIB::ZLIB png fltk SDL2::SDL2 SDL2::SDL2_ttf SDL2::SDL2_mixer SDL2::SDL2main)
+target_link_libraries(cdgdeck PRIVATE ZLIB::ZLIB PNG::PNG fltk SDL2::SDL2 $<IF:$<TARGET_EXISTS:SDL2_ttf::SDL2_ttf>,SDL2_ttf::SDL2_ttf,SDL2_ttf::SDL2_ttf-static> $<IF:$<TARGET_EXISTS:SDL2_mixer::SDL2_mixer>,SDL2_mixer::SDL2_mixer,SDL2_mixer::SDL2_mixer-static> SDL2::SDL2main)
 # Note: 4 target(s) were omitted.
 #target_link_libraries(cdgdeck PRIVATE fltk fltk_gl fltk_forms fltk_SHARED)
 #target_link_libraries(cdgdeck PRIVATE SDL2::SDL2 SDL2::SDL2main)
diff --git a/stdafx.h b/stdafx.h
index d50de80..88aaca7 100644
--- a/stdafx.h
+++ b/stdafx.h
@@ -15,15 +15,13 @@
 using namespace std;
 
 // C RunTime Header Files
-#include <stdlib.h>
-#include <malloc.h>
-#include <memory.h>
+#include <cstdlib>
 
 #include <string>
 #include <fstream>
 
-#include <time.h>
-#include <assert.h>
+#include <ctime>
+#include <cassert>
 
 #include "SDL.h"
 #include "SDL_ttf.h"
diff --git a/vcpkg b/vcpkg
new file mode 160000
index 0000000..ac7af74
--- /dev/null
+++ b/vcpkg
@@ -0,0 +1 @@
+Subproject commit ac7af7424cbaf9057cb246b620f455303dccd6ed
diff --git a/vcpkg.json b/vcpkg.json
new file mode 100644
index 0000000..b5b8c41
--- /dev/null
+++ b/vcpkg.json
@@ -0,0 +1,3 @@
+{
+  "dependencies": [ "sdl2", "sdl2-mixer", "sdl2-ttf", "libpng", "zlib", "fltk" ]
+}
diff --git a/vcpkg_deps.txt b/vcpkg_deps.txt
deleted file mode 100644
index d85e947..0000000
--- a/vcpkg_deps.txt
+++ /dev/null
@@ -1 +0,0 @@
-sdl2 sdl2-mixer sdl2-ttf libpng zlib fltk

From 712297d22a6c24732304f6816e2c0fe374817cb6 Mon Sep 17 00:00:00 2001
From: Isaac Brodsky <isaac@isaacbrodsky.com>
Date: Fri, 13 Feb 2026 12:01:59 -0800
Subject: [PATCH 2/2] fix build

---
 .github/workflows/test.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a07a80d..e3ccd44 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -20,6 +20,9 @@ jobs:
             cxx: g++
 
     steps:
+      - name: Install pre-deps
+        run: sudo apt install autoconf autoconf-archive automake libtool
+
       - uses: actions/checkout@v6
         with:
           submodules: 'recursive'