From a72e7f17c060eace77b82f629cc22353d097bb3a Mon Sep 17 00:00:00 2001 From: Tobiasz Laskowski Date: Wed, 22 Jan 2025 18:29:55 +0000 Subject: [PATCH] Fix options path for BuildHxcppMbedtls.xml See: https://github.com/HaxeFoundation/hxcpp/issues/1178 --- templates/ios/template/{{app.file}}/haxe/makefile | 3 ++- templates/tvos/PROJ/haxe/makefile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/templates/ios/template/{{app.file}}/haxe/makefile b/templates/ios/template/{{app.file}}/haxe/makefile index ed3a88c5..6f498a72 100644 --- a/templates/ios/template/{{app.file}}/haxe/makefile +++ b/templates/ios/template/{{app.file}}/haxe/makefile @@ -60,7 +60,8 @@ $(HAXE_BUILDS): build-haxe-%: touch ../Classes/Main.mm cd build/$(CONFIG)$(SUFFIX_$*); ::HAXELIB_PATH:: export HXCPP_NO_COLOR=1; \ haxelib run ::CPP_BUILD_LIBRARY:: $(CURDIR)/BuildHxcppMbedtls.xml \ - -Ddestination=$(CURDIR)/../lib/$*$(LIB_MBEDTLS_DEST) -options Options.txt $(DEBUG) + -Ddestination=$(CURDIR)/../lib/$*$(LIB_MBEDTLS_DEST) \ + -options $(CURDIR)/build/$(CONFIG)$(SUFFIX_$*)/Options.txt $(DEBUG) clean: rm -rf build diff --git a/templates/tvos/PROJ/haxe/makefile b/templates/tvos/PROJ/haxe/makefile index e75ed9a8..0123454d 100644 --- a/templates/tvos/PROJ/haxe/makefile +++ b/templates/tvos/PROJ/haxe/makefile @@ -54,7 +54,8 @@ $(HAXE_BUILDS): build-haxe-%: touch ../Classes/Main.mm cd build/$(CONFIG)$(SUFFIX_$*); ::HAXELIB_PATH:: export HXCPP_NO_COLOR=1; \ haxelib run ::CPP_BUILD_LIBRARY:: $(CURDIR)/BuildHxcppMbedtls.xml \ - -Ddestination=$(CURDIR)/../lib/$*$(LIB_MBEDTLS_DEST) -options Options.txt $(DEBUG) + -Ddestination=$(CURDIR)/../lib/$*$(LIB_MBEDTLS_DEST) \ + -options $(CURDIR)/build/$(CONFIG)$(SUFFIX_$*)/Options.txt $(DEBUG) clean: rm -rf build