diff options
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | src/cmake-conf.mk | 1 | ||||
| -rw-r--r-- | src/cmake/conf/mxe-conf.cmake.in | 1 |
3 files changed, 3 insertions, 0 deletions
@@ -735,6 +735,7 @@ build-only-$(1)_$(3): BUILD_$(if $(call seq,$(TARGET),$(BUILD)),NATIVE,CROSS) = build-only-$(1)_$(3): $(if $(findstring posix,$(TARGET)),POSIX,WIN32)_THREADS = TRUE build-only-$(1)_$(3): LIB_SUFFIX = $(if $(findstring shared,$(3)),dll,a) build-only-$(1)_$(3): BITS = $(if $(findstring x86_64,$(3)),64,32) +build-only-$(1)_$(3): PROCESSOR = $(firstword $(call split,-,$(3))) build-only-$(1)_$(3): BUILD_TYPE = $(if $(findstring debug,$(3) $($(1)_CONFIGURE_OPTS)),debug,release) build-only-$(1)_$(3): BUILD_TYPE_SUFFIX = $(if $(findstring debug,$(3) $($(1)_CONFIGURE_OPTS)),d) build-only-$(1)_$(3): INSTALL_STRIP_TOOLCHAIN = install$(if $(STRIP_TOOLCHAIN),-strip) diff --git a/src/cmake-conf.mk b/src/cmake-conf.mk index 225efc0..3f588af 100644 --- a/src/cmake-conf.mk +++ b/src/cmake-conf.mk @@ -23,6 +23,7 @@ define $(PKG)_BUILD -DCMAKE_SHARED_BOOL=$(CMAKE_SHARED_BOOL) \ -DCMAKE_STATIC_BOOL=$(CMAKE_STATIC_BOOL) \ -DLIBTYPE=$(if $(BUILD_SHARED),SHARED,STATIC) \ + -DPROCESSOR=$(PROCESSOR) \ -DPREFIX=$(PREFIX) \ -DTARGET=$(TARGET) \ -DBUILD=$(BUILD) \ diff --git a/src/cmake/conf/mxe-conf.cmake.in b/src/cmake/conf/mxe-conf.cmake.in index 8bd4cf1..6341b32 100644 --- a/src/cmake/conf/mxe-conf.cmake.in +++ b/src/cmake/conf/mxe-conf.cmake.in @@ -24,6 +24,7 @@ endif() ## General configuration set(CMAKE_SYSTEM_NAME Windows) +set(CMAKE_SYSTEM_PROCESSOR @PROCESSOR@) set(MSYS 1) set(CMAKE_EXPORT_NO_PACKAGE_REGISTRY ON) # Workaround for https://www.cmake.org/Bug/view.php?id=14075 |