From c2595b908d6837a9dfe04c43bb58fb4dea1563a1 Mon Sep 17 00:00:00 2001
From: Apprentice-Alchemist
 <53486764+Apprentice-Alchemist@users.noreply.github.com>
Date: Sat, 19 Mar 2022 13:46:00 +0100
Subject: [PATCH] Fixup CI, and some includes.

---
 .github/workflows/main.yml |  2 +-
 project/BuildHashlink.xml  | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 347188a85..b37cb5804 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Install system dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y libgl1-mesa-dev libglu1-mesa-dev g++-multilib gcc-multilib libasound2-dev libx11-dev libxext-dev libxi-dev libxrandr-dev libxinerama-dev libmbedtls-dev
+          sudo apt-get install -y libgl1-mesa-dev libglu1-mesa-dev g++-multilib gcc-multilib libasound2-dev libx11-dev libxext-dev libxi-dev libxrandr-dev libxinerama-dev libmbedtls-dev libpng-dev libturbojpeg-dev libuv1-dev libvorbis-dev
 
       - uses: krdlab/setup-haxe@v1
         with:
diff --git a/project/BuildHashlink.xml b/project/BuildHashlink.xml
index 82b7f1b8d..dcdbb0b15 100644
--- a/project/BuildHashlink.xml
+++ b/project/BuildHashlink.xml
@@ -177,6 +177,15 @@
 		<file name="${HASHLINK_PATH}/libs/fmt/mikkt.c" />
 		<file name="${HASHLINK_PATH}/include/mikktspace/mikktspace.c" />
 		<section if="windows">
+			<compilerflag value="-I${HASHLINK_PATH}/include/png"/>
+			<compilerflag value="-I${HASHLINK_PATH}/include/turbojpeg"/>
+			<!-- TODO: arm64 windows -->
+			<compilerflag value="-I${HASHLINK_PATH}/include/turbojpeg/x64"/>
+
+			<compilerflag value="-I${HASHLINK_PATH}/include/zlib"/>
+			<compilerflag value="-I${HASHLINK_PATH}/include/vorbis"/>
+
+
 			<file name="${HASHLINK_PATH}/include/png/png.c" />
 			<file name="${HASHLINK_PATH}/include/png/pngerror.c" />
 			<file name="${HASHLINK_PATH}/include/png/pngget.c" />
@@ -400,6 +409,7 @@
 		<lib name="-L${OUTPUT_DIR}/${BINDIR}" unless="windows" />
 		<lib name="-libpath:${OUTPUT_DIR}/${BINDIR}" if="windows" />
 		<lib name="libhl.lib" if="windows" />
+		<lib name="${HASHLINK_PATH}/include/turbojpeg/x64/simd.lib" if="windows"/>
 	</target>
 
 	<target id="ui" output="ui" tool="linker" toolid="dll">