X-Git-Url: http://ecere.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=crossplatform.mk;h=10cd02ed21d7241a19e6cab5b8b5b8e3f1397ab2;hb=refs%2Fheads%2Fshaders;hp=1de7312864652bffa218d9994403f477beb04a8a;hpb=aa6ca7f9ca8e287303f09cf85e49a17cf0417574;p=sdk

diff --git a/crossplatform.mk b/crossplatform.mk
index 1de7312..10cd02e 100644
--- a/crossplatform.mk
+++ b/crossplatform.mk
@@ -1,18 +1,18 @@
 # HOST PLATFORM DETECTION
-ifeq "$(OS)" "Windows_NT"
+ifeq ($(OS),Windows_NT)
    HOST_PLATFORM := win32
    WINDOWS_HOST := defined
 else
  _UNAME := $(shell uname)
  UNAME_P := $(shell uname -p)
- ifeq "$(_UNAME)" "FreeBSD"
+ ifeq ($(_UNAME),FreeBSD)
  # Using Linux platform for Unix OSes for now 
  #   HOST_PLATFORM := bsd
     BSD_HOST := defined
     HOST_PLATFORM := linux
     LINUX_HOST := defined
  else
-  ifeq "$(_UNAME)" "Darwin"
+  ifeq ($(_UNAME),Darwin)
      HOST_PLATFORM := apple
      OSX_HOST := defined
   else
@@ -50,13 +50,13 @@ endif
 ifndef PLATFORM
    PLATFORM := $(TARGET_PLATFORM)
 endif
-ifeq "$(TARGET_PLATFORM)" "win32"
+ifeq ($(TARGET_PLATFORM),win32)
    WINDOWS_TARGET := defined
 else
-ifeq "$(TARGET_PLATFORM)" "apple"
+ifeq ($(TARGET_PLATFORM),apple)
    OSX_TARGET := defined
 else
-#ifeq "$(TARGET_PLATFORM)" "bsd"
+#ifeq ($(TARGET_PLATFORM),bsd)
 #   BSD_TARGET := defined
 #else
    LINUX_TARGET := defined
@@ -65,29 +65,29 @@ endif
 endif
 
 # CROSS_TARGET
-ifneq "$(TARGET_PLATFORM)" "$(HOST_PLATFORM)"
+ifneq ($(TARGET_PLATFORM),$(HOST_PLATFORM))
    CROSS_TARGET := defined
 endif
 
 # TARGET_TYPE
-ifeq "$(TARGET_TYPE)" "staticlib"
+ifeq ($(TARGET_TYPE),staticlib)
    STATIC_LIBRARY_TARGET := defined
 else
-ifeq "$(TARGET_TYPE)" "sharedlib"
+ifeq ($(TARGET_TYPE),sharedlib)
    SHARED_LIBRARY_TARGET := defined
 else
-ifeq "$(TARGET_TYPE)" "executable"
+ifeq ($(TARGET_TYPE),executable)
    EXECUTABLE_TARGET := defined
 endif
 endif
 endif
 
-ifeq "$(GCC_PREFIX)" "i586-mingw32msvc-"
+ifeq ($(GCC_PREFIX),i586-mingw32msvc-)
 export ARCH
 ARCH := x32
 endif
 
-ifeq "$(GCC_PREFIX)" "i686-w64-mingw32-"
+ifeq ($(GCC_PREFIX),i686-w64-mingw32-)
 export ARCH
 ARCH := x32
 endif
@@ -95,34 +95,34 @@ endif
 # Accept different things for ARCH but standardize on x32/x64
 # This will be used for object directories
 ifdef ARCH
- ifeq "$(ARCH)" "32"
+ ifeq ($(ARCH),32)
   override ARCH := x32
  endif
- ifeq "$(ARCH)" "x86"
+ ifeq ($(ARCH),x86)
   override ARCH := x32
  endif
