Merge branch 'develop' into 8.3.0-Dev

templates/cpp/static/BuildMain.xml

@@ -2,6 +2,10 @@
 
 	<include name="${HXCPP}/build-tool/BuildCommon.xml" />
 
+	<include name="${HXCPP}/project/thirdparty/mbedtls-files.xml" noerror="true" />
+	<set name="HAS_HXCPP_MBEDTLS_FILES" value="1" if="MBEDTLS_DIR" />
+	<include name="${HXCPP}/src/hx/libs/ssl/Build.xml" unless="HAS_HXCPP_MBEDTLS_FILES" />
+
 	<files id="main">
 
 		<file name="Main.cpp" />
@@ -11,6 +15,8 @@
 	<target id="main" output="Main${DBG}" tool="linker" toolid="exe">
 
 		<files id="main" />
+		<files id="mbedtls" if="HAS_HXCPP_MBEDTLS_FILES" />
+		<files id="hxcpp_ssl" unless="HAS_HXCPP_MBEDTLS_FILES" />
 		::foreach ndlls::
 		<lib name="::path::" />::end::
 
@@ -35,6 +41,7 @@
 			<lib name="rpcrt4.lib" />
 			<lib name="dwrite.lib" />
 			<lib name="setupapi.lib" />
+			<lib name="crypt32.lib" />
 
 		</section>
 

templates/cpp/static/Main.cpp

@@ -1,6 +1,6 @@
 #include <stdio.h>
 
-#if defined(HX_WINDOWS) && !defined(HXCPP_DEBUG)
+#if defined(HX_WINDOWS) && !defined(HXCPP_DEBUGGER)
 #include <windows.h>
 #endif
 
@@ -14,7 +14,7 @@ extern "C" int lime_openal_register_prims ();
 extern "C" int ::nameSafe::_register_prims ();::end::::end::
 
 
