tarball,Makefiles; use _SDK_SRC_ROOT instead of misuses of _CF_DIR. _CF_DIR is for...

diff --git a/Makefile b/Makefile
index 74f2eca..7176ad8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -878,6 +878,8 @@ update_ecs:
 
 troubleshoot:
        @$(call echo,Printing values of some variables.)
+       @$(call echo,_SDK_SRC_ROOT=$(_SDK_SRC_ROOT))
+       @$(call echo,_CF_DIR=$(_CF_DIR))
        @$(call echo,HOST_PLATFORM=$(HOST_PLATFORM))
        @$(call echo,TARGET_PLATFORM=$(TARGET_PLATFORM))
        @$(call echo,PLATFORM=$(PLATFORM))

diff --git a/audio/Makefile b/audio/Makefile
index aa7db11..4879de2 100644 (file)
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -31,10 +31,10 @@ CONSOLE = -mwindows
 
 # INCLUDES
 
-_CF_DIR = ../
+_SDK_SRC_ROOT = ../
 
-include $(_CF_DIR)crossplatform.mk
-include $(_CF_DIR)default.cf
+include $(_SDK_SRC_ROOT)crossplatform.mk
+include $(_SDK_SRC_ROOT)default.cf
 
 # POST-INCLUDES VARIABLES
 

diff --git a/compiler/Makefile b/compiler/Makefile
index a87f751..b7cf566 100644 (file)
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -5,8 +5,10 @@ endif
 
 CONFIG := release
 
-include ../crossplatform.mk
-include ../default.cf
+_SDK_SRC_ROOT = ../
+
+include $(_SDK_SRC_ROOT)crossplatform.mk
+include $(_SDK_SRC_ROOT)default.cf
 
 all: ecp ecc ecs
 

diff --git a/compiler/bootstrap/Makefile b/compiler/bootstrap/Makefile
index 3d4c461..692801b 100644 (file)
--- a/compiler/bootstrap/Makefile
+++ b/compiler/bootstrap/Makefile
@@ -5,8 +5,10 @@ endif
 
 OBJ = obj/bin.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/
 
-include ../../crossplatform.mk
-include ../../default.cf
+_SDK_SRC_ROOT = ../../
+
+include $(_SDK_SRC_ROOT)crossplatform.mk
+include $(_SDK_SRC_ROOT)default.cf
 
 all: bindir ecere libec ecp ecc ecs
        $(call cp,ecp/obj/bootstrap.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/ecp$(E) ecc/obj/bootstrap.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/ecc$(E) ecs/obj/bootstrap.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/ecs$(E),$(OBJ))

diff --git a/compiler/bootstrap/ecc/Makefile b/compiler/bootstrap/ecc/Makefile
index d316bf8..02255d1 100644 (file)
--- a/compiler/bootstrap/ecc/Makefile
+++ b/compiler/bootstrap/ecc/Makefile
@@ -30,10 +30,10 @@ CONSOLE = -mconsole
 
 # INCLUDES
 
-_CF_DIR = ../../../
+_SDK_SRC_ROOT = ../../../
 
-include $(_CF_DIR)crossplatform.mk
-include $(_CF_DIR)default.cf
+include $(_SDK_SRC_ROOT)crossplatform.mk
+include $(_SDK_SRC_ROOT)default.cf
 
 # POST-INCLUDES VARIABLES
 

diff --git a/compiler/bootstrap/ecere/Makefile b/compiler/bootstrap/ecere/Makefile
index a3d30ec..3aa90bd 100644 (file)
--- a/compiler/bootstrap/ecere/Makefile
+++ b/compiler/bootstrap/ecere/Makefile
@@ -30,10 +30,10 @@ CONSOLE = -mwindows
 
 # INCLUDES
 
-_CF_DIR = ../../../
+_SDK_SRC_ROOT = ../../../
 