- ifeq "$(ARCH)" "i386"
+ ifeq ($(ARCH),i386)
   override ARCH := x32
  endif
- ifeq "$(ARCH)" "i686"
+ ifeq ($(ARCH),i686)
   override ARCH := x32
  endif
- ifeq "$(ARCH)" "64"
+ ifeq ($(ARCH),64)
   override ARCH := x64
  endif
- ifeq "$(ARCH)" "amd64"
+ ifeq ($(ARCH),amd64)
   override ARCH := x64
  endif
- ifeq "$(ARCH)" "x86_64"
+ ifeq ($(ARCH),x86_64)
   override ARCH := x64
  endif
 
  # Set ARCH_FLAGS only if ARCH is set
- ifeq "$(ARCH)" "x64"
+ ifeq ($(ARCH),x64)
   TARGET_ARCH := x86_64
   ARCH_FLAGS := -m64
  endif
- ifeq "$(ARCH)" "x32"
+ ifeq ($(ARCH),x32)
   TARGET_ARCH := i386
   ARCH_FLAGS := -m32
  endif
@@ -138,8 +138,8 @@ endif
 # On Windows/32 bit systems, pass -m32 as TDM-GCC packaged with the installer produces 64 bit executables by default
 # Disable this if your compiler does not accept -m32
 ifndef ARCH
- ifeq "$(HOST_PLATFORM)" "win32"
-  ifeq "$(TARGET_PLATFORM)" "win32"
+ ifeq ($(HOST_PLATFORM),win32)
+  ifeq ($(TARGET_PLATFORM),win32)
    ifndef ProgramFiles(x86)
     ARCH := x32
     TARGET_ARCH := i386
@@ -157,7 +157,7 @@ endif
 # COMPILER SUFFIX
 COMPILER_SUFFIX = $(ARCH_SUFFIX)
 ifdef COMPILER
-ifneq "$(COMPILER)" "default"
+ifneq ($(COMPILER),default)
 COMPILER_SUFFIX = .$(COMPILER)$(ARCH_SUFFIX)
 endif
 endif
@@ -195,13 +195,14 @@ else
 endif
 
 # PREFIXES AND EXTENSIONS
-.SUFFIXES: .c .ec .sym .imp .bowl .o .a
 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))
@@ -209,6 +210,7 @@ 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)
 
 # TARGET VERSION
 VER := $(if $(LINUX_TARGET),$(if $(LINUX_HOST),$(if $(VERSION),.$(VERSION),),),)
@@ -235,24 +237,32 @@ ifndef MSYSCON
    WIN_SHELL_COMMANDS := defined
 endif
 endif
+ifneq ($(V),1)
+   SILENT_IS_ON := defined
+endif
+ifeq ($(D),1)
+   DEBUG_IS_ON := defined
+endif
 ifdef WIN_SHELL_COMMANDS
    nullerror = 2>NUL
    echo = $(if $(1),echo $(1))
    touch = $(if $(1),@cmd /c "for %%I in ($(call sys_path,$(1))) do @(cd %%~pI && type nul >> %%~nxI && copy /by %%~nxI+,, > nul 2>&1 && cd %%cd%%)")
