Skip to content
This repository was archived by the owner on Sep 16, 2023. It is now read-only.

Commit 8c39e02

Browse files
authored
Merge pull request #2257 from EnigmaEngine/feature/upgrade-haxe
Upgrade Haxe to latest (4.2.3).
2 parents c2c62a7 + 7a59700 commit 8c39e02

File tree

8 files changed

+55
-15
lines changed

8 files changed

+55
-15
lines changed

.github/workflows/html5.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- uses: actions/checkout@v2
1919
- uses: krdlab/setup-haxe@v1
2020
with:
21-
haxe-version: 4.1.5
21+
haxe-version: 4.2.3
2222
# Runs a set of commands using the runners shell
2323
- name: script run line haha
2424
run: |

.github/workflows/linux.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- uses: actions/checkout@v2
1919
- uses: krdlab/setup-haxe@v1
2020
with:
21-
haxe-version: 4.1.5
21+
haxe-version: 4.2.3
2222
# Runs a set of commands using the runners shell
2323
- name: script run line haha
2424
run: |

.github/workflows/windows.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ jobs:
1818
- uses: actions/checkout@v2
1919
- uses: krdlab/setup-haxe@v1
2020
with:
21-
haxe-version: 4.1.5
21+
haxe-version: 4.2.3
2222
# Runs a set of commands using the runners shell
2323
- name: script run line haha
2424
run: |
25-
cinst haxe --version 4.1.5 -y
25+
cinst haxe --version 4.2.3 -y
2626
RefreshEnv
2727
mkdir "%HAXELIB_ROOT%"
2828
haxelib setup "%HAXELIB_ROOT%"

.vscode/tasks.json

+44-4
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,26 @@
2121
"isDefault": true
2222
}
2323
},
24+
{
25+
"label": "Build Linux (Debug)",
26+
"type": "lime",
27+
"targetConfiguration": "Build Linux (Debug)",
28+
"command": "build",
29+
"group": {
30+
"kind": "build",
31+
"isDefault": true
32+
}
33+
},
34+
{
35+
"label": "Build Linux (Release)",
36+
"type": "lime",
37+
"targetConfiguration": "Build Linux (Release)",
38+
"command": "build",
39+
"group": {
40+
"kind": "build",
41+
"isDefault": true
42+
}
43+
},
2444
{
2545
"label": "Build HTML5 (Debug)",
2646
"type": "lime",
@@ -42,19 +62,39 @@
4262
}
4363
},
4464
{
45-
"label": "Build Linux (Debug)",
65+
"label": "Build Windows (Neko Debug)",
4666
"type": "lime",
47-
"targetConfiguration": "Build Linux (Debug)",
67+
"targetConfiguration": "Build Neko (Debug)",
4868
"command": "build",
4969
"group": {
5070
"kind": "build",
5171
"isDefault": true
5272
}
5373
},
5474
{
55-
"label": "Build Linux (Release)",
75+
"label": "Build Windows (Neko Release)",
5676
"type": "lime",
57-
"targetConfiguration": "Build Linux (Release)",
77+
"targetConfiguration": "Build Windows (Neko Release)",
78+
"command": "build",
79+
"group": {
80+
"kind": "build",
81+
"isDefault": true
82+
}
83+
},
84+
{
85+
"label": "Build Windows (Hashlink Debug)",
86+
"type": "lime",
87+
"targetConfiguration": "Build Hashlink (Debug)",
88+
"command": "build",
89+
"group": {
90+
"kind": "build",
91+
"isDefault": true
92+
}
93+
},
94+
{
95+
"label": "Build Windows (Hashlink Release)",
96+
"type": "lime",
97+
"targetConfiguration": "Build Hashlink (Release)",
5898
"command": "build",
5999
"group": {
60100
"kind": "build",

appveyor-linux.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ install:
1010
- sudo add-apt-repository ppa:haxe/releases -y
1111
- sudo apt update
1212
- sudo apt install neko tar gcc-7 g++-7 gcc-7-multilib g++-7-multilib -y
13-
- wget https://github.com/HaxeFoundation/haxe/releases/download/4.1.5/haxe-4.1.5-linux64.tar.gz
13+
- wget https://github.com/HaxeFoundation/haxe/releases/download/4.2.3/haxe-4.2.3-linux64.tar.gz
1414
- mkdir $HAXE_INSTALLDIR
15-
- tar -xf haxe-4.1.5-linux64.tar.gz -C $HAXE_INSTALLDIR
15+
- tar -xf haxe-4.2.3-linux64.tar.gz -C $HAXE_INSTALLDIR
1616
- export PATH=$PATH:$HAXE_INSTALLDIR/haxe_20201231082044_5e33a78aa
1717
- mkdir $HAXELIB_ROOT && haxelib setup $HAXELIB_ROOT
1818
- haxelib install lime 7.9.0

appveyor-macos.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ install:
1010
- brew install neko
1111
- brew install gnu-tar
1212
- brew install wget
13-
- wget "https://github.com/HaxeFoundation/haxe/releases/download/4.1.5/haxe-4.1.5-osx.tar.gz"
13+
- wget "https://github.com/HaxeFoundation/haxe/releases/download/4.2.3/haxe-4.2.3-osx.tar.gz"
1414
- mkdir $HAXE_INSTALLDIR
15-
- tar -xf haxe-4.1.5-osx.tar.gz -C $HAXE_INSTALLDIR
15+
- tar -xf haxe-4.2.3-osx.tar.gz -C $HAXE_INSTALLDIR
1616
- export PATH=$PATH:$HAXE_INSTALLDIR/haxe_20201231082044_5e33a78aa
1717
- mkdir $HAXELIB_ROOT && haxelib setup $HAXELIB_ROOT
1818
- haxelib install lime 7.9.0

appveyor-windows.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ install:
1111
# Install the neko chocolatey package (https://chocolatey.org/packages/neko)
1212
- cinst neko --version 2.3.0 -y
1313
# Install the haxe chocolatey package (https://chocolatey.org/packages/haxe)
14-
- cinst haxe --version 4.1.5 -y
14+
- cinst haxe --version 4.2.3 -y
1515
- RefreshEnv
1616
# Setup haxelib
1717
- mkdir "%HAXELIB_ROOT%"

docs/building.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
**Also also note**: To build for *Windows*, you need to be on *Windows*. To build for *Linux*, you need to be on *Linux*. Same goes for macOS. You can build for html5/browsers on any platform.
88

99
## Dependencies
10-
1. [Install Haxe 4.1.5](https://haxe.org/download/version/4.1.5/). You should use 4.1.5 instead of the latest version because the latest version has some problems with Friday Night Funkin': Kade Engine.
10+
1. [Install Haxe](https://haxe.org/download/). You should use the latest version.
1111
2. After installing Haxe, [Install HaxeFlixel](https://haxeflixel.com/documentation/install-haxeflixel/).
1212
3. Install `git`.
1313
- Windows: install from the [git-scm](https://git-scm.com/downloads) website.
1414
- Linux: install the `git` package: `sudo apt install git` (ubuntu), `sudo pacman -S git` (arch), etc... (you probably already have it)
1515
4. Install and set up the necessary libraries:
16-
- `haxelib install lime 7.9.0`
16+
- `haxelib install lime`
1717
- `haxelib install openfl`
1818
- `haxelib install flixel`
1919
- `haxelib install flixel-tools`

0 commit comments

Comments
 (0)