-include $(_CF_DIR)crossplatform.mk
-include $(_CF_DIR)default.cf
+include $(_SDK_SRC_ROOT)crossplatform.mk
+include $(_SDK_SRC_ROOT)default.cf
 
 # POST-INCLUDES VARIABLES
 

diff --git a/compiler/bootstrap/ecp/Makefile b/compiler/bootstrap/ecp/Makefile
index aad63eb..eef3e23 100644 (file)
--- a/compiler/bootstrap/ecp/Makefile
+++ b/compiler/bootstrap/ecp/Makefile
@@ -30,10 +30,10 @@ CONSOLE = -mconsole
 
 # INCLUDES
 
-_CF_DIR = ../../../
+_SDK_SRC_ROOT = ../../../
 
-include $(_CF_DIR)crossplatform.mk
-include $(_CF_DIR)default.cf
+include $(_SDK_SRC_ROOT)crossplatform.mk
+include $(_SDK_SRC_ROOT)default.cf
 
 # POST-INCLUDES VARIABLES
 

diff --git a/compiler/bootstrap/ecs/Makefile b/compiler/bootstrap/ecs/Makefile
index e46bb81..d70afaa 100644 (file)
--- a/compiler/bootstrap/ecs/Makefile
+++ b/compiler/bootstrap/ecs/Makefile
@@ -30,10 +30,10 @@ CONSOLE = -mconsole
 
 # INCLUDES
 
-_CF_DIR = ../../../
+_SDK_SRC_ROOT = ../../../
 
-include $(_CF_DIR)crossplatform.mk
-include $(_CF_DIR)default.cf
+include $(_SDK_SRC_ROOT)crossplatform.mk
+include $(_SDK_SRC_ROOT)default.cf
 
 # POST-INCLUDES VARIABLES
 

diff --git a/compiler/bootstrap/libec/Makefile b/compiler/bootstrap/libec/Makefile
index ad99bc5..5770cff 100644 (file)
--- a/compiler/bootstrap/libec/Makefile
+++ b/compiler/bootstrap/libec/Makefile
@@ -30,10 +30,10 @@ CONSOLE = -mwindows
 
 # INCLUDES
 
-_CF_DIR = ../../../
+_SDK_SRC_ROOT = ../../../
 
-include $(_CF_DIR)crossplatform.mk
-include $(_CF_DIR)default.cf
+include $(_SDK_SRC_ROOT)crossplatform.mk
+include $(_SDK_SRC_ROOT)default.cf
 
 # POST-INCLUDES VARIABLES
 

diff --git a/compiler/ecc/Makefile b/compiler/ecc/Makefile
index 5ea9985..88e2f30 100644 (file)
--- a/compiler/ecc/Makefile
+++ b/compiler/ecc/Makefile
@@ -30,11 +30,11 @@ CONSOLE = -mconsole
 
 # INCLUDES
 
-_CF_DIR = ../../
+_SDK_SRC_ROOT = ../../
 USE_BOOTSTRAP := defined
 
-include $(_CF_DIR)crossplatform.mk
-include $(_CF_DIR)default.cf
+include $(_SDK_SRC_ROOT)crossplatform.mk
+include $(_SDK_SRC_ROOT)default.cf
 
 # POST-INCLUDES VARIABLES
 

diff --git a/compiler/ecc/Makefile.bootstrap b/compiler/ecc/Makefile.bootstrap
index 6e22775..8fb2384 100644 (file)
--- a/compiler/ecc/Makefile.bootstrap
+++ b/compiler/ecc/Makefile.bootstrap
@@ -31,9 +31,10 @@ CONSOLE = -mconsole
 
 # INCLUDES
 
+_SDK_SRC_ROOT = ../../
 _CF_DIR = .configs/
 
-include $(_CF_DIR)crossplatform.mk
+include $(_SDK_SRC_ROOT)crossplatform.mk
 include $(_CF_DIR)$(TARGET_PLATFORM)-$(COMPILER).cf
 
 # POST-INCLUDES VARIABLES

