win32/config-msvc.mak: Don't hardcode GTK_HOST to i686-pc-vsXX

Instead, rely on the mechanism that we already have to set the platform string
appropriately, eg:

i686-pc-vsXX for 32-bit x86 builds
x86_64-pc-vsXX for x64 builds
aarch64-pc-vsXX for arm64 builds
This commit is contained in:
Chun-wei Fan 2021-02-23 17:34:13 +08:00
parent 935691f94c
commit 07e06fb4dd

View File

@ -38,6 +38,14 @@ GLIB_COMPILE_RESOURCES = $(PREFIX)\bin\glib-compile-resources.exe
GDBUS_CODEGEN = $(PREFIX)\bin\gdbus-codegen
!endif
!if "$(PLAT)" == "x64"
AT_PLAT=x86_64
!elseif "$(PLAT)" == "arm64"
AT_PLAT=aarch64
!else
AT_PLAT=i686
!endif
# Please do not change anything beneath this line unless maintaining the NMake Makefiles
GTK_VERSION = @GTK_VERSION@
@ -70,7 +78,7 @@ GTK_PREPROCESSOR_FLAGS = \
/D_USE_MATH_DEFINES \
/DGTK_COMPILATION \
/DG_LOG_DOMAIN=\"Gtk\" \
/DGTK_HOST=\"i686-pc-vs$(VSVER)\" \
/DGTK_HOST=\"$(AT_PLAT)-pc-vs$(VSVER)\" \
/DGTK_PRINT_BACKENDS=\"file\" \
/DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
/DINCLUDE_IM_am_et \