X-Git-Url: https://ecere.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=crossplatform.mk;h=b3b90c0d2b3f38db8a027012755cc230f61712f3;hb=refs%2Fheads%2F850;hp=6f0c3715ee29baa683385652ce401fc780c7f095;hpb=4b275c9679b40852496e9058dbd8046ecf534ea6;p=sdk

diff --git a/crossplatform.mk b/crossplatform.mk
index 6f0c371..b3b90c0 100644
--- a/crossplatform.mk
+++ b/crossplatform.mk
@@ -3,21 +3,24 @@ ifeq "$(OS)" "Windows_NT"
    HOST_PLATFORM := win32
    WINDOWS_HOST := defined
 else
-ifeq "$(OSTYPE)" "FreeBSD"
-# tocheck: temporarily using linux when on bsd
-#   HOST_PLATFORM := bsd
-#   BSD_HOST := defined
-   HOST_PLATFORM := linux
-   LINUX_HOST := defined
-else
-ifeq "$(shell uname)" "Darwin"
-   HOST_PLATFORM := apple
-   OSX_HOST := defined
-else
-   HOST_PLATFORM := linux
-   LINUX_HOST := defined
-endif
-endif
+ _UNAME := $(shell uname)
+ UNAME_P := $(shell uname -p)
+ 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"
+     HOST_PLATFORM := apple
+     OSX_HOST := defined
+  else
+     HOST_PLATFORM := linux
+     LINUX_HOST := defined
+  endif
+ endif
+ HOST_ARCH := $(UNAME_P)
 endif
 
 # TARGET_PLATFORM
@@ -33,11 +36,14 @@ else
 ifdef OSX_HOST
    TARGET_PLATFORM := apple
 else
-ifdef BSD_HOST
-   TARGET_PLATFORM := bsd
-else
+#ifdef BSD_HOST
+#   TARGET_PLATFORM := bsd
+#else
    TARGET_PLATFORM := linux
+ifdef BSD_HOST
+   BSD_TARGET := defined
 endif
+#endif
 endif
 endif
 endif
@@ -50,12 +56,83 @@ else
 ifeq "$(TARGET_PLATFORM)" "apple"
    OSX_TARGET := defined
 else
-ifeq "$(TARGET_PLATFORM)" "bsd"
-   BSD_TARGET := defined
-else
+#ifeq "$(TARGET_PLATFORM)" "bsd"
+#   BSD_TARGET := defined
+#else
    LINUX_TARGET := defined
+#endif
+endif
 endif
+
+# CROSS_TARGET
+ifneq "$(TARGET_PLATFORM)" "$(HOST_PLATFORM)"
+   CROSS_TARGET := defined
 endif
+
+# TARGET_TYPE
+ifeq "$(TARGET_TYPE)" "staticlib"
+   STATIC_LIBRARY_TARGET := defined
+else
+ifeq "$(TARGET_TYPE)" "sharedlib"
+   SHARED_LIBRARY_TARGET := defined
+else
+ifeq "$(TARGET_TYPE)" "executable"
+   EXECUTABLE_TARGET := defined
+endif
+endif
+endif
+
+ifeq "$(GCC_PREFIX)" "i586-mingw32msvc-"
+export ARCH
+ARCH := x32
+endif
+
+ifeq "$(GCC_PREFIX)" "i686-w64-mingw32-"
+export ARCH
+ARCH := x32
+endif
+
+# Accept different things for ARCH but standardize on x32/x64
+# This will be used for object directories
+ifdef ARCH
+ ifeq "$(ARCH)" "32"
+  override ARCH := x32
+ endif
+ ifeq "$(ARCH)" "x86"
+  override ARCH := x32
+ endif
+ ifeq "$(ARCH)" "i386"
+  override ARCH := x32
+ endif
+ ifeq "$(ARCH)" "i686"
+  override ARCH := x32
+ endif
+ ifeq "$(ARCH)" "64"
+  override ARCH := x64
+ endif
+ ifeq "$(ARCH)" "amd64"
+  override ARCH := x64
+ endif
+ ifeq "$(ARCH)" "x86_64"
+  override ARCH := x64
+ endif
+
+ # Set ARCH_FLAGS only if ARCH is set
+ ifeq "$(ARCH)" "x64"
+  TARGET_ARCH := x86_64
+  ARCH_FLAGS := -m64
+ endif
+ ifeq "$(ARCH)" "x32"
+  TARGET_ARCH := i386
+  ARCH_FLAGS := -m32
+ endif
+
+ ARCH_SUFFIX := .$(ARCH)
+
+ ifdef LINUX_TARGET
+  TARGET_ARCH := $(TARGET_ARCH)-linux-gnu
+ endif
+
 endif
 
 # DEBUG SUFFIX
@@ -63,18 +140,25 @@ ifdef DEBUG
 DEBUG_SUFFIX := .debug
 endif
 