diff --git a/compiler/ecp/Makefile b/compiler/ecp/Makefile
index acdc4fc..bcc0947 100644 (file)
--- a/compiler/ecp/Makefile
+++ b/compiler/ecp/Makefile
@@ -30,11 +30,11 @@ CONSOLE = -mconsole
 
 # INCLUDES
 
-_CF_DIR = ../../
+_SDK_SRC_ROOT = ../../
 USE_BOOTSTRAP := defined
 
-include $(_CF_DIR)crossplatform.mk
-include $(_CF_DIR)default.cf
+include $(_SDK_SRC_ROOT)crossplatform.mk
+include $(_SDK_SRC_ROOT)default.cf
 
 # POST-INCLUDES VARIABLES
 

diff --git a/compiler/ecp/Makefile.bootstrap b/compiler/ecp/Makefile.bootstrap
index 4751c00..3235f87 100644 (file)
--- a/compiler/ecp/Makefile.bootstrap
+++ b/compiler/ecp/Makefile.bootstrap
@@ -31,9 +31,10 @@ CONSOLE = -mconsole
 
 # INCLUDES
 
+_SDK_SRC_ROOT = ../../
 _CF_DIR = .configs/
 
-include $(_CF_DIR)crossplatform.mk
+include $(_SDK_SRC_ROOT)crossplatform.mk
 include $(_CF_DIR)$(TARGET_PLATFORM)-$(COMPILER).cf
 
 # POST-INCLUDES VARIABLES

diff --git a/compiler/ecs/Makefile b/compiler/ecs/Makefile
index 615856f..65c97c9 100644 (file)
--- a/compiler/ecs/Makefile
+++ b/compiler/ecs/Makefile
@@ -30,11 +30,11 @@ CONSOLE = -mconsole
 
 # INCLUDES
 
-_CF_DIR = ../../
+_SDK_SRC_ROOT = ../../
 USE_BOOTSTRAP := defined
 
-include $(_CF_DIR)crossplatform.mk
-include $(_CF_DIR)default.cf
+include $(_SDK_SRC_ROOT)crossplatform.mk
+include $(_SDK_SRC_ROOT)default.cf
 
 # POST-INCLUDES VARIABLES
 

diff --git a/compiler/ecs/Makefile.bootstrap b/compiler/ecs/Makefile.bootstrap
index d34a00c..3567e71 100644 (file)
--- a/compiler/ecs/Makefile.bootstrap
+++ b/compiler/ecs/Makefile.bootstrap
@@ -31,9 +31,10 @@ CONSOLE = -mconsole
 
 # INCLUDES
 
+_SDK_SRC_ROOT = ../../
 _CF_DIR = .configs/
 
-include $(_CF_DIR)crossplatform.mk
+include $(_SDK_SRC_ROOT)crossplatform.mk
 include $(_CF_DIR)$(TARGET_PLATFORM)-$(COMPILER).cf
 
 # POST-INCLUDES VARIABLES

diff --git a/compiler/libec/Makefile b/compiler/libec/Makefile
index 1b1ad4d..2cc8f10 100644 (file)
--- a/compiler/libec/Makefile
+++ b/compiler/libec/Makefile
@@ -30,11 +30,11 @@ CONSOLE = -mwindows
 
 # INCLUDES
 
-_CF_DIR = ../../
+_SDK_SRC_ROOT = ../../
 USE_BOOTSTRAP := defined
 
-include $(_CF_DIR)crossplatform.mk
-include $(_CF_DIR)default.cf
+include $(_SDK_SRC_ROOT)crossplatform.mk
+include $(_SDK_SRC_ROOT)default.cf
 
 # POST-INCLUDES VARIABLES
 

