diff options
Diffstat (limited to 'makefile')
-rw-r--r-- | makefile | 17 |
1 files changed, 14 insertions, 3 deletions
@@ -90,6 +90,7 @@ # OVERRIDE_CC = cc # OVERRIDE_CXX = c++ # OVERRIDE_LD = ld +# OVERRIDE_AR = ar # DEPRECATED = 0 # LTO = 1 @@ -108,7 +109,7 @@ # FORCE_VERSION_COMPILE = 1 # MSBUILD = 1 -# IGNORE_BAD_LOCALISATION=1 +# IGNORE_BAD_LOCALISATION = 1 # PRECOMPILE = 0 # DEBUG_DIR=c:\test\location @@ -238,6 +239,7 @@ endif # build scripts will be run from # scripts/target/$(TARGET)/$(SUBTARGET).lua #------------------------------------------------- + ifdef PROJECT PARAMS += --PROJECT='$(PROJECT)' TARGET := $(PROJECT) @@ -591,6 +593,12 @@ ifndef CROSS_BUILD LD := $(OVERRIDE_LD) endif endif +ifdef OVERRIDE_AR +PARAMS += --AR='$(OVERRIDE_AR)' +ifndef CROSS_BUILD +AR := $(OVERRIDE_AR) +endif +endif #------------------------------------------------- # sanity check the configuration @@ -893,11 +901,11 @@ endif ifdef SANITIZE PARAMS += --SANITIZE='$(SANITIZE)' endif + #------------------------------------------------- # All scripts #------------------------------------------------- - SCRIPTS = scripts/genie.lua \ scripts/src/lib.lua \ scripts/src/emu.lua \ @@ -1466,6 +1474,7 @@ xcode4-ios: generate #------------------------------------------------- # gmake-solaris #------------------------------------------------- + ifndef CLANG_VERSION $(PROJECTDIR)/$(MAKETYPE)-solaris/Makefile: makefile $(SCRIPTS) $(GENIE) $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --gcc=solaris --gcc_version=$(GCC_VERSION) $(MAKETYPE) @@ -1486,6 +1495,7 @@ solaris_x86: generate $(PROJECTDIR)/$(MAKETYPE)-solaris/Makefile #------------------------------------------------- # gmake-solaris-clang #------------------------------------------------- + ifdef CLANG_VERSION $(PROJECTDIR)/$(MAKETYPE)-solaris/Makefile: makefile $(SCRIPTS) $(GENIE) $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --gcc=solaris --gcc_version=$(CLANG_VERSION) $(MAKETYPE) @@ -1503,7 +1513,6 @@ solaris_x86_clang: generate $(PROJECTDIR)/$(MAKETYPE)-solaris/Makefile $(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-solaris config=$(CONFIG)32 precompile $(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-solaris config=$(CONFIG)32 - #------------------------------------------------- # gmake-freebsd #------------------------------------------------- @@ -1673,6 +1682,7 @@ endif #------------------------------------------------- # cmake #------------------------------------------------- + .PHONY: cmake cmake: generate $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) cmake @@ -1771,6 +1781,7 @@ ifdef IGNORE_BAD_LOCALISATION else $(SILENT)$(PYTHON) scripts/build/msgfmt.py --output-file $@ $< endif + #------------------------------------------------- # Regression tests #------------------------------------------------- |