Valve/Proton
1
0
Fork 0
mirror of https://github.com/ValveSoftware/Proton.git synced 2025-05-17 17:08:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

fixup! make: Add support for arbitrary archs / cross archs selection.

Browse Source
This commit is contained in:
Billy Laws 2025-01-16 20:20:31 +00:00 committed by Arkadiusz Hiler
parent 68d36773d5
commit c12229bda5
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile.in
View File

@ -14,11 +14,6 @@ MFLAGS += V=1 VERBOSE=1
endif endif
SHELL := /bin/bash SHELL := /bin/bash
ARCHS := i386-unix x86_64-unix i386-windows x86_64-windows
HOST_ARCH := $(shell uname -m)
unix_ARCHS = $(subst -unix,,$(filter %-unix,$(ARCHS)))
windows_ARCHS = $(subst -windows,,$(filter %-windows,$(ARCHS)))
## ##
## General/global config ## General/global config
@ -79,6 +74,12 @@ $(DST_DIR):
mkdir -p $@ mkdir -p $@
ifeq ($(CONTAINER),1) # inside the container ifeq ($(CONTAINER),1) # inside the container
ARCHS := i386-unix x86_64-unix i386-windows x86_64-windows
HOST_ARCH := $(shell uname -m)
unix_ARCHS = $(subst -unix,,$(filter %-unix,$(ARCHS)))
windows_ARCHS = $(subst -windows,,$(filter %-windows,$(ARCHS)))
i386_SOURCE_DATE_EPOCH := $(BASE_SOURCE_DATE_EPOCH) i386_SOURCE_DATE_EPOCH := $(BASE_SOURCE_DATE_EPOCH)
x86_64_SOURCE_DATE_EPOCH := $(shell expr $(BASE_SOURCE_DATE_EPOCH) - 10) x86_64_SOURCE_DATE_EPOCH := $(shell expr $(BASE_SOURCE_DATE_EPOCH) - 10)
@ -418,7 +419,7 @@ WINE_AUTOCONF_ARGS = \
--disable-tests --disable-tests
WINE_x86_64_AUTOCONF_ARGS = \ WINE_x86_64_AUTOCONF_ARGS = \
--enable-archs="x86_64 $(filter-out x86_64 $(unix_ARCHS),$(windows_ARCHS))" \ --enable-archs=$(call list-join,$(comma),x86_64 $(filter-out x86_64 $(unix_ARCHS),$(windows_ARCHS))) \
--enable-win64 \ --enable-win64 \
WINE_i386_AUTOCONF_ARGS += \ WINE_i386_AUTOCONF_ARGS += \