From c47ef57194c6f8b080bb630fc3a763dee7fd7fb0 Mon Sep 17 00:00:00 2001 From: Jerome St-Louis Date: Mon, 5 Nov 2012 23:36:12 -0500 Subject: [PATCH] sdk/Build System: Added support for cross-compiling the tarball --- Makefile | 77 +++++++++++++++++++++++++++++++++++++-- compiler/Makefile | 3 +- compiler/ecc/Makefile | 12 +++--- compiler/ecp/Makefile | 12 +++--- compiler/ecs/Makefile | 12 +++--- compiler/libec/Makefile | 16 ++++---- crossplatform.mk | 3 ++ documentor/Makefile | 12 +++--- ear/cmd/Makefile | 12 +++--- ear/extract/Makefile | 12 +++--- ecere/Makefile | 12 +++--- ecere/Makefile.ecereCOM | 8 ++-- ecere/Makefile.vanilla | 8 ++-- eda/drivers/sqlite/Makefile | 12 +++--- eda/drivers/sqliteCipher/Makefile | 12 +++--- eda/libeda/Makefile | 12 +++--- epj2make/Makefile | 12 +++--- ide/Makefile | 14 +++---- ide/src/project/vsSupport.ec | 2 +- 19 files changed, 170 insertions(+), 93 deletions(-) diff --git a/Makefile b/Makefile index d6bf157..8f31bf4 100644 --- a/Makefile +++ b/Makefile @@ -4,8 +4,20 @@ include crossplatform.mk include include.mk +ifdef CROSS_TARGET +XBOOT = GCC_PREFIX= TARGET_PLATFORM=$(HOST_PLATFORM) PLATFORM=$(HOST_PLATFORM) +else +XBOOT = +endif + LIBVER := .0.44 +ifdef WINDOWS_HOST +HOST_SOV := $(HOST_SO) +else +HOST_SOV := $(HOST_SO)$(LIBVER) +endif + ifdef WINDOWS_TARGET SOV := $(SO) @@ -109,6 +121,9 @@ endif OBJDIR := obj$(OBJALT)/ OBJBINDIR := $(OBJDIR)$(PLATFORM)/bin/ OBJLIBDIR := $(OBJDIR)$(PLATFORM)/lib/ +XOBJDIR := obj$(OBJALT)/ +XOBJBINDIR := $(OBJDIR)$(HOST_PLATFORM)/bin/ +XOBJLIBDIR := $(OBJDIR)$(HOST_PLATFORM)/lib/ all: prepbinaries ide epj2make documentor eda codeguard @$(call echo,The Ecere SDK is fully built.) @@ -117,22 +132,42 @@ outputdirs: $(if $(wildcard $(OBJDIR)),,$(call mkdirq,$(OBJDIR))) $(if $(wildcard $(OBJBINDIR)),,$(call mkdirq,$(OBJBINDIR))) $(if $(wildcard $(OBJLIBDIR)),,$(call mkdirq,$(OBJLIBDIR))) +ifdef CROSS_TARGET + $(if $(wildcard $(XOBJDIR)),,$(call mkdirq,$(XOBJDIR))) + $(if $(wildcard $(XOBJBINDIR)),,$(call mkdirq,$(XOBJBINDIR))) + $(if $(wildcard $(XOBJLIBDIR)),,$(call mkdirq,$(XOBJLIBDIR))) +endif bootstrap: outputdirs - cd compiler && $(MAKE) bootstrap + cd compiler && $(MAKE) $(XBOOT) bootstrap deps: +ifdef CROSS_TARGET + @$(call echo,Building dependencies (host)...) + cd deps && $(MAKE) $(XBOOT) +endif @$(call echo,Building dependencies...) cd deps && $(MAKE) ecere: bootstrap deps +ifdef CROSS_TARGET + @$(call echo,Building 2nd stage ecere (host)...) +else @$(call echo,Building 2nd stage ecere...) - cd ecere && $(MAKE) nores - cd ear && $(MAKE) nores +endif + cd ecere && $(MAKE) nores $(XBOOT) + cd ear && $(MAKE) nores $(XBOOT) cd ecere && $(MAKE) cleantarget +ifdef CROSS_TARGET + @$(call echo,Building 2nd stage ecere...) +endif cd ecere && $(MAKE) ecerecom: bootstrap +ifdef CROSS_TARGET + @$(call echo,Building eC Core Runtime (host)...) + cd ecere && $(MAKE) -f Makefile.ecereCOM $(XBOOT) +endif @$(call echo,Building eC Core Runtime...) cd ecere && $(MAKE) -f Makefile.ecereCOM @@ -146,6 +181,10 @@ ear: ecere ecerevanilla cd ear && $(MAKE) compiler: ecere ear +ifdef CROSS_TARGET + @$(call echo,Building 2nd stage compiler (host)) + cd compiler && $(MAKE) $(XBOOT) +endif @$(call echo,Building 2nd stage compiler) cd compiler && $(MAKE) @@ -179,6 +218,38 @@ endif $(call cpq,compiler/ecp/obj/release.$(PLATFORM)/ecp$(E),$(OBJBINDIR)) $(call cpq,compiler/ecs/obj/release.$(PLATFORM)/ecs$(E),$(OBJBINDIR)) +ifdef CROSS_TARGET + +ifdef WINDOWS_HOST + $(call cpq,ecere/obj/release.$(HOST_PLATFORM)/$(HOST_LP)ecere$(HOST_SOV),$(XOBJBINDIR)) + $(call cpq,ecere/obj/ecereCOM.release.$(HOST_PLATFORM)/$(HOST_LP)ecereCOM$(HOST_SOV),$(XOBJBINDIR)) + $(call cpq,compiler/libec/obj/release.$(HOST_PLATFORM)/$(HOST_LP)ec$(HOST_SOV),$(XOBJBINDIR)) +endif +ifdef WINDOWS_HOST + $(call cpq,ecere/obj/release.$(HOST_PLATFORM)/$(HOST_LP)ecere$(HOST_SOV),$(XOBJLIBDIR)) + $(call cpq,ecere/obj/ecereCOM.release.$(HOST_PLATFORM)/$(HOST_LP)ecereCOM$(HOST_SOV),$(XOBJLIBDIR)) + $(call cpq,compiler/libec/obj/release.$(HOST_PLATFORM)/$(HOST_LP)ec$(HOST_SOV),$(XOBJLIBDIR)) + ln -sf $(HOST_LP)ecere$(HOST_SOV) $(XOBJLIBDIR)$(LP)ecere$(HOST_SO).0 + ln -sf $(HOST_LP)ecereCOM$(HOST_SOV) $(XOBJLIBDIR)$(LP)ecereCOM$(HOST_SO).0 + ln -sf $(HOST_LP)ec$(HOST_SOV) $(XOBJLIBDIR)$(LP)ec$(HOST_SO).0 + ln -sf $(HOST_LP)ecere$(HOST_SOV) $(XOBJLIBDIR)$(LP)ecere$(HOST_SO) + ln -sf $(HOST_LP)ecereCOM$(HOST_SOV) $(XOBJLIBDIR)$(LP)ecereCOM$(HOST_SO) + ln -sf $(HOST_LP)ec$(HOST_SOV) $(XOBJLIBDIR)$(LP)ec$(HOST_SO) +endif +ifndef WINDOWS_HOST +ifndef LINUX_HOST + $(call cpq,ecere/obj/release.$(HOST_PLATFORM)/$(HOST_LP)ecere$(HOST_SO),$(XOBJLIBDIR)) + $(call cpq,ecere/obj/ecereCOM.release.$(HOST_PLATFORM)/$(HOST_LP)ecereCOM$(HOST_SO),$(XOBJLIBDIR)) + $(call cpq,compiler/libec/obj/release.$(HOST_PLATFORM)/$(HOST_LP)ec$(HOST_SO),$(XOBJLIBDIR)) +endif +endif + $(call cpq,ear/cmd/obj/release.$(HOST_PLATFORM)/ear$(HOST_E),$(XOBJBINDIR)) + $(call cpq,compiler/ecc/obj/release.$(HOST_PLATFORM)/ecc$(HOST_E),$(XOBJBINDIR)) + $(call cpq,compiler/ecp/obj/release.$(HOST_PLATFORM)/ecp$(HOST_E),$(XOBJBINDIR)) + $(call cpq,compiler/ecs/obj/release.$(HOST_PLATFORM)/ecs$(HOST_E),$(XOBJBINDIR)) + +endif + epj2make: prepbinaries @$(call echo,Building epj2make...) cd epj2make && $(MAKE) diff --git a/compiler/Makefile b/compiler/Makefile index 400185f..4b05a79 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -2,7 +2,6 @@ .SILENT: CONFIG := release -OBJ = libec/obj/$(CONFIG).$(PLATFORM)/ PRECOMPILED_SOURCES = libec/precompiled/expression.c libec/precompiled/grammar.c libec/precompiled/type.c include ../crossplatform.mk @@ -10,6 +9,8 @@ include ../include.mk all: ecp ecc ecs +OBJ = libec/obj/$(CONFIG).$(TARGET_PLATFORM)/ + libec: @$(call echo,Building 2nd stage libec...) ifeq "$(wildcard libec/precompiled)" "libec/precompiled" diff --git a/compiler/ecc/Makefile b/compiler/ecc/Makefile index 9381e1a..5ffb450 100755 --- a/compiler/ecc/Makefile +++ b/compiler/ecc/Makefile @@ -36,12 +36,12 @@ include $(_CF_DIR)include.mk # CUSTOM TOOLCHAIN / COMPILER CONFIG -export LD_LIBRARY_PATH = ../../obj/$(PLATFORM)/lib/ -export DYLD_LIBRARY_PATH = ../../obj/$(PLATFORM)/lib/ -ECP := $(call psep,../bootstrap/obj/bin.$(PLATFORM)/ecp) -ECC := $(call psep,../bootstrap/obj/bin.$(PLATFORM)/ecc)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) -ECS := $(call psep,../bootstrap/obj/bin.$(PLATFORM)/ecs)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) -EAR := $(call psep,../../obj/$(PLATFORM)/bin/ear) +export LD_LIBRARY_PATH = ../../obj/$(HOST_PLATFORM)/lib/ +export DYLD_LIBRARY_PATH = ../../obj/$(HOST_PLATFORM)/lib/ +ECP := $(call psep,../bootstrap/obj/bin.$(HOST_PLATFORM)/ecp$(HOST_E)) +ECC := $(call psep,../bootstrap/obj/bin.$(HOST_PLATFORM)/ecc$(HOST_E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) +ECS := $(call psep,../bootstrap/obj/bin.$(HOST_PLATFORM)/ecs$(HOST_E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) +EAR := $(call psep,../../obj/$(HOST_PLATFORM)/bin/ear$(HOST_E)) # END OF CUSTOM TOOLCHAIN / COMPILER CONFIG diff --git a/compiler/ecp/Makefile b/compiler/ecp/Makefile index 5169884..6c7829c 100755 --- a/compiler/ecp/Makefile +++ b/compiler/ecp/Makefile @@ -36,12 +36,12 @@ include $(_CF_DIR)include.mk # CUSTOM TOOLCHAIN / COMPILER CONFIG -export LD_LIBRARY_PATH = ../../obj/$(PLATFORM)/lib/ -export DYLD_LIBRARY_PATH = ../../obj/$(PLATFORM)/lib/ -ECP := $(call psep,../bootstrap/obj/bin.$(PLATFORM)/ecp) -ECC := $(call psep,../bootstrap/obj/bin.$(PLATFORM)/ecc)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) -ECS := $(call psep,../bootstrap/obj/bin.$(PLATFORM)/ecs)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) -EAR := $(call psep,../../obj/$(PLATFORM)/bin/ear) +export LD_LIBRARY_PATH = ../../obj/$(HOST_PLATFORM)/lib/ +export DYLD_LIBRARY_PATH = ../../obj/$(HOST_PLATFORM)/lib/ +ECP := $(call psep,../bootstrap/obj/bin.$(HOST_PLATFORM)/ecp$(HOST_E)) +ECC := $(call psep,../bootstrap/obj/bin.$(HOST_PLATFORM)/ecc$(HOST_E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) +ECS := $(call psep,../bootstrap/obj/bin.$(HOST_PLATFORM)/ecs$(HOST_E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) +EAR := $(call psep,../../obj/$(HOST_PLATFORM)/bin/ear$(HOST_E)) # END OF CUSTOM TOOLCHAIN / COMPILER CONFIG diff --git a/compiler/ecs/Makefile b/compiler/ecs/Makefile index 278ecfa..d3f113a 100755 --- a/compiler/ecs/Makefile +++ b/compiler/ecs/Makefile @@ -36,12 +36,12 @@ include $(_CF_DIR)include.mk # CUSTOM TOOLCHAIN / COMPILER CONFIG -export LD_LIBRARY_PATH = ../../obj/$(PLATFORM)/lib/ -export DYLD_LIBRARY_PATH = ../../obj/$(PLATFORM)/lib/ -ECP := $(call psep,../bootstrap/obj/bin.$(PLATFORM)/ecp) -ECC := $(call psep,../bootstrap/obj/bin.$(PLATFORM)/ecc)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) -ECS := $(call psep,../bootstrap/obj/bin.$(PLATFORM)/ecs)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) -EAR := $(call psep,../../obj/$(PLATFORM)/bin/ear) +export LD_LIBRARY_PATH = ../../obj/$(HOST_PLATFORM)/lib/ +export DYLD_LIBRARY_PATH = ../../obj/$(HOST_PLATFORM)/lib/ +ECP := $(call psep,../bootstrap/obj/bin.$(HOST_PLATFORM)/ecp$(HOST_E)) +ECC := $(call psep,../bootstrap/obj/bin.$(HOST_PLATFORM)/ecc$(HOST_E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) +ECS := $(call psep,../bootstrap/obj/bin.$(HOST_PLATFORM)/ecs$(HOST_E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) +EAR := $(call psep,../../obj/$(HOST_PLATFORM)/bin/ear$(HOST_E)) # END OF CUSTOM TOOLCHAIN / COMPILER CONFIG diff --git a/compiler/libec/Makefile b/compiler/libec/Makefile index 0bdd0c2..e95cf9b 100755 --- a/compiler/libec/Makefile +++ b/compiler/libec/Makefile @@ -38,13 +38,13 @@ include $(_CF_DIR)include.mk # CUSTOM TOOLCHAIN / COMPILER CONFIG ifndef WINDOWS_TARGET -export LD_LIBRARY_PATH = ../../obj/$(PLATFORM)/lib/ -export DYLD_LIBRARY_PATH = ../../obj/$(PLATFORM)/lib/ +export LD_LIBRARY_PATH = ../../obj/$(HOST_PLATFORM)/lib/ +export DYLD_LIBRARY_PATH = ../../obj/$(HOST_PLATFORM)/lib/ endif -ECP := $(call psep,../bootstrap/obj/bin.$(PLATFORM)/ecp) -ECC := $(call psep,../bootstrap/obj/bin.$(PLATFORM)/ecc)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) -ECS := $(call psep,../bootstrap/obj/bin.$(PLATFORM)/ecs)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) -EAR := $(call psep,../../obj/$(PLATFORM)/bin/ear) +ECP := $(call psep,../bootstrap/obj/bin.$(HOST_PLATFORM)/ecp$(HOST_E)) +ECC := $(call psep,../bootstrap/obj/bin.$(HOST_PLATFORM)/ecc$(HOST_E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) +ECS := $(call psep,../bootstrap/obj/bin.$(HOST_PLATFORM)/ecs$(HOST_E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) +EAR := $(call psep,../../obj/$(HOST_PLATFORM)/bin/ear$(HOST_E)) # BSL CFLAGS BSL_CFLAGS = -fmessage-length=0 -O2 -ffast-math $(FORCE_32_BIT) $(FPIC) -w @@ -175,7 +175,9 @@ ifdef LINUX_TARGET ln -sf $(LP)$(MODULE)$(SO).0.44 ../../$(SODESTDIR)$(LP)$(MODULE)$(SO) endif ifdef WINDOWS_TARGET - $(call cpq,$(TARGET),../../compiler/bootstrap/obj/bin.$(PLATFORM)/) +ifndef CROSS_TARGET + $(call cpq,$(TARGET),../../compiler/bootstrap/obj/bin.$(HOST_PLATFORM)/) +endif endif # SYMBOL RULES diff --git a/crossplatform.mk b/crossplatform.mk index 389bbdc..318c4eb 100755 --- a/crossplatform.mk +++ b/crossplatform.mk @@ -136,6 +136,9 @@ A := .a E := $(if $(WINDOWS_TARGET),.exe,) SO := $(if $(WINDOWS_TARGET),.dll,$(if $(OSX_TARGET),.dylib,.so)) LP := $(if $(WINDOWS_TARGET),$(if $(STATIC_LIBRARY_TARGET),lib,),lib) +HOST_E := $(if $(WINDOWS_HOST),.exe,) +HOST_SO := $(if $(WINDOWS_HOST),.dll,$(if $(OSX_HOST),.dylib,.so)) +HOST_LP := $(if $(WINDOWS_HOST),$(if $(STATIC_LIBRARY_TARGET),lib,),lib) # SUPER TOOLS ifdef CCACHE diff --git a/documentor/Makefile b/documentor/Makefile index 0676237..4112697 100755 --- a/documentor/Makefile +++ b/documentor/Makefile @@ -36,12 +36,12 @@ include $(_CF_DIR)include.mk # CUSTOM TOOLCHAIN / COMPILER CONFIG -export LD_LIBRARY_PATH=../obj/$(PLATFORM)/lib -export DYLD_LIBRARY_PATH=../obj/$(PLATFORM)/lib -ECP := $(call psep,../obj/$(PLATFORM)/bin/ecp) -ECC := $(call psep,../obj/$(PLATFORM)/bin/ecc)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) -ECS := $(call psep,../obj/$(PLATFORM)/bin/ecs)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) -EAR := $(call psep,../obj/$(PLATFORM)/bin/ear) +export LD_LIBRARY_PATH=../obj/$(HOST_PLATFORM)/lib +export DYLD_LIBRARY_PATH=../obj/$(HOST_PLATFORM)/lib +ECP := $(call psep,../obj/$(HOST_PLATFORM)/bin/ecp$(HOST_E)) +ECC := $(call psep,../obj/$(HOST_PLATFORM)/bin/ecc$(HOST_E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) +ECS := $(call psep,../obj/$(HOST_PLATFORM)/bin/ecs$(HOST_E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) +EAR := $(call psep,../obj/$(HOST_PLATFORM)/bin/ear$(HOST_E)) # END OF CUSTOM TOOLCHAIN / COMPILER CONFIG diff --git a/ear/cmd/Makefile b/ear/cmd/Makefile index 20fcdf7..d8f5ed6 100755 --- a/ear/cmd/Makefile +++ b/ear/cmd/Makefile @@ -36,12 +36,12 @@ include $(_CF_DIR)include.mk # CUSTOM TOOLCHAIN / COMPILER CONFIG -export LD_LIBRARY_PATH = ../../obj/$(PLATFORM)/lib/ -export DYLD_LIBRARY_PATH = ../../obj/$(PLATFORM)/lib/ -ECP := $(call psep,../../compiler/bootstrap/obj/bin.$(PLATFORM)/ecp) -ECC := $(call psep,../../compiler/bootstrap/obj/bin.$(PLATFORM)/ecc)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) -ECS := $(call psep,../../compiler/bootstrap/obj/bin.$(PLATFORM)/ecs)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) -EAR := $(call psep,../../obj/$(PLATFORM)/bin/ear) +export LD_LIBRARY_PATH = ../../obj/$(HOST_PLATFORM)/lib/ +export DYLD_LIBRARY_PATH = ../../obj/$(HOST_PLATFORM)/lib/ +ECP := $(call psep,../../compiler/bootstrap/obj/bin.$(HOST_PLATFORM)/ecp$(HOST_E)) +ECC := $(call psep,../../compiler/bootstrap/obj/bin.$(HOST_PLATFORM)/ecc$(HOST_E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) +ECS := $(call psep,../../compiler/bootstrap/obj/bin.$(HOST_PLATFORM)/ecs$(HOST_E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) +EAR := $(call psep,../../obj/$(HOST_PLATFORM)/bin/ear$(HOST_E)) # END OF CUSTOM TOOLCHAIN / COMPILER CONFIG diff --git a/ear/extract/Makefile b/ear/extract/Makefile index 76e430f..e6d012a 100755 --- a/ear/extract/Makefile +++ b/ear/extract/Makefile @@ -36,12 +36,12 @@ include $(_CF_DIR)include.mk # CUSTOM TOOLCHAIN / COMPILER CONFIG -export LD_LIBRARY_PATH = ../../obj/$(PLATFORM)/lib/ -export DYLD_LIBRARY_PATH = ../../obj/$(PLATFORM)/lib/ -ECP := $(call psep,../../compiler/bootstrap/obj/bin.$(PLATFORM)/ecp) -ECC := $(call psep,../../compiler/bootstrap/obj/bin.$(PLATFORM)/ecc)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) -ECS := $(call psep,../../compiler/bootstrap/obj/bin.$(PLATFORM)/ecs)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) -EAR := $(call psep,../../obj/$(PLATFORM)/bin/ear) +export LD_LIBRARY_PATH = ../../obj/$(HOST_PLATFORM)/lib/ +export DYLD_LIBRARY_PATH = ../../obj/$(HOST_PLATFORM)/lib/ +ECP := $(call psep,../../compiler/bootstrap/obj/bin.$(HOST_PLATFORM)/ecp$(HOST_E)) +ECC := $(call psep,../../compiler/bootstrap/obj/bin.$(HOST_PLATFORM)/ecc$(HOST_E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) +ECS := $(call psep,../../compiler/bootstrap/obj/bin.$(HOST_PLATFORM)/ecs$(HOST_E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) +EAR := $(call psep,../../obj/$(HOST_PLATFORM)/bin/ear$(HOST_E)) # END OF CUSTOM TOOLCHAIN / COMPILER CONFIG diff --git a/ecere/Makefile b/ecere/Makefile index c62edec..d3a9e9a 100755 --- a/ecere/Makefile +++ b/ecere/Makefile @@ -36,12 +36,12 @@ include $(_CF_DIR)include.mk # CUSTOM TOOLCHAIN / COMPILER CONFIG -export LD_LIBRARY_PATH=../obj/$(PLATFORM)/lib -export DYLD_LIBRARY_PATH=../obj/$(PLATFORM)/lib -ECP := $(call psep,../compiler/bootstrap/obj/bin.$(PLATFORM)/ecp$(E)) -ECC := $(call psep,../compiler/bootstrap/obj/bin.$(PLATFORM)/ecc$(E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) -ECS := $(call psep,../compiler/bootstrap/obj/bin.$(PLATFORM)/ecs$(E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) -EAR := $(call psep,../obj/$(PLATFORM)/bin/ear) +export LD_LIBRARY_PATH=../obj/$(HOST_PLATFORM)/lib +export DYLD_LIBRARY_PATH=../obj/$(HOST_PLATFORM)/lib +ECP := $(call psep,../compiler/bootstrap/obj/bin.$(HOST_PLATFORM)/ecp$(HOST_E)) +ECC := $(call psep,../compiler/bootstrap/obj/bin.$(HOST_PLATFORM)/ecc$(HOST_E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) +ECS := $(call psep,../compiler/bootstrap/obj/bin.$(HOST_PLATFORM)/ecs$(HOST_E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) +EAR := $(call psep,../obj/$(HOST_PLATFORM)/bin/ear$(HOST_E)) # END OF CUSTOM TOOLCHAIN / COMPILER CONFIG diff --git a/ecere/Makefile.ecereCOM b/ecere/Makefile.ecereCOM index 28fbe44..59ff32f 100755 --- a/ecere/Makefile.ecereCOM +++ b/ecere/Makefile.ecereCOM @@ -36,10 +36,10 @@ include $(_CF_DIR)include.mk # CUSTOM TOOLCHAIN / COMPILER CONFIG -ECP := $(call psep,../compiler/bootstrap/obj/bin.$(PLATFORM)/ecp$(E)) -ECC := $(call psep,../compiler/bootstrap/obj/bin.$(PLATFORM)/ecc$(E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) -ECS := $(call psep,../compiler/bootstrap/obj/bin.$(PLATFORM)/ecs$(E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) -EAR := $(call psep,../obj/$(PLATFORM)/bin/ear) +ECP := $(call psep,../compiler/bootstrap/obj/bin.$(HOST_PLATFORM)/ecp$(HOST_E)) +ECC := $(call psep,../compiler/bootstrap/obj/bin.$(HOST_PLATFORM)/ecc$(HOST_E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) +ECS := $(call psep,../compiler/bootstrap/obj/bin.$(HOST_PLATFORM)/ecs$(HOST_E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) +EAR := $(call psep,../obj/$(HOST_PLATFORM)/bin/ear$(HOST_E)) # END OF CUSTOM TOOLCHAIN / COMPILER CONFIG diff --git a/ecere/Makefile.vanilla b/ecere/Makefile.vanilla index 5d923f0..e3db107 100755 --- a/ecere/Makefile.vanilla +++ b/ecere/Makefile.vanilla @@ -36,10 +36,10 @@ include $(_CF_DIR)include.mk # CUSTOM TOOLCHAIN / COMPILER CONFIG -ECP := $(call psep,../compiler/bootstrap/obj/bin.$(PLATFORM)/ecp$(E)) -ECC := $(call psep,../compiler/bootstrap/obj/bin.$(PLATFORM)/ecc$(E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) -ECS := $(call psep,../compiler/bootstrap/obj/bin.$(PLATFORM)/ecs$(E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) -EAR := $(call psep,../obj/$(PLATFORM)/bin/ear) +ECP := $(call psep,../compiler/bootstrap/obj/bin.$(HOST_PLATFORM)/ecp$(HOST_E)) +ECC := $(call psep,../compiler/bootstrap/obj/bin.$(HOST_PLATFORM)/ecc$(HOST_E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) +ECS := $(call psep,../compiler/bootstrap/obj/bin.$(HOST_PLATFORM)/ecs$(HOST_E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) +EAR := $(call psep,../obj/$(HOST_PLATFORM)/bin/ear$(HOST_E)) # END OF CUSTOM TOOLCHAIN / COMPILER CONFIG diff --git a/eda/drivers/sqlite/Makefile b/eda/drivers/sqlite/Makefile index 2cf43fe..36d8cd6 100755 --- a/eda/drivers/sqlite/Makefile +++ b/eda/drivers/sqlite/Makefile @@ -36,12 +36,12 @@ include $(_CF_DIR)include.mk # CUSTOM TOOLCHAIN / COMPILER CONFIG -export LD_LIBRARY_PATH = ../../../obj/$(PLATFORM)/lib/ -export DYLD_LIBRARY_PATH = ../../../obj/$(PLATFORM)/lib/ -ECP := $(call psep,../../../obj/$(PLATFORM)/bin/ecp) -ECC := $(call psep,../../../obj/$(PLATFORM)/bin/ecc)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) -ECS := $(call psep,../../../obj/$(PLATFORM)/bin/ecs)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) -EAR := $(call psep,../../../obj/$(PLATFORM)/bin/ear) +export LD_LIBRARY_PATH = ../../../obj/$(HOST_PLATFORM)/lib/ +export DYLD_LIBRARY_PATH = ../../../obj/$(HOST_PLATFORM)/lib/ +ECP := $(call psep,../../../obj/$(HOST_PLATFORM)/bin/ecp$(HOST_E)) +ECC := $(call psep,../../../obj/$(HOST_PLATFORM)/bin/ecc$(HOST_E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) +ECS := $(call psep,../../../obj/$(HOST_PLATFORM)/bin/ecs$(HOST_E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) +EAR := $(call psep,../../../obj/$(HOST_PLATFORM)/bin/ear$(HOST_E)) # END OF CUSTOM TOOLCHAIN / COMPILER CONFIG diff --git a/eda/drivers/sqliteCipher/Makefile b/eda/drivers/sqliteCipher/Makefile index 00eb39d..d8bc1de 100755 --- a/eda/drivers/sqliteCipher/Makefile +++ b/eda/drivers/sqliteCipher/Makefile @@ -36,12 +36,12 @@ include $(_CF_DIR)include.mk # CUSTOM TOOLCHAIN / COMPILER CONFIG -export LD_LIBRARY_PATH = ../../../obj/$(PLATFORM)/lib/ -export DYLD_LIBRARY_PATH = ../../../obj/$(PLATFORM)/lib/ -ECP := $(call psep,../../../obj/$(PLATFORM)/bin/ecp) -ECC := $(call psep,../../../obj/$(PLATFORM)/bin/ecc)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) -ECS := $(call psep,../../../obj/$(PLATFORM)/bin/ecs)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) -EAR := $(call psep,../../../obj/$(PLATFORM)/bin/ear) +export LD_LIBRARY_PATH = ../../../obj/$(HOST_PLATFORM)/lib/ +export DYLD_LIBRARY_PATH = ../../../obj/$(HOST_PLATFORM)/lib/ +ECP := $(call psep,../../../obj/$(HOST_PLATFORM)/bin/ecp$(HOST_E)) +ECC := $(call psep,../../../obj/$(HOST_PLATFORM)/bin/ecc$(HOST_E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) +ECS := $(call psep,../../../obj/$(HOST_PLATFORM)/bin/ecs$(HOST_E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) +EAR := $(call psep,../../../obj/$(HOST_PLATFORM)/bin/ear$(HOST_E)) # END OF CUSTOM TOOLCHAIN / COMPILER CONFIG diff --git a/eda/libeda/Makefile b/eda/libeda/Makefile index 7e9908f..05d0192 100755 --- a/eda/libeda/Makefile +++ b/eda/libeda/Makefile @@ -36,12 +36,12 @@ include $(_CF_DIR)include.mk # CUSTOM TOOLCHAIN / COMPILER CONFIG -export LD_LIBRARY_PATH = ../../obj/$(PLATFORM)/lib/ -export DYLD_LIBRARY_PATH = ../../obj/$(PLATFORM)/lib/ -ECP := $(call psep,../../obj/$(PLATFORM)/bin/ecp) -ECC := $(call psep,../../obj/$(PLATFORM)/bin/ecc)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) -ECS := $(call psep,../../obj/$(PLATFORM)/bin/ecs)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) -EAR := $(call psep,../../obj/$(PLATFORM)/bin/ear) +export LD_LIBRARY_PATH = ../../obj/$(HOST_PLATFORM)/lib/ +export DYLD_LIBRARY_PATH = ../../obj/$(HOST_PLATFORM)/lib/ +ECP := $(call psep,../../obj/$(HOST_PLATFORM)/bin/ecp$(HOST_E)) +ECC := $(call psep,../../obj/$(HOST_PLATFORM)/bin/ecc$(HOST_E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) +ECS := $(call psep,../../obj/$(HOST_PLATFORM)/bin/ecs$(HOST_E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) +EAR := $(call psep,../../obj/$(HOST_PLATFORM)/bin/ear$(HOST_E)) # END OF CUSTOM TOOLCHAIN / COMPILER CONFIG diff --git a/epj2make/Makefile b/epj2make/Makefile index 1a1467c..d7fb102 100755 --- a/epj2make/Makefile +++ b/epj2make/Makefile @@ -36,12 +36,12 @@ include $(_CF_DIR)include.mk # CUSTOM TOOLCHAIN / COMPILER CONFIG -export LD_LIBRARY_PATH=../obj/$(PLATFORM)/lib -export DYLD_LIBRARY_PATH=../obj/$(PLATFORM)/lib -ECP := $(call psep,../obj/$(PLATFORM)/bin/ecp) -ECC := $(call psep,../obj/$(PLATFORM)/bin/ecc)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) -ECS := $(call psep,../obj/$(PLATFORM)/bin/ecs)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) -EAR := $(call psep,../obj/$(PLATFORM)/bin/ear) +export LD_LIBRARY_PATH=../obj/$(HOST_PLATFORM)/lib +export DYLD_LIBRARY_PATH=../obj/$(HOST_PLATFORM)/lib +ECP := $(call psep,../obj/$(HOST_PLATFORM)/bin/ecp$(HOST_E)) +ECC := $(call psep,../obj/$(HOST_PLATFORM)/bin/ecc$(HOST_E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) +ECS := $(call psep,../obj/$(HOST_PLATFORM)/bin/ecs$(HOST_E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) +EAR := $(call psep,../obj/$(HOST_PLATFORM)/bin/ear$(HOST_E)) # END OF CUSTOM TOOLCHAIN / COMPILER CONFIG diff --git a/ide/Makefile b/ide/Makefile index 28bead7..f4df8fa 100755 --- a/ide/Makefile +++ b/ide/Makefile @@ -36,12 +36,12 @@ include $(_CF_DIR)include.mk # CUSTOM TOOLCHAIN / COMPILER CONFIG -export LD_LIBRARY_PATH=../obj/$(PLATFORM)/lib -export DYLD_LIBRARY_PATH=../obj/$(PLATFORM)/lib -ECP := $(call psep,../obj/$(PLATFORM)/bin/ecp) -ECC := $(call psep,../obj/$(PLATFORM)/bin/ecc)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) -ECS := $(call psep,../obj/$(PLATFORM)/bin/ecs)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) -EAR := $(call psep,../obj/$(PLATFORM)/bin/ear) +export LD_LIBRARY_PATH=../obj/$(HOST_PLATFORM)/lib +export DYLD_LIBRARY_PATH=../obj/$(HOST_PLATFORM)/lib +ECP := $(call psep,../obj/$(HOST_PLATFORM)/bin/ecp$(HOST_E)) +ECC := $(call psep,../obj/$(HOST_PLATFORM)/bin/ecc$(HOST_E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) +ECS := $(call psep,../obj/$(HOST_PLATFORM)/bin/ecs$(HOST_E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),) +EAR := $(call psep,../obj/$(HOST_PLATFORM)/bin/ear$(HOST_E)) # END OF CUSTOM TOOLCHAIN / COMPILER CONFIG @@ -282,7 +282,7 @@ endif ifdef WINDOWS_TARGET obj/resources.o: src/icon2.ico src/resources.rc | objdir - windres src/resources.rc obj/resources.o + $(GCC_PREFIX)windres src/resources.rc obj/resources.o endif # SYMBOL RULES diff --git a/ide/src/project/vsSupport.ec b/ide/src/project/vsSupport.ec index 84f2d29..25de2f3 100644 --- a/ide/src/project/vsSupport.ec +++ b/ide/src/project/vsSupport.ec @@ -1,5 +1,5 @@ #ifdef __WIN32__ -import "project" +import "Project" static char indendation[MAX_F_STRING]; -- 1.8.3.1