File tree Expand file tree Collapse file tree 2 files changed +13
-5
lines changed Expand file tree Collapse file tree 2 files changed +13
-5
lines changed Original file line number Diff line number Diff line change @@ -51,6 +51,13 @@ when ($IDE_MSVS != "yes") {
51
51
/LIBPATH:\""${_MSVC_TC_VC_ROOT}/lib/$_MSVC_ARCH"\"
52
52
}
53
53
54
+ when ($WINDOWS_MANIFEST != "") {
55
+ _FLAGS_MANIFEST=/MANIFEST:EMBED /MANIFESTINPUT:${input:WINDOWS_MANIFEST}
56
+ }
57
+ otherwise {
58
+ _FLAGS_MANIFEST=
59
+ }
60
+
54
61
_FLAGS_COMMON =/NOLOGO /ERRORREPORT:PROMPT /SUBSYSTEM:CONSOLE /TLBID:1 $MSVC_DYNAMICBASE /NXCOMPAT
55
62
_FLAGS_COMMON+=$_FLAGS_IGNORE
56
63
_FLAGS_COMMON+=$_FLAGS_MACHINE
@@ -100,7 +107,7 @@ LINK_STDLIBS=\
100
107
ws2_32.lib
101
108
102
109
LDFLAGS_GLOBAL=
103
- LDFLAGS=
110
+ LDFLAGS=$_FLAGS_MANIFEST
104
111
OBJADDE=
105
112
OBJADDE_LIB=
106
113
OBJADDE_LIB_GLOBAL=
Original file line number Diff line number Diff line change @@ -5697,19 +5697,20 @@ when (!$TENSORRT_VERSION) {
5697
5697
ANDROID_APK_TEST_ACTIVITY_VALUE=com.yandex.test.unittests/.RunTestsActivity
5698
5698
5699
5699
# tag:windows-specific
5700
- WINDOWS_MANIFEST=
5700
+ WINDOWS_MANIFEST=${ARCADIA_ROOT}/build/long-path.manifest
5701
5701
macro WINDOWS_MANIFEST(Manifest) {
5702
5702
SET(WINDOWS_MANIFEST $Manifest)
5703
5703
}
5704
5704
5705
+ # tag:deprecated
5705
5706
# https://docs.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation#enable-long-paths-in-windows-10-version-1607-and-later
5706
5707
macro WINDOWS_LONG_PATH_MANIFEST() {
5707
- SET(WINDOWS_MANIFEST build/long-path.manifest )
5708
+ ENABLE(UNUSED_MACRO )
5708
5709
}
5709
5710
5710
5711
# tag:windows-specific
5711
- when ($MSVC == "yes" && $WINDOWS_MANIFEST ) {
5712
- LDFLAGS+=/MANIFEST:EMBED /MANIFESTINPUT:${input: WINDOWS_MANIFEST}
5712
+ macro DISABLE_WINDOWS_MANIFEST( ) {
5713
+ SET( WINDOWS_MANIFEST)
5713
5714
}
5714
5715
5715
5716
# tag:cpp-specific
You can’t perform that action at this time.
0 commit comments