Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[make] Generate haxelib binary with nekotools boot -c on Mac/Linux #11653

Merged
merged 10 commits into from
May 16, 2024
Merged

[make] Generate haxelib binary with nekotools boot -c on Mac/Linux #11653

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
cc54d0a
[make] Generate haxelib binary with `nekotools boot -c` on Mac/Linux
tobil4sk May 3, 2024
ee4124d
[make] Fix for unix platforms if PLATFORM is defined
tobil4sk May 3, 2024
a7f55d5
[make] Set the HAXE_STD_PATH while building haxelib
tobil4sk May 3, 2024
aab6c8a
[ci] Install missing neko headers during setup
tobil4sk May 4, 2024
cd8e71a
[ci] Ensure /usr/local/include exists before installing neko
tobil4sk May 4, 2024
589afb5
[ci] Install neko headers for earthly builds as well
tobil4sk May 4, 2024
93341a9
[make] Omit HAXE_STD_PATH when building haxelib on windows
tobil4sk May 4, 2024
7accedd
[ci] Continue building x64 haxelib on mac arm64 for now
tobil4sk May 4, 2024
d9c3eaf
[make] Set rpath on mac when building haxelib
tobil4sk May 5, 2024
70374da
[make] Set std path for haxelib build on windows
tobil4sk May 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,17 @@ copy_haxetoolkit: /cygdrive/c/HaxeToolkit/haxe/haxe.exe
endif

# haxelib should depends on haxe, but we don't want to do that...
haxelib:
(cd $(CURDIR)/extra/haxelib_src && $(CURDIR)/$(HAXE_OUTPUT) client.hxml && nekotools boot run.n)
mv extra/haxelib_src/run$(EXTENSION) $(HAXELIB_OUTPUT)
haxelib_unix:
cd $(CURDIR)/extra/haxelib_src && \
HAXE_STD_PATH=$(CURDIR)/std $(CURDIR)/$(HAXE_OUTPUT) client.hxml && \
nekotools boot -c run.n
${CC} $(CURDIR)/extra/haxelib_src/run.c -o $(HAXELIB_OUTPUT) -lneko

ifeq ($(SYSTEM_NAME),Windows)
haxelib: haxelib_$(PLATFORM)
else
haxelib: haxelib_unix
endif

tools: haxelib

Expand Down
7 changes: 7 additions & 0 deletions Makefile.win
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,13 @@ PACKAGE_FILES=$(HAXE_OUTPUT) $(HAXELIB_OUTPUT) std \
"$$(cygcheck $(CURDIR)/$(HAXE_OUTPUT) | grep libmbedtls.dll | sed -e 's/^\s*//')" \
"$$(cygcheck $(CURDIR)/$(HAXE_OUTPUT) | grep libmbedx509.dll | sed -e 's/^\s*//')"

# haxelib should depends on haxe, but we don't want to do that...
haxelib_win:
cd $(CURDIR)/extra/haxelib_src && \
HAXE_STD_PATH=$(CURDIR)/std $(CURDIR)/$(HAXE_OUTPUT) client.hxml && \
nekotools boot run.n
mv extra/haxelib_src/run$(EXTENSION) $(HAXELIB_OUTPUT)

echo_package_files:
echo $(PACKAGE_FILES)

Expand Down
Loading