kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixup CI, and some includes.

Browse Source
This commit is contained in:
Apprentice-Alchemist
2022-03-19 13:46:00 +01:00
parent 4c001e1169
commit c2595b908d
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/main.yml vendored
View File

@@ -17,7 +17,7 @@ jobs:
- name: Install system dependencies - name: Install system dependencies
run: | run: |
sudo apt-get update 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 - uses: krdlab/setup-haxe@v1
with: with:

10
project/BuildHashlink.xml
View File

@@ -177,6 +177,15 @@
<file name="${HASHLINK_PATH}/libs/fmt/mikkt.c" /> <file name="${HASHLINK_PATH}/libs/fmt/mikkt.c" />
<file name="${HASHLINK_PATH}/include/mikktspace/mikktspace.c" /> <file name="${HASHLINK_PATH}/include/mikktspace/mikktspace.c" />
<section if="windows"> <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/png.c" />
<file name="${HASHLINK_PATH}/include/png/pngerror.c" /> <file name="${HASHLINK_PATH}/include/png/pngerror.c" />
<file name="${HASHLINK_PATH}/include/png/pngget.c" /> <file name="${HASHLINK_PATH}/include/png/pngget.c" />
@@ -400,6 +409,7 @@
<lib name="-L${OUTPUT_DIR}/${BINDIR}" unless="windows" /> <lib name="-L${OUTPUT_DIR}/${BINDIR}" unless="windows" />
<lib name="-libpath:${OUTPUT_DIR}/${BINDIR}" if="windows" /> <lib name="-libpath:${OUTPUT_DIR}/${BINDIR}" if="windows" />
<lib name="libhl.lib" if="windows" /> <lib name="libhl.lib" if="windows" />
<lib name="${HASHLINK_PATH}/include/turbojpeg/x64/simd.lib" if="windows"/>
</target> </target>
<target id="ui" output="ui" tool="linker" toolid="dll"> <target id="ui" output="ui" tool="linker" toolid="dll">