-   cpq = $(if $(1),@cmd /c "for %%I in ($(call sys_path,$(1))) do copy /by %%I $(call sys_path,$(2))" > nul 2>&1)
-   rmq = $(if $(1),-del /f /q $(call sys_path,$(call sys_path_list,$(1))) > nul 2>&1)
-   rmrq = $(if $(1),-rmdir /q /s $(call sys_path,$(1)) > nul 2>&1)
-   mkdirq = $(if $(1),-mkdir $(call sys_path,$(1)) > nul 2>&1)
-   rmdirq = $(if $(1),-rmdir /q $(call sys_path,$(1)) > nul 2>&1)
+   cp = $(if $(1),@cmd /c "for %%I in ($(call sys_path,$(1))) do copy /by %%I $(call sys_path,$(2))"$(if $(SILENT_IS_ON), > nul,))
+   cpr = $(if $(1),xcopy /y /s$(if $(SILENT_IS_ON), /q,) $(call sys_path,$(call sys_path_list,$(1))) $(call sys_path,$(2))$(if $(SILENT_IS_ON), > nul,))
+   rm = $(if $(1),-del /f$(if $(SILENT_IS_ON), /q,) $(call sys_path,$(call sys_path_list,$(1)))$(if $(SILENT_IS_ON), > nul,)$(if $(DEBUG_IS_ON),, 2>&1))
+   rmr = $(if $(1),-rmdir /s$(if $(SILENT_IS_ON), /q,) $(call sys_path,$(1))$(if $(SILENT_IS_ON), > nul,))
+   mkdir = $(if $(1),-mkdir $(call sys_path,$(1))$(if $(SILENT_IS_ON), > nul,)$(if $(DEBUG_IS_ON),, 2>&1))
+   rmdir = $(if $(1),-rmdir$(if $(SILENT_IS_ON), /q,) $(call sys_path,$(1))$(if $(SILENT_IS_ON), > nul,))
 else
    nullerror = 2>/dev/null
    echo = $(if $(1),echo "$(1)")
    touch = $(if $(1),touch $(1))
-   cpq = $(if $(1),cp $(1) $(2))
-   rmq = $(if $(1),-rm -f $(1))
-   rmrq = $(if $(1),-rm -f -r $(1))
-   mkdirq = $(if $(1),-mkdir -p $(1))
-   rmdirq = $(if $(1),-rmdir $(1))
+   cp = $(if $(1),cp$(if $(SILENT_IS_ON),, -v) $(1) $(2))
+   cpr = $(if $(1),cp -r$(if $(SILENT_IS_ON),,v) $(1) $(2))
+   rm = $(if $(1),-rm -f$(if $(SILENT_IS_ON),,v) $(1))
+   rmr = $(if $(1),-rm -fr$(if $(SILENT_IS_ON),,v) $(1))
+   mkdir = $(if $(1),-mkdir -p$(if $(SILENT_IS_ON),,v) $(1))
+   rmdir = $(if $(1),-rmdir$(if $(SILENT_IS_ON),, -v) $(1))
 endif
 
 # potential common use variables
@@ -292,7 +302,7 @@ ifndef REPOSITORY_VER
       else
          ifneq ($(shell $(GIT) log -n 1 --format="%%%%" $(nullerror)),)
             export GIT_REPOSITORY := yes
-            export REPOSITORY_VER := $(shell $(GIT) describe --tags --dirty="\ (dirty)" --always)
+            export REPOSITORY_VER := $(shell $(GIT) describe --tags --dirty=" (dirty)" --always)
          endif
       endif
    endif
@@ -312,7 +322,7 @@ ECSLIBOPT := $(if $(STATIC_LIBRARY_TARGET),-staticlib,$(if $(SHARED_LIBRARY_TARG
 FVISIBILITY := $(if $(WINDOWS_TARGET),,-fvisibility=hidden)
 FPIC := $(if $(WINDOWS_TARGET),,-fPIC)
 EXECUTABLE := $(if $(WINDOWS_TARGET),$(if $(EXECUTABLE_TARGET),$(CONSOLE),),)
-INSTALLNAME := $(if $(OSX_TARGET),$(if $(STATIC_LIBRARY_TARGET),-install_name $(LP)$(MODULE)$(SO),),)
+INSTALLNAME := $(if $(OSX_TARGET),$(if $(SHARED_LIBRARY_TARGET),-install_name $(LP)$(MODULE)$(SO),),)
 
 # LINKER OPTIONS
 SHAREDLIB := $(if $(SHARED_LIBRARY_TARGET),$(if $(OSX_TARGET),-dynamiclib -single_module -multiply_defined suppress,-shared),)