From d375d74459ed2276f0d052ce5b03dafc7c67e660 Mon Sep 17 00:00:00 2001 From: Tobiasz Laskowski Date: Wed, 22 Jan 2025 15:45:06 +0000 Subject: [PATCH] Make minor ios/tvos makefile adjustments The targets do not create a file with the target name, so they should be marked as .PHONY We are not using implicit rules either, so we can disable them by making .SUFFIXES empty Group targets together Also remove LIB_BASE variable, it has been unused since: f7ab6ab36b80522261ef3233a4a714c7183f109a --- .../ios/template/{{app.file}}/haxe/makefile | 24 ++++++++++--------- templates/tvos/PROJ/haxe/makefile | 24 ++++++++++--------- 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/templates/ios/template/{{app.file}}/haxe/makefile b/templates/ios/template/{{app.file}}/haxe/makefile index d0f3b6787..85a0b6fc5 100644 --- a/templates/ios/template/{{app.file}}/haxe/makefile +++ b/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,12 +23,19 @@ ifeq ("$(HAXE_OS)","iphonesimulator") endif CONFIG := $(CONFIG)-$(HAXE_OS) +LIB_DEST := $(DEBUG)/libApplicationMain.a + +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) @@ -74,3 +73,6 @@ build-haxe-arm64: clean: rm -rf build + +.PHONY: default debug_print clean $(HAXE_BUILDS) +.SUFFIXES: diff --git a/templates/tvos/PROJ/haxe/makefile b/templates/tvos/PROJ/haxe/makefile index c1125e6d7..dacaa0ed0 100644 --- a/templates/tvos/PROJ/haxe/makefile +++ b/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,12 +23,19 @@ ifeq ("$(HAXE_OS)","appletvsimulator") endif CONFIG := $(CONFIG)-$(HAXE_OS) +LIB_DEST := $(DEBUG)/libApplicationMain.a + +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) @@ -53,3 +52,6 @@ build-haxe-arm64: clean: rm -rf build + +.PHONY: default debug_print clean $(HAXE_BUILDS) +.SUFFIXES: