X-Git-Url: https://ecere.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=default.cf;h=8c9aa81d1e44bbcc522aa02e2759faa3463d9c50;hb=10a1c90f046c501b2ede5e39776700fde0072e81;hp=b5653a6ca1cb03b21bebd0a626c7ad16facd0516;hpb=c12d3a34d37b39058c1a63a67c6f416860d70e0f;p=sdk

diff --git a/default.cf b/default.cf
index b5653a6..8c9aa81 100644
--- a/default.cf
+++ b/default.cf
@@ -2,14 +2,36 @@ EC_BINS := $(_CF_DIR)$(if $(USE_BOOTSTRAP),compiler/bootstrap/obj/bin.$(HOST_PLA
 
 ifdef WINDOWS_HOST
  # Auto-Select MinGW-w64 when asking for 64 bit
- ifeq "$(ARCH)" "x64"
+ ifeq ($(ARCH),x64)
   GCC_PREFIX=x86_64-w64-mingw32-
  endif
 endif
 
+# PREFIXES AND EXTENSIONS
+EC := .ec
+S := .sym
+I := .imp
+B := .bowl
+C := .c
+ifndef O
+O := .o
+endif
+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)
+.SUFFIXES: .c .ec .sym .imp .bowl $(O) $(A)
+
 # TOOLCHAIN
+ifdef TRAVIS
+export CPP     = $(CC)
+else
 export CC      = $(CCACHE_COMPILE)$(DISTCC_COMPILE)$(GCC_PREFIX)gcc$(_SYSROOT)$(if $(GCC_CC_FLAGS),$(space)$(GCC_CC_FLAGS),)
 export CPP     = $(CCACHE_COMPILE)$(DISTCC_COMPILE)$(GCC_PREFIX)gcc$(_SYSROOT)
+endif
 export AS      = $(GCC_PREFIX)as
 export LD      = $(GCC_PREFIX)ld
 export AR      = $(GCC_PREFIX)ar
@@ -21,10 +43,10 @@ export EAR := $(call sys_path,$(_CF_DIR)obj/$(HOST_PLATFORM)$(COMPILER_SUFFIX)$(
 ifdef WINDOWS_TARGET
 WINDRES := $(GCC_PREFIX)windres
  ifdef ARCH
-  ifeq "$(ARCH)" "x32"
+  ifeq ($(ARCH),x32)
 WINDRES_FLAGS := -F pe-i386
   else
-   ifeq "$(ARCH)" "x64"
+   ifeq ($(ARCH),x64)
 WINDRES_FLAGS := -F pe-x86-64
    endif
   endif