This is an automated email from the ASF dual-hosted git repository. leginee pushed a commit to branch bazel-migration in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit c1d164c79b758c3c4cf7f95603dfb2d0551f2525 Author: Peter Kovacs <[email protected]> AuthorDate: Tue Jul 21 12:14:21 2026 +0200 build/win64: strip hardcoded _X86_/INTEL from module BUILD files [P2] The arch CPU defines are now injected per-arch by the toolchain (default_compile_flags_list: x86 -> _X86_=1/INTEL, x64 -> _AMD64_=1/X86_64, see [P1]), so the literal "_X86_=1" / "INTEL" entries in the per-module defines lists are removed here. WIN32 (arch-neutral on Windows) is kept. This lets the migrated core compile for x64 with no per-file arch flags, and is a no-op for the x86 build (the toolchain re-supplies the identical defines). Mechanical change across ~96 module BUILD.bazel files. Co-Authored-By: Claude Opus 4.8 <[email protected]> (cherry picked from commit 32952be836c20cc7130dcfd08bf77e2a6fbe4304) --- main/UnoControls/BUILD.bazel | 2 +- main/accessibility/BUILD.bazel | 2 +- main/animations/BUILD.bazel | 2 +- main/avmedia/BUILD.bazel | 2 +- main/basctl/BUILD.bazel | 2 +- main/basebmp/BUILD.bazel | 2 +- main/basegfx/BUILD.bazel | 2 +- main/basic/BUILD.bazel | 2 +- main/binaryurp/BUILD.bazel | 2 +- main/canvas/BUILD.bazel | 2 +- main/chart2/BUILD.bazel | 2 +- main/codemaker/BUILD.bazel | 2 +- main/comphelper/BUILD.bazel | 2 +- main/configmgr/BUILD.bazel | 2 +- main/connectivity/BUILD.bazel | 2 +- main/cppcanvas/BUILD.bazel | 2 +- main/cppu/BUILD.bazel | 2 +- main/cppuhelper/BUILD.bazel | 2 +- main/cpputools/BUILD.bazel | 2 +- main/crashrep/BUILD.bazel | 2 +- main/cui/BUILD.bazel | 2 +- main/dbaccess/BUILD.bazel | 2 +- main/desktop/BUILD.bazel | 24 +++++++++++------------ main/drawinglayer/BUILD.bazel | 2 +- main/dtrans/BUILD.bazel | 2 +- main/editeng/BUILD.bazel | 2 +- main/embeddedobj/BUILD.bazel | 2 +- main/embedserv/BUILD.bazel | 2 +- main/eventattacher/BUILD.bazel | 2 +- main/extensions/BUILD.bazel | 2 +- main/extensions/source/oooimprovement/BUILD.bazel | 2 +- main/fileaccess/BUILD.bazel | 2 +- main/filter/BUILD.bazel | 2 +- main/forms/BUILD.bazel | 2 +- main/formula/BUILD.bazel | 2 +- main/fpicker/BUILD.bazel | 2 +- main/framework/BUILD.bazel | 2 +- main/i18npool/BUILD.bazel | 2 +- main/i18npool/pool/BUILD.bazel | 2 +- main/i18nutil/BUILD.bazel | 2 +- main/idl/BUILD.bazel | 2 +- main/idlc/BUILD.bazel | 2 +- main/io/BUILD.bazel | 2 +- main/javaunohelper/BUILD.bazel | 2 +- main/jurt/BUILD.bazel | 2 +- main/jvmaccess/BUILD.bazel | 2 +- main/jvmfwk/BUILD.bazel | 2 +- main/l10ntools/BUILD.bazel | 2 +- main/lingucomponent/BUILD.bazel | 2 -- main/linguistic/BUILD.bazel | 2 +- main/mysqlc/BUILD.bazel | 2 +- main/o3tl/BUILD.bazel | 2 +- main/oox/BUILD.bazel | 2 +- main/package/BUILD.bazel | 2 +- main/pyuno/BUILD.bazel | 2 +- main/rdbmaker/BUILD.bazel | 2 +- main/registry/BUILD.bazel | 2 +- main/remotebridges/BUILD.bazel | 2 +- main/reportdesign/BUILD.bazel | 2 +- main/rsc/BUILD.bazel | 2 +- main/sax/BUILD.bazel | 2 +- main/sc/BUILD.bazel | 2 +- main/scaddins/BUILD.bazel | 2 +- main/sccomp/BUILD.bazel | 2 +- main/scripting/BUILD.bazel | 2 +- main/sd/BUILD.bazel | 2 +- main/sdext/BUILD.bazel | 2 +- main/sfx2/BUILD.bazel | 2 +- main/shell/BUILD.bazel | 2 +- main/slideshow/BUILD.bazel | 2 +- main/sot/BUILD.bazel | 2 +- main/starmath/BUILD.bazel | 2 +- main/stoc/BUILD.bazel | 2 +- main/store/BUILD.bazel | 2 +- main/svgio/BUILD.bazel | 2 +- main/svl/BUILD.bazel | 2 +- main/svtools/BUILD.bazel | 2 +- main/svx/BUILD.bazel | 2 +- main/sw/BUILD.bazel | 2 +- main/test/BUILD.bazel | 2 +- main/toolkit/BUILD.bazel | 2 +- main/tools/BUILD.bazel | 4 ++-- main/ucb/BUILD.bazel | 2 +- main/ucbhelper/BUILD.bazel | 2 +- main/unotools/BUILD.bazel | 2 +- main/unoxml/BUILD.bazel | 2 +- main/uui/BUILD.bazel | 2 +- main/vbahelper/BUILD.bazel | 2 +- main/vcl/BUILD.bazel | 2 +- main/vos/BUILD.bazel | 2 +- main/winaccessibility/BUILD.bazel | 2 +- main/writerfilter/BUILD.bazel | 2 +- main/xmlhelp/BUILD.bazel | 2 +- main/xmloff/BUILD.bazel | 2 +- main/xmlreader/BUILD.bazel | 2 +- main/xmlscript/BUILD.bazel | 2 +- main/xmlsecurity/BUILD.bazel | 2 +- 97 files changed, 108 insertions(+), 110 deletions(-) diff --git a/main/UnoControls/BUILD.bazel b/main/UnoControls/BUILD.bazel index 8f3515d2c5..f3d4fc4a8b 100644 --- a/main/UnoControls/BUILD.bazel +++ b/main/UnoControls/BUILD.bazel @@ -5,7 +5,7 @@ load("@rules_cc//cc:defs.bzl", "cc_binary") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", ] diff --git a/main/accessibility/BUILD.bazel b/main/accessibility/BUILD.bazel index a32c8b2b28..eef4336722 100644 --- a/main/accessibility/BUILD.bazel +++ b/main/accessibility/BUILD.bazel @@ -6,7 +6,7 @@ load("//build/rules:rsc_pipeline.bzl", "rsc_res") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "ACCESSIBILITY_DLLIMPLEMENTATION", diff --git a/main/animations/BUILD.bazel b/main/animations/BUILD.bazel index 453aa4498b..9c438eaa8d 100644 --- a/main/animations/BUILD.bazel +++ b/main/animations/BUILD.bazel @@ -5,7 +5,7 @@ load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", ] diff --git a/main/avmedia/BUILD.bazel b/main/avmedia/BUILD.bazel index 3dae64fa61..ea72c76789 100644 --- a/main/avmedia/BUILD.bazel +++ b/main/avmedia/BUILD.bazel @@ -6,7 +6,7 @@ load("//build/rules:rsc_pipeline.bzl", "rsc_res") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", "snwprintf=_snwprintf", diff --git a/main/basctl/BUILD.bazel b/main/basctl/BUILD.bazel index 5620856fa3..63af557944 100644 --- a/main/basctl/BUILD.bazel +++ b/main/basctl/BUILD.bazel @@ -7,7 +7,7 @@ load("//build/rules:sdi_target.bzl", "sdi_target") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", "SUPD=680", diff --git a/main/basebmp/BUILD.bazel b/main/basebmp/BUILD.bazel index 7e7395f4ac..08ba7d042e 100644 --- a/main/basebmp/BUILD.bazel +++ b/main/basebmp/BUILD.bazel @@ -3,7 +3,7 @@ load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "BASEBMP_DLLIMPLEMENTATION", diff --git a/main/basegfx/BUILD.bazel b/main/basegfx/BUILD.bazel index 276fb6bc97..d047db8d6d 100644 --- a/main/basegfx/BUILD.bazel +++ b/main/basegfx/BUILD.bazel @@ -5,7 +5,7 @@ load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "BASEGFX_DLLIMPLEMENTATION", diff --git a/main/basic/BUILD.bazel b/main/basic/BUILD.bazel index edd46acadf..17a4d0c84b 100644 --- a/main/basic/BUILD.bazel +++ b/main/basic/BUILD.bazel @@ -6,7 +6,7 @@ load("//build/rules:rsc_pipeline.bzl", "rsc_res") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", "snwprintf=_snwprintf", diff --git a/main/binaryurp/BUILD.bazel b/main/binaryurp/BUILD.bazel index 7a6e14fe70..5022b59ac3 100644 --- a/main/binaryurp/BUILD.bazel +++ b/main/binaryurp/BUILD.bazel @@ -5,7 +5,7 @@ load("@rules_cc//cc:defs.bzl", "cc_binary") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", ] diff --git a/main/canvas/BUILD.bazel b/main/canvas/BUILD.bazel index 1323666ea3..5602bd1cb5 100644 --- a/main/canvas/BUILD.bazel +++ b/main/canvas/BUILD.bazel @@ -5,7 +5,7 @@ load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", ] diff --git a/main/chart2/BUILD.bazel b/main/chart2/BUILD.bazel index 64a858edb7..59d574819e 100644 --- a/main/chart2/BUILD.bazel +++ b/main/chart2/BUILD.bazel @@ -6,7 +6,7 @@ load("//build/rules:rsc_pipeline.bzl", "rename_file", "rsc_res") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", "snwprintf=_snwprintf", diff --git a/main/codemaker/BUILD.bazel b/main/codemaker/BUILD.bazel index 528722f932..0690824abd 100644 --- a/main/codemaker/BUILD.bazel +++ b/main/codemaker/BUILD.bazel @@ -11,7 +11,7 @@ _COPTS = [ _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", ] diff --git a/main/comphelper/BUILD.bazel b/main/comphelper/BUILD.bazel index 9c133bb3a4..4c6fc29291 100644 --- a/main/comphelper/BUILD.bazel +++ b/main/comphelper/BUILD.bazel @@ -6,7 +6,7 @@ load("//build/rules:gtest_test.bzl", "gtest_test") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "COMPHELPER_DLLIMPLEMENTATION", diff --git a/main/configmgr/BUILD.bazel b/main/configmgr/BUILD.bazel index 87c99a48e2..977d76921b 100644 --- a/main/configmgr/BUILD.bazel +++ b/main/configmgr/BUILD.bazel @@ -5,7 +5,7 @@ load("@rules_cc//cc:defs.bzl", "cc_binary") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", ] diff --git a/main/connectivity/BUILD.bazel b/main/connectivity/BUILD.bazel index d20ed929f0..efe38df92c 100644 --- a/main/connectivity/BUILD.bazel +++ b/main/connectivity/BUILD.bazel @@ -6,7 +6,7 @@ load("//build/rules:rsc_pipeline.bzl", "rsc_res") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", "snwprintf=_snwprintf", diff --git a/main/cppcanvas/BUILD.bazel b/main/cppcanvas/BUILD.bazel index 92338e4a52..de4771d7ed 100644 --- a/main/cppcanvas/BUILD.bazel +++ b/main/cppcanvas/BUILD.bazel @@ -5,7 +5,7 @@ load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", ] diff --git a/main/cppu/BUILD.bazel b/main/cppu/BUILD.bazel index 710ede207c..8d9cd217cb 100644 --- a/main/cppu/BUILD.bazel +++ b/main/cppu/BUILD.bazel @@ -14,7 +14,7 @@ _COPTS = [ _DEFINES = [ "WNT", "GUI", "WIN32", "_MT", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", ] diff --git a/main/cppuhelper/BUILD.bazel b/main/cppuhelper/BUILD.bazel index 925fc8a1a2..15b32d4614 100644 --- a/main/cppuhelper/BUILD.bazel +++ b/main/cppuhelper/BUILD.bazel @@ -15,7 +15,7 @@ _COPTS = [ _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", ] diff --git a/main/cpputools/BUILD.bazel b/main/cpputools/BUILD.bazel index 25fb54cd10..36544449b6 100644 --- a/main/cpputools/BUILD.bazel +++ b/main/cpputools/BUILD.bazel @@ -3,7 +3,7 @@ load("@rules_cc//cc:defs.bzl", "cc_binary") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", ] diff --git a/main/crashrep/BUILD.bazel b/main/crashrep/BUILD.bazel index 6d298dafcd..27d57ba1e6 100644 --- a/main/crashrep/BUILD.bazel +++ b/main/crashrep/BUILD.bazel @@ -73,7 +73,7 @@ genrule( ) _DEFINES = [ - "WNT", "WIN32", "INTEL", "_X86_=1", + "WNT", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", "snprintf=_snprintf", "SUPD=680", diff --git a/main/cui/BUILD.bazel b/main/cui/BUILD.bazel index 5f5274ab7d..79f4a663ee 100644 --- a/main/cui/BUILD.bazel +++ b/main/cui/BUILD.bazel @@ -6,7 +6,7 @@ load("//build/rules:rsc_pipeline.bzl", "rsc_res") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", "SUPD=680", diff --git a/main/dbaccess/BUILD.bazel b/main/dbaccess/BUILD.bazel index f12ac9bbac..e727afaf86 100644 --- a/main/dbaccess/BUILD.bazel +++ b/main/dbaccess/BUILD.bazel @@ -6,7 +6,7 @@ load("//build/rules:rsc_pipeline.bzl", "rename_file", "rsc_res") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", ] diff --git a/main/desktop/BUILD.bazel b/main/desktop/BUILD.bazel index 42c2622380..976c15248a 100644 --- a/main/desktop/BUILD.bazel +++ b/main/desktop/BUILD.bazel @@ -7,7 +7,7 @@ load("//build/rules:rsc_pipeline.bzl", "rsc_res") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", "snwprintf=_snwprintf", @@ -762,7 +762,7 @@ cc_binary( "/Imain/desktop/inc/pch", ], defines = [ - "WNT", "WIN32", "INTEL", "_X86_=1", + "WNT", "WIN32", "snprintf=_snprintf", "SUPD=680", "MSC", ], @@ -825,7 +825,7 @@ cc_binary( "/Imain/desktop/inc/pch", ], defines = [ - "WNT", "WIN32", "INTEL", "_X86_=1", + "WNT", "WIN32", "snprintf=_snprintf", "SUPD=680", "MSC", "UNICODE", "_UNICODE", ], @@ -852,7 +852,7 @@ cc_binary( "/Imain/desktop/inc/pch", ], defines = [ - "WNT", "WIN32", "INTEL", "_X86_=1", + "WNT", "WIN32", "snprintf=_snprintf", "SUPD=680", "MSC", "UNICODE", "_UNICODE", ], @@ -878,7 +878,7 @@ cc_binary( "/Imain/desktop/inc/pch", ], defines = [ - "WNT", "WIN32", "INTEL", "_X86_=1", + "WNT", "WIN32", "snprintf=_snprintf", "SUPD=680", "MSC", "UNICODE", "_UNICODE", ], @@ -903,7 +903,7 @@ cc_binary( "/Imain/desktop/win32/source/guistdio", ], defines = [ - "WNT", "WIN32", "INTEL", "_X86_=1", + "WNT", "WIN32", "snprintf=_snprintf", "SUPD=680", "MSC", ], @@ -926,7 +926,7 @@ cc_binary( "/Imain/desktop/win32/source/guistdio", ], defines = [ - "WNT", "WIN32", "INTEL", "_X86_=1", + "WNT", "WIN32", "snprintf=_snprintf", "SUPD=680", "MSC", ], @@ -948,7 +948,7 @@ cc_binary( "/Imain/desktop/source/pkgchk/unopkg", ], defines = [ - "WNT", "WIN32", "INTEL", "_X86_=1", + "WNT", "WIN32", "snprintf=_snprintf", "SUPD=680", "MSC", ], @@ -979,7 +979,7 @@ cc_binary( "/Imain/desktop/inc/pch", ], defines = [ - "WNT", "WIN32", "INTEL", "_X86_=1", + "WNT", "WIN32", "snprintf=_snprintf", "SUPD=680", "MSC", "UNICODE", "_UNICODE", ], @@ -1003,7 +1003,7 @@ cc_binary( "/Imain/desktop/inc/pch", ], defines = [ - "WNT", "WIN32", "INTEL", "_X86_=1", + "WNT", "WIN32", "snprintf=_snprintf", "SUPD=680", "MSC", "UNICODE", "_UNICODE", ], @@ -1030,7 +1030,7 @@ cc_binary( "/Imain/desktop/inc/pch", ], defines = [ - "WNT", "WIN32", "INTEL", "_X86_=1", + "WNT", "WIN32", "snprintf=_snprintf", "SUPD=680", "MSC", "UNICODE", "_UNICODE", ], @@ -1056,7 +1056,7 @@ cc_binary( "/Imain/desktop/win32/source/QuickStart", ], defines = [ - "WNT", "WIN32", "INTEL", "_X86_=1", + "WNT", "WIN32", "snprintf=_snprintf", "SUPD=680", "MSC", ], diff --git a/main/drawinglayer/BUILD.bazel b/main/drawinglayer/BUILD.bazel index 049a8a864c..639630532b 100644 --- a/main/drawinglayer/BUILD.bazel +++ b/main/drawinglayer/BUILD.bazel @@ -5,7 +5,7 @@ load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", "snwprintf=_snwprintf", diff --git a/main/dtrans/BUILD.bazel b/main/dtrans/BUILD.bazel index 6f1476700e..f49fc35c73 100644 --- a/main/dtrans/BUILD.bazel +++ b/main/dtrans/BUILD.bazel @@ -5,7 +5,7 @@ load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", ] diff --git a/main/editeng/BUILD.bazel b/main/editeng/BUILD.bazel index 37327d32b4..8ee31a4651 100644 --- a/main/editeng/BUILD.bazel +++ b/main/editeng/BUILD.bazel @@ -6,7 +6,7 @@ load("//build/rules:rsc_pipeline.bzl", "rsc_res") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", ] diff --git a/main/embeddedobj/BUILD.bazel b/main/embeddedobj/BUILD.bazel index 78b7a7910b..a80056765c 100644 --- a/main/embeddedobj/BUILD.bazel +++ b/main/embeddedobj/BUILD.bazel @@ -5,7 +5,7 @@ load("@rules_cc//cc:defs.bzl", "cc_binary") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", ] diff --git a/main/embedserv/BUILD.bazel b/main/embedserv/BUILD.bazel index 88924b8528..99386e9cab 100644 --- a/main/embedserv/BUILD.bazel +++ b/main/embedserv/BUILD.bazel @@ -16,7 +16,7 @@ _ATL_REQUIRED = select({ _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", ] diff --git a/main/eventattacher/BUILD.bazel b/main/eventattacher/BUILD.bazel index 9f88107471..88d3b3c4cc 100644 --- a/main/eventattacher/BUILD.bazel +++ b/main/eventattacher/BUILD.bazel @@ -5,7 +5,7 @@ load("@rules_cc//cc:defs.bzl", "cc_binary") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", ] diff --git a/main/extensions/BUILD.bazel b/main/extensions/BUILD.bazel index 6916546738..2e31ad3c25 100644 --- a/main/extensions/BUILD.bazel +++ b/main/extensions/BUILD.bazel @@ -30,7 +30,7 @@ filegroup( _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", "snwprintf=_snwprintf", diff --git a/main/extensions/source/oooimprovement/BUILD.bazel b/main/extensions/source/oooimprovement/BUILD.bazel index 6580a47e09..4552c375d8 100644 --- a/main/extensions/source/oooimprovement/BUILD.bazel +++ b/main/extensions/source/oooimprovement/BUILD.bazel @@ -20,7 +20,7 @@ cc_binary( defines = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", "snwprintf=_snwprintf", diff --git a/main/fileaccess/BUILD.bazel b/main/fileaccess/BUILD.bazel index 3c33d46d4f..3e6f3a7c78 100644 --- a/main/fileaccess/BUILD.bazel +++ b/main/fileaccess/BUILD.bazel @@ -5,7 +5,7 @@ load("@rules_cc//cc:defs.bzl", "cc_binary") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "FILEACCESS_DLLIMPLEMENTATION", diff --git a/main/filter/BUILD.bazel b/main/filter/BUILD.bazel index 9e2a92569a..7006f0f478 100644 --- a/main/filter/BUILD.bazel +++ b/main/filter/BUILD.bazel @@ -7,7 +7,7 @@ load("//main/filter:filter_rules.bzl", "FILTER_COPTS", "FILTER_HDR_DEPS", "graph _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", "snwprintf=_snwprintf", diff --git a/main/forms/BUILD.bazel b/main/forms/BUILD.bazel index 75c39ca3f2..5b9981004d 100644 --- a/main/forms/BUILD.bazel +++ b/main/forms/BUILD.bazel @@ -6,7 +6,7 @@ load("//build/rules:rsc_pipeline.bzl", "rsc_res") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", ] diff --git a/main/formula/BUILD.bazel b/main/formula/BUILD.bazel index ca3ee76ca1..790efc230a 100644 --- a/main/formula/BUILD.bazel +++ b/main/formula/BUILD.bazel @@ -6,7 +6,7 @@ load("//build/rules:rsc_pipeline.bzl", "rsc_res") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", ] diff --git a/main/fpicker/BUILD.bazel b/main/fpicker/BUILD.bazel index b6cf6ceee8..bf5de2a007 100644 --- a/main/fpicker/BUILD.bazel +++ b/main/fpicker/BUILD.bazel @@ -6,7 +6,7 @@ load("//build/rules:rsc_pipeline.bzl", "rsc_res") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", ] diff --git a/main/framework/BUILD.bazel b/main/framework/BUILD.bazel index d44fe67f12..a77a229f9c 100644 --- a/main/framework/BUILD.bazel +++ b/main/framework/BUILD.bazel @@ -6,7 +6,7 @@ load("//build/rules:rsc_pipeline.bzl", "rsc_res") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", "snwprintf=_snwprintf", diff --git a/main/i18npool/BUILD.bazel b/main/i18npool/BUILD.bazel index b1557b7c63..de215f5543 100644 --- a/main/i18npool/BUILD.bazel +++ b/main/i18npool/BUILD.bazel @@ -7,7 +7,7 @@ load("//build/rules:localedata_pipeline.bzl", "localedata_gen") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "I18NPOOL_DLLIMPLEMENTATION", diff --git a/main/i18npool/pool/BUILD.bazel b/main/i18npool/pool/BUILD.bazel index ef95fba6d4..25de05c545 100644 --- a/main/i18npool/pool/BUILD.bazel +++ b/main/i18npool/pool/BUILD.bazel @@ -7,7 +7,7 @@ load("//main/i18npool:breakiter_pipeline.bzl", "breakiter_data") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "I18NPOOL_DLLIMPLEMENTATION", diff --git a/main/i18nutil/BUILD.bazel b/main/i18nutil/BUILD.bazel index 2858ac02e8..d2c867ca37 100644 --- a/main/i18nutil/BUILD.bazel +++ b/main/i18nutil/BUILD.bazel @@ -5,7 +5,7 @@ load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "I18NUTIL_DLLIMPLEMENTATION", diff --git a/main/idl/BUILD.bazel b/main/idl/BUILD.bazel index 4157f53776..8f1580a617 100644 --- a/main/idl/BUILD.bazel +++ b/main/idl/BUILD.bazel @@ -4,7 +4,7 @@ load("//build/rules:sdi_target.bzl", "svidl_bundle") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "snprintf=_snprintf", "IDL_COMPILER", ] diff --git a/main/idlc/BUILD.bazel b/main/idlc/BUILD.bazel index a5b3c2dc32..51e77991d6 100644 --- a/main/idlc/BUILD.bazel +++ b/main/idlc/BUILD.bazel @@ -16,7 +16,7 @@ _COPTS = [ _DEFINES = [ "WNT", "GUI", "WIN32", "_MT", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", ] diff --git a/main/io/BUILD.bazel b/main/io/BUILD.bazel index 1163cb67db..009fabfe32 100644 --- a/main/io/BUILD.bazel +++ b/main/io/BUILD.bazel @@ -15,7 +15,7 @@ _COPTS = [ _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", ] diff --git a/main/javaunohelper/BUILD.bazel b/main/javaunohelper/BUILD.bazel index f3fb187d17..62b5034c6f 100644 --- a/main/javaunohelper/BUILD.bazel +++ b/main/javaunohelper/BUILD.bazel @@ -14,7 +14,7 @@ _COPTS = [ _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "SHAREDLIB", "_DLL_", "SOLAR_JAVA", ] diff --git a/main/jurt/BUILD.bazel b/main/jurt/BUILD.bazel index 2e75c1622b..ef1af69bc2 100644 --- a/main/jurt/BUILD.bazel +++ b/main/jurt/BUILD.bazel @@ -4,7 +4,7 @@ load("@rules_java//java:defs.bzl", "java_library") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "INTEL", "_X86_=1", + "SHAREDLIB", "_DLL_", "snprintf=_snprintf", ] diff --git a/main/jvmaccess/BUILD.bazel b/main/jvmaccess/BUILD.bazel index 3111688c59..5687b21920 100644 --- a/main/jvmaccess/BUILD.bazel +++ b/main/jvmaccess/BUILD.bazel @@ -11,7 +11,7 @@ _COPTS = [ _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "SOLAR_JAVA", diff --git a/main/jvmfwk/BUILD.bazel b/main/jvmfwk/BUILD.bazel index 4011969973..394f6024f8 100644 --- a/main/jvmfwk/BUILD.bazel +++ b/main/jvmfwk/BUILD.bazel @@ -17,7 +17,7 @@ _COPTS = [ _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "JVMFWK_DLLIMPLEMENTATION", diff --git a/main/l10ntools/BUILD.bazel b/main/l10ntools/BUILD.bazel index 51e4acb2ee..698d33b174 100644 --- a/main/l10ntools/BUILD.bazel +++ b/main/l10ntools/BUILD.bazel @@ -9,7 +9,7 @@ load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "snprintf=_snprintf", "YY_NEVER_INTERACTIVE=1", # suppress flex interactive-mode check diff --git a/main/lingucomponent/BUILD.bazel b/main/lingucomponent/BUILD.bazel index 917662cc84..d826ee57e7 100644 --- a/main/lingucomponent/BUILD.bazel +++ b/main/lingucomponent/BUILD.bazel @@ -8,8 +8,6 @@ _DEFINES = [ "WIN32", "_WINDOWS", "CPPU_ENV=msci", - "INTEL", - "_X86_=1", "snprintf=_snprintf", "SUPD=680", ] diff --git a/main/linguistic/BUILD.bazel b/main/linguistic/BUILD.bazel index e510cacc10..9b21c55f35 100644 --- a/main/linguistic/BUILD.bazel +++ b/main/linguistic/BUILD.bazel @@ -5,7 +5,7 @@ load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", ] diff --git a/main/mysqlc/BUILD.bazel b/main/mysqlc/BUILD.bazel index 62a29a7082..8d297380b6 100644 --- a/main/mysqlc/BUILD.bazel +++ b/main/mysqlc/BUILD.bazel @@ -10,7 +10,7 @@ load("@rules_cc//cc:defs.bzl", "cc_binary") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", "SUPD=680", diff --git a/main/o3tl/BUILD.bazel b/main/o3tl/BUILD.bazel index bff8db6d44..e51a3d1696 100644 --- a/main/o3tl/BUILD.bazel +++ b/main/o3tl/BUILD.bazel @@ -26,7 +26,7 @@ gtest_test( "/Zc:wchar_t-", ], defines = [ - "WNT", "WIN32", "INTEL", "_X86_=1", + "WNT", "WIN32", "snprintf=_snprintf", ], deps = [ diff --git a/main/oox/BUILD.bazel b/main/oox/BUILD.bazel index ca739c5acd..5034bdcc02 100644 --- a/main/oox/BUILD.bazel +++ b/main/oox/BUILD.bazel @@ -5,7 +5,7 @@ load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", "snwprintf=_snwprintf", diff --git a/main/package/BUILD.bazel b/main/package/BUILD.bazel index 27224e832c..6cae000e1b 100644 --- a/main/package/BUILD.bazel +++ b/main/package/BUILD.bazel @@ -5,7 +5,7 @@ load("@rules_cc//cc:defs.bzl", "cc_binary") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "PACKAGE_DLLIMPLEMENTATION", diff --git a/main/pyuno/BUILD.bazel b/main/pyuno/BUILD.bazel index e6ea9ab693..76d8131009 100644 --- a/main/pyuno/BUILD.bazel +++ b/main/pyuno/BUILD.bazel @@ -5,7 +5,7 @@ load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", ] diff --git a/main/rdbmaker/BUILD.bazel b/main/rdbmaker/BUILD.bazel index 960a6a9e93..d7e335013d 100644 --- a/main/rdbmaker/BUILD.bazel +++ b/main/rdbmaker/BUILD.bazel @@ -14,7 +14,7 @@ _COPTS = [ _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", ] diff --git a/main/registry/BUILD.bazel b/main/registry/BUILD.bazel index bf74f86cff..d52ce725f4 100644 --- a/main/registry/BUILD.bazel +++ b/main/registry/BUILD.bazel @@ -12,7 +12,7 @@ _COPTS = [ _DEFINES = [ "WNT", "GUI", "WIN32", "_MT", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", ] diff --git a/main/remotebridges/BUILD.bazel b/main/remotebridges/BUILD.bazel index eb72c29c39..54ebea9607 100644 --- a/main/remotebridges/BUILD.bazel +++ b/main/remotebridges/BUILD.bazel @@ -5,7 +5,7 @@ load("@rules_cc//cc:defs.bzl", "cc_binary") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", ] diff --git a/main/reportdesign/BUILD.bazel b/main/reportdesign/BUILD.bazel index 30d11bbcd4..c734a8e09f 100644 --- a/main/reportdesign/BUILD.bazel +++ b/main/reportdesign/BUILD.bazel @@ -6,7 +6,7 @@ load("//build/rules:rsc_pipeline.bzl", "rsc_res") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", "REPORTDESIGN_DLLIMPLEMENTATION", diff --git a/main/rsc/BUILD.bazel b/main/rsc/BUILD.bazel index 8e5a346233..bdf20e9c69 100644 --- a/main/rsc/BUILD.bazel +++ b/main/rsc/BUILD.bazel @@ -13,7 +13,7 @@ cc_library( _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "snprintf=_snprintf", ] diff --git a/main/sax/BUILD.bazel b/main/sax/BUILD.bazel index ac7ae9a871..c4edef0901 100644 --- a/main/sax/BUILD.bazel +++ b/main/sax/BUILD.bazel @@ -6,7 +6,7 @@ load("//build/rules:gtest_test.bzl", "gtest_test") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", ] diff --git a/main/sc/BUILD.bazel b/main/sc/BUILD.bazel index 730f906681..b05addfe4a 100644 --- a/main/sc/BUILD.bazel +++ b/main/sc/BUILD.bazel @@ -7,7 +7,7 @@ load("//build/rules:sdi_target.bzl", "sdi_target") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", "snwprintf=_snwprintf", diff --git a/main/scaddins/BUILD.bazel b/main/scaddins/BUILD.bazel index 0cf26133da..d00a0d1037 100644 --- a/main/scaddins/BUILD.bazel +++ b/main/scaddins/BUILD.bazel @@ -7,7 +7,7 @@ load("//build/rules:rsc_pipeline.bzl", "rsc_res") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", "SUPD=680", diff --git a/main/sccomp/BUILD.bazel b/main/sccomp/BUILD.bazel index 038c7d3120..36f07d3a45 100644 --- a/main/sccomp/BUILD.bazel +++ b/main/sccomp/BUILD.bazel @@ -6,7 +6,7 @@ load("//build/rules:rsc_pipeline.bzl", "rsc_res") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", "SUPD=680", diff --git a/main/scripting/BUILD.bazel b/main/scripting/BUILD.bazel index aa43bc83fb..8bb262450d 100644 --- a/main/scripting/BUILD.bazel +++ b/main/scripting/BUILD.bazel @@ -6,7 +6,7 @@ load("//build/rules:rsc_pipeline.bzl", "rsc_res") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", ] diff --git a/main/sd/BUILD.bazel b/main/sd/BUILD.bazel index d997e99159..31dce90a68 100644 --- a/main/sd/BUILD.bazel +++ b/main/sd/BUILD.bazel @@ -7,7 +7,7 @@ load("//build/rules:sdi_target.bzl", "sdi_target") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", "snwprintf=_snwprintf", diff --git a/main/sdext/BUILD.bazel b/main/sdext/BUILD.bazel index 35d69dae44..61dad4adc2 100644 --- a/main/sdext/BUILD.bazel +++ b/main/sdext/BUILD.bazel @@ -6,7 +6,7 @@ load("//build/rules:rsc_pipeline.bzl", "rsc_res") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", "snwprintf=_snwprintf", diff --git a/main/sfx2/BUILD.bazel b/main/sfx2/BUILD.bazel index 285d9879ce..5003b4fb42 100644 --- a/main/sfx2/BUILD.bazel +++ b/main/sfx2/BUILD.bazel @@ -7,7 +7,7 @@ load("//build/rules:sdi_target.bzl", "sdi_package", "sdi_target") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", "snwprintf=_snwprintf", diff --git a/main/shell/BUILD.bazel b/main/shell/BUILD.bazel index 3415205f14..40a0e7f998 100644 --- a/main/shell/BUILD.bazel +++ b/main/shell/BUILD.bazel @@ -38,7 +38,7 @@ _SHLXT_COPTS = [ _UNO_DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", diff --git a/main/slideshow/BUILD.bazel b/main/slideshow/BUILD.bazel index 25a31499c0..ce9fe9f193 100644 --- a/main/slideshow/BUILD.bazel +++ b/main/slideshow/BUILD.bazel @@ -5,7 +5,7 @@ load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", "snwprintf=_snwprintf", diff --git a/main/sot/BUILD.bazel b/main/sot/BUILD.bazel index 3d6f78944f..1e669c7c3e 100644 --- a/main/sot/BUILD.bazel +++ b/main/sot/BUILD.bazel @@ -3,7 +3,7 @@ load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "SOT_DLLIMPLEMENTATION", diff --git a/main/starmath/BUILD.bazel b/main/starmath/BUILD.bazel index e077f0c856..08b9efe50a 100644 --- a/main/starmath/BUILD.bazel +++ b/main/starmath/BUILD.bazel @@ -7,7 +7,7 @@ load("//build/rules:sdi_target.bzl", "sdi_target") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", "snwprintf=_snwprintf", diff --git a/main/stoc/BUILD.bazel b/main/stoc/BUILD.bazel index 4a31d3b27a..f9478655a6 100644 --- a/main/stoc/BUILD.bazel +++ b/main/stoc/BUILD.bazel @@ -18,7 +18,7 @@ _COPTS = [ _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", ] diff --git a/main/store/BUILD.bazel b/main/store/BUILD.bazel index 07f3dcf46e..5c8d8f2042 100644 --- a/main/store/BUILD.bazel +++ b/main/store/BUILD.bazel @@ -12,7 +12,7 @@ _COPTS = [ _DEFINES = [ "WNT", "GUI", "WIN32", "_MT", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", ] diff --git a/main/svgio/BUILD.bazel b/main/svgio/BUILD.bazel index dc567c3d5f..d2113e5e2e 100644 --- a/main/svgio/BUILD.bazel +++ b/main/svgio/BUILD.bazel @@ -5,7 +5,7 @@ load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", "snwprintf=_snwprintf", diff --git a/main/svl/BUILD.bazel b/main/svl/BUILD.bazel index 8a085699f1..376a2d005c 100644 --- a/main/svl/BUILD.bazel +++ b/main/svl/BUILD.bazel @@ -6,7 +6,7 @@ load("//build/rules:rsc_pipeline.bzl", "rsc_res") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", ] diff --git a/main/svtools/BUILD.bazel b/main/svtools/BUILD.bazel index a841f3effd..3e0fe4ea95 100644 --- a/main/svtools/BUILD.bazel +++ b/main/svtools/BUILD.bazel @@ -6,7 +6,7 @@ load("//build/rules:rsc_pipeline.bzl", "rsc_res") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", "_HAS_ITERATOR_DEBUGGING=0", diff --git a/main/svx/BUILD.bazel b/main/svx/BUILD.bazel index d35ebf3518..729072a18e 100644 --- a/main/svx/BUILD.bazel +++ b/main/svx/BUILD.bazel @@ -7,7 +7,7 @@ load("//build/rules:sdi_target.bzl", "sdi_package", "sdi_target") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", "snwprintf=_snwprintf", diff --git a/main/sw/BUILD.bazel b/main/sw/BUILD.bazel index f19561b519..29cd183efb 100644 --- a/main/sw/BUILD.bazel +++ b/main/sw/BUILD.bazel @@ -7,7 +7,7 @@ load("//build/rules:sdi_target.bzl", "sdi_target") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", "snwprintf=_snwprintf", diff --git a/main/test/BUILD.bazel b/main/test/BUILD.bazel index 9cf802b95c..fb1f1f06ff 100644 --- a/main/test/BUILD.bazel +++ b/main/test/BUILD.bazel @@ -13,7 +13,7 @@ load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "SHAREDLIB", "_DLL_", "OOO_DLLIMPLEMENTATION_TEST", "snprintf=_snprintf", diff --git a/main/toolkit/BUILD.bazel b/main/toolkit/BUILD.bazel index 355ea57ec8..5d80d70a3a 100644 --- a/main/toolkit/BUILD.bazel +++ b/main/toolkit/BUILD.bazel @@ -5,7 +5,7 @@ load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", ] diff --git a/main/tools/BUILD.bazel b/main/tools/BUILD.bazel index 039f66c481..7fe0f964a6 100644 --- a/main/tools/BUILD.bazel +++ b/main/tools/BUILD.bazel @@ -6,7 +6,7 @@ load("//build/rules:gtest_test.bzl", "gtest_test") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "TOOLS_DLLIMPLEMENTATION", @@ -251,7 +251,7 @@ gtest_test( defines = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "snprintf=_snprintf", ], deps = [ diff --git a/main/ucb/BUILD.bazel b/main/ucb/BUILD.bazel index bba6c8f6a3..8eed1dd828 100644 --- a/main/ucb/BUILD.bazel +++ b/main/ucb/BUILD.bazel @@ -5,7 +5,7 @@ load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", "snwprintf=_snwprintf", diff --git a/main/ucbhelper/BUILD.bazel b/main/ucbhelper/BUILD.bazel index dc0272c58c..8a752965b2 100644 --- a/main/ucbhelper/BUILD.bazel +++ b/main/ucbhelper/BUILD.bazel @@ -5,7 +5,7 @@ load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "UCBHELPER_DLLIMPLEMENTATION", diff --git a/main/unotools/BUILD.bazel b/main/unotools/BUILD.bazel index 58737926f2..6622bc0dd2 100644 --- a/main/unotools/BUILD.bazel +++ b/main/unotools/BUILD.bazel @@ -5,7 +5,7 @@ load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "UNOTOOLS_DLLIMPLEMENTATION", diff --git a/main/unoxml/BUILD.bazel b/main/unoxml/BUILD.bazel index b0dc323e65..7e1f2e5606 100644 --- a/main/unoxml/BUILD.bazel +++ b/main/unoxml/BUILD.bazel @@ -3,7 +3,7 @@ load("@rules_cc//cc:defs.bzl", "cc_binary") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", ] diff --git a/main/uui/BUILD.bazel b/main/uui/BUILD.bazel index 61e8bcd79d..8c8fc92333 100644 --- a/main/uui/BUILD.bazel +++ b/main/uui/BUILD.bazel @@ -6,7 +6,7 @@ load("//build/rules:rsc_pipeline.bzl", "rsc_res") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", ] diff --git a/main/vbahelper/BUILD.bazel b/main/vbahelper/BUILD.bazel index 85eac21689..400db0f8f9 100644 --- a/main/vbahelper/BUILD.bazel +++ b/main/vbahelper/BUILD.bazel @@ -5,7 +5,7 @@ load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", "snwprintf=_snwprintf", diff --git a/main/vcl/BUILD.bazel b/main/vcl/BUILD.bazel index 02231bc41c..8cbae9417b 100644 --- a/main/vcl/BUILD.bazel +++ b/main/vcl/BUILD.bazel @@ -6,7 +6,7 @@ load("//build/rules:rsc_pipeline.bzl", "rsc_res") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", ] diff --git a/main/vos/BUILD.bazel b/main/vos/BUILD.bazel index 272db44eb4..2530658710 100644 --- a/main/vos/BUILD.bazel +++ b/main/vos/BUILD.bazel @@ -12,7 +12,7 @@ _COPTS = [ _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "INTEL", "_X86_=1", + "SHAREDLIB", "_DLL_", "VOS_DLLIMPLEMENTATION", ] diff --git a/main/winaccessibility/BUILD.bazel b/main/winaccessibility/BUILD.bazel index 98a56a5eb3..17b495bd9c 100644 --- a/main/winaccessibility/BUILD.bazel +++ b/main/winaccessibility/BUILD.bazel @@ -13,7 +13,7 @@ _ATL_REQUIRED = select({ _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", ] diff --git a/main/writerfilter/BUILD.bazel b/main/writerfilter/BUILD.bazel index 0caccb8923..61e1c4d7a6 100644 --- a/main/writerfilter/BUILD.bazel +++ b/main/writerfilter/BUILD.bazel @@ -8,7 +8,7 @@ load(":ooxml_ns_rules.bzl", "OOXML_NS", "ooxml_ns_factory_rules") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", "snwprintf=_snwprintf", diff --git a/main/xmlhelp/BUILD.bazel b/main/xmlhelp/BUILD.bazel index bf1cae4a45..438d14c38f 100644 --- a/main/xmlhelp/BUILD.bazel +++ b/main/xmlhelp/BUILD.bazel @@ -16,7 +16,7 @@ exports_files(glob([ _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", ] diff --git a/main/xmloff/BUILD.bazel b/main/xmloff/BUILD.bazel index 8a07cdd65c..8d934155e4 100644 --- a/main/xmloff/BUILD.bazel +++ b/main/xmloff/BUILD.bazel @@ -5,7 +5,7 @@ load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", ] diff --git a/main/xmlreader/BUILD.bazel b/main/xmlreader/BUILD.bazel index 2eb72067f8..c38b4d0445 100644 --- a/main/xmlreader/BUILD.bazel +++ b/main/xmlreader/BUILD.bazel @@ -12,7 +12,7 @@ _COPTS = [ _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", ] diff --git a/main/xmlscript/BUILD.bazel b/main/xmlscript/BUILD.bazel index ce2f257eaf..ba6338f446 100644 --- a/main/xmlscript/BUILD.bazel +++ b/main/xmlscript/BUILD.bazel @@ -5,7 +5,7 @@ load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "XCR_DLLIMPLEMENTATION", diff --git a/main/xmlsecurity/BUILD.bazel b/main/xmlsecurity/BUILD.bazel index 7a09e56a41..fee63d9325 100644 --- a/main/xmlsecurity/BUILD.bazel +++ b/main/xmlsecurity/BUILD.bazel @@ -6,7 +6,7 @@ load("//build/rules:rsc_pipeline.bzl", "rsc_res") _DEFINES = [ "WNT", "GUI", "WIN32", "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500", - "CPPU_ENV=msci", "INTEL", "_X86_=1", + "CPPU_ENV=msci", "FULL_DESK", "SHAREDLIB", "_DLL_", "snprintf=_snprintf", ]
