Skip to content

Commit 40942f3

Browse files
Yuta12342Yuta12342
committed
Merge branch 'Archipelago' of https://github.com/Z11Coding/Mixtape-Engine-Rework into Archipelago
2 parents f037775 + 09f16aa commit 40942f3

File tree

6 files changed

+98
-33
lines changed

6 files changed

+98
-33
lines changed

‎.github/workflows/main.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ jobs:
3636
sudo apt-get install libvlccore-dev
3737
haxelib setup ~/haxelib
3838
haxelib install hxcpp > /dev/null --quiet
39-
chmod +x ./setup/unix.sh
40-
sh ./setup/unix.sh
39+
chmod +x ./setup/unixLinux.sh
40+
sh ./setup/unixLinux.sh
4141
- name: Skip SScript setup mode
4242
run: echo 'oy9:showMacroty8:loopCosti25y10:includeAllfg' >> ~/settings.cocoa
4343
- name: Create Version Tag
4444
run: echo "${{github.run_id}}" > VERSION
4545
- name: Compile
46-
run: haxelib run lime build Project.xml linux --app-version="4.0.0-${{ github.run_id}}" -D officialBuild
46+
run: haxelib run lime build Project.xml linux --app-version="4.0.0-${{ github.run_id}}" -D
4747
- name: Publish Artifact
4848
uses: actions/[email protected]
4949
with:
@@ -72,7 +72,7 @@ jobs:
7272
- name: Create Version Tag
7373
run: echo "${{github.run_id}}" > VERSION
7474
- name: Compile
75-
run: haxelib run lime build windows --app-version="4.0.0-${{ github.run_id}}" -D officialBuild
75+
run: haxelib run lime build windows --app-version="4.0.0-${{ github.run_id}}" -D
7676
- name: Publish Artifact
7777
uses: actions/[email protected]
7878
with:
@@ -93,14 +93,14 @@ jobs:
9393
run: |
9494
haxelib setup ~/haxelib
9595
haxelib install hxcpp > /dev/null --quiet
96-
chmod +x ./setup/unix.sh
97-
sh ./setup/unix.sh
96+
chmod +x ./setup/unixMac.sh
97+
sh ./setup/unixMac.sh
9898
- name: Skip SScript setup mode
9999
run: echo 'oy9:showMacroty8:loopCosti25y10:includeAllfg' >> ~/settings.cocoa
100100
- name: Create Version Tag
101101
run: echo "${{github.run_id}}" > VERSION
102102
- name: Compile
103-
run: haxelib run lime build mac --app-version="4.0.0-${{ github.run_id}}" -D officialBuild
103+
run: haxelib run lime build mac --app-version="4.0.0-${{ github.run_id}}" -D
104104
- name: Publish Artifact
105105
uses: actions/[email protected]
106106
with:

‎setup/unix.sh‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎setup/unixLinux.sh‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
#!/bin/sh
2+
# SETUP FOR LINUX SYSTEMS!!!
3+
# IT'S DIFFERENT BECAUSE SYSTOOLS NEEDS IT TO BE
4+
# REMINDER THAT YOU NEED HAXE INSTALLED PRIOR TO USING THIS
5+
# https://haxe.org/download
6+
cd ..
7+
echo Makking the main haxelib and setuping folder in same time..
8+
mkdir ~/haxelib && haxelib setup ~/haxelib
9+
echo Installing dependencies...
10+
echo This might take a few moments depending on your internet speed.
11+
haxelib install lime 8.1.2
12+
haxelib install openfl 9.3.3
13+
haxelib install flixel 5.6.1
14+
haxelib install flixel-addons 3.2.2
15+
haxelib install flixel-tools 1.5.1
16+
haxelib install hscript-iris 1.1.3
17+
haxelib install tjson 1.4.0
18+
haxelib install hxdiscord_rpc 1.2.4
19+
haxelib install hxvlc 2.0.1 --skip-dependencies
20+
haxelib install lime 8.1.2
21+
haxelib install openfl 9.3.3
22+
haxelib install helder.set 0.3.1
23+
haxelib install yaml 2.0.1
24+
haxelib install hxWebSockets 1.4.0
25+
haxelib install haxe-concurrent 5.1.3
26+
haxelib install actuate 1.9.0
27+
haxelib install flixel-ui 2.6.1
28+
haxelib install hscript 2.5.0
29+
haxelib git flxanimate https://github.com/Dot-Stuff/flxanimate 768740a56b26aa0c072720e0d1236b94afe68e3e
30+
haxelib git linc_luajit https://github.com/superpowers04/linc_luajit 1906c4a96f6bb6df66562b3f24c62f4c5bba14a7
31+
haxelib git funkin.vis https://github.com/FunkinCrew/funkVis 22b1ce089dd924f15cdc4632397ef3504d464e90
32+
haxelib git grig.audio https://gitlab.com/haxe-grig/grig.audio.git cbf91e2180fd2e374924fe74844086aab7891666
33+
haxelib git flxanimate https://github.com/Dot-Stuff/flxanimate 768740a56b26aa0c072720e0d1236b94afe68e3e
34+
haxelib git linc_luajit https://github.com/superpowers04/linc_luajit 1906c4a96f6bb6df66562b3f24c62f4c5bba14a7
35+
haxelib git funkin.vis https://github.com/FunkinCrew/funkVis 22b1ce089dd924f15cdc4632397ef3504d464e90
36+
haxelib git grig.audio https://gitlab.com/haxe-grig/grig.audio.git cbf91e2180fd2e374924fe74844086aab7891666
37+
haxelib git haxeui-core https://github.com/haxeui/haxeui-core 51c23588614397089a5ce182cddea729f0be6fa0
38+
haxelib git haxeui-flixel https://github.com/haxeui/haxeui-flixel da27e833947f32ef007ed11f523aa5524f5a5d54
39+
haxelib git flixel-text-input https://github.com/FunkinCrew/flixel-text-input 951a0103a17bfa55eed86703ce50b4fb0d7590bc
40+
haxelib git FlxPartialSound https://github.com/FunkinCrew/FlxPartialSound.git f986332ba5ab02abd386ce662578baf04904604a
41+
haxelib git tentools https://github.com/TentaRJ/tentools.git
42+
haxelib git systools https://github.com/haya3218/systools
43+
haxelib run lime rebuild systools linux
44+
echo Finished!

