Skip to content

Commit f2b55af

Browse files
MRK2009MRK2009
authored
Fix compilation errors for both Linux and macOS in internal-merge (#1040)
1 parent 80481f2 commit f2b55af

3 files changed

Lines changed: 24 additions & 20 deletions

File tree

‎.github/workflows/linux.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ on:
44
push:
55
workflow_dispatch:
66

7+
env:
8+
HAXE_VERSION: 4.3.7
9+
HXCPP_COMPILE_CACHE: ${{ github.workspace }}/.hxcpp_cache
10+
711
jobs:
812
build:
913
name: Linux Build
@@ -17,7 +21,7 @@ jobs:
1721
- name: Setting up Haxe
1822
uses: krdlab/setup-haxe@v2
1923
with:
20-
haxe-version: 4.3.7
24+
haxe-version: ${{ env.HAXE_VERSION }}
2125
# - name: Restore existing build cache for faster compilation
2226
# uses: actions/cache@v4.2.3
2327
# with:
@@ -26,8 +30,6 @@ jobs:
2630
# path: |
2731
# .haxelib/
2832
# export/release/linux/obj/
29-
- run: |
30-
echo "HXCPP_COMPILE_CACHE=~/.hxcpp" >> $GITHUB_ENV
3133
- name: Installing Packages for Building Lime (TEMPORARY)
3234
run: |
3335
sudo apt-get update
@@ -36,7 +38,7 @@ jobs:
3638
libpng-dev libturbojpeg-dev libvorbis-dev libopenal-dev libsdl2-dev libglu1-mesa-dev libmbedtls-dev libuv1-dev libsqlite3-dev \
3739
libx11-dev libxext-dev libxfixes-dev libxi-dev libxinerama-dev libxkbcommon-dev libxcursor-dev libxrandr-dev libxss-dev libxt-dev libxtst-dev libxv-dev libxxf86vm-dev \
3840
libpulse-dev libasound2-dev libpipewire-0.3-dev \
39-
g++-multilib gcc-multilib
41+
zlib1g-dev
4042
- name: Installing LibVLC
4143
run: |
4244
sudo apt-get install libvlc-dev libvlccore-dev
@@ -102,7 +104,7 @@ jobs:
102104
- name: Setting up Haxe
103105
uses: krdlab/setup-haxe@v2
104106
with:
105-
haxe-version: 4.3.7
107+
haxe-version: ${{ env.HAXE_VERSION }}
106108
# - name: Restore existing build cache for faster compilation
107109
# uses: actions/cache@v4.2.3
108110
# with:
@@ -111,8 +113,6 @@ jobs:
111113
# path: |
112114
# .haxelib/
113115
# export/debug/linux/obj/
114-
- run: |
115-
echo "HXCPP_COMPILE_CACHE=~/.hxcpp" >> $GITHUB_ENV
116116
- name: Installing Packages for Building Lime (TEMPORARY)
117117
run: |
118118
sudo apt-get update
@@ -121,7 +121,7 @@ jobs:
121121
libpng-dev libturbojpeg-dev libvorbis-dev libopenal-dev libsdl2-dev libglu1-mesa-dev libmbedtls-dev libuv1-dev libsqlite3-dev \
122122
libx11-dev libxext-dev libxfixes-dev libxi-dev libxinerama-dev libxkbcommon-dev libxcursor-dev libxrandr-dev libxss-dev libxt-dev libxtst-dev libxv-dev libxxf86vm-dev \
123123
libpulse-dev libasound2-dev libpipewire-0.3-dev \
124-
g++-multilib gcc-multilib
124+
zlib1g-dev
125125
- name: Installing LibVLC
126126
run: |
127127
sudo apt-get install libvlc-dev libvlccore-dev

‎.github/workflows/macos.yml‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ on:
44
push:
55
workflow_dispatch:
66

7+
env:
8+
HAXE_VERSION: 4.3.7
9+
HXCPP_COMPILE_CACHE: ${{ github.workspace }}/.hxcpp_cache
10+
711
jobs:
812
build:
913
name: Mac OS Build
@@ -17,7 +21,7 @@ jobs:
1721
- name: Setting up Haxe
1822
uses: krdlab/setup-haxe@v2
1923
with:
20-
haxe-version: 4.3.7
24+
haxe-version: ${{ env.HAXE_VERSION }}
2125
# - name: Restore existing build cache for faster compilation
2226
# uses: actions/cache@v4.2.3
2327
# with:
@@ -26,10 +30,10 @@ jobs:
2630
# path: |
2731
# .haxelib/
2832
# export/release/macos/obj/
29-
- run: |
30-
echo "HXCPP_COMPILE_CACHE=~/.hxcpp" >> $GITHUB_ENV
3133
- name: Installing/Updating libraries
3234
run: |
35+
brew untap aws/tap
36+
brew install zlib
3337
haxe -cp commandline -D analyzer-optimize --run Main setup -si
3438
- name: Building the game
3539
run: |
@@ -90,7 +94,7 @@ jobs:
9094
- name: Setting up Haxe
9195
uses: krdlab/setup-haxe@v2
9296
with:
93-
haxe-version: 4.3.7
97+
haxe-version: ${{ env.HAXE_VERSION }}
9498
# - name: Restore existing build cache for faster compilation
9599
# uses: actions/cache@v4.2.3
96100
# with:
@@ -99,10 +103,10 @@ jobs:
99103
# path: |
100104
# .haxelib/
101105
# export/debug/macos/obj/
102-
- run: |
103-
echo "HXCPP_COMPILE_CACHE=~/.hxcpp" >> $GITHUB_ENV
104106
- name: Installing/Updating libraries
105107
run: |
108+
brew untap aws/tap
109+
brew install zlib
106110
haxe -cp commandline -D analyzer-optimize --run Main setup -si
107111
- name: Building the game
108112
run: |

‎.github/workflows/windows.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ on:
44
push:
55
workflow_dispatch:
66

7+
env:
8+
HAXE_VERSION: 4.3.7
9+
HXCPP_COMPILE_CACHE: ${{ github.workspace }}/.hxcpp_cache
10+
711
jobs:
812
build:
913
name: Windows Build
@@ -17,7 +21,7 @@ jobs:
1721
- name: Setting up Haxe
1822
uses: krdlab/setup-haxe@v2
1923
with:
20-
haxe-version: 4.3.7
24+
haxe-version: ${{ env.HAXE_VERSION }}
2125
# - name: Restore existing build cache for faster compilation
2226
# uses: actions/cache@v4.2.3
2327
# with:
@@ -26,8 +30,6 @@ jobs:
2630
# path: |
2731
# .haxelib/
2832
# export/release/windows/obj/
29-
- run: |
30-
echo "HXCPP_COMPILE_CACHE=~/.hxcpp" >> $GITHUB_ENV
3133
- name: Installing/Updating libraries
3234
run: |
3335
haxe -cp commandline -D analyzer-optimize --run Main setup -si --no-vscheck
@@ -90,7 +92,7 @@ jobs:
9092
- name: Setting up Haxe
9193
uses: krdlab/setup-haxe@v2
9294
with:
93-
haxe-version: 4.3.7
95+
haxe-version: ${{ env.HAXE_VERSION }}
9496
# - name: Restore existing build cache for faster compilation
9597
# uses: actions/cache@v4.2.3
9698
# with:
@@ -100,8 +102,6 @@ jobs:
100102
# .haxelib/
101103
# export/debug/windows/haxe/
102104
# export/debug/windows/obj/
103-
- run: |
104-
echo "HXCPP_COMPILE_CACHE=~/.hxcpp" >> $GITHUB_ENV
105105
- name: Installing/Updating libraries
106106
run: |
107107
haxe -cp commandline -D analyzer-optimize --run Main setup -si --no-vscheck

0 commit comments

Comments
 (0)