Skip to content

Commit

Permalink
[make] Remove \r from haxelib libpath output
Browse files Browse the repository at this point in the history
Otherwise we end up with the carriage return still being there on windows
  • Loading branch information
tobil4sk committed Sep 3, 2024
1 parent c8c6935 commit ffe4d78
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -115,17 +115,19 @@ HAXELIB_INTERP=HAXE_STD_PATH=$(HAXE_STD_PATH) $(CURDIR)/$(HAXE_OUTPUT) \
--hxb-lib $(HAXELIB_SRC_PATH)/haxelib_hxb.zip \
--run haxelib.client.Main

HXCPP_LIBPATH = `$(HAXELIB_INTERP) libpath hxcpp | tr -d '\r'`

haxelib_hxcpp: $(HAXELIB_SRC_PATH)/haxelib_hxb.zip
$(HAXELIB_INTERP) config > /dev/null || $(HAXELIB_INTERP) newrepo
$(HAXELIB_INTERP) path hxcpp > /dev/null || \
($(HAXELIB_INTERP) git hxcpp https://github.com/HaxeFoundation/hxcpp.git && \
hxcpp_path=`$(HAXELIB_INTERP) libpath hxcpp` && \
hxcpp_path=$(HXCPP_LIBPATH) && \
$(CURDIR)/$(HAXE_OUTPUT) --cwd $$hxcpp_path/tools/hxcpp compile.hxml)

# haxelib should depends on haxe, but we don't want to do that...
# since haxelib isn't available in PATH yet, we have to pass -D no-compilation and build manually
haxelib: $(HAXELIB_SRC_PATH)/haxelib_hxb.zip haxelib_hxcpp
hxcpp_path=`$(HAXELIB_INTERP) libpath hxcpp` \
hxcpp_path=$(HXCPP_LIBPATH) \
HAXE_STD_PATH=$(HAXE_STD_PATH) $(CURDIR)/$(HAXE_OUTPUT) --cwd $(HAXELIB_SRC_PATH) \
client_cpp.hxml -D destination=../../../../$(HAXELIB_OUTPUT) -D no-compilation -D hxcpp.path=$$hxcpp_path
$(HAXELIB_INTERP) --cwd $(HAXELIB_SRC_PATH)/bin/cpp run hxcpp Build.xml haxe
Expand Down

0 comments on commit ffe4d78

Please sign in to comment.