‎setup/unixMac.sh‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
#!/bin/sh
2+
# SETUP FOR MAC SYSTEMS!!!
3+
# IT'S DIFFERENT BECAUSE SYSTOOLS NEEDS IT TO BE
4+
# REMINDER THAT YOU NEED HAXE INSTALLED PRIOR TO USING THIS
5+
# https://haxe.org/download
6+
cd ..
7+
echo Makking the main haxelib and setuping folder in same time..
8+
mkdir ~/haxelib && haxelib setup ~/haxelib
9+
echo Installing dependencies...
10+
echo This might take a few moments depending on your internet speed.
11+
haxelib install lime 8.1.2
12+
haxelib install openfl 9.3.3
13+
haxelib install flixel 5.6.1
14+
haxelib install flixel-addons 3.2.2
15+
haxelib install flixel-tools 1.5.1
16+
haxelib install hscript-iris 1.1.3
17+
haxelib install tjson 1.4.0
18+
haxelib install hxdiscord_rpc 1.2.4
19+
haxelib install hxvlc 2.0.1 --skip-dependencies
20+
haxelib install lime 8.1.2
21+
haxelib install openfl 9.3.3
22+
haxelib install helder.set 0.3.1
23+
haxelib install yaml 2.0.1
24+
haxelib install hxWebSockets 1.4.0
25+
haxelib install haxe-concurrent 5.1.3
26+
haxelib install actuate 1.9.0
27+
haxelib install flixel-ui 2.6.1
28+
haxelib install hscript 2.5.0
29+
haxelib git flxanimate https://github.com/Dot-Stuff/flxanimate 768740a56b26aa0c072720e0d1236b94afe68e3e
30+
haxelib git linc_luajit https://github.com/superpowers04/linc_luajit 1906c4a96f6bb6df66562b3f24c62f4c5bba14a7
31+
haxelib git funkin.vis https://github.com/FunkinCrew/funkVis 22b1ce089dd924f15cdc4632397ef3504d464e90
32+
haxelib git grig.audio https://gitlab.com/haxe-grig/grig.audio.git cbf91e2180fd2e374924fe74844086aab7891666
33+
haxelib git flxanimate https://github.com/Dot-Stuff/flxanimate 768740a56b26aa0c072720e0d1236b94afe68e3e
34+
haxelib git linc_luajit https://github.com/superpowers04/linc_luajit 1906c4a96f6bb6df66562b3f24c62f4c5bba14a7
35+
haxelib git funkin.vis https://github.com/FunkinCrew/funkVis 22b1ce089dd924f15cdc4632397ef3504d464e90
36+
haxelib git grig.audio https://gitlab.com/haxe-grig/grig.audio.git cbf91e2180fd2e374924fe74844086aab7891666
37+
haxelib git haxeui-core https://github.com/haxeui/haxeui-core 51c23588614397089a5ce182cddea729f0be6fa0
38+
haxelib git haxeui-flixel https://github.com/haxeui/haxeui-flixel da27e833947f32ef007ed11f523aa5524f5a5d54
39+
haxelib git flixel-text-input https://github.com/FunkinCrew/flixel-text-input 951a0103a17bfa55eed86703ce50b4fb0d7590bc
40+
haxelib git FlxPartialSound https://github.com/FunkinCrew/FlxPartialSound.git f986332ba5ab02abd386ce662578baf04904604a
41+
haxelib git tentools https://github.com/TentaRJ/tentools.git
42+
haxelib git systools https://github.com/haya3218/systools
43+
haxelib run lime rebuild systools mac
44+
echo Finished!

‎setup/windows.bat‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ haxelib install yaml 2.0.1
1818
haxelib install hxWebSockets 1.4.0
1919
haxelib install haxe-concurrent 5.1.3
2020
haxelib install actuate 1.9.0
21+
haxelib install flixel-ui 2.6.1
22+
haxelib install hscript 2.5.0
2123
haxelib set lime 8.1.2
2224
haxelib set openfl 9.3.3
2325
haxelib git flxanimate https://github.com/Dot-Stuff/flxanimate 768740a56b26aa0c072720e0d1236b94afe68e3e

‎source/backend/window/WindowUtil.hx‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#if windows
21
package backend.window;
32

43
// most codes stolen from vs dave and bambi source code.
@@ -43,5 +42,4 @@ class WindowUtil
4342
return res;
4443
}
4544
#end
46-
}
47-
#end
45+
}

0 commit comments

Comments
 (0)