+# COMPILER SUFFIX
+COMPILER_SUFFIX = $(ARCH_SUFFIX)
 ifdef COMPILER
 ifneq "$(COMPILER)" "default"
-COMPILER_SUFFIX := .$(COMPILER)
+COMPILER_SUFFIX = .$(COMPILER)$(ARCH_SUFFIX)
 endif
 endif
 
 # MISC STRING TOOLS
 empty :=
+esc := $(empty)$(empty)
 space := $(empty) $(empty)
-escspace = $(subst $(space),\$(space),$(subst \$(space),$(space),$1))
-hidspace = $(subst $(space),,$(subst \$(space),,$1))
-shwspace = $(subst ,\$(space),$1)
+comma := ,
+slash := $(empty)/$(empty)
+backslash := $(empty)\$(empty)
+escspace = $(subst $(space),$(backslash)$(space),$(subst $(backslash)$(space),$(space),$(1)))
+hidspace = $(subst $(space),$(esc),$(subst $(backslash)$(space),$(esc),$(1)))
+shwspace = $(subst $(esc),$(backslash)$(space),$(1))
+unescp_all = $(subst $(esc),$(backslash),$(subst $(backslash),,$(subst $(backslash)$(backslash),$(esc),$(1))))
 
 # PATH SEPARATOR STRING TOOLS
 ifdef WINDOWS_HOST
@@ -83,13 +167,15 @@ ifndef MSYSCON
 endif
 endif
 ifdef WIN_PS_TOOLS
-   fixps = $(subst \,/,$(1))
-   psep = $(subst \\,/,$(subst /,\,$(1)))
-   PS := $(strip \)
+   psep := $(backslash)
+   slash_path = $(subst $(backslash),$(slash),$(1))
+   sys_path = $(subst $(backslash)$(backslash),$(slash),$(subst $(slash),$(backslash),$(1)))
+   quote_path = "$(call sys_path,$(call unescp_all,$(1)))"
 else
-   fixps = $(1)
-   PS := $(strip /)
-   psep = $(1)
+   psep := $(slash)
+   slash_path = $(1)
+   sys_path = $(1)
+   quote_path = $(1)
 endif
 
 # PREFIXES AND EXTENSIONS
@@ -101,38 +187,32 @@ B := .bowl
 C := .c
 O := .o
 A := .a
-ifdef WINDOWS_TARGET
-   E := .exe
-ifeq "$(TARGET_TYPE)" "staticlib"
-   LP := lib
-else
-   LP :=
-endif
-   SO := .dll
-else
-ifdef OSX_TARGET
-   E :=
-   LP := lib
-   SO := .dylib
-else
-   E :=
-   LP := lib
-   SO := .so
-endif
-endif
+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)
+
+# VERSIONING
+VER := $(if $(LINUX_TARGET),$(if $(LINUX_HOST),$(if $(VERSION),.$(VERSION),),),)
 
 # SUPER TOOLS
 ifdef CCACHE
-   CCACHE_COMPILE := ccache
+   CCACHE_COMPILE := ccache$(space)
 ifdef DISTCC
-   DISTCC_COMPILE := distcc
+   DISTCC_COMPILE := distcc$(space)
 endif
 else
 ifdef DISTCC
-   DISTCC_COMPILE := distcc
+   DISTCC_COMPILE := distcc$(space)
 endif
 endif
 
+_CPP = $(if $(findstring $(space),$(CPP)),"$(CPP)",$(CPP))
+
+_SYSROOT = $(if $(SYSROOT),$(space)--sysroot=$(SYSROOT),)
+
 # SHELL COMMANDS
 ifdef WINDOWS_HOST
 ifndef MSYSCON
@@ -141,102 +221,59 @@ endif
 endif
 ifdef WIN_SHELL_COMMANDS
    echo = $(if $(1),echo $(1))
-   cpq = $(if $(1),@cmd /c for %%I in ($(call psep,$(1))) do @copy /y %%I $(call psep,$(2)) > nul 2>&1)
-   rmq = $(if $(1),-@del /f /q $(call psep,$(1)) > nul 2>&1)
-   rmrq = $(if $(1),-@rmdir /q /s $(call psep,$(1)) > nul 2>&1)
-   mkdirq = $(if $(1),-@mkdir $(call psep,$(1)) > nul 2>&1)
-   rmdirq = $(if $(1),-@rmdir /q $(call psep,$(1)) > nul 2>&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,$(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)
 else
    echo = $(if $(1),echo "$(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))
+   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))
 endif
 
 # COMPILER OPTIONS
