Fixup CI, and some includes.

openfl · Apr 14, 2022 · 848e36f · 848e36f
1 parent 9700e6c
commit 848e36f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -14,7 +14,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
@@ -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">