diff --git a/templates/ios/template/{{app.file}}/haxe/makefile b/templates/ios/template/{{app.file}}/haxe/makefile index 6f498a72e0..aeead274e8 100644 --- a/templates/ios/template/{{app.file}}/haxe/makefile +++ b/templates/ios/template/{{app.file}}/haxe/makefile @@ -59,7 +59,7 @@ $(HAXE_BUILDS): build-haxe-%: -options Options.txt $(DEBUG) touch ../Classes/Main.mm cd build/$(CONFIG)$(SUFFIX_$*); ::HAXELIB_PATH:: export HXCPP_NO_COLOR=1; \ - haxelib run ::CPP_BUILD_LIBRARY:: $(CURDIR)/BuildHxcppMbedtls.xml \ + ::CPP_CACHE_WORKAROUND:: haxelib run ::CPP_BUILD_LIBRARY:: $(CURDIR)/BuildHxcppMbedtls.xml \ -Ddestination=$(CURDIR)/../lib/$*$(LIB_MBEDTLS_DEST) \ -options $(CURDIR)/build/$(CONFIG)$(SUFFIX_$*)/Options.txt $(DEBUG) diff --git a/templates/tvos/PROJ/haxe/makefile b/templates/tvos/PROJ/haxe/makefile index 0123454de6..77286dae24 100644 --- a/templates/tvos/PROJ/haxe/makefile +++ b/templates/tvos/PROJ/haxe/makefile @@ -53,7 +53,7 @@ $(HAXE_BUILDS): build-haxe-%: -options Options.txt $(DEBUG) touch ../Classes/Main.mm cd build/$(CONFIG)$(SUFFIX_$*); ::HAXELIB_PATH:: export HXCPP_NO_COLOR=1; \ - haxelib run ::CPP_BUILD_LIBRARY:: $(CURDIR)/BuildHxcppMbedtls.xml \ + ::CPP_CACHE_WORKAROUND:: haxelib run ::CPP_BUILD_LIBRARY:: $(CURDIR)/BuildHxcppMbedtls.xml \ -Ddestination=$(CURDIR)/../lib/$*$(LIB_MBEDTLS_DEST) \ -options $(CURDIR)/build/$(CONFIG)$(SUFFIX_$*)/Options.txt $(DEBUG) diff --git a/tools/platforms/IOSPlatform.hx b/tools/platforms/IOSPlatform.hx index 94bc43f6f6..0c6c0eba4c 100644 --- a/tools/platforms/IOSPlatform.hx +++ b/tools/platforms/IOSPlatform.hx @@ -331,6 +331,8 @@ class IOSPlatform extends PlatformTarget context.IOS_COMPILER = project.config.getString("ios.compiler", "clang"); context.CPP_BUILD_LIBRARY = project.config.getString("cpp.buildLibrary", "hxcpp"); + context.CPP_CACHE_WORKAROUND = "unset HXCPP_COMPILE_CACHE;"; + context.IOS_LINKER_FLAGS = ["-stdlib=libc++"].concat(project.config.getArrayString("ios.linker-flags")); context.IOS_NON_EXEMPT_ENCRYPTION = project.config.getBool("ios.non-exempt-encryption", false); diff --git a/tools/platforms/TVOSPlatform.hx b/tools/platforms/TVOSPlatform.hx index 567750639e..eea70a31ac 100644 --- a/tools/platforms/TVOSPlatform.hx +++ b/tools/platforms/TVOSPlatform.hx @@ -262,6 +262,8 @@ class TVOSPlatform extends PlatformTarget context.IOS_COMPILER = project.config.getString("tvos.compiler", "clang"); context.CPP_BUILD_LIBRARY = project.config.getString("cpp.buildLibrary", "hxcpp"); + context.CPP_CACHE_WORKAROUND = "unset HXCPP_COMPILE_CACHE;"; + context.IOS_LINKER_FLAGS = ["-stdlib=libc++"].concat(project.config.getArrayString("tvos.linker-flags")); context.IOS_NON_EXEMPT_ENCRYPTION = project.config.getBool("tvos.non-exempt-encryption", true);