-ifeq "$(TARGET_TYPE)" "sharedlib"
-   ECSLIBOPT := -dynamiclib
-else
-ifeq "$(TARGET_TYPE)" "staticlib"
-   ECSLIBOPT := -staticlib
-else
-   ECSLIBOPT :=
-endif
-endif
-ifdef WINDOWS_TARGET
-   FVISIBILITY :=
-   FPIC :=
-ifeq "$(TARGET_TYPE)" "executable"
-   EXECUTABLE := $(CONSOLE)
-else
-   EXECUTABLE :=
-endif
-else
-   FVISIBILITY := -fvisibility=hidden
-   FPIC := -fPIC
-   EXECUTABLE :=
-endif
-ifdef OSX
-ifeq "$(TARGET_TYPE)" "sharedlib"
-   INSTALLNAME := -install_name $(LP)$(MODULE)$(SO)
-else
-   INSTALLNAME :=
-endif
-else
-   INSTALLNAME :=
-endif
+ECSLIBOPT := $(if $(STATIC_LIBRARY_TARGET),-staticlib,$(if $(SHARED_LIBRARY_TARGET),-dynamiclib,))
+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),),)
 
 # LINKER OPTIONS
-ifdef OSX
-ifeq "$(TARGET_TYPE)" "sharedlib"
-   SHAREDLIB := -dynamiclib -single_module -multiply_defined suppress
-   LINKOPT :=
-else
-   SHAREDLIB :=
-   LINKOPT :=
-endif
-ifeq "$(TARGET_TYPE)" "sharedlib"
-   STRIPOPT := -x
-else
-   STRIPOPT := -u -r
-endif
-else
-ifeq "$(TARGET_TYPE)" "sharedlib"
-   SHAREDLIB := -shared
-else
-   SHAREDLIB :=
-endif
-   LINKOPT :=
-   STRIPOPT := -x --strip-unneeded --remove-section=.comment --remove-section=.note
-endif
-ifdef WINDOWS_TARGET
-   SODESTDIR := obj/$(TARGET_PLATFORM)/bin/
-else
-   SODESTDIR := obj/$(TARGET_PLATFORM)/lib/
-endif
+SHAREDLIB := $(if $(SHARED_LIBRARY_TARGET),$(if $(OSX_TARGET),-dynamiclib -single_module -multiply_defined suppress,-shared),)
+LINKOPT :=
+STRIPOPT := $(if $(OSX_TARGET),$(if $(SHARED_LIBRARY_TARGET),-x, -u -r), -x --strip-unneeded --remove-section=.comment --remove-section=.note)
+HOST_SODESTDIR := $(if $(WINDOWS_HOST),obj/$(HOST_PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/bin/,obj/$(HOST_PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/lib/)
+SODESTDIR := $(if $(WINDOWS_TARGET),obj/$(TARGET_PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/bin/,obj/$(TARGET_PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/lib/)
 
+# EXCLUDED_LIBS TOOL
 _L = $(if $(filter $(1),$(EXCLUDED_LIBS)),,-l$(1))
 
-# COMMON LIBRARIES DETECTION
-
-ifdef WINDOWS_TARGET
-
-ifdef OPENSSL_CONF
-_OPENSSL_CONF = $(call hidspace,$(call fixps,$(OPENSSL_CONF)))
-OPENSSL_INCLUDE_DIR = $(call shwspace,$(subst /bin/openssl.cfg,/include,$(_OPENSSL_CONF)))
-OPENSSL_LIB_DIR = $(call shwspace,$(subst /bin/openssl.cfg,/lib,$(_OPENSSL_CONF)))
-OPENSSL_BIN_DIR = $(call shwspace,$(subst /bin/openssl.cfg,/bin,$(_OPENSSL_CONF)))
-else
-# to avoid issues with empty -L/-I
-OPENSSL_INCLUDE_DIR = .
-OPENSSL_LIB_DIR = .
-OPENSSL_BIN_DIR = .
+# DEBIAN
+ifdef DEBIAN_PACKAGE
+CFLAGS += $(CPPFLAGS)
 endif
 
-else
-
-OFLAGS += -L/usr/lib/ec
+ifdef DEBUG
+CFLAGS += -D_DEBUG
+endif
 
+# COMMON LIBRARIES DETECTION
+ifdef WINDOWS_TARGET
+ ifdef OPENSSL_CONF
+  _OPENSSL_CONF = $(call hidspace,$(call slash_path,$(OPENSSL_CONF)))
+  OPENSSL_INCLUDE_DIR = $(call shwspace,$(subst /bin/openssl.cfg,/include,$(_OPENSSL_CONF)))
+  OPENSSL_LIB_DIR = $(call shwspace,$(subst /bin/openssl.cfg,/lib,$(_OPENSSL_CONF)))
+  OPENSSL_BIN_DIR = $(call shwspace,$(subst /bin/openssl.cfg,/bin,$(_OPENSSL_CONF)))
+ else
+# to avoid issues with empty -L/-I
+  OPENSSL_INCLUDE_DIR = .
+  OPENSSL_LIB_DIR = .
+  OPENSSL_BIN_DIR = .
+ endif
 endif