From c8c66cc4572092a4bdd17682a50072c0a7c0a0d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Bernon?= Date: Sun, 12 Jan 2025 11:44:56 +0100 Subject: [PATCH] make: Use arch names instead of 32/64 suffixes. --- Makefile | 16 +- Makefile.in | 332 ++++++++++++++++++------------------ make/rules-autoconf.mk | 2 +- make/rules-cargo.mk | 10 +- make/rules-cmake.mk | 2 +- make/rules-common.mk | 62 +++---- make/rules-configure.mk | 6 +- make/rules-makedep.mk | 22 +-- make/rules-meson.mk | 14 +- make/rules-wine-requests.mk | 16 +- make/rules-winemaker.mk | 6 +- 11 files changed, 244 insertions(+), 244 deletions(-) diff --git a/Makefile b/Makefile index abcc07ac..988cf5ec 100644 --- a/Makefile +++ b/Makefile @@ -153,15 +153,15 @@ module: | $(BUILD_ROOT)/$(module)/lib/wine/x86_64-windows module: | $(BUILD_ROOT)/$(module)/lib/wine/x86_64-unix module: configure $(MAKE) $(MFLAGS) $(MAKEOVERRIDES) -C $(BUILD_DIR)/ $(UNSTRIPPED) module=$(module) module && \ - cp -f $(BUILD_DIR)/obj-wine-32/dlls/$(module)/$(MODULE_PEFILE) $(BUILD_ROOT)/$(module)/lib/wine/i386-windows/ && \ - cp -f $(BUILD_DIR)/obj-wine-64/dlls/$(module)/$(MODULE_PEFILE) $(BUILD_ROOT)/$(module)/lib/wine/x86_64-windows/ && \ - if [ -e $(BUILD_DIR)/obj-wine-32/dlls/$(module)/$(MODULE_PEFILE).so ]; then \ - cp -f $(BUILD_DIR)/obj-wine-32/dlls/$(module)/$(MODULE_PEFILE).so $(BUILD_ROOT)/$(module)/lib/wine/i386-unix/ && \ - cp -f $(BUILD_DIR)/obj-wine-64/dlls/$(module)/$(MODULE_PEFILE).so $(BUILD_ROOT)/$(module)/lib/wine/x86_64-unix/; \ + cp -f $(BUILD_DIR)/obj-wine-i386/dlls/$(module)/$(MODULE_PEFILE) $(BUILD_ROOT)/$(module)/lib/wine/i386-windows/ && \ + cp -f $(BUILD_DIR)/obj-wine-x86_64/dlls/$(module)/$(MODULE_PEFILE) $(BUILD_ROOT)/$(module)/lib/wine/x86_64-windows/ && \ + if [ -e $(BUILD_DIR)/obj-wine-i386/dlls/$(module)/$(MODULE_PEFILE).so ]; then \ + cp -f $(BUILD_DIR)/obj-wine-i386/dlls/$(module)/$(MODULE_PEFILE).so $(BUILD_ROOT)/$(module)/lib/wine/i386-unix/ && \ + cp -f $(BUILD_DIR)/obj-wine-x86_64/dlls/$(module)/$(MODULE_PEFILE).so $(BUILD_ROOT)/$(module)/lib/wine/x86_64-unix/; \ fi - if [ -e $(BUILD_DIR)/obj-wine-32/dlls/$(module)/$(MODULE_SOFILE) ]; then \ - cp -f $(BUILD_DIR)/obj-wine-32/dlls/$(module)/$(MODULE_SOFILE) $(BUILD_ROOT)/$(module)/lib/wine/i386-unix/ && \ - cp -f $(BUILD_DIR)/obj-wine-64/dlls/$(module)/$(MODULE_SOFILE) $(BUILD_ROOT)/$(module)/lib/wine/x86_64-unix/; \ + if [ -e $(BUILD_DIR)/obj-wine-i386/dlls/$(module)/$(MODULE_SOFILE) ]; then \ + cp -f $(BUILD_DIR)/obj-wine-i386/dlls/$(module)/$(MODULE_SOFILE) $(BUILD_ROOT)/$(module)/lib/wine/i386-unix/ && \ + cp -f $(BUILD_DIR)/obj-wine-x86_64/dlls/$(module)/$(MODULE_SOFILE) $(BUILD_ROOT)/$(module)/lib/wine/x86_64-unix/; \ fi any $(CONTAINERGOALS): configure diff --git a/Makefile.in b/Makefile.in index 1317b7ab..309e2819 100644 --- a/Makefile.in +++ b/Makefile.in @@ -57,8 +57,8 @@ OPTIMIZE_FLAGS := -O2 -march=nocona -mtune=core-avx2 -mfpmath=sse SANITY_FLAGS := -fwrapv -fno-strict-aliasing DEBUG_FLAGS := -ggdb -ffunction-sections -fdata-sections -fno-omit-frame-pointer COMMON_FLAGS = $(DEBUG_FLAGS) $(OPTIMIZE_FLAGS) $(SANITY_FLAGS) -ffile-prefix-map=$(CCACHE_BASEDIR)=. -32_COMMON_FLAGS := -mstackrealign -64_COMMON_FLAGS := -mcmodel=small +i386_COMMON_FLAGS := -mstackrealign +x86_64_COMMON_FLAGS := -mcmodel=small ifneq ($(SUPPRESS_WARNINGS),) COMMON_FLAGS += -w @@ -74,8 +74,8 @@ $(DST_DIR): mkdir -p $@ ifeq ($(CONTAINER),1) # inside the container -32_SOURCE_DATE_EPOCH := $(BASE_SOURCE_DATE_EPOCH) -64_SOURCE_DATE_EPOCH := $(shell expr $(BASE_SOURCE_DATE_EPOCH) - 10) +i386_SOURCE_DATE_EPOCH := $(BASE_SOURCE_DATE_EPOCH) +x86_64_SOURCE_DATE_EPOCH := $(shell expr $(BASE_SOURCE_DATE_EPOCH) - 10) # all, all-dist and dist are basically synonyms .PHONY: all all-dist dist @@ -107,8 +107,8 @@ DAV1D_MESON_ARGS = \ -Denable_tests=false $(eval $(call rules-source,dav1d,$(SRCDIR)/dav1d)) -$(eval $(call rules-meson,dav1d,32)) -$(eval $(call rules-meson,dav1d,64)) +$(eval $(call rules-meson,dav1d,i386)) +$(eval $(call rules-meson,dav1d,x86_64)) ## @@ -119,8 +119,8 @@ GST_ORC_MESON_ARGS := \ -Dorc-test=disabled $(eval $(call rules-source,gst_orc,$(SRCDIR)/gst-orc)) -$(eval $(call rules-meson,gst_orc,32)) -$(eval $(call rules-meson,gst_orc,64)) +$(eval $(call rules-meson,gst_orc,i386)) +$(eval $(call rules-meson,gst_orc,x86_64)) ## @@ -136,8 +136,8 @@ GSTREAMER_MESON_ARGS := \ GSTREAMER_DEPENDS = gst_orc $(eval $(call rules-source,gstreamer,$(SRCDIR)/gstreamer/subprojects/gstreamer)) -$(eval $(call rules-meson,gstreamer,32)) -$(eval $(call rules-meson,gstreamer,64)) +$(eval $(call rules-meson,gstreamer,i386)) +$(eval $(call rules-meson,gstreamer,x86_64)) ## @@ -145,8 +145,8 @@ $(eval $(call rules-meson,gstreamer,64)) ## $(eval $(call rules-source,graphene,$(SRCDIR)/graphene)) -$(eval $(call rules-meson,graphene,32)) -$(eval $(call rules-meson,graphene,64)) +$(eval $(call rules-meson,graphene,i386)) +$(eval $(call rules-meson,graphene,x86_64)) ## @@ -177,8 +177,8 @@ GST_BASE_MESON_ARGS := \ GST_BASE_DEPENDS = gst_orc graphene gstreamer $(eval $(call rules-source,gst_base,$(SRCDIR)/gstreamer/subprojects/gst-plugins-base)) -$(eval $(call rules-meson,gst_base,32)) -$(eval $(call rules-meson,gst_base,64)) +$(eval $(call rules-meson,gst_base,i386)) +$(eval $(call rules-meson,gst_base,x86_64)) ## @@ -208,8 +208,8 @@ GST_GOOD_MESON_ARGS := \ GST_GOOD_DEPENDS = gst_orc gstreamer gst_base $(eval $(call rules-source,gst_good,$(SRCDIR)/gstreamer/subprojects/gst-plugins-good/)) -$(eval $(call rules-meson,gst_good,32)) -$(eval $(call rules-meson,gst_good,64)) +$(eval $(call rules-meson,gst_good,i386)) +$(eval $(call rules-meson,gst_good,x86_64)) ## ## gst-plugins-bad @@ -224,8 +224,8 @@ GST_BAD_MESON_ARGS := \ GST_BAD_DEPENDS = gst_orc gstreamer gst_base $(eval $(call rules-source,gst_bad,$(SRCDIR)/gstreamer/subprojects/gst-plugins-bad/)) -$(eval $(call rules-meson,gst_bad,32)) -$(eval $(call rules-meson,gst_bad,64)) +$(eval $(call rules-meson,gst_bad,i386)) +$(eval $(call rules-meson,gst_bad,x86_64)) ## ## FFmpeg @@ -241,13 +241,13 @@ FFMPEG_CONFIGURE_ARGS := \ --enable-demuxer=matroska \ $(eval $(call rules-source,ffmpeg,$(SRCDIR)/ffmpeg)) -$(eval $(call rules-configure,ffmpeg,32)) -$(eval $(call rules-configure,ffmpeg,64)) +$(eval $(call rules-configure,ffmpeg,i386)) +$(eval $(call rules-configure,ffmpeg,x86_64)) ## Only use ffmpeg to build gst-libav; we don't ship it. -$(OBJ)/.ffmpeg-32-dist: +$(OBJ)/.ffmpeg-i386-dist: touch $@ -$(OBJ)/.ffmpeg-64-dist: +$(OBJ)/.ffmpeg-x86_64-dist: touch $@ ## @@ -257,8 +257,8 @@ $(OBJ)/.ffmpeg-64-dist: GST_LIBAV_DEPENDS = gst_orc gstreamer gst_base ffmpeg $(eval $(call rules-source,gst_libav,$(SRCDIR)/gstreamer/subprojects/gst-libav)) -$(eval $(call rules-meson,gst_libav,32)) -$(eval $(call rules-meson,gst_libav,64)) +$(eval $(call rules-meson,gst_libav,i386)) +$(eval $(call rules-meson,gst_libav,x86_64)) ## @@ -271,17 +271,17 @@ GST_PLUGINS_RS_CARGO_ARGS = \ GST_PLUGINS_RS_DEPENDS = gst_orc gstreamer gst_base dav1d $(eval $(call rules-source,gst_plugins_rs,$(SRCDIR)/gst-plugins-rs)) -$(eval $(call rules-cargo,gst_plugins_rs,32)) -$(eval $(call rules-cargo,gst_plugins_rs,64)) +$(eval $(call rules-cargo,gst_plugins_rs,i386)) +$(eval $(call rules-cargo,gst_plugins_rs,x86_64)) -$(OBJ)/.gst_plugins_rs-64-post-build: - mkdir -p $(GST_PLUGINS_RS_64_DST)/lib/x86_64-linux-gnu/gstreamer-1.0/ - cp -a $(GST_PLUGINS_RS_64_OBJ)/x86_64-unknown-linux-gnu/release/libgstdav1d.so $(GST_PLUGINS_RS_64_DST)/lib/x86_64-linux-gnu/gstreamer-1.0/ +$(OBJ)/.gst_plugins_rs-x86_64-post-build: + mkdir -p $(GST_PLUGINS_RS_x86_64_DST)/lib/x86_64-linux-gnu/gstreamer-1.0/ + cp -a $(GST_PLUGINS_RS_x86_64_OBJ)/x86_64-unknown-linux-gnu/release/libgstdav1d.so $(GST_PLUGINS_RS_x86_64_DST)/lib/x86_64-linux-gnu/gstreamer-1.0/ touch $@ -$(OBJ)/.gst_plugins_rs-32-post-build: - mkdir -p $(GST_PLUGINS_RS_32_DST)/lib/i386-linux-gnu/gstreamer-1.0/ - cp -a $(GST_PLUGINS_RS_32_OBJ)/i686-unknown-linux-gnu/release/libgstdav1d.so $(GST_PLUGINS_RS_32_DST)/lib/i386-linux-gnu/gstreamer-1.0/ +$(OBJ)/.gst_plugins_rs-i386-post-build: + mkdir -p $(GST_PLUGINS_RS_i386_DST)/lib/i386-linux-gnu/gstreamer-1.0/ + cp -a $(GST_PLUGINS_RS_i386_OBJ)/i686-unknown-linux-gnu/release/libgstdav1d.so $(GST_PLUGINS_RS_i386_DST)/lib/i386-linux-gnu/gstreamer-1.0/ touch $@ @@ -290,8 +290,8 @@ $(OBJ)/.gst_plugins_rs-32-post-build: ## $(eval $(call rules-source,vulkan-headers,$(SRCDIR)/Vulkan-Headers)) -$(eval $(call rules-cmake,vulkan-headers,32,CROSS)) -$(eval $(call rules-cmake,vulkan-headers,64,CROSS)) +$(eval $(call rules-cmake,vulkan-headers,i386,CROSS)) +$(eval $(call rules-cmake,vulkan-headers,x86_64,CROSS)) ## @@ -299,8 +299,8 @@ $(eval $(call rules-cmake,vulkan-headers,64,CROSS)) ## $(eval $(call rules-source,spirv-headers,$(SRCDIR)/SPIRV-Headers)) -$(eval $(call rules-cmake,spirv-headers,32,CROSS)) -$(eval $(call rules-cmake,spirv-headers,64,CROSS)) +$(eval $(call rules-cmake,spirv-headers,i386,CROSS)) +$(eval $(call rules-cmake,spirv-headers,x86_64,CROSS)) ## @@ -308,8 +308,8 @@ $(eval $(call rules-cmake,spirv-headers,64,CROSS)) ## $(eval $(call rules-source,glslang,$(SRCDIR)/glslang)) -$(eval $(call rules-cmake,glslang,32)) -$(eval $(call rules-cmake,glslang,64)) +$(eval $(call rules-cmake,glslang,i386)) +$(eval $(call rules-cmake,glslang,x86_64)) ## @@ -320,8 +320,8 @@ LSTEAMCLIENT_DEPENDS = wine LSTEAMCLIENT_LDFLAGS = -static-libgcc -static-libstdc++ $(eval $(call rules-source,lsteamclient,$(SRCDIR)/lsteamclient)) -$(eval $(call rules-makedep,lsteamclient,32,CROSS)) -$(eval $(call rules-makedep,lsteamclient,64,CROSS)) +$(eval $(call rules-makedep,lsteamclient,i386,CROSS)) +$(eval $(call rules-makedep,lsteamclient,x86_64,CROSS)) ## @@ -332,8 +332,8 @@ $(eval $(call rules-makedep,lsteamclient,64,CROSS)) OPENXR_CMAKE_ARGS = -DHAVE_FILESYSTEM_WITHOUT_LIB=0 $(eval $(call rules-source,openxr,$(SRCDIR)/OpenXR-SDK)) -# $(eval $(call rules-cmake,openxr,32)) -$(eval $(call rules-cmake,openxr,64)) +# $(eval $(call rules-cmake,openxr,i386)) +$(eval $(call rules-cmake,openxr,x86_64)) ## @@ -345,7 +345,7 @@ WINEOPENXR_LDFLAGS = -lopenxr_loader WINEOPENXR_DEPENDS = wine openxr $(eval $(call rules-source,wineopenxr,$(SRCDIR)/wineopenxr)) -$(eval $(call rules-makedep,wineopenxr,64,CROSS)) +$(eval $(call rules-makedep,wineopenxr,x86_64,CROSS)) DIST_WINEOPENXR64_JSON := $(DIST_PREFIX)/drive_c/openxr/wineopenxr64.json $(WINEOPENXR_SRC)/wineopenxr64.json: wineopenxr @@ -372,15 +372,15 @@ STEAMEXE_LDFLAGS = \ STEAMEXE_DEPENDS = wine $(eval $(call rules-source,steamexe,$(SRCDIR)/steam_helper)) -$(eval $(call rules-makedep,steamexe,32,CROSS)) -$(eval $(call rules-makedep,steamexe,64,CROSS)) +$(eval $(call rules-makedep,steamexe,i386,CROSS)) +$(eval $(call rules-makedep,steamexe,x86_64,CROSS)) -$(OBJ)/.steamexe-post-build32: +$(OBJ)/.steamexe-i386-post-build: mkdir -p $(DST_LIBDIR)/i386-linux-gnu/ cp $(SRC)/steam_helper/32/libsteam_api.so $(DST_LIBDIR)/i386-linux-gnu/ touch $@ -$(OBJ)/.steamexe-post-build64: +$(OBJ)/.steamexe-x86_64-post-build: mkdir -p $(DST_LIBDIR)/x86_64-linux-gnu/ cp $(SRC)/steam_helper/64/libsteam_api.so $(DST_LIBDIR)/x86_64-linux-gnu/ touch $@ @@ -390,13 +390,13 @@ $(OBJ)/.steamexe-post-build64: ## $(eval $(call rules-source,piper,$(SRCDIR)/piper)) -$(eval $(call rules-cmake,piper,64)) +$(eval $(call rules-cmake,piper,x86_64)) -$(OBJ)/.piper-64-post-build: - mkdir -p $(PIPER_64_DST)/lib/$(64_TARGET) - mv $(PIPER_64_DST)/*.so* $(PIPER_64_DST)/lib/$(64_TARGET) +$(OBJ)/.piper-x86_64-post-build: + mkdir -p $(PIPER_x86_64_DST)/lib/$(x86_64_TARGET) + mv $(PIPER_x86_64_DST)/*.so* $(PIPER_x86_64_DST)/lib/$(x86_64_TARGET) mkdir -p $(DST_DIR)/share - cp -a $(PIPER_64_DST)/{espeak-ng-data,libtashkeel_model.ort} $(DST_DIR)/share/ + cp -a $(PIPER_x86_64_DST)/{espeak-ng-data,libtashkeel_model.ort} $(DST_DIR)/share/ touch $@ ## @@ -427,23 +427,23 @@ WINE_AUTOCONF_ARGS = \ --with-mingw \ --disable-tests -WINE_32_AUTOCONF_ARGS = \ - VKD3D_PE_CFLAGS="-I$(VULKAN_HEADERS_32_DST)/include -I$(VKD3D_32_DST)/include/vkd3d" \ - VKD3D_PE_LIBS="-L$(VKD3D_32_LIBDIR)/vkd3d/i386-windows -l:libvkd3d-1.dll -l:libvkd3d-shader-1.dll" +WINE_i386_AUTOCONF_ARGS = \ + VKD3D_PE_CFLAGS="-I$(VULKAN_HEADERS_i386_DST)/include -I$(VKD3D_i386_DST)/include/vkd3d" \ + VKD3D_PE_LIBS="-L$(VKD3D_i386_LIBDIR)/vkd3d/i386-windows -l:libvkd3d-1.dll -l:libvkd3d-shader-1.dll" -WINE_64_AUTOCONF_ARGS = --enable-win64 \ - VKD3D_PE_CFLAGS="-I$(VULKAN_HEADERS_64_DST)/include -I$(VKD3D_64_DST)/include/vkd3d" \ - VKD3D_PE_LIBS="-L$(VKD3D_64_LIBDIR)/vkd3d/x86_64-windows -l:libvkd3d-1.dll -l:libvkd3d-shader-1.dll" +WINE_x86_64_AUTOCONF_ARGS = --enable-win64 \ + VKD3D_PE_CFLAGS="-I$(VULKAN_HEADERS_x86_64_DST)/include -I$(VKD3D_x86_64_DST)/include/vkd3d" \ + VKD3D_PE_LIBS="-L$(VKD3D_x86_64_LIBDIR)/vkd3d/x86_64-windows -l:libvkd3d-1.dll -l:libvkd3d-shader-1.dll" WINE_DEPENDS = gst_orc gstreamer gst_base vkd3d ffmpeg -WINE_64_DEPENDS = piper +WINE_x86_64_DEPENDS = piper -WINE_32_LIBDIR = $(WINE_32_DST)/lib -WINE_64_LIBDIR = $(WINE_64_DST)/lib +WINE_i386_LIBDIR = $(WINE_i386_DST)/lib +WINE_x86_64_LIBDIR = $(WINE_x86_64_DST)/lib $(eval $(call rules-source,wine,$(SRCDIR)/wine)) -$(eval $(call rules-autoconf,wine,32)) -$(eval $(call rules-autoconf,wine,64)) +$(eval $(call rules-autoconf,wine,i386)) +$(eval $(call rules-autoconf,wine,x86_64)) $(eval $(call rules-wine-requests,wine)) $(OBJ)/.wine-post-source: @@ -451,19 +451,19 @@ $(OBJ)/.wine-post-source: -cd $(WINE_SRC) && tools/make_specfiles touch $@ -$(OBJ)/.wine-64-post-build: +$(OBJ)/.wine-x86_64-post-build: mkdir -p $(DST_DIR)/{bin,share} - $(call install-strip,$(WINE_64_DST)/bin/wine64,$(DST_DIR)/bin) - $(call install-strip,$(WINE_64_DST)/bin/wine64-preloader,$(DST_DIR)/bin) - $(call install-strip,$(WINE_64_DST)/bin/wineserver,$(DST_DIR)/bin) - cp -a $(WINE_64_DST)/share/wine $(DST_DIR)/share - cp -a $(WINE_64_DST)/bin/msidb $(DST_DIR)/bin + $(call install-strip,$(WINE_x86_64_DST)/bin/wine64,$(DST_DIR)/bin) + $(call install-strip,$(WINE_x86_64_DST)/bin/wine64-preloader,$(DST_DIR)/bin) + $(call install-strip,$(WINE_x86_64_DST)/bin/wineserver,$(DST_DIR)/bin) + cp -a $(WINE_x86_64_DST)/share/wine $(DST_DIR)/share + cp -a $(WINE_x86_64_DST)/bin/msidb $(DST_DIR)/bin touch $@ -$(OBJ)/.wine-32-post-build: +$(OBJ)/.wine-i386-post-build: mkdir -p $(DST_DIR)/bin - $(call install-strip,$(WINE_32_DST)/bin/wine,$(DST_DIR)/bin) - $(call install-strip,$(WINE_32_DST)/bin/wine-preloader,$(DST_DIR)/bin) + $(call install-strip,$(WINE_i386_DST)/bin/wine,$(DST_DIR)/bin) + $(call install-strip,$(WINE_i386_DST)/bin/wine-preloader,$(DST_DIR)/bin) touch $@ @@ -475,8 +475,8 @@ VRCLIENT_LDFLAGS = -static-libgcc -static-libstdc++ VRCLIENT_DEPENDS = vulkan-headers wine $(eval $(call rules-source,vrclient,$(SRCDIR)/vrclient_x64)) -$(eval $(call rules-makedep,vrclient,32,CROSS)) -$(eval $(call rules-makedep,vrclient,64,CROSS)) +$(eval $(call rules-makedep,vrclient,i386,CROSS)) +$(eval $(call rules-makedep,vrclient,x86_64,CROSS)) ## @@ -484,19 +484,19 @@ $(eval $(call rules-makedep,vrclient,64,CROSS)) ## # wine builds DLLs with the same names, we need to differentiate the timestamps -DXVK_32_SOURCE_DATE_EPOCH := $(shell expr $(32_SOURCE_DATE_EPOCH) - 1) -DXVK_64_SOURCE_DATE_EPOCH := $(shell expr $(64_SOURCE_DATE_EPOCH) - 1) +DXVK_i386_SOURCE_DATE_EPOCH := $(shell expr $(i386_SOURCE_DATE_EPOCH) - 1) +DXVK_x86_64_SOURCE_DATE_EPOCH := $(shell expr $(x86_64_SOURCE_DATE_EPOCH) - 1) DXVK_SOURCE_ARGS = \ --exclude version.h.in \ -DXVK_32_MESON_ARGS = --bindir=$(DXVK_32_DST)/lib/wine/dxvk/i386-windows -DXVK_64_MESON_ARGS = --bindir=$(DXVK_64_DST)/lib/wine/dxvk/x86_64-windows +DXVK_i386_MESON_ARGS = --bindir=$(DXVK_i386_DST)/lib/wine/dxvk/i386-windows +DXVK_x86_64_MESON_ARGS = --bindir=$(DXVK_x86_64_DST)/lib/wine/dxvk/x86_64-windows DXVK_DEPENDS = glslang $(eval $(call rules-source,dxvk,$(SRCDIR)/dxvk)) -$(eval $(call rules-meson,dxvk,32,CROSS)) -$(eval $(call rules-meson,dxvk,64,CROSS)) +$(eval $(call rules-meson,dxvk,i386,CROSS)) +$(eval $(call rules-meson,dxvk,x86_64,CROSS)) $(OBJ)/.dxvk-post-source: sed -re 's#@VCS_TAG@#$(shell git -C $(SRCDIR)/dxvk describe --always --abbrev=15 --dirty=0)#' \ @@ -511,12 +511,12 @@ $(OBJ)/.dxvk-post-source: ## dxvk-nvapi ## -DXVK_NVAPI_32_MESON_ARGS = --bindir=$(DXVK_NVAPI_32_DST)/lib/wine/nvapi/i386-windows -DXVK_NVAPI_64_MESON_ARGS = --bindir=$(DXVK_NVAPI_64_DST)/lib/wine/nvapi/x86_64-windows +DXVK_NVAPI_i386_MESON_ARGS = --bindir=$(DXVK_NVAPI_i386_DST)/lib/wine/nvapi/i386-windows +DXVK_NVAPI_x86_64_MESON_ARGS = --bindir=$(DXVK_NVAPI_x86_64_DST)/lib/wine/nvapi/x86_64-windows $(eval $(call rules-source,dxvk-nvapi,$(SRCDIR)/dxvk-nvapi)) -$(eval $(call rules-meson,dxvk-nvapi,32,CROSS)) -$(eval $(call rules-meson,dxvk-nvapi,64,CROSS)) +$(eval $(call rules-meson,dxvk-nvapi,i386,CROSS)) +$(eval $(call rules-meson,dxvk-nvapi,x86_64,CROSS)) $(OBJ)/.dxvk-nvapi-post-source: mkdir -p $(DST_LIBDIR)/wine/nvapi @@ -556,23 +556,23 @@ VKD3D_CFLAGS = -fno-lto VKD3D_LDFLAGS = -static-libgcc $(CROSSLDFLAGS) VKD3D_DEPENDS = vulkan-headers spirv-headers -VKD3D_32_LIBDIR = $(VKD3D_32_DST)/lib -VKD3D_64_LIBDIR = $(VKD3D_64_DST)/lib +VKD3D_i386_LIBDIR = $(VKD3D_i386_DST)/lib +VKD3D_x86_64_LIBDIR = $(VKD3D_x86_64_DST)/lib $(eval $(call rules-source,vkd3d,$(SRCDIR)/vkd3d)) -$(eval $(call rules-autoconf,vkd3d,32,CROSS)) -$(eval $(call rules-autoconf,vkd3d,64,CROSS)) +$(eval $(call rules-autoconf,vkd3d,i386,CROSS)) +$(eval $(call rules-autoconf,vkd3d,x86_64,CROSS)) -$(OBJ)/.vkd3d-64-post-build: - mkdir -p $(VKD3D_64_LIBDIR)/vkd3d/x86_64-windows - mv $(VKD3D_64_DST)/bin/libvkd3d-1.dll $(VKD3D_64_LIBDIR)/vkd3d/x86_64-windows - mv $(VKD3D_64_DST)/bin/libvkd3d-shader-1.dll $(VKD3D_64_LIBDIR)/vkd3d/x86_64-windows +$(OBJ)/.vkd3d-x86_64-post-build: + mkdir -p $(VKD3D_x86_64_LIBDIR)/vkd3d/x86_64-windows + mv $(VKD3D_x86_64_DST)/bin/libvkd3d-1.dll $(VKD3D_x86_64_LIBDIR)/vkd3d/x86_64-windows + mv $(VKD3D_x86_64_DST)/bin/libvkd3d-shader-1.dll $(VKD3D_x86_64_LIBDIR)/vkd3d/x86_64-windows touch $@ -$(OBJ)/.vkd3d-32-post-build: - mkdir -p $(VKD3D_32_LIBDIR)/vkd3d/i386-windows - mv $(VKD3D_32_DST)/bin/libvkd3d-1.dll $(VKD3D_32_LIBDIR)/vkd3d/i386-windows - mv $(VKD3D_32_DST)/bin/libvkd3d-shader-1.dll $(VKD3D_32_LIBDIR)/vkd3d/i386-windows +$(OBJ)/.vkd3d-i386-post-build: + mkdir -p $(VKD3D_i386_LIBDIR)/vkd3d/i386-windows + mv $(VKD3D_i386_DST)/bin/libvkd3d-1.dll $(VKD3D_i386_LIBDIR)/vkd3d/i386-windows + mv $(VKD3D_i386_DST)/bin/libvkd3d-shader-1.dll $(VKD3D_i386_LIBDIR)/vkd3d/i386-windows touch $@ ## @@ -580,15 +580,15 @@ $(OBJ)/.vkd3d-32-post-build: ## # wine builds DLLs with the same names, we need to differentiate the timestamps -VKD3D_PROTON_32_SOURCE_DATE_EPOCH := $(shell expr $(32_SOURCE_DATE_EPOCH) - 2) -VKD3D_PROTON_64_SOURCE_DATE_EPOCH := $(shell expr $(64_SOURCE_DATE_EPOCH) - 2) +VKD3D_PROTON_i386_SOURCE_DATE_EPOCH := $(shell expr $(i386_SOURCE_DATE_EPOCH) - 2) +VKD3D_PROTON_x86_64_SOURCE_DATE_EPOCH := $(shell expr $(x86_64_SOURCE_DATE_EPOCH) - 2) VKD3D_PROTON_SOURCE_ARGS = \ --exclude vkd3d_build.h.in \ --exclude vkd3d_version.h.in \ -VKD3D_PROTON_32_MESON_ARGS = --bindir=$(VKD3D_PROTON_32_DST)/lib/wine/vkd3d-proton/i386-windows -VKD3D_PROTON_64_MESON_ARGS = --bindir=$(VKD3D_PROTON_64_DST)/lib/wine/vkd3d-proton/x86_64-windows +VKD3D_PROTON_i386_MESON_ARGS = --bindir=$(VKD3D_PROTON_i386_DST)/lib/wine/vkd3d-proton/i386-windows +VKD3D_PROTON_x86_64_MESON_ARGS = --bindir=$(VKD3D_PROTON_x86_64_DST)/lib/wine/vkd3d-proton/x86_64-windows VKD3D_PROTON_DEPENDS = glslang ifneq ($(UNSTRIPPED_BUILD),) @@ -596,8 +596,8 @@ ifneq ($(UNSTRIPPED_BUILD),) endif $(eval $(call rules-source,vkd3d-proton,$(SRCDIR)/vkd3d-proton)) -$(eval $(call rules-meson,vkd3d-proton,32,CROSS)) -$(eval $(call rules-meson,vkd3d-proton,64,CROSS)) +$(eval $(call rules-meson,vkd3d-proton,i386,CROSS)) +$(eval $(call rules-meson,vkd3d-proton,x86_64,CROSS)) $(OBJ)/.vkd3d-proton-post-source: sed -re 's#@VCS_TAG@#$(shell git -C $(SRCDIR)/vkd3d-proton describe --always --exclude=* --abbrev=15 --dirty=0)#' \ @@ -621,24 +621,24 @@ BATTLEYE_LDFLAGS = -static-libgcc -static-libstdc++ -ldl BATTLEYE_DEPENDS = wine $(eval $(call rules-source,battleye,$(SRCDIR)/battleye-bridge)) -$(eval $(call rules-winemaker,battleye,32,beclient.dll)) -$(eval $(call rules-winemaker,battleye,64,beclient_x64.dll)) +$(eval $(call rules-winemaker,battleye,i386,beclient.dll)) +$(eval $(call rules-winemaker,battleye,x86_64,beclient_x64.dll)) $(OBJ)/.battleye-post-source: - mkdir -p $(BATTLEYE_32_OBJ) && cp -a $(BATTLEYE_SRC)/beclient.spec $(BATTLEYE_32_OBJ)/beclient.spec - mkdir -p $(BATTLEYE_64_OBJ) && cp -a $(BATTLEYE_SRC)/beclient.spec $(BATTLEYE_64_OBJ)/beclient_x64.spec + mkdir -p $(BATTLEYE_i386_OBJ) && cp -a $(BATTLEYE_SRC)/beclient.spec $(BATTLEYE_i386_OBJ)/beclient.spec + mkdir -p $(BATTLEYE_x86_64_OBJ) && cp -a $(BATTLEYE_SRC)/beclient.spec $(BATTLEYE_x86_64_OBJ)/beclient_x64.spec touch $@ -$(OBJ)/.battleye-64-post-build: +$(OBJ)/.battleye-x86_64-post-build: mkdir -p $(OBJ)/dist-battleye/v1 - cp -r $(BATTLEYE_64_DST)/* $(OBJ)/dist-battleye/v1/ - rm -rf $(BATTLEYE_64_DST)/* + cp -r $(BATTLEYE_x86_64_DST)/* $(OBJ)/dist-battleye/v1/ + rm -rf $(BATTLEYE_x86_64_DST)/* touch $@ -$(OBJ)/.battleye-32-post-build: +$(OBJ)/.battleye-i386-post-build: mkdir -p $(OBJ)/dist-battleye/v1 - cp -r $(BATTLEYE_32_DST)/* $(OBJ)/dist-battleye/v1/ - rm -rf $(BATTLEYE_32_DST)/* + cp -r $(BATTLEYE_i386_DST)/* $(OBJ)/dist-battleye/v1/ + rm -rf $(BATTLEYE_i386_DST)/* touch $@ endif @@ -652,30 +652,30 @@ ifneq ($(wildcard $(SRCDIR)/eac-bridge/.*),) EAC_DEPENDS = wine $(eval $(call rules-source,eac,$(SRCDIR)/eac-bridge)) -$(eval $(call create-rules-common,eac,EAC,64)) -$(eval $(call create-rules-common,eac,EAC,32)) +$(eval $(call create-rules-common,eac,EAC,x86_64)) +$(eval $(call create-rules-common,eac,EAC,i386)) -$(OBJ)/.eac-64-build: - @echo ":: building 64bit eac..." >&2 - rsync -arx "$(EAC_SRC)/" "$(EAC_64_OBJ)/" - env $(EAC_64_ENV) \ - $(MAKE) -C "$(EAC_64_OBJ)" WINE_OBJ="$(WINE_64_OBJ)" HOST="x86_64-w64-mingw32" CROSSCXX="x86_64-w64-mingw32-g++" BIT="64" +$(OBJ)/.eac-x86_64-build: + @echo ":: building eac-x86_64..." >&2 + rsync -arx "$(EAC_SRC)/" "$(EAC_x86_64_OBJ)/" + env $(EAC_x86_64_ENV) \ + $(MAKE) -C "$(EAC_x86_64_OBJ)" WINE_OBJ="$(WINE_x86_64_OBJ)" HOST="x86_64-w64-mingw32" CROSSCXX="x86_64-w64-mingw32-g++" BIT="64" mkdir -p $(OBJ)/dist-eac/v2/lib/x86_64-linux-gnu - $(call install-strip,$(EAC_64_OBJ)/easyanticheat.so,$(OBJ)/dist-eac/v2/lib/x86_64-linux-gnu) - $(call install-strip,$(EAC_64_OBJ)/easyanticheat.dll,$(OBJ)/dist-eac/v2/lib/x86_64-linux-gnu) + $(call install-strip,$(EAC_x86_64_OBJ)/easyanticheat.so,$(OBJ)/dist-eac/v2/lib/x86_64-linux-gnu) + $(call install-strip,$(EAC_x86_64_OBJ)/easyanticheat.dll,$(OBJ)/dist-eac/v2/lib/x86_64-linux-gnu) cp $(OBJ)/dist-eac/v2/lib/x86_64-linux-gnu/easyanticheat.so $(OBJ)/dist-eac/v2/lib/x86_64-linux-gnu/easyanticheat_x64.so cp $(OBJ)/dist-eac/v2/lib/x86_64-linux-gnu/easyanticheat.dll $(OBJ)/dist-eac/v2/lib/x86_64-linux-gnu/easyanticheat_x64.dll touch $@ -$(OBJ)/.eac-32-build: - @echo ":: building 32bit eac..." >&2 - rsync -arx "$(EAC_SRC)/" "$(EAC_32_OBJ)/" - env $(EAC_32_ENV) \ - $(MAKE) -C "$(EAC_32_OBJ)" WINE_OBJ="$(WINE_32_OBJ)" HOST="i686-w64-mingw32" CROSSCXX="i686-w64-mingw32-g++" BIT="32" +$(OBJ)/.eac-i386-build: + @echo ":: building eac-i386..." >&2 + rsync -arx "$(EAC_SRC)/" "$(EAC_i386_OBJ)/" + env $(EAC_i386_ENV) \ + $(MAKE) -C "$(EAC_i386_OBJ)" WINE_OBJ="$(WINE_i386_OBJ)" HOST="i686-w64-mingw32" CROSSCXX="i686-w64-mingw32-g++" BIT="32" mkdir -p $(OBJ)/dist-eac/v2/lib32 - $(call install-strip,$(EAC_32_OBJ)/easyanticheat.so,$(OBJ)/dist-eac/v2/lib32) - $(call install-strip,$(EAC_32_OBJ)/easyanticheat.dll,$(OBJ)/dist-eac/v2/lib32) + $(call install-strip,$(EAC_i386_OBJ)/easyanticheat.so,$(OBJ)/dist-eac/v2/lib32) + $(call install-strip,$(EAC_i386_OBJ)/easyanticheat.dll,$(OBJ)/dist-eac/v2/lib32) mv $(OBJ)/dist-eac/v2/lib32/easyanticheat.so $(OBJ)/dist-eac/v2/lib32/easyanticheat_x86.so mv $(OBJ)/dist-eac/v2/lib32/easyanticheat.dll $(OBJ)/dist-eac/v2/lib32/easyanticheat_x86.dll touch $@ @@ -689,18 +689,18 @@ endif SYMSTORE_DEPENDS = wine $(eval $(call rules-source,symstore,$(SRCDIR)/symstore)) -$(eval $(call create-rules-common,symstore,SYMSTORE,64)) +$(eval $(call create-rules-common,symstore,SYMSTORE,x86_64)) -$(OBJ)/.symstore-64-build: +$(OBJ)/.symstore-x86_64-build: @echo ":: building symstore helper..." >&2 - rsync -arx "$(SYMSTORE_SRC)/" "$(SYMSTORE_64_OBJ)/" - $(MAKE) -C "$(SYMSTORE_64_OBJ)" SYMSTORE_CFLAGS="-I$(WINE_SRC)/include -I$(WINE_64_OBJ)/include" + rsync -arx "$(SYMSTORE_SRC)/" "$(SYMSTORE_x86_64_OBJ)/" + $(MAKE) -C "$(SYMSTORE_x86_64_OBJ)" SYMSTORE_CFLAGS="-I$(WINE_SRC)/include -I$(WINE_x86_64_OBJ)/include" touch $@ .PHONY: symstore-tarball symstore-tarball: mkdir -p $(OBJ)/symstore/$(BUILD_NAME) - $(SYMSTORE_64_OBJ)/symstore --skip-managed $(DST_BASE) $(OBJ)/symstore/$(BUILD_NAME) + $(SYMSTORE_x86_64_OBJ)/symstore --skip-managed $(DST_BASE) $(OBJ)/symstore/$(BUILD_NAME) cd $(OBJ)/symstore/$(BUILD_NAME) && zip -r ../$(BUILD_NAME)-symstore.zip . >& /dev/null ## @@ -929,33 +929,33 @@ all-dist: $(DIST_FONTS) ## GECKO_VER := 2.47.4 -GECKO_32_TARBALL := wine-gecko-$(GECKO_VER)-x86.tar.xz -GECKO_64_TARBALL := wine-gecko-$(GECKO_VER)-x86_64.tar.xz -GECKO_64_TARBALL_URL := https://dl.winehq.org/wine/wine-gecko/$(GECKO_VER)/$(GECKO_64_TARBALL) -GECKO_32_TARBALL_URL := https://dl.winehq.org/wine/wine-gecko/$(GECKO_VER)/$(GECKO_32_TARBALL) +GECKO_i386_TARBALL := wine-gecko-$(GECKO_VER)-x86.tar.xz +GECKO_x86_64_TARBALL := wine-gecko-$(GECKO_VER)-x86_64.tar.xz +GECKO_x86_64_TARBALL_URL := https://dl.winehq.org/wine/wine-gecko/$(GECKO_VER)/$(GECKO_x86_64_TARBALL) +GECKO_i386_TARBALL_URL := https://dl.winehq.org/wine/wine-gecko/$(GECKO_VER)/$(GECKO_i386_TARBALL) GECKO_DST := $(DST_DIR)/share/wine/gecko -$(SRC)/contrib/$(GECKO_64_TARBALL): +$(SRC)/contrib/$(GECKO_x86_64_TARBALL): mkdir -p $(dir $@) - wget --no-use-server-timestamps -O $@ $(GECKO_64_TARBALL_URL) || (rm $@; false) + wget --no-use-server-timestamps -O $@ $(GECKO_x86_64_TARBALL_URL) || (rm $@; false) -$(SRC)/contrib/$(GECKO_32_TARBALL): +$(SRC)/contrib/$(GECKO_i386_TARBALL): mkdir -p $(dir $@) - wget --no-use-server-timestamps -O $@ $(GECKO_32_TARBALL_URL) || (rm $@; false) + wget --no-use-server-timestamps -O $@ $(GECKO_i386_TARBALL_URL) || (rm $@; false) -$(OBJ)/.gecko-32-dist: $(SRC)/contrib/$(GECKO_32_TARBALL) +$(OBJ)/.gecko-i386-dist: $(SRC)/contrib/$(GECKO_i386_TARBALL) mkdir -p $(GECKO_DST) rm -rf $(GECKO_DST)/wine-gecko-$(GECKO_VER)-x86 tar --no-same-owner -xf $< -C $(GECKO_DST) touch $@ -$(OBJ)/.gecko-64-dist: $(SRC)/contrib/$(GECKO_64_TARBALL) +$(OBJ)/.gecko-x86_64-dist: $(SRC)/contrib/$(GECKO_x86_64_TARBALL) mkdir -p $(GECKO_DST) rm -rf $(GECKO_DST)/wine-gecko-$(GECKO_VER)-x86_64 tar --no-same-owner -xf $< -C $(GECKO_DST) touch $@ -all-dist: $(OBJ)/.gecko-32-dist $(OBJ)/.gecko-64-dist +all-dist: $(OBJ)/.gecko-i386-dist $(OBJ)/.gecko-x86_64-dist ## @@ -1009,41 +1009,41 @@ all-dist: $(DIST_XALIA) ## ICU_VER := 6.8.2 -ICU_64_DIST_DIR := $(DST_LIBDIR)/wine/icu/x86_64-windows -ICU_64_TARBALL := icu-$(ICU_VER)-x86_64.tar.xz -ICU_32_DIST_DIR := $(DST_LIBDIR)/wine/icu/i386-windows -ICU_32_TARBALL := icu-$(ICU_VER)-x86.tar.xz +ICU_x86_64_DIST_DIR := $(DST_LIBDIR)/wine/icu/x86_64-windows +ICU_x86_64_TARBALL := icu-$(ICU_VER)-x86_64.tar.xz +ICU_i386_DIST_DIR := $(DST_LIBDIR)/wine/icu/i386-windows +ICU_i386_TARBALL := icu-$(ICU_VER)-x86.tar.xz -$(OBJ)/.icu-64-dist: $(SRC)/icu/$(ICU_64_TARBALL) - mkdir -p $(ICU_64_DIST_DIR) - rm -rf $(ICU_64_DIST_DIR)/*.dll - tar --no-same-owner -xf $< -C $(ICU_64_DIST_DIR) +$(OBJ)/.icu-x86_64-dist: $(SRC)/icu/$(ICU_x86_64_TARBALL) + mkdir -p $(ICU_x86_64_DIST_DIR) + rm -rf $(ICU_x86_64_DIST_DIR)/*.dll + tar --no-same-owner -xf $< -C $(ICU_x86_64_DIST_DIR) touch $@ -$(OBJ)/.icu-32-dist: $(SRC)/icu/$(ICU_32_TARBALL) - mkdir -p $(ICU_32_DIST_DIR) - rm -rf $(ICU_32_DIST_DIR)/*.dll - tar --no-same-owner -xf $< -C $(ICU_32_DIST_DIR) +$(OBJ)/.icu-i386-dist: $(SRC)/icu/$(ICU_i386_TARBALL) + mkdir -p $(ICU_i386_DIST_DIR) + rm -rf $(ICU_i386_DIST_DIR)/*.dll + tar --no-same-owner -xf $< -C $(ICU_i386_DIST_DIR) touch $@ -all-dist: $(OBJ)/.icu-64-dist $(OBJ)/.icu-32-dist +all-dist: $(OBJ)/.icu-x86_64-dist $(OBJ)/.icu-i386-dist ## ## openvr ## -OVR_32_DIST := $(DST_LIBDIR)/wine/dxvk/i386-windows/openvr_api_dxvk.dll -$(OVR_32_DIST): $(SRCDIR)/openvr/bin/win32/openvr_api.dll | $(DST_DIR) +OVR_i386_DIST := $(DST_LIBDIR)/wine/dxvk/i386-windows/openvr_api_dxvk.dll +$(OVR_i386_DIST): $(SRCDIR)/openvr/bin/win32/openvr_api.dll | $(DST_DIR) mkdir -p $(DST_LIBDIR)/wine/dxvk/i386-windows cp -af $< $@ -OVR_64_DIST := $(DST_LIBDIR)/wine/dxvk/x86_64-windows/openvr_api_dxvk.dll -$(OVR_64_DIST): $(SRCDIR)/openvr/bin/win64/openvr_api.dll | $(DST_DIR) +OVR_x86_64_DIST := $(DST_LIBDIR)/wine/dxvk/x86_64-windows/openvr_api_dxvk.dll +$(OVR_x86_64_DIST): $(SRCDIR)/openvr/bin/win64/openvr_api.dll | $(DST_DIR) mkdir -p $(DST_LIBDIR)/wine/dxvk/x86_64-windows cp -af $< $@ -all-dist: $(OVR_32_DIST) $(OVR_64_DIST) +all-dist: $(OVR_i386_DIST) $(OVR_x86_64_DIST) ## @@ -1163,11 +1163,11 @@ redist: all .PHONY: module32 module64 module -module32: | all-source wine-32-configure - +$(BEAR) $(MAKE) -j$(J) $(filter -j%,$(MAKEFLAGS)) $(MFLAGS) $(MAKEOVERRIDES) -C $(WINE_32_OBJ)/dlls/$(module) +module32: | all-source wine-i386-configure + +$(BEAR) $(MAKE) -j$(J) $(filter -j%,$(MAKEFLAGS)) $(MFLAGS) $(MAKEOVERRIDES) -C $(WINE_i386_OBJ)/dlls/$(module) -module64: | all-source wine-64-configure - +$(BEAR) $(MAKE) -j$(J) $(filter -j%,$(MAKEFLAGS)) $(MFLAGS) $(MAKEOVERRIDES) -C $(WINE_64_OBJ)/dlls/$(module) +module64: | all-source wine-x86_64-configure + +$(BEAR) $(MAKE) -j$(J) $(filter -j%,$(MAKEFLAGS)) $(MFLAGS) $(MAKEOVERRIDES) -C $(WINE_x86_64_OBJ)/dlls/$(module) module: | all-source wine-configure module: module32 module64 diff --git a/make/rules-autoconf.mk b/make/rules-autoconf.mk index a8e8f3d4..2a1a8451 100644 --- a/make/rules-autoconf.mk +++ b/make/rules-autoconf.mk @@ -1,7 +1,7 @@ # parameters: # $(1): lowercase package name # $(2): uppercase package name -# $(3): 32/64, build type +# $(3): build target # $(4): CROSS/, cross compile # define create-rules-autoconf diff --git a/make/rules-cargo.mk b/make/rules-cargo.mk index fb9f3ac2..ba784e04 100644 --- a/make/rules-cargo.mk +++ b/make/rules-cargo.mk @@ -1,7 +1,7 @@ # parameters: # $(1): lowercase package name # $(2): uppercase package name -# $(3): 32/64, build type +# $(3): build target # define create-rules-cargo $(call create-rules-common,$(1),$(2),$(3)) @@ -24,8 +24,8 @@ endef rules-cargo = $(call create-rules-cargo,$(1),$(call toupper,$(1)),$(2)) -32_CARGO_TARGET := i686-unknown-linux-gnu -64_CARGO_TARGET := x86_64-unknown-linux-gnu +i386_CARGO_TARGET := i686-unknown-linux-gnu +x86_64_CARGO_TARGET := x86_64-unknown-linux-gnu -32_CARGO_ARGS := --target $(32_CARGO_TARGET) -64_CARGO_ARGS := --target $(64_CARGO_TARGET) +i386_CARGO_ARGS := --target $(i386_CARGO_TARGET) +x86_64_CARGO_ARGS := --target $(x86_64_CARGO_TARGET) diff --git a/make/rules-cmake.mk b/make/rules-cmake.mk index f1a3b1f7..7053d4ed 100644 --- a/make/rules-cmake.mk +++ b/make/rules-cmake.mk @@ -1,7 +1,7 @@ # parameters: # $(1): lowercase package name # $(2): uppercase package name -# $(3): 32/64, build type +# $(3): build target # $(4): CROSS/, cross compile # define create-rules-cmake diff --git a/make/rules-common.mk b/make/rules-common.mk index 5ea49e34..f2bbaa52 100644 --- a/make/rules-common.mk +++ b/make/rules-common.mk @@ -1,7 +1,7 @@ # parameters: # $(1): lowercase package name # $(2): uppercase package name -# $(3): 32/64, build type +# $(3): build target # $(4): CROSS/, cross compile define create-rules-common $(2)_$(3)_OBJ := $$(OBJ)/obj-$(1)-$(3) @@ -132,22 +132,22 @@ ifeq ($(1),wine) $(2)_$(3)_ENV += \ CROSSCFLAGS="$$($(2)_$(3)_INCFLAGS) $$($(2)_CFLAGS) $$(COMMON_FLAGS) $$($(3)_COMMON_FLAGS)" \ CROSSLDFLAGS="$$($(2)_$(3)_LIBFLAGS) $$($(2)_$(3)_LDFLAGS) $$($(2)_LDFLAGS) $$(CROSSLDFLAGS)" \ - i386_AR="$$(CROSS32_TARGET)-ar" \ - i386_RANLIB="$$(CROSS32_TARGET)-ranlib" \ - i386_CC="$$(CROSS32_TARGET)-gcc" \ - i386_CXX="$$(CROSS32_TARGET)-g++" \ - i386_LD="$$(CROSS32_TARGET)-ld" \ - i386_CFLAGS="$$($(2)_32_INCFLAGS) $$($(2)_CFLAGS) $$(COMMON_FLAGS) $$(32_COMMON_FLAGS)" \ - i386_LDFLAGS="$$($(2)_32_LIBFLAGS) $$($(2)_32_LDFLAGS) $$($(2)_LDFLAGS) $$(CROSSLDFLAGS)" \ - i386_PKG_CONFIG_LIBDIR="/usr/lib/$$(CROSS32_LIBDIR)/pkgconfig:/usr/share/pkgconfig" \ - x86_64_AR="$$(CROSS64_TARGET)-ar" \ - x86_64_RANLIB="$$(CROSS64_TARGET)-ranlib" \ - x86_64_CC="$$(CROSS64_TARGET)-gcc" \ - x86_64_CXX="$$(CROSS64_TARGET)-g++" \ - x86_64_LD="$$(CROSS64_TARGET)-ld" \ - x86_64_CFLAGS="$$($(2)_64_INCFLAGS) $$($(2)_CFLAGS) $$(COMMON_FLAGS) $$(64_COMMON_FLAGS)" \ - x86_64_LDFLAGS="$$($(2)_64_LIBFLAGS) $$($(2)_64_LDFLAGS) $$($(2)_LDFLAGS) $$(CROSSLDFLAGS)" \ - x86_64_PKG_CONFIG_LIBDIR="/usr/lib/$$(CROSS64_LIBDIR)/pkgconfig:/usr/share/pkgconfig" \ + i386_AR="$$(CROSSi386_TARGET)-ar" \ + i386_RANLIB="$$(CROSSi386_TARGET)-ranlib" \ + i386_CC="$$(CROSSi386_TARGET)-gcc" \ + i386_CXX="$$(CROSSi386_TARGET)-g++" \ + i386_LD="$$(CROSSi386_TARGET)-ld" \ + i386_CFLAGS="$$($(2)_i386_INCFLAGS) $$($(2)_CFLAGS) $$(COMMON_FLAGS) $$(32_COMMON_FLAGS)" \ + i386_LDFLAGS="$$($(2)_i386_LIBFLAGS) $$($(2)_i386_LDFLAGS) $$($(2)_LDFLAGS) $$(CROSSLDFLAGS)" \ + i386_PKG_CONFIG_LIBDIR="/usr/lib/$$(CROSSi386_LIBDIR)/pkgconfig:/usr/share/pkgconfig" \ + x86_64_AR="$$(CROSSx86_64_TARGET)-ar" \ + x86_64_RANLIB="$$(CROSSx86_64_TARGET)-ranlib" \ + x86_64_CC="$$(CROSSx86_64_TARGET)-gcc" \ + x86_64_CXX="$$(CROSSx86_64_TARGET)-g++" \ + x86_64_LD="$$(CROSSx86_64_TARGET)-ld" \ + x86_64_CFLAGS="$$($(2)_x86_64_INCFLAGS) $$($(2)_CFLAGS) $$(COMMON_FLAGS) $$(64_COMMON_FLAGS)" \ + x86_64_LDFLAGS="$$($(2)_x86_64_LIBFLAGS) $$($(2)_x86_64_LDFLAGS) $$($(2)_LDFLAGS) $$(CROSSLDFLAGS)" \ + x86_64_PKG_CONFIG_LIBDIR="/usr/lib/$$(CROSSx86_64_LIBDIR)/pkgconfig:/usr/share/pkgconfig" \ endif @@ -160,24 +160,24 @@ else install-strip = objcopy $(OBJCOPY_FLAGS) --strip-debug $(1) $(2)/$(notdir $(1)) && rm -f $(2)/$(notdir $(1)).debug endif -32_TARGET := i686-linux-gnu -64_TARGET := x86_64-linux-gnu -CROSS32_TARGET := i686-w64-mingw32 -CROSS64_TARGET := x86_64-w64-mingw32 +i386_TARGET := i686-linux-gnu +x86_64_TARGET := x86_64-linux-gnu +CROSSi386_TARGET := i686-w64-mingw32 +CROSSx86_64_TARGET := x86_64-w64-mingw32 -32_LIBDIR := i386-linux-gnu -64_LIBDIR := x86_64-linux-gnu -CROSS32_LIBDIR := i386-w64-mingw32 -CROSS64_LIBDIR := x86_64-w64-mingw32 +i386_LIBDIR := i386-linux-gnu +x86_64_LIBDIR := x86_64-linux-gnu +CROSSi386_LIBDIR := i386-w64-mingw32 +CROSSx86_64_LIBDIR := x86_64-w64-mingw32 -32_WINEDIR := wine/i386-unix -64_WINEDIR := wine/x86_64-unix -CROSS32_WINEDIR := wine/i386-windows -CROSS64_WINEDIR := wine/x86_64-windows +i386_WINEDIR := wine/i386-unix +x86_64_WINEDIR := wine/x86_64-unix +CROSSi386_WINEDIR := wine/i386-windows +CROSSx86_64_WINEDIR := wine/x86_64-windows -$(OBJ)/.%-32-post-build: +$(OBJ)/.%-i386-post-build: touch $@ -$(OBJ)/.%-64-post-build: +$(OBJ)/.%-x86_64-post-build: touch $@ rules-common = $(call create-rules-common,$(1),$(call toupper,$(1)),$(2),$(3)) diff --git a/make/rules-configure.mk b/make/rules-configure.mk index 356f2508..7216dde6 100644 --- a/make/rules-configure.mk +++ b/make/rules-configure.mk @@ -1,7 +1,7 @@ # parameters: # $(1): lowercase package name # $(2): uppercase package name -# $(3): 32/64, build type +# $(3): build target # $(4): CROSS/, cross compile # define create-rules-configure @@ -31,7 +31,7 @@ $$(OBJ)/.$(1)-$(3)-build: touch $$@ endef -32_CONFIGURE_ARGS := --arch=x86 -64_CONFIGURE_ARGS := --arch=x86_64 +i386_CONFIGURE_ARGS := --arch=x86 +x86_64_CONFIGURE_ARGS := --arch=x86_64 rules-configure = $(call create-rules-configure,$(1),$(call toupper,$(1)),$(2),$(3)) diff --git a/make/rules-makedep.mk b/make/rules-makedep.mk index 5faf2e42..f3eca03e 100644 --- a/make/rules-makedep.mk +++ b/make/rules-makedep.mk @@ -1,7 +1,7 @@ # parameters: # $(1): lowercase package name # $(2): uppercase package name -# $(3): 32/64, build type +# $(3): build target # define create-rules-makedep $(call create-rules-common,$(1),$(2),$(3)) # cannot pass $(4)/CROSS here because of link flags for remaining .dll.so modules @@ -22,17 +22,17 @@ $$(OBJ)/.$(1)-$(3)-configure: -e '/^CXXFLAGS/c CXXFLAGS = $$($(2)_$(3)_INCFLAGS) $$($(2)_CXXFLAGS) $$(COMMON_FLAGS) $$($(3)_COMMON_FLAGS) -std=c++17' \ -e '/^LDFLAGS/c LDFLAGS = $$($(2)_$(3)_LIBFLAGS) $$($(2)_$(3)_LDFLAGS) $$($(2)_LDFLAGS)' \ \ - -e '/^x86_64_CC/a x86_64_CXX = $$(CROSS64_TARGET)-g++' \ - -e '/^x86_64_CFLAGS/c x86_64_CFLAGS = $$($(2)_64_INCFLAGS) $$($(2)_CFLAGS) $$(COMMON_FLAGS) $$(64_COMMON_FLAGS)' \ - -e '/^x86_64_CPPFLAGS/c x86_64_CPPFLAGS = $$($(2)_64_INCFLAGS) $$($(2)_CPPFLAGS) $$(COMMON_FLAGS) $$(64_COMMON_FLAGS)' \ - -e '/^x86_64_CXXFLAGS/c x86_64_CXXFLAGS = $$($(2)_64_INCFLAGS) $$($(2)_CXXFLAGS) $$(COMMON_FLAGS) $$(64_COMMON_FLAGS) -std=c++17' \ - -e '/^x86_64_LDFLAGS/c x86_64_LDFLAGS = $$($(2)_64_LIBFLAGS) $$($(2)_64_LDFLAGS) $$(CROSSLDFLAGS)' \ + -e '/^x86_64_CC/a x86_64_CXX = $$(CROSSx86_64_TARGET)-g++' \ + -e '/^x86_64_CFLAGS/c x86_64_CFLAGS = $$($(2)_x86_64_INCFLAGS) $$($(2)_CFLAGS) $$(COMMON_FLAGS) $$(x86_64_COMMON_FLAGS)' \ + -e '/^x86_64_CPPFLAGS/c x86_64_CPPFLAGS = $$($(2)_x86_64_INCFLAGS) $$($(2)_CPPFLAGS) $$(COMMON_FLAGS) $$(x86_64_COMMON_FLAGS)' \ + -e '/^x86_64_CXXFLAGS/c x86_64_CXXFLAGS = $$($(2)_x86_64_INCFLAGS) $$($(2)_CXXFLAGS) $$(COMMON_FLAGS) $$(x86_64_COMMON_FLAGS) -std=c++17' \ + -e '/^x86_64_LDFLAGS/c x86_64_LDFLAGS = $$($(2)_x86_64_LIBFLAGS) $$($(2)_x86_64_LDFLAGS) $$(CROSSLDFLAGS)' \ \ - -e '/^i386_CC/a i386_CXX = $$(CROSS32_TARGET)-g++' \ - -e '/^i386_CFLAGS/c i386_CFLAGS = $$($(2)_32_INCFLAGS) $$($(2)_CFLAGS) $$(COMMON_FLAGS) $$(32_COMMON_FLAGS)' \ - -e '/^i386_CPPFLAGS/c i386_CPPFLAGS = $$($(2)_32_INCFLAGS) $$($(2)_CPPFLAGS) $$(COMMON_FLAGS) $$(32_COMMON_FLAGS)' \ - -e '/^i386_CXXFLAGS/c i386_CXXFLAGS = $$($(2)_32_INCFLAGS) $$($(2)_CXXFLAGS) $$(COMMON_FLAGS) $$(32_COMMON_FLAGS) -std=c++17' \ - -e '/^i386_LDFLAGS/c i386_LDFLAGS = $$($(2)_32_LIBFLAGS) $$($(2)_32_LDFLAGS) $$(CROSSLDFLAGS)' \ + -e '/^i386_CC/a i386_CXX = $$(CROSSi386_TARGET)-g++' \ + -e '/^i386_CFLAGS/c i386_CFLAGS = $$($(2)_i386_INCFLAGS) $$($(2)_CFLAGS) $$(COMMON_FLAGS) $$(i386_COMMON_FLAGS)' \ + -e '/^i386_CPPFLAGS/c i386_CPPFLAGS = $$($(2)_i386_INCFLAGS) $$($(2)_CPPFLAGS) $$(COMMON_FLAGS) $$(i386_COMMON_FLAGS)' \ + -e '/^i386_CXXFLAGS/c i386_CXXFLAGS = $$($(2)_i386_INCFLAGS) $$($(2)_CXXFLAGS) $$(COMMON_FLAGS) $$(i386_COMMON_FLAGS) -std=c++17' \ + -e '/^i386_LDFLAGS/c i386_LDFLAGS = $$($(2)_i386_LIBFLAGS) $$($(2)_i386_LDFLAGS) $$(CROSSLDFLAGS)' \ \ -e 's@UNIXLDFLAGS =@UNIXLDFLAGS = -L$$(WINE_$(3)_LIBDIR)/$$($(3)_WINEDIR) -l:ntdll.so@' \ $$(WINE_$(3)_OBJ)/Makefile > $$($(2)_$(3)_OBJ)/Makefile diff --git a/make/rules-meson.mk b/make/rules-meson.mk index 8e1baa23..8b442179 100644 --- a/make/rules-meson.mk +++ b/make/rules-meson.mk @@ -1,7 +1,7 @@ # parameters: # $(1): lowercase package name # $(2): uppercase package name -# $(3): 32/64, build type +# $(3): build target # $(4): CROSS/, cross compile # define create-rules-meson @@ -64,12 +64,12 @@ $$(OBJ)/.$(1)-$(3)-build: touch $$@ endef -32_MESON_CPU := x86 -64_MESON_CPU := x86_64 +i386_MESON_CPU := x86 +x86_64_MESON_CPU := x86_64 -32_MESON_SYSTEM := linux -64_MESON_SYSTEM := linux -CROSS32_MESON_SYSTEM := windows -CROSS64_MESON_SYSTEM := windows +i386_MESON_SYSTEM := linux +x86_64_MESON_SYSTEM := linux +CROSSi386_MESON_SYSTEM := windows +CROSSx86_64_MESON_SYSTEM := windows rules-meson = $(call create-rules-meson,$(1),$(call toupper,$(1)),$(2),$(3)) diff --git a/make/rules-wine-requests.mk b/make/rules-wine-requests.mk index b1f5cc83..54be352f 100644 --- a/make/rules-wine-requests.mk +++ b/make/rules-wine-requests.mk @@ -13,13 +13,13 @@ $$($(2)_SRC)/server/request_trace.h: | $$(OBJ)/.$(1)-post-source $$($(2)_SRC)/server/request_trace.h: $$($(2)_ORIGIN)/server/request_trace.h cp -a $$< $$@ -$$(OBJ)/.$(1)-32-configure: $$($(2)_SRC)/include/wine/server_protocol.h -$$(OBJ)/.$(1)-32-configure: $$($(2)_SRC)/server/request_handlers.h -$$(OBJ)/.$(1)-32-configure: $$($(2)_SRC)/server/request_trace.h +$$(OBJ)/.$(1)-i386-configure: $$($(2)_SRC)/include/wine/server_protocol.h +$$(OBJ)/.$(1)-i386-configure: $$($(2)_SRC)/server/request_handlers.h +$$(OBJ)/.$(1)-i386-configure: $$($(2)_SRC)/server/request_trace.h -$$(OBJ)/.$(1)-64-configure: $$($(2)_SRC)/include/wine/server_protocol.h -$$(OBJ)/.$(1)-64-configure: $$($(2)_SRC)/server/request_handlers.h -$$(OBJ)/.$(1)-64-configure: $$($(2)_SRC)/server/request_trace.h +$$(OBJ)/.$(1)-x86_64-configure: $$($(2)_SRC)/include/wine/server_protocol.h +$$(OBJ)/.$(1)-x86_64-configure: $$($(2)_SRC)/server/request_handlers.h +$$(OBJ)/.$(1)-x86_64-configure: $$($(2)_SRC)/server/request_trace.h $$(OBJ)/.$(1)-wine-requests: $$($(2)_SRC)/include/wine/server_protocol.h $$(OBJ)/.$(1)-wine-requests: $$($(2)_SRC)/server/request_handlers.h @@ -31,8 +31,8 @@ $$(OBJ)/.$(1)-wine-requests: | $$(OBJ)/.$(1)-post-source cd "$$($(2)_SRC)" && tools/make_requests touch $$@ -$$(OBJ)/.$(1)-32-build: $$(OBJ)/.$(1)-wine-requests -$$(OBJ)/.$(1)-64-build: $$(OBJ)/.$(1)-wine-requests +$$(OBJ)/.$(1)-i386-build: $$(OBJ)/.$(1)-wine-requests +$$(OBJ)/.$(1)-x86_64-build: $$(OBJ)/.$(1)-wine-requests endef rules-wine-requests = $(call create-rules-wine-requests,$(1),$(call toupper,$(1))) diff --git a/make/rules-winemaker.mk b/make/rules-winemaker.mk index bcb53ad9..d3b4ced4 100644 --- a/make/rules-winemaker.mk +++ b/make/rules-winemaker.mk @@ -1,7 +1,7 @@ # parameters: # $(1): lowercase package name # $(2): uppercase package name -# $(3): 32/64, build type +# $(3): build target # $(4): module name (with extension) # define create-rules-winemaker @@ -38,7 +38,7 @@ $$(OBJ)/.$(1)-$(3)-build: touch $$@ endef -32_WINEMAKER_ARGS := --wine32 -64_WINEMAKER_ARGS := +i386_WINEMAKER_ARGS := --wine32 +x86_64_WINEMAKER_ARGS := rules-winemaker = $(call create-rules-winemaker,$(1),$(call toupper,$(1)),$(2),$(3))