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_P := $(shell uname -p)
-ifeq ($(UNAME_P),x86_64)
- HOST_ARCH = X64
-else
-ifneq ($(filter %86,$(UNAME_P)),)
- HOST_ARCH = X86
-else
-ifneq ($(filter arm%,$(UNAME_P)),)
- HOST_ARCH = ARM
-endif
-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
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
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
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)/bin/,obj/$(HOST_PLATFORM)/lib/)
-SODESTDIR := $(if $(WINDOWS_TARGET),obj/$(TARGET_PLATFORM)/bin/,obj/$(TARGET_PLATFORM)/lib/)
+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
+ 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 = .
-endif
-else
-OFLAGS += -L/usr/lib/ec
+ OPENSSL_INCLUDE_DIR = .
+ OPENSSL_LIB_DIR = .
+ OPENSSL_BIN_DIR = .
+ endif
endif