diff --git a/compiler/libec/Makefile.bootstrap b/compiler/libec/Makefile.bootstrap
index ddff6cd..e545316 100644 (file)
--- a/compiler/libec/Makefile.bootstrap
+++ b/compiler/libec/Makefile.bootstrap
@@ -31,9 +31,10 @@ CONSOLE = -mwindows
 
 # INCLUDES
 
+_SDK_SRC_ROOT = ../../
 _CF_DIR = .configs/
 
-include $(_CF_DIR)crossplatform.mk
+include $(_SDK_SRC_ROOT)crossplatform.mk
 include $(_CF_DIR)$(TARGET_PLATFORM)-$(COMPILER).cf
 
 # POST-INCLUDES VARIABLES

diff --git a/default.cf b/default.cf
index aa3d8aa..b58fdf2 100644 (file)
--- a/default.cf
+++ b/default.cf
@@ -1,4 +1,4 @@
-EC_BINS := $(_CF_DIR)$(if $(USE_BOOTSTRAP),compiler/bootstrap/obj/bin.$(HOST_PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/,obj/$(HOST_PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/bin/)
+EC_BINS := $(_SDK_SRC_ROOT)$(if $(USE_BOOTSTRAP),compiler/bootstrap/obj/bin.$(HOST_PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/,obj/$(HOST_PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/bin/)
 
 ifdef WINDOWS_HOST
  # Auto-Select MinGW-w64 when asking for 64 bit
@@ -20,7 +20,7 @@ export STRIP   = $(GCC_PREFIX)strip
 export ECP := $(call sys_path,$(EC_BINS)ecp$(HOST_E))$(if $(GCC_FLAGS),$(space)$(GCC_FLAGS),)
 export ECC := $(call sys_path,$(EC_BINS)ecc$(HOST_E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),)$(if $(GCC_FLAGS),$(space)$(GCC_FLAGS),)
 export ECS := $(call sys_path,$(EC_BINS)ecs$(HOST_E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),)$(if $(OUTPUT_POT), -outputpot,)$(if $(DISABLED_POOLING), -disabled-pooling,)
-export EAR := $(call sys_path,$(_CF_DIR)obj/$(HOST_PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/bin/ear$(HOST_E))
+export EAR := $(call sys_path,$(_SDK_SRC_ROOT)obj/$(HOST_PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/bin/ear$(HOST_E))
 ifdef WINDOWS_TARGET
 WINDRES := $(GCC_PREFIX)windres
  ifdef ARCH
@@ -56,8 +56,8 @@ TARGET_ARCH :=$(shell $(CC) -dumpmachine)
 endif
 
 ifndef WINDOWS_HOST
-export LD_LIBRARY_PATH = $(_CF_DIR)obj/$(HOST_PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/lib/
-export DYLD_LIBRARY_PATH = $(_CF_DIR)obj/$(HOST_PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/lib/
+export LD_LIBRARY_PATH = $(_SDK_SRC_ROOT)obj/$(HOST_PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/lib/
+export DYLD_LIBRARY_PATH = $(_SDK_SRC_ROOT)obj/$(HOST_PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/lib/
 endif
 
 # HARD CODED PLATFORM-SPECIFIC OPTIONS

diff --git a/deps/Makefile b/deps/Makefile
index accd4ef..5fc745d 100644 (file)
--- a/deps/Makefile
+++ b/deps/Makefile
@@ -3,8 +3,10 @@
 
 # CROSS-PLATFORM MAGIC
 
-include ../crossplatform.mk
-include ../default.cf
+_SDK_SRC_ROOT = ../
+
+include $(_SDK_SRC_ROOT)crossplatform.mk
+include $(_SDK_SRC_ROOT)default.cf
 
 ifdef WINDOWS_TARGET
 all: freetype jpeg png gif ffi z

diff --git a/deps/freetype-2.3.12/Makefile b/deps/freetype-2.3.12/Makefile
index 97fbc27..2813459 100644 (file)
--- a/deps/freetype-2.3.12/Makefile
+++ b/deps/freetype-2.3.12/Makefile
@@ -30,10 +30,10 @@ CONSOLE = -mwindows
 
 # INCLUDES
 
-_CF_DIR = ../../
+_SDK_SRC_ROOT = ../../
 
-include $(_CF_DIR)crossplatform.mk
-include $(_CF_DIR)default.cf
+include $(_SDK_SRC_ROOT)crossplatform.mk
+include $(_SDK_SRC_ROOT)default.cf
 
 # POST-INCLUDES VARIABLES
 

diff --git a/deps/jpeg-9a/Makefile b/deps/jpeg-9a/Makefile
index 13f1753..0dd2c9f 100644 (file)
--- a/deps/jpeg-9a/Makefile
+++ b/deps/jpeg-9a/Makefile
@@ -31,10 +31,10 @@ CONSOLE = -mwindows
 
 # INCLUDES
 
-_CF_DIR = ../../
+_SDK_SRC_ROOT = ../../
 
-include $(_CF_DIR)crossplatform.mk
-include $(_CF_DIR)default.cf
+include $(_SDK_SRC_ROOT)crossplatform.mk
+include $(_SDK_SRC_ROOT)default.cf
 
 # POST-INCLUDES VARIABLES
 

diff --git a/deps/libffi-3.0.11/Makefile b/deps/libffi-3.0.11/Makefile
index cc8ecf3..bcb99ff 100644 (file)
--- a/deps/libffi-3.0.11/Makefile
+++ b/deps/libffi-3.0.11/Makefile
@@ -30,10 +30,10 @@ CONSOLE = -mwindows
 
 # INCLUDES
 
-_CF_DIR = ../../
+_SDK_SRC_ROOT = ../../
 
-include $(_CF_DIR)crossplatform.mk
-include $(_CF_DIR)default.cf
+include $(_SDK_SRC_ROOT)crossplatform.mk
+include $(_SDK_SRC_ROOT)default.cf
 
 # POST-INCLUDES VARIABLES
 

diff --git a/deps/libpng-1.6.12/Makefile b/deps/libpng-1.6.12/Makefile
index 74ffd6f..664cde6 100644 (file)
--- a/deps/libpng-1.6.12/Makefile
+++ b/deps/libpng-1.6.12/Makefile
@@ -31,10 +31,10 @@ CONSOLE = -mwindows
 
 # INCLUDES
 
-_CF_DIR = ../../
+_SDK_SRC_ROOT = ../../
 
-include $(_CF_DIR)crossplatform.mk
-include $(_CF_DIR)default.cf
+include $(_SDK_SRC_ROOT)crossplatform.mk
+include $(_SDK_SRC_ROOT)default.cf
 
 # POST-INCLUDES VARIABLES
 

diff --git a/deps/libungif-4.1.1/Makefile b/deps/libungif-4.1.1/Makefile
index eefda09..2692292 100644 (file)
--- a/deps/libungif-4.1.1/Makefile
+++ b/deps/libungif-4.1.1/Makefile
@@ -30,10 +30,10 @@ CONSOLE = -mwindows
 
 # INCLUDES
 
-_CF_DIR = ../../
+_SDK_SRC_ROOT = ../../
 
-include $(_CF_DIR)crossplatform.mk
-include $(_CF_DIR)default.cf
+include $(_SDK_SRC_ROOT)crossplatform.mk
+include $(_SDK_SRC_ROOT)default.cf
 
 # POST-INCLUDES VARIABLES
 

diff --git a/deps/zlib-1.2.8/Makefile b/deps/zlib-1.2.8/Makefile
index d4bdd6f..2c0364a 100644 (file)
--- a/deps/zlib-1.2.8/Makefile
+++ b/deps/zlib-1.2.8/Makefile
@@ -31,10 +31,10 @@ CONSOLE = -mwindows
 
 # INCLUDES
 
-_CF_DIR = ../../
+_SDK_SRC_ROOT = ../../
 
-include $(_CF_DIR)crossplatform.mk
-include $(_CF_DIR)default.cf
+include $(_SDK_SRC_ROOT)crossplatform.mk
+include $(_SDK_SRC_ROOT)default.cf
 
 # POST-INCLUDES VARIABLES
 

diff --git a/documentor/Makefile b/documentor/Makefile
index 3288445..18c5029 100644 (file)
--- a/documentor/Makefile
+++ b/documentor/Makefile
@@ -30,10 +30,10 @@ CONSOLE = -mwindows
 
 # INCLUDES
 
-_CF_DIR = ../
+_SDK_SRC_ROOT = ../
 
-include $(_CF_DIR)crossplatform.mk
-include $(_CF_DIR)default.cf
+include $(_SDK_SRC_ROOT)crossplatform.mk
+include $(_SDK_SRC_ROOT)default.cf
 
 # POST-INCLUDES VARIABLES
 

diff --git a/ear/Makefile b/ear/Makefile
index 44cc60e..4e985da 100644 (file)
--- a/ear/Makefile
+++ b/ear/Makefile
@@ -5,8 +5,10 @@ endif
 
 # CROSS-PLATFORM MAGIC
 
-include ../crossplatform.mk
-include ../default.cf
+_SDK_SRC_ROOT = ../
+
+include $(_SDK_SRC_ROOT)crossplatform.mk
+include $(_SDK_SRC_ROOT)default.cf
 
 all:
        @$(call echo,Building self-extract tool...)

diff --git a/ear/cmd/Makefile b/ear/cmd/Makefile
index 4da558b..5b37aa7 100644 (file)
--- a/ear/cmd/Makefile
+++ b/ear/cmd/Makefile
@@ -30,11 +30,11 @@ CONSOLE = -mconsole
 
 # INCLUDES
 
-_CF_DIR = ../../
+_SDK_SRC_ROOT = ../../
 USE_BOOTSTRAP := defined
 
-include $(_CF_DIR)crossplatform.mk
-include $(_CF_DIR)default.cf
+include $(_SDK_SRC_ROOT)crossplatform.mk
+include $(_SDK_SRC_ROOT)default.cf
 
 # POST-INCLUDES VARIABLES
 

diff --git a/ear/extract/Makefile b/ear/extract/Makefile
index 5c52d07..88f427d 100644 (file)
--- a/ear/extract/Makefile
+++ b/ear/extract/Makefile
@@ -30,11 +30,11 @@ CONSOLE = -mwindows
 
 # INCLUDES
 
-_CF_DIR = ../../
+_SDK_SRC_ROOT = ../../
 USE_BOOTSTRAP := defined
 
-include $(_CF_DIR)crossplatform.mk
-include $(_CF_DIR)default.cf
+include $(_SDK_SRC_ROOT)crossplatform.mk
+include $(_SDK_SRC_ROOT)default.cf
 
 # POST-INCLUDES VARIABLES
 

diff --git a/ecere/Makefile b/ecere/Makefile
index 47a888d..1fc3f9c 100644 (file)
--- a/ecere/Makefile
+++ b/ecere/Makefile
@@ -31,11 +31,11 @@ CONSOLE = -mwindows
 
 # INCLUDES
 
-_CF_DIR = ../
+_SDK_SRC_ROOT = ../
 USE_BOOTSTRAP := defined
 
-include $(_CF_DIR)crossplatform.mk
-include $(_CF_DIR)default.cf
+include $(_SDK_SRC_ROOT)crossplatform.mk
+include $(_SDK_SRC_ROOT)default.cf
 
 ifdef PREFIXLIBDIR
 CFLAGS += -DDEB_HOST_MULTIARCH=\"$(call escspace,$(PREFIXLIBDIR))\"

diff --git a/ecere/Makefile.bootstrap b/ecere/Makefile.bootstrap
index 0c37668..40b1b22 100644 (file)
--- a/ecere/Makefile.bootstrap
+++ b/ecere/Makefile.bootstrap
@@ -31,9 +31,10 @@ CONSOLE = -mwindows
 
 # INCLUDES
 
+_SDK_SRC_ROOT = ../
 _CF_DIR = .configs/
 
-include $(_CF_DIR)crossplatform.mk
+include $(_SDK_SRC_ROOT)crossplatform.mk
 include $(_CF_DIR)$(TARGET_PLATFORM)-$(COMPILER).cf
 
 # POST-INCLUDES VARIABLES

diff --git a/ecere/Makefile.ecereCOM b/ecere/Makefile.ecereCOM
index f00b0ec..7c8d6cd 100644 (file)
--- a/ecere/Makefile.ecereCOM
+++ b/ecere/Makefile.ecereCOM
@@ -31,11 +31,11 @@ CONSOLE = -mwindows
 
 # INCLUDES
 
-_CF_DIR = ../
+_SDK_SRC_ROOT = ../
 USE_BOOTSTRAP := defined
 
-include $(_CF_DIR)crossplatform.mk
-include $(_CF_DIR)default.cf
+include $(_SDK_SRC_ROOT)crossplatform.mk
+include $(_SDK_SRC_ROOT)default.cf
 
 ifdef PREFIXLIBDIR
 CFLAGS += -DDEB_HOST_MULTIARCH=\"$(call escspace,$(PREFIXLIBDIR))\"

diff --git a/ecere/Makefile.installer b/ecere/Makefile.installer
index f12e0ad..88b5f91 100644 (file)
--- a/ecere/Makefile.installer
+++ b/ecere/Makefile.installer
@@ -31,10 +31,10 @@ CONSOLE = -mwindows
 
 # INCLUDES
 
-_CF_DIR = ../
+_SDK_SRC_ROOT = ../
 
-include $(_CF_DIR)crossplatform.mk
-include $(_CF_DIR)default.cf
+include $(_SDK_SRC_ROOT)crossplatform.mk
+include $(_SDK_SRC_ROOT)default.cf
 
 # POST-INCLUDES VARIABLES
 

diff --git a/ecere/Makefile.vanilla b/ecere/Makefile.vanilla
index 71e0753..641d5d7 100644 (file)
--- a/ecere/Makefile.vanilla
+++ b/ecere/Makefile.vanilla
@@ -31,11 +31,11 @@ CONSOLE = -mwindows
 
 # INCLUDES
 
-_CF_DIR = ../
+_SDK_SRC_ROOT = ../
 USE_BOOTSTRAP := defined
 
-include $(_CF_DIR)crossplatform.mk
-include $(_CF_DIR)default.cf
+include $(_SDK_SRC_ROOT)crossplatform.mk
+include $(_SDK_SRC_ROOT)default.cf
 
 ifdef PREFIXLIBDIR
 CFLAGS += -DDEB_HOST_MULTIARCH=\"$(call escspace,$(PREFIXLIBDIR))\"

diff --git a/eda/Makefile b/eda/Makefile
index be9ebbb..bcfc7c5 100644 (file)
--- a/eda/Makefile
+++ b/eda/Makefile
@@ -5,10 +5,10 @@ endif
 
 # CROSS-PLATFORM MAGIC
 
-_CF_DIR = ../
+_SDK_SRC_ROOT = ../
 
-include $(_CF_DIR)crossplatform.mk
-include $(_CF_DIR)default.cf
+include $(_SDK_SRC_ROOT)crossplatform.mk
+include $(_SDK_SRC_ROOT)default.cf
 
 all:
        @$(call echo,Building Ecere Data Access layer...)

diff --git a/eda/drivers/sqlite/Makefile b/eda/drivers/sqlite/Makefile
index e78b4b7..16f283a 100644 (file)
--- a/eda/drivers/sqlite/Makefile
+++ b/eda/drivers/sqlite/Makefile
@@ -30,10 +30,10 @@ CONSOLE = -mwindows
 
 # INCLUDES
 
-_CF_DIR = ../../../
+_SDK_SRC_ROOT = ../../../
 
-include $(_CF_DIR)crossplatform.mk
-include $(_CF_DIR)default.cf
+include $(_SDK_SRC_ROOT)crossplatform.mk
+include $(_SDK_SRC_ROOT)default.cf
 
 # POST-INCLUDES VARIABLES
 

diff --git a/eda/drivers/sqliteCipher/Makefile b/eda/drivers/sqliteCipher/Makefile
index 4bfc70c..f1f69dc 100644 (file)
--- a/eda/drivers/sqliteCipher/Makefile
+++ b/eda/drivers/sqliteCipher/Makefile
@@ -30,10 +30,10 @@ CONSOLE = -mwindows
 
 # INCLUDES
 
-_CF_DIR = ../../../
+_SDK_SRC_ROOT = ../../../
 
-include $(_CF_DIR)crossplatform.mk
-include $(_CF_DIR)default.cf
+include $(_SDK_SRC_ROOT)crossplatform.mk
+include $(_SDK_SRC_ROOT)default.cf
 
 # POST-INCLUDES VARIABLES
 

diff --git a/eda/libeda/Makefile b/eda/libeda/Makefile
index 584a577..b45640e 100644 (file)
--- a/eda/libeda/Makefile
+++ b/eda/libeda/Makefile
@@ -30,10 +30,10 @@ CONSOLE = -mwindows
 
 # INCLUDES
 
-_CF_DIR = ../../
+_SDK_SRC_ROOT = ../../
 
-include $(_CF_DIR)crossplatform.mk
-include $(_CF_DIR)default.cf
+include $(_SDK_SRC_ROOT)crossplatform.mk
+include $(_SDK_SRC_ROOT)default.cf
 
 # POST-INCLUDES VARIABLES
 

diff --git a/epj2make/Makefile b/epj2make/Makefile
index 3196e3c..ab4bd60 100644 (file)
--- a/epj2make/Makefile
+++ b/epj2make/Makefile
@@ -30,10 +30,10 @@ CONSOLE = -mconsole
 
 # INCLUDES
 
-_CF_DIR = ../
+_SDK_SRC_ROOT = ../
 
-include $(_CF_DIR)crossplatform.mk
-include $(_CF_DIR)default.cf
+include $(_SDK_SRC_ROOT)crossplatform.mk
+include $(_SDK_SRC_ROOT)default.cf
 
 # POST-INCLUDES VARIABLES
 

diff --git a/ide/Makefile b/ide/Makefile
index 228e38d..0f3df17 100644 (file)
--- a/ide/Makefile
+++ b/ide/Makefile
@@ -31,10 +31,10 @@ CONSOLE = -mwindows
 
 # INCLUDES
 
-_CF_DIR = ../
+_SDK_SRC_ROOT = ../
 
-include $(_CF_DIR)crossplatform.mk
-include $(_CF_DIR)default.cf
+include $(_SDK_SRC_ROOT)crossplatform.mk
+include $(_SDK_SRC_ROOT)default.cf
 
 # POST-INCLUDES VARIABLES
 

diff --git a/installer/Makefile b/installer/Makefile
index 12ce23f..cbdbbe6 100644 (file)
--- a/installer/Makefile
+++ b/installer/Makefile
@@ -31,10 +31,10 @@ CONSOLE = -mwindows
 
 # INCLUDES
 
-_CF_DIR = ../
+_SDK_SRC_ROOT = ../
 
-include $(_CF_DIR)crossplatform.mk
-include $(_CF_DIR)default.cf
+include $(_SDK_SRC_ROOT)crossplatform.mk
+include $(_SDK_SRC_ROOT)default.cf
 
 # POST-INCLUDES VARIABLES