-#if defined(HX_WINDOWS) && !defined(HXCPP_DEBUG)
+#if defined(HX_WINDOWS) && !defined(HXCPP_DEBUGGER)
 int __stdcall WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) {
 #else
 extern "C" int main(int argc, char *argv[]) {

templates/ios/template/{{app.file}}.xcodeproj/project.pbxproj

@@ -396,6 +396,7 @@
 					"\"$(SRCROOT)/::APP_FILE::/lib/x86_64\"",
 				);
 				OTHER_LDFLAGS = (
+					"-lmbedtls_hxcpp",
 					::foreach ndlls:: "-l::name::",
 					::end::
 					::foreach linkedLibraries:: "-l::__current__::",
@@ -448,6 +449,7 @@
 					"\"$(SRCROOT)/::APP_FILE::/lib/x86_64\"",
 				);
 				OTHER_LDFLAGS = (
+					"-lmbedtls_hxcpp",
 					::foreach ndlls:: "-l::name::",
 					::end::
 					::foreach linkedLibraries:: "-l::__current__::",

templates/ios/template/{{app.file}}/haxe/BuildHxcppMbedtls.xml

@@ -0,0 +1,15 @@
+<xml>
+
+	<include name="${HXCPP}/project/thirdparty/mbedtls-files.xml" noerror="true" />
+	<set name="HAS_HXCPP_MBEDTLS_FILES" value="1" if="MBEDTLS_DIR" />
+	<include name="${HXCPP}/build-tool/BuildCommon.xml" unless="HAS_HXCPP_MBEDTLS_FILES" />
+	<include name="${HXCPP}/src/hx/libs/ssl/Build.xml" unless="HAS_HXCPP_MBEDTLS_FILES" />
+
+	<target id="default" output="libmbedtls_hxcpp${DBG}" tool="linker" toolid="static_link">
+
+		<files id="mbedtls" if="HAS_HXCPP_MBEDTLS_FILES" />
+		<files id="hxcpp_ssl" unless="HAS_HXCPP_MBEDTLS_FILES" />
+
+	</target>
+
+</xml>

templates/ios/template/{{app.file}}/haxe/makefile

@@ -5,18 +5,10 @@ endif
 
 HAXE_BUILDS := $(ARCHS:%=build-haxe-%)
 
-ifeq ("$(ACTION)","clean")
-default: clean
-else
-default: $(HAXE_BUILDS)
-endif
-
 ifeq ("$(CONFIGURATION)","Debug")
    BUILD_STYLE := Debug
 endif
 
-default: debug_print
-
 ifeq ("$(BUILD_STYLE)","Debug")
    DEBUG := -debug
    CONFIG := Debug
@@ -31,46 +23,48 @@ ifeq ("$(HAXE_OS)","iphonesimulator")
 endif
 CONFIG := $(CONFIG)-$(HAXE_OS)
 
+LIB_DEST := $(DEBUG)/libApplicationMain.a
+LIB_MBEDTLS_DEST := $(DEBUG)/libmbedtls_hxcpp.a
+
+SIMULATOR_ARCH = i386 x86_64
+
+SUFFIX_i386 =
+SUFFIX_x86_64 = -64
+SUFFIX_armv6 =
+SUFFIX_armv7 = -v7
+SUFFIX_arm64 = -64
+
+HXCPP_FLAGS_i386 = -D simulator
+HXCPP_FLAGS_x86_64 = -D simulator -D HXCPP_M64
+HXCPP_FLAGS_armv6 = -D HXCPP_ARMV6
+HXCPP_FLAGS_armv7 = -D HXCPP_ARMV7
+HXCPP_FLAGS_arm64 = -D HXCPP_ARM64
+
+ifeq ("$(ACTION)","clean")
+default: clean
+else
+default: $(HAXE_BUILDS)
+endif
+
+default: debug_print
+
 debug_print:
 	@echo "Make $(HAXE_BUILDS)"
 
-LIB_BASE := build/$(CONFIG)/::CPP_LIBPREFIX::ApplicationMain$(DEBUG)
-LIB_DEST := $(DEBUG)/libApplicationMain.a
-
-build-haxe-i386:
-	@echo "Haxe simulator build: $(CONFIG)"
-	haxe Build.hxml -D simulator -cpp build/$(CONFIG) $(DEBUG)
-	cd build/$(CONFIG); ::HAXELIB_PATH:: export HXCPP_NO_COLOR=1; haxelib run ::CPP_BUILD_LIBRARY:: Build.xml $(DEBUG) -options Options.txt
-	cp build/$(CONFIG)/::CPP_LIBPREFIX::ApplicationMain$(DEBUG).iphonesim.a ../lib/i386$(LIB_DEST)
-	touch ../Classes/Main.mm
-
-build-haxe-x86_64:
-	@echo "Haxe simulator build: $(CONFIG)-64"
-	haxe Build.hxml -D simulator -D HXCPP_M64 -cpp build/$(CONFIG)-64 $(DEBUG)
-	cd build/$(CONFIG)-64; ::HAXELIB_PATH:: export HXCPP_NO_COLOR=1; haxelib run ::CPP_BUILD_LIBRARY:: Build.xml $(DEBUG) -options Options.txt
-	cp build/$(CONFIG)-64/::CPP_LIBPREFIX::ApplicationMain$(DEBUG).iphonesim-64.a ../lib/x86_64$(LIB_DEST)
-	touch ../Classes/Main.mm
-
-build-haxe-armv6:
-	@echo "Haxe device build: $(CONFIG)"
-	haxe Build.hxml -D HXCPP_ARMV6 -cpp build/$(CONFIG) $(DEBUG)
-	cd build/$(CONFIG); ::HAXELIB_PATH:: export HXCPP_NO_COLOR=1; haxelib run ::CPP_BUILD_LIBRARY:: Build.xml $(DEBUG) -options Options.txt
-	cp build/$(CONFIG)/::CPP_LIBPREFIX::ApplicationMain$(DEBUG).iphoneos.a ../lib/armv6$(LIB_DEST)
-	touch ../Classes/Main.mm
-
-build-haxe-armv7:
-	@echo "Haxe device build: $(CONFIG)-v7"
-	haxe Build.hxml -D HXCPP_ARMV7 -cpp build/$(CONFIG)-v7 $(DEBUG)
-	cd build/$(CONFIG)-v7; ::HAXELIB_PATH:: export HXCPP_NO_COLOR=1; haxelib run ::CPP_BUILD_LIBRARY:: Build.xml $(DEBUG) -options Options.txt
-	cp build/$(CONFIG)-v7/::CPP_LIBPREFIX::ApplicationMain$(DEBUG).iphoneos-v7.a ../lib/armv7$(LIB_DEST)
-	touch ../Classes/Main.mm
-
-build-haxe-arm64:
-	@echo "Haxe device build: $(CONFIG)-64"
-	haxe Build.hxml -D HXCPP_ARM64 -cpp build/$(CONFIG)-64 $(DEBUG)
-	cd build/$(CONFIG)-64; ::HAXELIB_PATH:: export HXCPP_NO_COLOR=1; haxelib run ::CPP_BUILD_LIBRARY:: Build.xml $(DEBUG) -options Options.txt
-	cp build/$(CONFIG)-64/::CPP_LIBPREFIX::ApplicationMain$(DEBUG).iphoneos-64.a ../lib/arm64$(LIB_DEST)
+$(HAXE_BUILDS): build-haxe-%:
+	@echo "Haxe $(if $(filter $*,$(SIMULATOR_ARCH)),simulator,device) build: $(CONFIG)$(SUFFIX_$*)"
+	haxe Build.hxml $(HXCPP_FLAGS_$*) -cpp build/$(CONFIG)$(SUFFIX_$*) $(DEBUG)
+	cd build/$(CONFIG)$(SUFFIX_$*); ::HAXELIB_PATH:: export HXCPP_NO_COLOR=1; \
+		haxelib run ::CPP_BUILD_LIBRARY:: Build.xml haxe -Ddestination=$(CURDIR)/../lib/$*$(LIB_DEST) \
+		-options Options.txt $(DEBUG)
 	touch ../Classes/Main.mm
+	cd build/$(CONFIG)$(SUFFIX_$*); ::HAXELIB_PATH:: export HXCPP_NO_COLOR=1; \
+		::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)
 
 clean:
 	rm -rf build
+
+.PHONY: default debug_print clean $(HAXE_BUILDS)
+.SUFFIXES:

templates/tvos/PROJ.xcodeproj/project.pbxproj

@@ -335,6 +335,7 @@
 					"\"$(SRCROOT)/::APP_FILE::/lib/x86_64\"",
 				);
 				OTHER_LDFLAGS = (
+					"-lmbedtls_hxcpp",
 					::foreach ndlls:: "-l::name::",
 					::end::
 					::foreach linkedLibraries:: "-l::__current__::",
@@ -383,6 +384,7 @@
 					"\"$(SRCROOT)/::APP_FILE::/lib/x86_64\"",
 				);
 				OTHER_LDFLAGS = (
+					"-lmbedtls_hxcpp",
 					::foreach ndlls:: "-l::name::",
 					::end::
 					::foreach linkedLibraries:: "-l::__current__::",

templates/tvos/PROJ/haxe/BuildHxcppMbedtls.xml

@@ -0,0 +1,15 @@
+<xml>
+
+	<include name="${HXCPP}/project/thirdparty/mbedtls-files.xml" noerror="true" />
+	<set name="HAS_HXCPP_MBEDTLS_FILES" value="1" if="MBEDTLS_DIR" />
+	<include name="${HXCPP}/build-tool/BuildCommon.xml" unless="HAS_HXCPP_MBEDTLS_FILES" />
+	<include name="${HXCPP}/src/hx/libs/ssl/Build.xml" unless="HAS_HXCPP_MBEDTLS_FILES" />
+
+	<target id="default" output="libmbedtls_hxcpp${DBG}" tool="linker" toolid="static_link">
+
+		<files id="mbedtls" if="HAS_HXCPP_MBEDTLS_FILES" />
+		<files id="hxcpp_ssl" unless="HAS_HXCPP_MBEDTLS_FILES" />
+
+	</target>
+
+</xml>

templates/tvos/PROJ/haxe/makefile

@@ -5,18 +5,10 @@ endif
 
 HAXE_BUILDS := $(ARCHS:%=build-haxe-%)
 
-ifeq ("$(ACTION)","clean")
-default: clean
-else
-default: $(HAXE_BUILDS)
-endif
-
 ifeq ("$(CONFIGURATION)","Debug")
    BUILD_STYLE := Debug
 endif
 
-default: debug_print
-
 ifeq ("$(BUILD_STYLE)","Debug")
    DEBUG := -debug
    CONFIG := Debug
@@ -31,25 +23,42 @@ ifeq ("$(HAXE_OS)","appletvsimulator")
 endif
 CONFIG := $(CONFIG)-$(HAXE_OS)
 
+LIB_DEST := $(DEBUG)/libApplicationMain.a
+LIB_MBEDTLS_DEST := $(DEBUG)/libmbedtls_hxcpp.a
+
+SIMULATOR_ARCH = x86_64
+
+SUFFIX_arm64 = -64
+SUFFIX_x86_64 = -64
+
+HXCPP_FLAGS_x86_64 = -D simulator -D HXCPP_M64
+HXCPP_FLAGS_arm64 = -D HXCPP_ARM64
+
+ifeq ("$(ACTION)","clean")
+default: clean
+else
+default: $(HAXE_BUILDS)
+endif
+
+default: debug_print
+
 debug_print:
 	@echo "Make $(HAXE_BUILDS)"
 
-LIB_BASE := build/$(CONFIG)/::CPP_LIBPREFIX::ApplicationMain$(DEBUG)
-LIB_DEST := $(DEBUG)/libApplicationMain.a
-
-build-haxe-x86_64:
-	@echo "Haxe simulator build: $(CONFIG)-64"
-	haxe Build.hxml -D simulator -D HXCPP_M64 -cpp build/$(CONFIG)-64 $(DEBUG)
-	cd build/$(CONFIG)-64; ::HAXELIB_PATH:: export HXCPP_NO_COLOR=1; haxelib run ::CPP_BUILD_LIBRARY:: Build.xml $(DEBUG) -options Options.txt
-	cp build/$(CONFIG)-64/::CPP_LIBPREFIX::ApplicationMain$(DEBUG).appletvsim-64.a ../lib/x86_64$(LIB_DEST)
-	touch ../Classes/Main.mm
-
-build-haxe-arm64:
-	@echo "Haxe device build: $(CONFIG)-64"
-	haxe Build.hxml -D HXCPP_ARM64 -cpp build/$(CONFIG)-64 $(DEBUG)
-	cd build/$(CONFIG)-64; ::HAXELIB_PATH:: export HXCPP_NO_COLOR=1; haxelib run ::CPP_BUILD_LIBRARY:: Build.xml $(DEBUG) -options Options.txt
-	cp build/$(CONFIG)-64/::CPP_LIBPREFIX::ApplicationMain$(DEBUG).appletvos-64.a ../lib/arm64$(LIB_DEST)
+$(HAXE_BUILDS): build-haxe-%:
+	@echo "Haxe $(if $(filter $*,$(SIMULATOR_ARCH)),simulator,device) build: $(CONFIG)$(SUFFIX_$*)"
+	haxe Build.hxml $(HXCPP_FLAGS_$*) -cpp build/$(CONFIG)$(SUFFIX_$*) $(DEBUG)
+	cd build/$(CONFIG)$(SUFFIX_$*); ::HAXELIB_PATH:: export HXCPP_NO_COLOR=1; \
+		haxelib run ::CPP_BUILD_LIBRARY:: Build.xml haxe -Ddestination=$(CURDIR)/../lib/$*$(LIB_DEST) \
+		-options Options.txt $(DEBUG)
 	touch ../Classes/Main.mm
+	cd build/$(CONFIG)$(SUFFIX_$*); ::HAXELIB_PATH:: export HXCPP_NO_COLOR=1; \
+		::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)
 
 clean:
 	rm -rf build
+
+.PHONY: default debug_print clean $(HAXE_BUILDS)
+.SUFFIXES: