From 9a27e206ce2a3ffd009636570b51f848a11e1ef8 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 24 Feb 2024 20:50:38 +0100 Subject: [PATCH] Rebake after adding 32-bit ARM support for MSVC This should have been done in 99bc43cefe (Introduce minimal MSW ARM support, 2024-01-15). See #24222. --- autoconf_inc.m4 | 6 ------ demos/bombs/makefile.vc | 12 ++++++++++++ demos/forty/makefile.vc | 12 ++++++++++++ demos/fractal/makefile.vc | 12 ++++++++++++ demos/life/makefile.vc | 12 ++++++++++++ demos/poem/makefile.vc | 12 ++++++++++++ samples/access/makefile.vc | 12 ++++++++++++ samples/animate/makefile.vc | 12 ++++++++++++ samples/archive/makefile.vc | 12 ++++++++++++ samples/artprov/makefile.vc | 12 ++++++++++++ samples/aui/makefile.vc | 12 ++++++++++++ samples/calendar/makefile.vc | 12 ++++++++++++ samples/caret/makefile.vc | 12 ++++++++++++ samples/clipboard/makefile.vc | 12 ++++++++++++ samples/collpane/makefile.vc | 12 ++++++++++++ samples/combo/makefile.vc | 12 ++++++++++++ samples/config/makefile.vc | 12 ++++++++++++ samples/console/makefile.vc | 12 ++++++++++++ samples/dataview/makefile.vc | 12 ++++++++++++ samples/debugrpt/makefile.vc | 12 ++++++++++++ samples/dialogs/makefile.vc | 12 ++++++++++++ samples/dialup/makefile.vc | 12 ++++++++++++ samples/display/makefile.vc | 12 ++++++++++++ samples/dll/makefile.vc | 12 ++++++++++++ samples/dnd/makefile.vc | 12 ++++++++++++ samples/docview/makefile.vc | 12 ++++++++++++ samples/dragimag/makefile.vc | 12 ++++++++++++ samples/drawing/makefile.vc | 12 ++++++++++++ samples/erase/makefile.vc | 12 ++++++++++++ samples/event/makefile.vc | 12 ++++++++++++ samples/except/makefile.vc | 12 ++++++++++++ samples/exec/makefile.vc | 12 ++++++++++++ samples/font/makefile.vc | 12 ++++++++++++ samples/fswatcher/makefile.vc | 12 ++++++++++++ samples/grid/makefile.vc | 12 ++++++++++++ samples/help/makefile.vc | 12 ++++++++++++ samples/htlbox/makefile.vc | 12 ++++++++++++ samples/html/about/makefile.vc | 12 ++++++++++++ samples/html/help/makefile.vc | 12 ++++++++++++ samples/html/helpview/makefile.vc | 12 ++++++++++++ samples/html/printing/makefile.vc | 12 ++++++++++++ samples/html/test/makefile.vc | 12 ++++++++++++ samples/html/virtual/makefile.vc | 12 ++++++++++++ samples/html/widget/makefile.vc | 12 ++++++++++++ samples/html/zip/makefile.vc | 12 ++++++++++++ samples/image/makefile.vc | 12 ++++++++++++ samples/internat/makefile.vc | 12 ++++++++++++ samples/ipc/makefile.vc | 12 ++++++++++++ samples/joytest/makefile.vc | 12 ++++++++++++ samples/keyboard/makefile.vc | 12 ++++++++++++ samples/layout/makefile.vc | 12 ++++++++++++ samples/listctrl/makefile.vc | 12 ++++++++++++ samples/mdi/makefile.vc | 12 ++++++++++++ samples/mediaplayer/makefile.vc | 12 ++++++++++++ samples/menu/makefile.vc | 12 ++++++++++++ samples/mfc/makefile.vc | 12 ++++++++++++ samples/minimal/makefile.vc | 12 ++++++++++++ samples/nativdlg/makefile.vc | 12 ++++++++++++ samples/notebook/makefile.vc | 12 ++++++++++++ samples/oleauto/makefile.vc | 12 ++++++++++++ samples/opengl/cube/makefile.vc | 12 ++++++++++++ samples/opengl/isosurf/makefile.vc | 12 ++++++++++++ samples/opengl/penguin/makefile.vc | 12 ++++++++++++ samples/opengl/pyramid/makefile.vc | 12 ++++++++++++ samples/ownerdrw/makefile.vc | 12 ++++++++++++ samples/popup/makefile.vc | 12 ++++++++++++ samples/power/makefile.vc | 12 ++++++++++++ samples/preferences/makefile.vc | 12 ++++++++++++ samples/printing/makefile.vc | 12 ++++++++++++ samples/propgrid/Makefile.in | 8 ++++---- samples/propgrid/makefile.gcc | 2 +- samples/propgrid/makefile.vc | 14 +++++++++++++- samples/regtest/makefile.vc | 12 ++++++++++++ samples/render/makefile.vc | 12 ++++++++++++ samples/ribbon/makefile.vc | 12 ++++++++++++ samples/richtext/makefile.vc | 12 ++++++++++++ samples/sashtest/makefile.vc | 12 ++++++++++++ samples/scroll/makefile.vc | 12 ++++++++++++ samples/secretstore/makefile.vc | 12 ++++++++++++ samples/shaped/makefile.vc | 12 ++++++++++++ samples/sockets/makefile.vc | 12 ++++++++++++ samples/sound/makefile.vc | 12 ++++++++++++ samples/splash/makefile.vc | 12 ++++++++++++ samples/splitter/makefile.vc | 12 ++++++++++++ samples/statbar/makefile.vc | 12 ++++++++++++ samples/stc/makefile.vc | 12 ++++++++++++ samples/svg/makefile.vc | 12 ++++++++++++ samples/taborder/makefile.vc | 12 ++++++++++++ samples/taskbar/makefile.vc | 12 ++++++++++++ samples/taskbarbutton/makefile.vc | 12 ++++++++++++ samples/text/makefile.vc | 12 ++++++++++++ samples/thread/makefile.vc | 12 ++++++++++++ samples/toolbar/makefile.vc | 12 ++++++++++++ samples/treectrl/makefile.vc | 12 ++++++++++++ samples/treelist/makefile.vc | 12 ++++++++++++ samples/typetest/makefile.vc | 12 ++++++++++++ samples/uiaction/makefile.vc | 12 ++++++++++++ samples/validate/makefile.vc | 12 ++++++++++++ samples/vscroll/makefile.vc | 12 ++++++++++++ samples/webrequest/makefile.vc | 12 ++++++++++++ samples/webview/makefile.vc | 12 ++++++++++++ samples/widgets/makefile.vc | 12 ++++++++++++ samples/wizard/makefile.vc | 12 ++++++++++++ samples/wrapsizer/makefile.vc | 12 ++++++++++++ samples/xrc/makefile.vc | 12 ++++++++++++ samples/xti/makefile.vc | 12 ++++++++++++ tests/Makefile.in | 22 ++++++++++----------- tests/benchmarks/makefile.vc | 12 ++++++++++++ tests/makefile.gcc | 10 +++++----- tests/makefile.vc | 30 ++++++++++++++++++++--------- utils/helpview/src/makefile.vc | 12 ++++++++++++ utils/hhp2cached/makefile.vc | 12 ++++++++++++ utils/ifacecheck/src/makefile.vc | 12 ++++++++++++ utils/screenshotgen/src/makefile.vc | 12 ++++++++++++ utils/wxrc/makefile.vc | 12 ++++++++++++ 115 files changed, 1351 insertions(+), 37 deletions(-) diff --git a/autoconf_inc.m4 b/autoconf_inc.m4 index 6f70781d53..5bf4238d49 100644 --- a/autoconf_inc.m4 +++ b/autoconf_inc.m4 @@ -302,12 +302,6 @@ dnl ### begin block 20_COND_MONOLITHIC_0_USE_WEBVIEW_1[../../demos/bombs/bombs.b COND_MONOLITHIC_0_USE_WEBVIEW_1="" fi AC_SUBST(COND_MONOLITHIC_0_USE_WEBVIEW_1) -dnl ### begin block 20_COND_MONOLITHIC_0_USE_WEBVIEW_CHROMIUM_1[../../samples/propgrid/propgrid.bkl,../../tests/test.bkl] ### - COND_MONOLITHIC_0_USE_WEBVIEW_CHROMIUM_1="#" - if test "x$MONOLITHIC" = "x0" -a "x$USE_WEBVIEW_CHROMIUM" = "x1" ; then - COND_MONOLITHIC_0_USE_WEBVIEW_CHROMIUM_1="" - fi - AC_SUBST(COND_MONOLITHIC_0_USE_WEBVIEW_CHROMIUM_1) dnl ### begin block 20_COND_MONOLITHIC_0_USE_XML_1[wx.bkl] ### COND_MONOLITHIC_0_USE_XML_1="#" if test "x$MONOLITHIC" = "x0" -a "x$USE_XML" = "x1" ; then diff --git a/demos/bombs/makefile.vc b/demos/bombs/makefile.vc index d9611466f6..3e45ce6fb1 100644 --- a/demos/bombs/makefile.vc +++ b/demos/bombs/makefile.vc @@ -41,6 +41,9 @@ BOMBS_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -59,6 +62,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -98,6 +104,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -116,6 +125,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/demos/forty/makefile.vc b/demos/forty/makefile.vc index f22f789c77..ec64f47fb2 100644 --- a/demos/forty/makefile.vc +++ b/demos/forty/makefile.vc @@ -46,6 +46,9 @@ FORTY_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -64,6 +67,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -103,6 +109,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -121,6 +130,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/demos/fractal/makefile.vc b/demos/fractal/makefile.vc index 5b439d0103..c168b603a5 100644 --- a/demos/fractal/makefile.vc +++ b/demos/fractal/makefile.vc @@ -39,6 +39,9 @@ FRACTAL_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/demos/life/makefile.vc b/demos/life/makefile.vc index 5aa3f1d808..94368250b5 100644 --- a/demos/life/makefile.vc +++ b/demos/life/makefile.vc @@ -42,6 +42,9 @@ LIFE_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -60,6 +63,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -99,6 +105,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -117,6 +126,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/demos/poem/makefile.vc b/demos/poem/makefile.vc index cc2c293e6a..722a834bc7 100644 --- a/demos/poem/makefile.vc +++ b/demos/poem/makefile.vc @@ -39,6 +39,9 @@ WXPOEM_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/access/makefile.vc b/samples/access/makefile.vc index 1154a81366..5a7daf45f5 100644 --- a/samples/access/makefile.vc +++ b/samples/access/makefile.vc @@ -39,6 +39,9 @@ ACCESSTEST_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/animate/makefile.vc b/samples/animate/makefile.vc index c209720aa4..165d73aa2a 100644 --- a/samples/animate/makefile.vc +++ b/samples/animate/makefile.vc @@ -39,6 +39,9 @@ ANITEST_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/archive/makefile.vc b/samples/archive/makefile.vc index 2f0049439e..73bc2a4147 100644 --- a/samples/archive/makefile.vc +++ b/samples/archive/makefile.vc @@ -37,6 +37,9 @@ ARCHIVE_OBJECTS = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -55,6 +58,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -94,6 +100,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -112,6 +121,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/artprov/makefile.vc b/samples/artprov/makefile.vc index bedef3f241..de50197ba7 100644 --- a/samples/artprov/makefile.vc +++ b/samples/artprov/makefile.vc @@ -40,6 +40,9 @@ ARTTEST_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -58,6 +61,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -97,6 +103,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -115,6 +124,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/aui/makefile.vc b/samples/aui/makefile.vc index c211fdb4f7..04a9c5fe01 100644 --- a/samples/aui/makefile.vc +++ b/samples/aui/makefile.vc @@ -39,6 +39,9 @@ AUIDEMO_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/calendar/makefile.vc b/samples/calendar/makefile.vc index 7717f3ebc4..2cd1b5b5be 100644 --- a/samples/calendar/makefile.vc +++ b/samples/calendar/makefile.vc @@ -39,6 +39,9 @@ CALENDAR_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/caret/makefile.vc b/samples/caret/makefile.vc index c8011d6b17..753cd7463d 100644 --- a/samples/caret/makefile.vc +++ b/samples/caret/makefile.vc @@ -39,6 +39,9 @@ CARET_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/clipboard/makefile.vc b/samples/clipboard/makefile.vc index 99c22e18cd..ba1516bb5e 100644 --- a/samples/clipboard/makefile.vc +++ b/samples/clipboard/makefile.vc @@ -39,6 +39,9 @@ CLIPBOARD_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/collpane/makefile.vc b/samples/collpane/makefile.vc index 30f44ae450..d619752ca4 100644 --- a/samples/collpane/makefile.vc +++ b/samples/collpane/makefile.vc @@ -39,6 +39,9 @@ COLLPANE_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/combo/makefile.vc b/samples/combo/makefile.vc index d275105b7b..f6dadad6f7 100644 --- a/samples/combo/makefile.vc +++ b/samples/combo/makefile.vc @@ -39,6 +39,9 @@ COMBO_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/config/makefile.vc b/samples/config/makefile.vc index c48c43143a..3a34560288 100644 --- a/samples/config/makefile.vc +++ b/samples/config/makefile.vc @@ -39,6 +39,9 @@ CONFTEST_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/console/makefile.vc b/samples/console/makefile.vc index d33084653a..9320c55b3f 100644 --- a/samples/console/makefile.vc +++ b/samples/console/makefile.vc @@ -37,6 +37,9 @@ CONSOLE_OBJECTS = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -55,6 +58,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -94,6 +100,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -112,6 +121,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/dataview/makefile.vc b/samples/dataview/makefile.vc index 8b35b10af6..3c09a28dcf 100644 --- a/samples/dataview/makefile.vc +++ b/samples/dataview/makefile.vc @@ -40,6 +40,9 @@ DATAVIEW_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -58,6 +61,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -97,6 +103,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -115,6 +124,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/debugrpt/makefile.vc b/samples/debugrpt/makefile.vc index 1cde5fcc02..6eaeb5949e 100644 --- a/samples/debugrpt/makefile.vc +++ b/samples/debugrpt/makefile.vc @@ -39,6 +39,9 @@ DEBUGRPT_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/dialogs/makefile.vc b/samples/dialogs/makefile.vc index dd2a0883b7..dc8e3b48ac 100644 --- a/samples/dialogs/makefile.vc +++ b/samples/dialogs/makefile.vc @@ -40,6 +40,9 @@ DIALOGS_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -58,6 +61,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -97,6 +103,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -115,6 +124,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/dialup/makefile.vc b/samples/dialup/makefile.vc index c931af1106..fce191dae2 100644 --- a/samples/dialup/makefile.vc +++ b/samples/dialup/makefile.vc @@ -39,6 +39,9 @@ NETTEST_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/display/makefile.vc b/samples/display/makefile.vc index bda5083525..eda5eee49a 100644 --- a/samples/display/makefile.vc +++ b/samples/display/makefile.vc @@ -39,6 +39,9 @@ DISPLAY_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/dll/makefile.vc b/samples/dll/makefile.vc index fdae161cc6..1a7da7ff27 100644 --- a/samples/dll/makefile.vc +++ b/samples/dll/makefile.vc @@ -59,6 +59,9 @@ SDK_EXE_OBJECTS = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -77,6 +80,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -116,6 +122,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -134,6 +143,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/dnd/makefile.vc b/samples/dnd/makefile.vc index 0cebaf135c..4bd2179802 100644 --- a/samples/dnd/makefile.vc +++ b/samples/dnd/makefile.vc @@ -39,6 +39,9 @@ DND_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/docview/makefile.vc b/samples/docview/makefile.vc index 468f052842..d84c7e762f 100644 --- a/samples/docview/makefile.vc +++ b/samples/docview/makefile.vc @@ -41,6 +41,9 @@ DOCVIEW_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -59,6 +62,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -98,6 +104,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -116,6 +125,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/dragimag/makefile.vc b/samples/dragimag/makefile.vc index 246f43c695..2bc05fa6c4 100644 --- a/samples/dragimag/makefile.vc +++ b/samples/dragimag/makefile.vc @@ -39,6 +39,9 @@ DRAGIMAG_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/drawing/makefile.vc b/samples/drawing/makefile.vc index c5b8f2798e..5d9fbff43a 100644 --- a/samples/drawing/makefile.vc +++ b/samples/drawing/makefile.vc @@ -39,6 +39,9 @@ DRAWING_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/erase/makefile.vc b/samples/erase/makefile.vc index 0bc32ab50e..1fb612afdd 100644 --- a/samples/erase/makefile.vc +++ b/samples/erase/makefile.vc @@ -39,6 +39,9 @@ ERASE_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/event/makefile.vc b/samples/event/makefile.vc index 3175ec503d..c15753ebb3 100644 --- a/samples/event/makefile.vc +++ b/samples/event/makefile.vc @@ -41,6 +41,9 @@ EVENT_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -59,6 +62,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -98,6 +104,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -116,6 +125,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/except/makefile.vc b/samples/except/makefile.vc index 28ccb418e1..d9a19c5bbe 100644 --- a/samples/except/makefile.vc +++ b/samples/except/makefile.vc @@ -39,6 +39,9 @@ EXCEPT_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/exec/makefile.vc b/samples/exec/makefile.vc index 0589d8182b..d75e8f82dd 100644 --- a/samples/exec/makefile.vc +++ b/samples/exec/makefile.vc @@ -39,6 +39,9 @@ EXEC_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/font/makefile.vc b/samples/font/makefile.vc index d701a0ce0f..0bb5e1c42e 100644 --- a/samples/font/makefile.vc +++ b/samples/font/makefile.vc @@ -39,6 +39,9 @@ FONT_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/fswatcher/makefile.vc b/samples/fswatcher/makefile.vc index a4cc35cfd0..824b1f6bb7 100644 --- a/samples/fswatcher/makefile.vc +++ b/samples/fswatcher/makefile.vc @@ -39,6 +39,9 @@ FSWATCHER_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/grid/makefile.vc b/samples/grid/makefile.vc index cbaba843cf..42fc497b19 100644 --- a/samples/grid/makefile.vc +++ b/samples/grid/makefile.vc @@ -39,6 +39,9 @@ GRID_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/help/makefile.vc b/samples/help/makefile.vc index 0e3f42db3b..38b3ae21a5 100644 --- a/samples/help/makefile.vc +++ b/samples/help/makefile.vc @@ -39,6 +39,9 @@ HELP_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/htlbox/makefile.vc b/samples/htlbox/makefile.vc index 4e59b93fe8..cb6b7f13bc 100644 --- a/samples/htlbox/makefile.vc +++ b/samples/htlbox/makefile.vc @@ -39,6 +39,9 @@ HTLBOX_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/html/about/makefile.vc b/samples/html/about/makefile.vc index d2f73a8a18..dedaa48468 100644 --- a/samples/html/about/makefile.vc +++ b/samples/html/about/makefile.vc @@ -39,6 +39,9 @@ ABOUT_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/html/help/makefile.vc b/samples/html/help/makefile.vc index 5089fd5e52..974a447626 100644 --- a/samples/html/help/makefile.vc +++ b/samples/html/help/makefile.vc @@ -39,6 +39,9 @@ HTMLHELP_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/html/helpview/makefile.vc b/samples/html/helpview/makefile.vc index 997debfa2d..e6a8c77342 100644 --- a/samples/html/helpview/makefile.vc +++ b/samples/html/helpview/makefile.vc @@ -39,6 +39,9 @@ HELPVIEW_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/html/printing/makefile.vc b/samples/html/printing/makefile.vc index 9965b0c4b5..5a77fd7cb2 100644 --- a/samples/html/printing/makefile.vc +++ b/samples/html/printing/makefile.vc @@ -39,6 +39,9 @@ HTMLPRINTING_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/html/test/makefile.vc b/samples/html/test/makefile.vc index cb3193bc8a..8015dbd180 100644 --- a/samples/html/test/makefile.vc +++ b/samples/html/test/makefile.vc @@ -39,6 +39,9 @@ TEST_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/html/virtual/makefile.vc b/samples/html/virtual/makefile.vc index 459442c59e..fb72807e4c 100644 --- a/samples/html/virtual/makefile.vc +++ b/samples/html/virtual/makefile.vc @@ -39,6 +39,9 @@ VIRTUAL_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/html/widget/makefile.vc b/samples/html/widget/makefile.vc index 94fb446b57..779de31dca 100644 --- a/samples/html/widget/makefile.vc +++ b/samples/html/widget/makefile.vc @@ -39,6 +39,9 @@ WIDGET_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/html/zip/makefile.vc b/samples/html/zip/makefile.vc index 93295b700e..29a11e903e 100644 --- a/samples/html/zip/makefile.vc +++ b/samples/html/zip/makefile.vc @@ -39,6 +39,9 @@ ZIP_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/image/makefile.vc b/samples/image/makefile.vc index 551c9c32b4..a0e5a8f00e 100644 --- a/samples/image/makefile.vc +++ b/samples/image/makefile.vc @@ -40,6 +40,9 @@ IMAGE_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -58,6 +61,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -97,6 +103,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -115,6 +124,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/internat/makefile.vc b/samples/internat/makefile.vc index 2f3a1b872e..0384ea4ec4 100644 --- a/samples/internat/makefile.vc +++ b/samples/internat/makefile.vc @@ -39,6 +39,9 @@ INTERNAT_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/ipc/makefile.vc b/samples/ipc/makefile.vc index 52a70840bf..3054a525b4 100644 --- a/samples/ipc/makefile.vc +++ b/samples/ipc/makefile.vc @@ -77,6 +77,9 @@ BASEIPCSERVER_OBJECTS = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -95,6 +98,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -134,6 +140,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -152,6 +161,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/joytest/makefile.vc b/samples/joytest/makefile.vc index 5cde5b1032..c6a6162475 100644 --- a/samples/joytest/makefile.vc +++ b/samples/joytest/makefile.vc @@ -39,6 +39,9 @@ JOYTEST_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/keyboard/makefile.vc b/samples/keyboard/makefile.vc index c20fcb7f3c..617513a64d 100644 --- a/samples/keyboard/makefile.vc +++ b/samples/keyboard/makefile.vc @@ -39,6 +39,9 @@ KEYBOARD_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/layout/makefile.vc b/samples/layout/makefile.vc index 649530e61a..3d164be2c5 100644 --- a/samples/layout/makefile.vc +++ b/samples/layout/makefile.vc @@ -39,6 +39,9 @@ LAYOUT_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/listctrl/makefile.vc b/samples/listctrl/makefile.vc index 8ac208b8ae..c439cc50c3 100644 --- a/samples/listctrl/makefile.vc +++ b/samples/listctrl/makefile.vc @@ -39,6 +39,9 @@ LISTCTRL_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/mdi/makefile.vc b/samples/mdi/makefile.vc index d9a1714de1..b747f3acbd 100644 --- a/samples/mdi/makefile.vc +++ b/samples/mdi/makefile.vc @@ -39,6 +39,9 @@ MDI_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/mediaplayer/makefile.vc b/samples/mediaplayer/makefile.vc index 4a9cb15ea2..54db23a00c 100644 --- a/samples/mediaplayer/makefile.vc +++ b/samples/mediaplayer/makefile.vc @@ -39,6 +39,9 @@ MEDIAPLAYER_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/menu/makefile.vc b/samples/menu/makefile.vc index 6e20e86aee..5d8e11a962 100644 --- a/samples/menu/makefile.vc +++ b/samples/menu/makefile.vc @@ -39,6 +39,9 @@ MENU_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/mfc/makefile.vc b/samples/mfc/makefile.vc index f35e790f11..74ae0672a9 100644 --- a/samples/mfc/makefile.vc +++ b/samples/mfc/makefile.vc @@ -39,6 +39,9 @@ MFCTEST_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/minimal/makefile.vc b/samples/minimal/makefile.vc index 3cef6ce268..8a01ac5167 100644 --- a/samples/minimal/makefile.vc +++ b/samples/minimal/makefile.vc @@ -39,6 +39,9 @@ MINIMAL_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/nativdlg/makefile.vc b/samples/nativdlg/makefile.vc index 9001a41ca1..1376010135 100644 --- a/samples/nativdlg/makefile.vc +++ b/samples/nativdlg/makefile.vc @@ -39,6 +39,9 @@ NATIVDLG_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/notebook/makefile.vc b/samples/notebook/makefile.vc index 9648da77e5..682e3c427f 100644 --- a/samples/notebook/makefile.vc +++ b/samples/notebook/makefile.vc @@ -39,6 +39,9 @@ NOTEBOOK_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/oleauto/makefile.vc b/samples/oleauto/makefile.vc index 1e2ed08367..1b95be83b8 100644 --- a/samples/oleauto/makefile.vc +++ b/samples/oleauto/makefile.vc @@ -39,6 +39,9 @@ OLEAUTO_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/opengl/cube/makefile.vc b/samples/opengl/cube/makefile.vc index 15b4852971..fec505af72 100644 --- a/samples/opengl/cube/makefile.vc +++ b/samples/opengl/cube/makefile.vc @@ -39,6 +39,9 @@ CUBE_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/opengl/isosurf/makefile.vc b/samples/opengl/isosurf/makefile.vc index be0c1c73bd..c7d8f28d3e 100644 --- a/samples/opengl/isosurf/makefile.vc +++ b/samples/opengl/isosurf/makefile.vc @@ -39,6 +39,9 @@ ISOSURF_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/opengl/penguin/makefile.vc b/samples/opengl/penguin/makefile.vc index c2aabb356c..012ccb93ef 100644 --- a/samples/opengl/penguin/makefile.vc +++ b/samples/opengl/penguin/makefile.vc @@ -51,6 +51,9 @@ PENGUIN_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -69,6 +72,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -108,6 +114,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -126,6 +135,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/opengl/pyramid/makefile.vc b/samples/opengl/pyramid/makefile.vc index d41381ef1b..1b427d8c9a 100644 --- a/samples/opengl/pyramid/makefile.vc +++ b/samples/opengl/pyramid/makefile.vc @@ -42,6 +42,9 @@ PYRAMID_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -60,6 +63,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -99,6 +105,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -117,6 +126,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/ownerdrw/makefile.vc b/samples/ownerdrw/makefile.vc index 70935daf25..33983e902d 100644 --- a/samples/ownerdrw/makefile.vc +++ b/samples/ownerdrw/makefile.vc @@ -39,6 +39,9 @@ OWNERDRW_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/popup/makefile.vc b/samples/popup/makefile.vc index 2a92e60e45..fe38e8fc9a 100644 --- a/samples/popup/makefile.vc +++ b/samples/popup/makefile.vc @@ -39,6 +39,9 @@ POPUP_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/power/makefile.vc b/samples/power/makefile.vc index 46a07f6a61..f3b08f508d 100644 --- a/samples/power/makefile.vc +++ b/samples/power/makefile.vc @@ -39,6 +39,9 @@ POWER_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/preferences/makefile.vc b/samples/preferences/makefile.vc index ae688a0746..2bc41d9bc7 100644 --- a/samples/preferences/makefile.vc +++ b/samples/preferences/makefile.vc @@ -39,6 +39,9 @@ PREFERENCES_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/printing/makefile.vc b/samples/printing/makefile.vc index 3bec9fe324..a1c759d624 100644 --- a/samples/printing/makefile.vc +++ b/samples/printing/makefile.vc @@ -39,6 +39,9 @@ PRINTING_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/propgrid/Makefile.in b/samples/propgrid/Makefile.in index 2fdb7bbb67..e95469ecac 100644 --- a/samples/propgrid/Makefile.in +++ b/samples/propgrid/Makefile.in @@ -169,7 +169,7 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch Makefile propgrid$(EXEEXT): $(PROPGRID_OBJECTS) $(__propgrid___win32rc) - $(CXX) -o $@ $(PROPGRID_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(WX_LDFLAGS) $(__WXLIB_PROPGRID_p) $(__WXLIB_XRC_p) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(CXX) -o $@ $(PROPGRID_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(WX_LDFLAGS) $(__WXLIB_PROPGRID_p) $(__WXLIB_XRC_p) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) $(__propgrid___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@propgrid.app/Contents/PkgInfo: propgrid$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -181,10 +181,10 @@ propgrid$(EXEEXT): $(PROPGRID_OBJECTS) $(__propgrid___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.propgrid/" \ @COND_PLATFORM_MACOSX_1@ -e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/propgrid/" \ @COND_PLATFORM_MACOSX_1@ -e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/propgrid/" \ -@COND_PLATFORM_MACOSX_1@ -e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2023 wxWidgets/" \ +@COND_PLATFORM_MACOSX_1@ -e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2024 wxWidgets/" \ @COND_PLATFORM_MACOSX_1@ -e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ -e "s/\$${MACOSX_BUNDLE_INFO_STRING}/propgrid version $(WX_VERSION), (c) 2002-2023 wxWidgets/" \ -@COND_PLATFORM_MACOSX_1@ -e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2023 wxWidgets/" \ +@COND_PLATFORM_MACOSX_1@ -e "s/\$${MACOSX_BUNDLE_INFO_STRING}/propgrid version $(WX_VERSION), (c) 2002-2024 wxWidgets/" \ +@COND_PLATFORM_MACOSX_1@ -e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2024 wxWidgets/" \ @COND_PLATFORM_MACOSX_1@ -e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \ @COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >propgrid.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ diff --git a/samples/propgrid/makefile.gcc b/samples/propgrid/makefile.gcc index f392880b4c..de547215b9 100644 --- a/samples/propgrid/makefile.gcc +++ b/samples/propgrid/makefile.gcc @@ -225,7 +225,7 @@ clean: $(OBJS)\propgrid.exe: $(PROPGRID_OBJECTS) $(OBJS)\propgrid_sample_rc.o $(foreach f,$(subst \,/,$(PROPGRID_OBJECTS)),$(shell echo $f >> $(subst \,/,$@).rsp.tmp)) @move /y $@.rsp.tmp $@.rsp >nul - $(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_PROPGRID_p) $(__WXLIB_XRC_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme + $(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_PROPGRID_p) $(__WXLIB_XRC_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme @-del $@.rsp data: diff --git a/samples/propgrid/makefile.vc b/samples/propgrid/makefile.vc index 51bde34796..7fd4a87a18 100644 --- a/samples/propgrid/makefile.vc +++ b/samples/propgrid/makefile.vc @@ -41,6 +41,9 @@ PROPGRID_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -59,6 +62,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -98,6 +104,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -116,6 +125,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -432,7 +444,7 @@ clean: -if exist $(OBJS)\propgrid.pdb del $(OBJS)\propgrid.pdb $(OBJS)\propgrid.exe: $(PROPGRID_OBJECTS) $(OBJS)\propgrid_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\propgrid.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(WIN32_DPI_LINKFLAG) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\propgrid.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(WIN32_DPI_LINKFLAG) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<< $(PROPGRID_OBJECTS) $(PROPGRID_RESOURCES) $(__WXLIB_PROPGRID_p) $(__WXLIB_XRC_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib << diff --git a/samples/regtest/makefile.vc b/samples/regtest/makefile.vc index b58055e3af..a5d4ebb4c7 100644 --- a/samples/regtest/makefile.vc +++ b/samples/regtest/makefile.vc @@ -39,6 +39,9 @@ REGTEST_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/render/makefile.vc b/samples/render/makefile.vc index 1661966c7e..7cf915c05c 100644 --- a/samples/render/makefile.vc +++ b/samples/render/makefile.vc @@ -51,6 +51,9 @@ RENDDLL_OBJECTS = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -69,6 +72,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -114,6 +120,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -132,6 +141,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/ribbon/makefile.vc b/samples/ribbon/makefile.vc index 1e24e3ebb0..bbbcfab3a6 100644 --- a/samples/ribbon/makefile.vc +++ b/samples/ribbon/makefile.vc @@ -39,6 +39,9 @@ RIBBON_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/richtext/makefile.vc b/samples/richtext/makefile.vc index 9ec8977b24..96dfb9460b 100644 --- a/samples/richtext/makefile.vc +++ b/samples/richtext/makefile.vc @@ -39,6 +39,9 @@ RICHTEXT_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/sashtest/makefile.vc b/samples/sashtest/makefile.vc index 8be12a37fe..bc42ffbb11 100644 --- a/samples/sashtest/makefile.vc +++ b/samples/sashtest/makefile.vc @@ -39,6 +39,9 @@ SASHTEST_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/scroll/makefile.vc b/samples/scroll/makefile.vc index 57f44578c6..eaf0e2ebcc 100644 --- a/samples/scroll/makefile.vc +++ b/samples/scroll/makefile.vc @@ -39,6 +39,9 @@ SCROLL_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/secretstore/makefile.vc b/samples/secretstore/makefile.vc index ea31dd3bdc..b4aec51255 100644 --- a/samples/secretstore/makefile.vc +++ b/samples/secretstore/makefile.vc @@ -37,6 +37,9 @@ SECRETSTORE_OBJECTS = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -55,6 +58,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -94,6 +100,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -112,6 +121,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/shaped/makefile.vc b/samples/shaped/makefile.vc index c89186b24c..0dc2f3ed57 100644 --- a/samples/shaped/makefile.vc +++ b/samples/shaped/makefile.vc @@ -39,6 +39,9 @@ SHAPED_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/sockets/makefile.vc b/samples/sockets/makefile.vc index 474f819715..942d1835b3 100644 --- a/samples/sockets/makefile.vc +++ b/samples/sockets/makefile.vc @@ -75,6 +75,9 @@ BASESERVER_OBJECTS = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -93,6 +96,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -132,6 +138,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -150,6 +159,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/sound/makefile.vc b/samples/sound/makefile.vc index ea0b61c2f2..163e1f3cc3 100644 --- a/samples/sound/makefile.vc +++ b/samples/sound/makefile.vc @@ -39,6 +39,9 @@ SOUND_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/splash/makefile.vc b/samples/splash/makefile.vc index dbbbb3356e..e8f7c926a8 100644 --- a/samples/splash/makefile.vc +++ b/samples/splash/makefile.vc @@ -39,6 +39,9 @@ SPLASH_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/splitter/makefile.vc b/samples/splitter/makefile.vc index 188eebd7b9..95a18bb15c 100644 --- a/samples/splitter/makefile.vc +++ b/samples/splitter/makefile.vc @@ -39,6 +39,9 @@ SPLITTER_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/statbar/makefile.vc b/samples/statbar/makefile.vc index f8b7fc3a76..82d245e214 100644 --- a/samples/statbar/makefile.vc +++ b/samples/statbar/makefile.vc @@ -39,6 +39,9 @@ STATBAR_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/stc/makefile.vc b/samples/stc/makefile.vc index 390ef94504..6a0ed4df68 100644 --- a/samples/stc/makefile.vc +++ b/samples/stc/makefile.vc @@ -41,6 +41,9 @@ STCTEST_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -59,6 +62,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -98,6 +104,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -116,6 +125,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/svg/makefile.vc b/samples/svg/makefile.vc index a0333b54c1..1eeaaa0882 100644 --- a/samples/svg/makefile.vc +++ b/samples/svg/makefile.vc @@ -39,6 +39,9 @@ SVGTEST_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/taborder/makefile.vc b/samples/taborder/makefile.vc index f15e1cfb24..7dd4c95643 100644 --- a/samples/taborder/makefile.vc +++ b/samples/taborder/makefile.vc @@ -39,6 +39,9 @@ TABORDER_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/taskbar/makefile.vc b/samples/taskbar/makefile.vc index d6f91380a8..ad81baa482 100644 --- a/samples/taskbar/makefile.vc +++ b/samples/taskbar/makefile.vc @@ -39,6 +39,9 @@ TASKBAR_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/taskbarbutton/makefile.vc b/samples/taskbarbutton/makefile.vc index adf5a59106..fb99514ae6 100644 --- a/samples/taskbarbutton/makefile.vc +++ b/samples/taskbarbutton/makefile.vc @@ -39,6 +39,9 @@ TASKBARBUTTON_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/text/makefile.vc b/samples/text/makefile.vc index 39da7baa11..8d50ab2878 100644 --- a/samples/text/makefile.vc +++ b/samples/text/makefile.vc @@ -39,6 +39,9 @@ TEXT_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/thread/makefile.vc b/samples/thread/makefile.vc index b1cedc2226..5863752a6a 100644 --- a/samples/thread/makefile.vc +++ b/samples/thread/makefile.vc @@ -39,6 +39,9 @@ THREAD_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/toolbar/makefile.vc b/samples/toolbar/makefile.vc index e5059a366e..f745decefd 100644 --- a/samples/toolbar/makefile.vc +++ b/samples/toolbar/makefile.vc @@ -39,6 +39,9 @@ TOOLBAR_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/treectrl/makefile.vc b/samples/treectrl/makefile.vc index 33c604022c..5677492ce9 100644 --- a/samples/treectrl/makefile.vc +++ b/samples/treectrl/makefile.vc @@ -39,6 +39,9 @@ TREECTRL_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/treelist/makefile.vc b/samples/treelist/makefile.vc index d769cbcb23..2634c55ebe 100644 --- a/samples/treelist/makefile.vc +++ b/samples/treelist/makefile.vc @@ -39,6 +39,9 @@ TREELIST_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/typetest/makefile.vc b/samples/typetest/makefile.vc index b3f9bbef9f..7f492c53b9 100644 --- a/samples/typetest/makefile.vc +++ b/samples/typetest/makefile.vc @@ -39,6 +39,9 @@ TYPETEST_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/uiaction/makefile.vc b/samples/uiaction/makefile.vc index ed5e7a4486..857eecf620 100644 --- a/samples/uiaction/makefile.vc +++ b/samples/uiaction/makefile.vc @@ -39,6 +39,9 @@ UIACTION_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/validate/makefile.vc b/samples/validate/makefile.vc index 6d134351a8..d667a0c0bd 100644 --- a/samples/validate/makefile.vc +++ b/samples/validate/makefile.vc @@ -39,6 +39,9 @@ VALIDATE_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/vscroll/makefile.vc b/samples/vscroll/makefile.vc index fbb3cfa90d..d6e36c1771 100644 --- a/samples/vscroll/makefile.vc +++ b/samples/vscroll/makefile.vc @@ -39,6 +39,9 @@ VSTEST_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/webrequest/makefile.vc b/samples/webrequest/makefile.vc index 9f3d35b34e..d8969d7721 100644 --- a/samples/webrequest/makefile.vc +++ b/samples/webrequest/makefile.vc @@ -39,6 +39,9 @@ WEBREQUEST_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/webview/makefile.vc b/samples/webview/makefile.vc index ac8486f1be..2cfa72efb5 100644 --- a/samples/webview/makefile.vc +++ b/samples/webview/makefile.vc @@ -39,6 +39,9 @@ WEBVIEW_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/widgets/makefile.vc b/samples/widgets/makefile.vc index c79f826634..7b1370e1d9 100644 --- a/samples/widgets/makefile.vc +++ b/samples/widgets/makefile.vc @@ -70,6 +70,9 @@ WIDGETS_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -88,6 +91,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -127,6 +133,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -145,6 +154,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/wizard/makefile.vc b/samples/wizard/makefile.vc index 5f389c3046..a8be851c65 100644 --- a/samples/wizard/makefile.vc +++ b/samples/wizard/makefile.vc @@ -39,6 +39,9 @@ WIZARD_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/wrapsizer/makefile.vc b/samples/wrapsizer/makefile.vc index a6d322ee6f..237b33a27b 100644 --- a/samples/wrapsizer/makefile.vc +++ b/samples/wrapsizer/makefile.vc @@ -39,6 +39,9 @@ WRAPSIZER_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/xrc/makefile.vc b/samples/xrc/makefile.vc index 4cefc4157a..17aef73b0a 100644 --- a/samples/xrc/makefile.vc +++ b/samples/xrc/makefile.vc @@ -43,6 +43,9 @@ XRCDEMO_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -61,6 +64,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -100,6 +106,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -118,6 +127,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/samples/xti/makefile.vc b/samples/xti/makefile.vc index 0a0a57386a..c41fdf9c08 100644 --- a/samples/xti/makefile.vc +++ b/samples/xti/makefile.vc @@ -41,6 +41,9 @@ XTI_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -59,6 +62,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -98,6 +104,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -116,6 +125,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/tests/Makefile.in b/tests/Makefile.in index f9c14e47b6..ce5a9e5915 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -486,22 +486,22 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch Makefile test$(EXEEXT): $(TEST_OBJECTS) - $(CXX) -o $@ $(TEST_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(WX_LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(CXX) -o $@ $(TEST_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(WX_LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) @COND_USE_PCH_1@./.pch/testprec_test/testprec.h.gch: @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/testprec_test/testprec.h.gch testprec.h $(CXX) $(TEST_CXXFLAGS) @COND_USE_GUI_1@test_drawing$(EXEEXT): $(TEST_DRAWING_OBJECTS) -@COND_USE_GUI_1@ $(CXX) -o $@ $(TEST_DRAWING_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(WX_LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) +@COND_USE_GUI_1@ $(CXX) -o $@ $(TEST_DRAWING_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(WX_LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) @COND_USE_PCH_1@./.pch/testprec_test_drawing/testprec.h.gch: @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/testprec_test_drawing/testprec.h.gch testprec.h $(CXX) $(TEST_DRAWING_CXXFLAGS) @COND_SHARED_1_USE_GUI_1@$(DLLPREFIX_MODULE)test_drawingplugin.$(SO_SUFFIX_MODULE): $(TEST_DRAWINGPLUGIN_OBJECTS) -@COND_SHARED_1_USE_GUI_1@ $(SHARED_LD_MODULE_CXX) $@ $(TEST_DRAWINGPLUGIN_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS) $(WX_LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p_1) $(__LIB_LEXILLA_IF_MONO_p_1) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) +@COND_SHARED_1_USE_GUI_1@ $(SHARED_LD_MODULE_CXX) $@ $(TEST_DRAWINGPLUGIN_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS) $(WX_LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p_1) $(__LIB_LEXILLA_IF_MONO_p_1) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) @COND_USE_GUI_1@test_gui$(EXEEXT): $(TEST_GUI_OBJECTS) $(__test_gui___win32rc) -@COND_USE_GUI_1@ $(CXX) -o $@ $(TEST_GUI_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(WX_LDFLAGS) $(__WXLIB_WEBVIEW_p) $(EXTRALIBS_WEBVIEW) $(__WXLIB_STC_p) $(EXTRALIBS_STC) $(__WXLIB_AUI_p) $(__WXLIB_RICHTEXT_p) $(__WXLIB_MEDIA_p) $(EXTRALIBS_MEDIA) $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_PROPGRID_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__LIB_SCINTILLA_p) $(__LIB_LEXILLA_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p_2) $(__LIB_LEXILLA_IF_MONO_p_2) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) +@COND_USE_GUI_1@ $(CXX) -o $@ $(TEST_GUI_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(WX_LDFLAGS) $(__WXLIB_WEBVIEW_p) $(EXTRALIBS_WEBVIEW) $(__WXLIB_STC_p) $(EXTRALIBS_STC) $(__WXLIB_AUI_p) $(__WXLIB_RICHTEXT_p) $(__WXLIB_MEDIA_p) $(EXTRALIBS_MEDIA) $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_PROPGRID_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__LIB_SCINTILLA_p) $(__LIB_LEXILLA_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p_2) $(__LIB_LEXILLA_IF_MONO_p_2) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) @COND_PLATFORM_MACOSX_1_USE_GUI_1@test_gui.app/Contents/PkgInfo: $(__test_gui___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1_USE_GUI_1@ mkdir -p test_gui.app/Contents @@ -512,10 +512,10 @@ test$(EXEEXT): $(TEST_OBJECTS) @COND_PLATFORM_MACOSX_1_USE_GUI_1@ sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.test_gui/" \ @COND_PLATFORM_MACOSX_1_USE_GUI_1@ -e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/test_gui/" \ @COND_PLATFORM_MACOSX_1_USE_GUI_1@ -e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/test_gui/" \ -@COND_PLATFORM_MACOSX_1_USE_GUI_1@ -e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2023 wxWidgets/" \ +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ -e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2024 wxWidgets/" \ @COND_PLATFORM_MACOSX_1_USE_GUI_1@ -e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1_USE_GUI_1@ -e "s/\$${MACOSX_BUNDLE_INFO_STRING}/test_gui version $(WX_VERSION), (c) 2002-2023 wxWidgets/" \ -@COND_PLATFORM_MACOSX_1_USE_GUI_1@ -e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2023 wxWidgets/" \ +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ -e "s/\$${MACOSX_BUNDLE_INFO_STRING}/test_gui version $(WX_VERSION), (c) 2002-2024 wxWidgets/" \ +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ -e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2024 wxWidgets/" \ @COND_PLATFORM_MACOSX_1_USE_GUI_1@ -e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \ @COND_PLATFORM_MACOSX_1_USE_GUI_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >test_gui.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1_USE_GUI_1@ @@ -534,7 +534,7 @@ test$(EXEEXT): $(TEST_OBJECTS) @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/testprec_test_gui/testprec.h.gch testprec.h $(CXX) $(TEST_GUI_CXXFLAGS) @COND_USE_GUI_1@test_allheaders$(EXEEXT): $(TEST_ALLHEADERS_OBJECTS) $(__test_allheaders___win32rc) -@COND_USE_GUI_1@ $(CXX) -o $@ $(TEST_ALLHEADERS_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(WX_LDFLAGS) $(__WXLIB_WEBVIEW_p) $(EXTRALIBS_WEBVIEW) $(__WXLIB_STC_p) $(EXTRALIBS_STC) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__LIB_SCINTILLA_p) $(__LIB_LEXILLA_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p_3) $(__LIB_LEXILLA_IF_MONO_p_3) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) +@COND_USE_GUI_1@ $(CXX) -o $@ $(TEST_ALLHEADERS_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(WX_LDFLAGS) $(__WXLIB_WEBVIEW_p) $(EXTRALIBS_WEBVIEW) $(__WXLIB_STC_p) $(EXTRALIBS_STC) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__LIB_SCINTILLA_p) $(__LIB_LEXILLA_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p_3) $(__LIB_LEXILLA_IF_MONO_p_3) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) @COND_PLATFORM_MACOSX_1_USE_GUI_1@test_allheaders.app/Contents/PkgInfo: $(__test_allheaders___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1_USE_GUI_1@ mkdir -p test_allheaders.app/Contents @@ -545,10 +545,10 @@ test$(EXEEXT): $(TEST_OBJECTS) @COND_PLATFORM_MACOSX_1_USE_GUI_1@ sed -e "s/\$${MACOSX_BUNDLE_GUI_IDENTIFIER}/org.wxwidgets.test_allheaders/" \ @COND_PLATFORM_MACOSX_1_USE_GUI_1@ -e "s/\$${MACOSX_BUNDLE_EXECUTABLE_NAME}/test_allheaders/" \ @COND_PLATFORM_MACOSX_1_USE_GUI_1@ -e "s/\$${MACOSX_BUNDLE_BUNDLE_NAME}/test_allheaders/" \ -@COND_PLATFORM_MACOSX_1_USE_GUI_1@ -e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2023 wxWidgets/" \ +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ -e "s/\$${MACOSX_BUNDLE_COPYRIGHT}/Copyright 2002-2024 wxWidgets/" \ @COND_PLATFORM_MACOSX_1_USE_GUI_1@ -e "s/\$${MACOSX_BUNDLE_BUNDLE_VERSION}/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1_USE_GUI_1@ -e "s/\$${MACOSX_BUNDLE_INFO_STRING}/test_allheaders version $(WX_VERSION), (c) 2002-2023 wxWidgets/" \ -@COND_PLATFORM_MACOSX_1_USE_GUI_1@ -e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2023 wxWidgets/" \ +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ -e "s/\$${MACOSX_BUNDLE_INFO_STRING}/test_allheaders version $(WX_VERSION), (c) 2002-2024 wxWidgets/" \ +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ -e "s/\$${MACOSX_BUNDLE_LONG_VERSION_STRING}/$(WX_VERSION), (c) 2002-2024 wxWidgets/" \ @COND_PLATFORM_MACOSX_1_USE_GUI_1@ -e "s/\$${MACOSX_BUNDLE_SHORT_VERSION_STRING}/$(WX_RELEASE)/" \ @COND_PLATFORM_MACOSX_1_USE_GUI_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >test_allheaders.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1_USE_GUI_1@ diff --git a/tests/benchmarks/makefile.vc b/tests/benchmarks/makefile.vc index 7b417c22f5..feb24446ce 100644 --- a/tests/benchmarks/makefile.vc +++ b/tests/benchmarks/makefile.vc @@ -76,6 +76,9 @@ BENCH_GRAPHICS_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -94,6 +97,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -133,6 +139,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -151,6 +160,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/tests/makefile.gcc b/tests/makefile.gcc index 8cbaed0a1e..dff43244a1 100644 --- a/tests/makefile.gcc +++ b/tests/makefile.gcc @@ -526,21 +526,21 @@ clean: $(OBJS)\test.exe: $(TEST_OBJECTS) $(foreach f,$(subst \,/,$(TEST_OBJECTS)),$(shell echo $f >> $(subst \,/,$@).rsp.tmp)) @move /y $@.rsp.tmp $@.rsp >nul - $(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme + $(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme @-del $@.rsp ifeq ($(USE_GUI),1) $(OBJS)\test_drawing.exe: $(TEST_DRAWING_OBJECTS) $(foreach f,$(subst \,/,$(TEST_DRAWING_OBJECTS)),$(shell echo $f >> $(subst \,/,$@).rsp.tmp)) @move /y $@.rsp.tmp $@.rsp >nul - $(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme + $(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme @-del $@.rsp endif ifeq ($(SHARED),1) ifeq ($(USE_GUI),1) $(OBJS)\test_drawingplugin.dll: $(TEST_DRAWINGPLUGIN_OBJECTS) - $(CXX) $(LINK_MODULE_FLAGS) -fPIC -o $@ $(TEST_DRAWINGPLUGIN_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p_1) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme + $(CXX) $(LINK_MODULE_FLAGS) -fPIC -o $@ $(TEST_DRAWINGPLUGIN_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p_1) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme endif endif @@ -548,7 +548,7 @@ ifeq ($(USE_GUI),1) $(OBJS)\test_gui.exe: $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample_rc.o $(foreach f,$(subst \,/,$(TEST_GUI_OBJECTS)),$(shell echo $f >> $(subst \,/,$@).rsp.tmp)) @move /y $@.rsp.tmp $@.rsp >nul - $(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_WEBVIEW_p) $(__WXLIB_STC_p) -limm32 $(__WXLIB_AUI_p) $(__WXLIB_RICHTEXT_p) $(__WXLIB_MEDIA_p) $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(__WXLIB_HTML_p) $(__WXLIB_PROPGRID_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) -lwxscintilla$(WXDEBUGFLAG) $(__LIB_LEXILLA_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p_2) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme + $(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_WEBVIEW_p) $(__WXLIB_STC_p) -limm32 $(__WXLIB_AUI_p) $(__WXLIB_RICHTEXT_p) $(__WXLIB_MEDIA_p) $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(__WXLIB_HTML_p) $(__WXLIB_PROPGRID_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) -lwxscintilla$(WXDEBUGFLAG) $(__LIB_LEXILLA_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p_2) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme @-del $@.rsp endif @@ -556,7 +556,7 @@ ifeq ($(USE_GUI),1) $(OBJS)\test_allheaders.exe: $(TEST_ALLHEADERS_OBJECTS) $(OBJS)\test_allheaders_sample_rc.o $(foreach f,$(subst \,/,$(TEST_ALLHEADERS_OBJECTS)),$(shell echo $f >> $(subst \,/,$@).rsp.tmp)) @move /y $@.rsp.tmp $@.rsp >nul - $(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_WEBVIEW_p) $(__WXLIB_STC_p) -limm32 $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) -lwxscintilla$(WXDEBUGFLAG) $(__LIB_LEXILLA_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p_3) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme + $(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_WEBVIEW_p) $(__WXLIB_STC_p) -limm32 $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) -lwxscintilla$(WXDEBUGFLAG) $(__LIB_LEXILLA_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p_3) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme @-del $@.rsp endif diff --git a/tests/makefile.vc b/tests/makefile.vc index 2ee5ebb7d3..4895470c1f 100644 --- a/tests/makefile.vc +++ b/tests/makefile.vc @@ -292,6 +292,9 @@ TEST_ALLHEADERS_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -310,6 +313,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -349,6 +355,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -367,6 +376,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -815,34 +827,34 @@ clean: -if exist $(OBJS)\test_allheaders.pdb del $(OBJS)\test_allheaders.pdb $(OBJS)\test.exe: $(OBJS)\test_dummy.obj $(TEST_OBJECTS) - link /NOLOGO /OUT:$@ $(__DEBUGINFO_5) /pdb:"$(OBJS)\test.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_5) /pdb:"$(OBJS)\test.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<< $(TEST_OBJECTS) $(__WXLIB_NET_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib << !if "$(USE_GUI)" == "1" $(OBJS)\test_drawing.exe: $(OBJS)\test_drawing_dummy.obj $(TEST_DRAWING_OBJECTS) - link /NOLOGO /OUT:$@ $(__DEBUGINFO_5) /pdb:"$(OBJS)\test_drawing.pdb" $(__DEBUGINFO_19) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_5) /pdb:"$(OBJS)\test_drawing.pdb" $(__DEBUGINFO_19) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<< $(TEST_DRAWING_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib << !endif !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" $(OBJS)\test_drawingplugin.dll: $(TEST_DRAWINGPLUGIN_OBJECTS) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_5) /pdb:"$(OBJS)\test_drawingplugin.pdb" $(__DEBUGINFO_37) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<< + link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_5) /pdb:"$(OBJS)\test_drawingplugin.pdb" $(__DEBUGINFO_37) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<< $(TEST_DRAWINGPLUGIN_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p_1) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib << !endif !if "$(USE_GUI)" == "1" $(OBJS)\test_gui.exe: $(OBJS)\test_gui_dummy.obj $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_5) /pdb:"$(OBJS)\test_gui.pdb" $(__DEBUGINFO_51) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(WIN32_DPI_LINKFLAG) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_5) /pdb:"$(OBJS)\test_gui.pdb" $(__DEBUGINFO_51) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(WIN32_DPI_LINKFLAG) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<< $(TEST_GUI_OBJECTS) $(TEST_GUI_RESOURCES) $(__WXLIB_WEBVIEW_p) $(__WXLIB_STC_p) imm32.lib $(__WXLIB_AUI_p) $(__WXLIB_RICHTEXT_p) $(__WXLIB_MEDIA_p) $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(__WXLIB_HTML_p) $(__WXLIB_PROPGRID_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) wxscintilla$(WXDEBUGFLAG).lib $(__LIB_LEXILLA_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p_2) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib << !endif !if "$(USE_GUI)" == "1" $(OBJS)\test_allheaders.exe: $(OBJS)\test_allheaders_dummy.obj $(TEST_ALLHEADERS_OBJECTS) $(OBJS)\test_allheaders_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_5) /pdb:"$(OBJS)\test_allheaders.pdb" $(__DEBUGINFO_68) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(WIN32_DPI_LINKFLAG) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_5) /pdb:"$(OBJS)\test_allheaders.pdb" $(__DEBUGINFO_68) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(WIN32_DPI_LINKFLAG) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<< $(TEST_ALLHEADERS_OBJECTS) $(TEST_ALLHEADERS_RESOURCES) $(__WXLIB_WEBVIEW_p) $(__WXLIB_STC_p) imm32.lib $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) wxscintilla$(WXDEBUGFLAG).lib $(__LIB_LEXILLA_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p_3) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib << !endif @@ -859,14 +871,14 @@ data-images: if not exist image mkdir image for %f in (bitfields.bmp bitfields-alpha.bmp 8bpp-colorsused-large.bmp 8bpp-colorsused-negative.bmp rle4-delta-320x240.bmp rle8-delta-320x240.bmp rle8-delta-320x240-expected.bmp horse_grey.bmp horse_grey_flipped.bmp horse_rle4.bmp horse_rle4_flipped.bmp horse_rle8.bmp horse_rle8_flipped.bmp horse_bicubic_50x50.png horse_bicubic_100x100.png horse_bicubic_150x150.png horse_bicubic_300x300.png horse_bilinear_50x50.png horse_bilinear_100x100.png horse_bilinear_150x150.png horse_bilinear_300x300.png horse_box_average_50x50.png horse_box_average_100x100.png horse_box_average_150x150.png horse_box_average_300x300.png cross_bicubic_256x256.png cross_bilinear_256x256.png cross_box_average_256x256.png cross_nearest_neighb_256x256.png paste_input_background.png paste_input_black.png paste_input_overlay_transparent_border_opaque_square.png paste_input_overlay_transparent_border_semitransparent_circle.png paste_input_overlay_transparent_border_semitransparent_square.png paste_result_background_plus_circle_plus_square.png paste_result_background_plus_overlay_transparent_border_opaque_square.png paste_result_background_plus_overlay_transparent_border_semitransparent_square.png paste_result_no_background_square_over_circle.png wx.png toucan.png toucan_hue_0.538.png toucan_sat_-0.41.png toucan_bright_-0.259.png toucan_hsv_0.538_-0.41_-0.259.png toucan_light_46.png toucan_dis_240.png toucan_grey.png toucan_mono_255_255_255.png width-times-height-overflow.bmp width_height_32_bit_overflow.pgm bad_truncated.gif) do if not exist image\%f copy .\image\%f image -fr: - if not exist $(OBJS)\intl\fr mkdir $(OBJS)\intl\fr - for %f in (internat.po internat.mo) do if not exist $(OBJS)\intl\fr\%f copy .\intl\fr\%f $(OBJS)\intl\fr - en_GB: if not exist $(OBJS)\intl\en_GB mkdir $(OBJS)\intl\en_GB for %f in (internat.po internat.mo) do if not exist $(OBJS)\intl\en_GB\%f copy .\intl\en_GB\%f $(OBJS)\intl\en_GB +fr: + if not exist $(OBJS)\intl\fr mkdir $(OBJS)\intl\fr + for %f in (internat.po internat.mo) do if not exist $(OBJS)\intl\fr\%f copy .\intl\fr\%f $(OBJS)\intl\fr + ja: if not exist $(OBJS)\intl\ja mkdir $(OBJS)\intl\ja for %f in (internat.po internat.mo) do if not exist $(OBJS)\intl\ja\%f copy .\intl\ja\%f $(OBJS)\intl\ja diff --git a/utils/helpview/src/makefile.vc b/utils/helpview/src/makefile.vc index 1df458378b..85302ca130 100644 --- a/utils/helpview/src/makefile.vc +++ b/utils/helpview/src/makefile.vc @@ -39,6 +39,9 @@ HELPVIEW_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/utils/hhp2cached/makefile.vc b/utils/hhp2cached/makefile.vc index d7eb2b681d..f67d07385f 100644 --- a/utils/hhp2cached/makefile.vc +++ b/utils/hhp2cached/makefile.vc @@ -39,6 +39,9 @@ HHP2CACHED_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -57,6 +60,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -96,6 +102,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -114,6 +123,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/utils/ifacecheck/src/makefile.vc b/utils/ifacecheck/src/makefile.vc index ced78d7051..18ae7d3e0e 100644 --- a/utils/ifacecheck/src/makefile.vc +++ b/utils/ifacecheck/src/makefile.vc @@ -38,6 +38,9 @@ IFACECHECK_OBJECTS = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -56,6 +59,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -95,6 +101,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -113,6 +122,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/utils/screenshotgen/src/makefile.vc b/utils/screenshotgen/src/makefile.vc index c3d6e986ed..749f5b8df6 100644 --- a/utils/screenshotgen/src/makefile.vc +++ b/utils/screenshotgen/src/makefile.vc @@ -43,6 +43,9 @@ SCREENSHOTGEN_RESOURCES = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -61,6 +64,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -100,6 +106,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -118,6 +127,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif diff --git a/utils/wxrc/makefile.vc b/utils/wxrc/makefile.vc index 8c58e5f8a9..89cb9a909e 100644 --- a/utils/wxrc/makefile.vc +++ b/utils/wxrc/makefile.vc @@ -37,6 +37,9 @@ WXRC_OBJECTS = \ !if "$(TARGET_CPU)" == "AMD64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "ARM" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "ARM64" ARCH_SUFFIX = _arm64 !endif @@ -55,6 +58,9 @@ ARCH_SUFFIX = _x64 !if "$(TARGET_CPU)" == "amd64" ARCH_SUFFIX = _x64 !endif +!if "$(TARGET_CPU)" == "arm" +ARCH_SUFFIX = _arm +!endif !if "$(TARGET_CPU)" == "arm64" ARCH_SUFFIX = _arm64 !endif @@ -94,6 +100,9 @@ LIBTYPE_SUFFIX = dll !if "$(TARGET_CPU)" == "AMD64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "ARM" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "ARM64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif @@ -112,6 +121,9 @@ LINK_TARGET_CPU = /MACHINE:X64 !if "$(TARGET_CPU)" == "amd64" LINK_TARGET_CPU = /MACHINE:X64 !endif +!if "$(TARGET_CPU)" == "arm" +LINK_TARGET_CPU = /MACHINE:ARM +!endif !if "$(TARGET_CPU)" == "arm64" LINK_TARGET_CPU = /MACHINE:ARM64 !endif