git » sdk » commit 6b9d412

Move hxcpp build into make

author Stephen Paul Weber
2026-03-11 17:48:05 UTC
committer Stephen Paul Weber
2026-03-11 17:48:05 UTC
parent 19a93fabdf45d76a30126fc11196d97c067738cd

Move hxcpp build into make

.github/workflows/build.yml +0 -2
Makefile +1 -0
build-misc/Containerfile.image +2 -3

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1e1fb01..0a5d340 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -39,8 +39,6 @@ jobs:
     - name: Haxe Dependencies
       run: |
         make hx-build-dep
-        cd ~/haxe/hxcpp/git/tools/hxcpp
-        haxe compile.hxml
 
     - name: NPM Dependencies
       run: |
diff --git a/Makefile b/Makefile
index a6fb917..3b11168 100644
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,7 @@ hx-build-dep:
 	haxelib --quiet git hxtsdgen https://github.com/singpolyma/hxtsdgen
 	haxelib --quiet install utest
 	haxelib --quiet git hxtsdgen https://github.com/singpolyma/hxtsdgen
+	cd "$(shell haxelib libpath hxcpp)"/tools/hxcpp && haxe compile.hxml
 
 npm/borogove-browser.js:
 	haxe browserjs.hxml
diff --git a/build-misc/Containerfile.image b/build-misc/Containerfile.image
index 28a1b12..04d67f0 100644
--- a/build-misc/Containerfile.image
+++ b/build-misc/Containerfile.image
@@ -61,13 +61,12 @@ RUN printf '#!/bin/bash\nexec /usr/bin/node --tls-max-v1.2 "$@"' > /usr/local/bi
  && chmod a+x /usr/local/bin/node \
  && npm install typescript
 
-RUN haxelib setup /opt/haxe
-ENV HAXE_STD_PATH=/opt/haxe/std
 COPY Makefile *.hxml /usr/src/sdk/
 COPY . /usr/src/sdk/
 
+RUN haxelib setup /opt/haxe
+ENV HAXE_STD_PATH=/opt/haxe/std
 RUN make hx-build-dep
-RUN cd /opt/haxe/hxcpp/git/tools/hxcpp && haxe compile.hxml
 
 RUN make -j$(nproc)
 RUN cd cpp && make clean