Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/Debug/obj/base/allocator/allocator.ninja b/Debug/obj/base/allocator/allocator.ninja
- index f6adfaf..591d776 100644
- --- a/Debug/obj/base/allocator/allocator.ninja
- +++ b/Debug/obj/base/allocator/allocator.ninja
- @@ -4,52 +4,3 @@ cxx = $cl_x86
- cc_host = $cl_x86
- cxx_host = $cl_x86
- asm = $ml_x86
- -pdbname_c = obj\base\allocator\allocator.c.pdb
- -pdbname_cc = obj\base\allocator\allocator.cc.pdb
- -pchprefix = allocator
- -defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
- - -DWINVER=0x0603 -DWIN32 -D_WINDOWS -DNOMINMAX -DPSAPI_VERSION=1 $
- - -D_CRT_RAND_S -DCERT_CHAIN_PARA_HAS_EXTRA_FIELDS -DWIN32_LEAN_AND_MEAN $
- - -D_ATL_NO_OPENGL -D_SECURE_ATL -D_HAS_EXCEPTIONS=0 $
- - -D_WINSOCK_DEPRECATED_NO_WARNINGS -DCHROMIUM_BUILD $
- - -DCR_CLANG_REVISION=254049-1 -DUSE_AURA=1 -DUSE_ASH=1 $
- - -DUSE_DEFAULT_RENDER_THEME=1 -DUSE_LIBJPEG_TURBO=1 $
- - -DENABLE_ONE_CLICK_SIGNIN -DENABLE_WEBRTC=1 -DENABLE_MEDIA_ROUTER=1 $
- - -DENABLE_PEPPER_CDMS -DENABLE_CONFIGURATION_POLICY $
- - -DENABLE_NOTIFICATIONS -DENABLE_HIDPI=1 -DENABLE_TOPCHROME_MD=1 $
- - -DDONT_EMBED_BUILD_METADATA -DFIELDTRIAL_TESTING_ENABLED -DNO_TCMALLOC $
- - -D__STD_C -D_CRT_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_DEPRECATE $
- - -DNTDDI_VERSION=0x06030000 -D_USING_V110_SDK71_ -DENABLE_TASK_MANAGER=1 $
- - -DENABLE_EXTENSIONS=1 -DENABLE_PDF=1 -DENABLE_PLUGIN_INSTALLATION=1 $
- - -DENABLE_PLUGINS=1 -DENABLE_SESSION_SERVICE=1 -DENABLE_THEMES=1 $
- - -DENABLE_AUTOFILL_DIALOG=1 -DENABLE_BACKGROUND=1 -DENABLE_PRINTING=1 $
- - -DENABLE_BASIC_PRINTING=1 -DENABLE_PRINT_PREVIEW=1 $
- - -DENABLE_SPELLCHECK=1 -DENABLE_CAPTIVE_PORTAL_DETECTION=1 $
- - -DENABLE_APP_LIST=1 -DENABLE_SETTINGS_APP=1 -DENABLE_SUPERVISED_USERS=1 $
- - -DENABLE_MDNS=1 -DENABLE_SERVICE_DISCOVERY=1 $
- - -DV8_USE_EXTERNAL_STARTUP_DATA -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD $
- - -DSAFE_BROWSING_DB_LOCAL -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
- - -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE $
- - -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
- - -DTCMALLOC_FOR_DEBUGALLOCATION -D_UNICODE -DUNICODE -D_DEBUG
- -asmflags =
- -rcflags = /I..\.. /Igen /I..\..\base\allocator /d_DEBUG /l409
- -includes = -Igen -I..\..\third_party\wtl\include -I..\..\base\allocator $
- - -I..\..
- -midl_includes =
- -cflags = /wd4091 /wd4127 /wd4351 /wd4355 /wd4503 /wd4589 /wd4611 /wd4100 $
- - /wd4121 /wd4244 /wd4481 /wd4505 /wd4510 /wd4512 /wd4610 /wd4838 /wd4995 $
- - /wd4996 /wd4456 /wd4457 /wd4458 /wd4459 /wd4702 /wd4800 /Od /fp:precise $
- - /W3 /WX /Zi /GR- /Gy /GS /MT /bigobj /Zc:sizedDealloc- /FS
- -cflags_c =
- -cflags_cc = /TP
- -arflags =
- -
- -build obj\base\allocator\allocator.allocator_shim_win.obj: cxx $
- - ..\..\base\allocator\allocator_shim_win.cc || gen\allocator\libcmt.lib
- -
- -build obj\base\allocator\allocator.lib: alink $
- - obj\base\allocator\allocator.allocator_shim_win.obj || $
- - gen\allocator\libcmt.lib
- - libflags = /LIBPATH:"C:\Program Files (x86)\Windows $
- - Kits\8.1\Lib\win8\um\x86" /MACHINE:X86 /ignore:4221 /ignore:4006,4221
- diff --git a/Debug/obj/base/allocator/allocator_unittests.ninja b/Debug/obj/base/allocator/allocator_unittests.ninja
- index 5611d17..d152ded 100644
- --- a/Debug/obj/base/allocator/allocator_unittests.ninja
- +++ b/Debug/obj/base/allocator/allocator_unittests.ninja
- @@ -5,13 +5,7 @@ cc_host = $cl_x86
- cxx_host = $cl_x86
- asm = $ml_x86
- build obj\base\allocator\allocator_unittests.actions_depends.stamp: stamp $
- - obj\base\allocator\allocator.lib $
- - obj\base\allocator\allocator_extension_thunks.lib obj\testing\gtest.lib $
- - gen\allocator\libcmt.lib $
- - obj\base\third_party\dynamic_annotations\dynamic_annotations.lib
- -
- -build obj\base\allocator\allocator_unittests.compile_depends.stamp: stamp $
- - gen\allocator\libcmt.lib gen\allocator\libcmt.lib
- + obj\base\allocator\allocator_extension_thunks.lib obj\testing\gtest.lib
- pdbname_c = obj\base\allocator\allocator_unittests.c.pdb
- pdbname_cc = obj\base\allocator\allocator_unittests.cc.pdb
- @@ -38,10 +32,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
- -DENABLE_MDNS=1 -DENABLE_SERVICE_DISCOVERY=1 $
- -DV8_USE_EXTERNAL_STARTUP_DATA -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD $
- -DSAFE_BROWSING_DB_LOCAL -DGTEST_HAS_POSIX_RE=0 -DGTEST_LANG_CXX11=0 $
- - -DPERFTOOLS_DLL_DECL= -DUNIT_TEST -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
- - -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE $
- - -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
- - -D_UNICODE -DUNICODE -D_DEBUG
- + -DUNIT_TEST -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D_CRT_NONSTDC_NO_WARNINGS $
- + -D_CRT_NONSTDC_NO_DEPRECATE -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
- + -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
- asmflags =
- rcflags = /I..\.. /Igen /I..\..\base\allocator /d_DEBUG /l409
- includes = -Igen -I..\..\third_party\wtl\include -I..\..\base\allocator $
- @@ -56,11 +49,9 @@ cflags_cc = /TP
- arflags =
- build obj\base\profiler\allocator_unittests.alternate_timer.obj: cxx $
- - ..\..\base\profiler\alternate_timer.cc || $
- - obj\base\allocator\allocator_unittests.compile_depends.stamp
- + ..\..\base\profiler\alternate_timer.cc
- build obj\base\allocator\allocator_unittests.allocator_unittest.obj: cxx $
- - ..\..\base\allocator\allocator_unittest.cc || $
- - obj\base\allocator\allocator_unittests.compile_depends.stamp
- + ..\..\base\allocator\allocator_unittest.cc
- manifests = $
- obj\base\allocator\allocator_unittests.allocator_unittests.exe.generated.manifest $
- @@ -73,21 +64,19 @@ ldflags = /DEBUG /MACHINE:X86 /LIBPATH:"C:\Program Files (x86)\Windows $
- /PDB:allocator_unittests.exe.pdb /maxilksize:0x7ff00000 /safeseh $
- /dynamicbase /ignore:4199 /ignore:4221 /nxcompat /largeaddressaware $
- /SUBSYSTEM:CONSOLE,5.01 /INCREMENTAL /FIXED:NO /DYNAMICBASE:NO $
- - /NODEFAULTLIB:libcmtd.lib /NODEFAULTLIB:libcmt.lib wininet.lib $
- - dnsapi.lib version.lib msimg32.lib ws2_32.lib usp10.lib psapi.lib $
- - dbghelp.lib winmm.lib shlwapi.lib kernel32.lib gdi32.lib winspool.lib $
- - comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib user32.lib $
- - uuid.lib odbc32.lib odbccp32.lib delayimp.lib credui.lib netapi32.lib $
- - gen/allocator/libcmt.lib /SAFESEH /NXCOMPAT /MANIFEST $
- + wininet.lib dnsapi.lib version.lib msimg32.lib ws2_32.lib usp10.lib $
- + psapi.lib dbghelp.lib winmm.lib shlwapi.lib kernel32.lib gdi32.lib $
- + winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib $
- + oleaut32.lib user32.lib uuid.lib odbc32.lib odbccp32.lib delayimp.lib $
- + credui.lib netapi32.lib /SAFESEH /NXCOMPAT /MANIFEST $
- /ManifestFile:obj\base\allocator\allocator_unittests.allocator_unittests.exe.intermediate.manifest $
- /MANIFESTUAC:NO /ALLOWISOLATION
- libs =
- build allocator_unittests.exe allocator_unittests.exe.pdb: link_embed $
- obj\base\profiler\allocator_unittests.alternate_timer.obj $
- obj\base\allocator\allocator_unittests.allocator_unittest.obj $
- - obj\base\allocator\allocator.lib $
- obj\base\allocator\allocator_extension_thunks.lib obj\testing\gtest.lib $
- - obj\base\third_party\dynamic_annotations\dynamic_annotations.lib | $
- + | $
- obj\base\allocator\allocator_unittests.allocator_unittests.exe.generated.manifest $
- - ..\..\build\win\compatibility.manifest gen\allocator\libcmt.lib
- + ..\..\build\win\compatibility.manifest
- binary = allocator_unittests.exe
- diff --git a/Debug_x64/obj/base/allocator/allocator.ninja b/Debug_x64/obj/base/allocator/allocator.ninja
- index f53341c..692b1b3 100644
- --- a/Debug_x64/obj/base/allocator/allocator.ninja
- +++ b/Debug_x64/obj/base/allocator/allocator.ninja
- @@ -4,52 +4,3 @@ cxx = $cl_x64
- cc_host = $cl_x64
- cxx_host = $cl_x64
- asm = $ml_x64
- -pdbname_c = obj\base\allocator\allocator.c.pdb
- -pdbname_cc = obj\base\allocator\allocator.cc.pdb
- -pchprefix = allocator
- -defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
- - -DWINVER=0x0603 -DWIN32 -D_WINDOWS -DNOMINMAX -DPSAPI_VERSION=1 $
- - -D_CRT_RAND_S -DCERT_CHAIN_PARA_HAS_EXTRA_FIELDS -DWIN32_LEAN_AND_MEAN $
- - -D_ATL_NO_OPENGL -D_SECURE_ATL -D_HAS_EXCEPTIONS=0 $
- - -D_WINSOCK_DEPRECATED_NO_WARNINGS -DCHROMIUM_BUILD $
- - -DCR_CLANG_REVISION=254049-1 -DUSE_AURA=1 -DUSE_ASH=1 $
- - -DUSE_DEFAULT_RENDER_THEME=1 -DUSE_LIBJPEG_TURBO=1 $
- - -DENABLE_ONE_CLICK_SIGNIN -DENABLE_WEBRTC=1 -DENABLE_MEDIA_ROUTER=1 $
- - -DENABLE_PEPPER_CDMS -DENABLE_CONFIGURATION_POLICY $
- - -DENABLE_NOTIFICATIONS -DENABLE_HIDPI=1 -DENABLE_TOPCHROME_MD=1 $
- - -DDONT_EMBED_BUILD_METADATA -DFIELDTRIAL_TESTING_ENABLED -DNO_TCMALLOC $
- - -D__STD_C -D_CRT_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_DEPRECATE $
- - -DNTDDI_VERSION=0x06030000 -D_USING_V110_SDK71_ -DENABLE_TASK_MANAGER=1 $
- - -DENABLE_EXTENSIONS=1 -DENABLE_PDF=1 -DENABLE_PLUGIN_INSTALLATION=1 $
- - -DENABLE_PLUGINS=1 -DENABLE_SESSION_SERVICE=1 -DENABLE_THEMES=1 $
- - -DENABLE_AUTOFILL_DIALOG=1 -DENABLE_BACKGROUND=1 -DENABLE_PRINTING=1 $
- - -DENABLE_BASIC_PRINTING=1 -DENABLE_PRINT_PREVIEW=1 $
- - -DENABLE_SPELLCHECK=1 -DENABLE_CAPTIVE_PORTAL_DETECTION=1 $
- - -DENABLE_APP_LIST=1 -DENABLE_SETTINGS_APP=1 -DENABLE_SUPERVISED_USERS=1 $
- - -DENABLE_MDNS=1 -DENABLE_SERVICE_DISCOVERY=1 $
- - -DV8_USE_EXTERNAL_STARTUP_DATA -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD $
- - -DSAFE_BROWSING_DB_LOCAL -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
- - -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE $
- - -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
- - -DTCMALLOC_FOR_DEBUGALLOCATION -D_UNICODE -DUNICODE -D_DEBUG
- -asmflags =
- -rcflags = /I..\.. /Igen /I..\..\base\allocator /d_DEBUG /l409
- -includes = -Igen -I..\..\third_party\wtl\include -I..\..\base\allocator $
- - -I..\..
- -midl_includes =
- -cflags = /wd4091 /wd4127 /wd4351 /wd4355 /wd4503 /wd4589 /wd4611 /wd4100 $
- - /wd4121 /wd4244 /wd4481 /wd4505 /wd4510 /wd4512 /wd4610 /wd4838 /wd4995 $
- - /wd4996 /wd4456 /wd4457 /wd4458 /wd4459 /wd4702 /wd4800 /Od /fp:precise $
- - /W3 /WX /Zi /GR- /Gy /GS /MT /bigobj /Zc:sizedDealloc- /FS
- -cflags_c =
- -cflags_cc = /TP
- -arflags =
- -
- -build obj\base\allocator\allocator.allocator_shim_win.obj: cxx $
- - ..\..\base\allocator\allocator_shim_win.cc || gen\allocator\libcmt.lib
- -
- -build obj\base\allocator\allocator.lib: alink $
- - obj\base\allocator\allocator.allocator_shim_win.obj || $
- - gen\allocator\libcmt.lib
- - libflags = /LIBPATH:"C:\Program Files (x86)\Windows $
- - Kits\8.1\Lib\win8\um\x64" /MACHINE:X64 /ignore:4221 /ignore:4006,4221
- diff --git a/Debug_x64/obj/base/allocator/allocator_unittests.ninja b/Debug_x64/obj/base/allocator/allocator_unittests.ninja
- index e90e395..39abfd7 100644
- --- a/Debug_x64/obj/base/allocator/allocator_unittests.ninja
- +++ b/Debug_x64/obj/base/allocator/allocator_unittests.ninja
- @@ -5,13 +5,7 @@ cc_host = $cl_x64
- cxx_host = $cl_x64
- asm = $ml_x64
- build obj\base\allocator\allocator_unittests.actions_depends.stamp: stamp $
- - obj\base\allocator\allocator.lib $
- - obj\base\allocator\allocator_extension_thunks.lib obj\testing\gtest.lib $
- - gen\allocator\libcmt.lib $
- - obj\base\third_party\dynamic_annotations\dynamic_annotations.lib
- -
- -build obj\base\allocator\allocator_unittests.compile_depends.stamp: stamp $
- - gen\allocator\libcmt.lib gen\allocator\libcmt.lib
- + obj\base\allocator\allocator_extension_thunks.lib obj\testing\gtest.lib
- pdbname_c = obj\base\allocator\allocator_unittests.c.pdb
- pdbname_cc = obj\base\allocator\allocator_unittests.cc.pdb
- @@ -38,10 +32,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
- -DENABLE_MDNS=1 -DENABLE_SERVICE_DISCOVERY=1 $
- -DV8_USE_EXTERNAL_STARTUP_DATA -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD $
- -DSAFE_BROWSING_DB_LOCAL -DGTEST_HAS_POSIX_RE=0 -DGTEST_LANG_CXX11=0 $
- - -DPERFTOOLS_DLL_DECL= -DUNIT_TEST -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
- - -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE $
- - -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 $
- - -D_UNICODE -DUNICODE -D_DEBUG
- + -DUNIT_TEST -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D_CRT_NONSTDC_NO_WARNINGS $
- + -D_CRT_NONSTDC_NO_DEPRECATE -DDYNAMIC_ANNOTATIONS_ENABLED=1 $
- + -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_UNICODE -DUNICODE -D_DEBUG
- asmflags =
- rcflags = /I..\.. /Igen /I..\..\base\allocator /d_DEBUG /l409
- includes = -Igen -I..\..\third_party\wtl\include -I..\..\base\allocator $
- @@ -56,11 +49,9 @@ cflags_cc = /TP
- arflags =
- build obj\base\profiler\allocator_unittests.alternate_timer.obj: cxx $
- - ..\..\base\profiler\alternate_timer.cc || $
- - obj\base\allocator\allocator_unittests.compile_depends.stamp
- + ..\..\base\profiler\alternate_timer.cc
- build obj\base\allocator\allocator_unittests.allocator_unittest.obj: cxx $
- - ..\..\base\allocator\allocator_unittest.cc || $
- - obj\base\allocator\allocator_unittests.compile_depends.stamp
- + ..\..\base\allocator\allocator_unittest.cc
- manifests = $
- obj\base\allocator\allocator_unittests.allocator_unittests.exe.generated.manifest $
- @@ -72,22 +63,20 @@ ldflags = /DEBUG /MACHINE:X64 /LIBPATH:"C:\Program Files (x86)\Windows $
- /DELAYLOAD:shell32.dll /DELAYLOAD:uxtheme.dll $
- /PDB:allocator_unittests.exe.pdb /maxilksize:0x7ff00000 /dynamicbase $
- /ignore:4199 /ignore:4221 /nxcompat /SUBSYSTEM:CONSOLE,5.02 $
- - /INCREMENTAL /FIXED:NO /DYNAMICBASE:NO /NODEFAULTLIB:libcmtd.lib $
- - /NODEFAULTLIB:libcmt.lib /NODEFAULTLIB:olepro32.lib wininet.lib $
- - dnsapi.lib version.lib msimg32.lib ws2_32.lib usp10.lib psapi.lib $
- - dbghelp.lib winmm.lib shlwapi.lib kernel32.lib gdi32.lib winspool.lib $
- - comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib user32.lib $
- - uuid.lib odbc32.lib odbccp32.lib delayimp.lib credui.lib netapi32.lib $
- - gen/allocator/libcmt.lib /NXCOMPAT /MANIFEST $
- + /INCREMENTAL /FIXED:NO /DYNAMICBASE:NO /NODEFAULTLIB:olepro32.lib $
- + wininet.lib dnsapi.lib version.lib msimg32.lib ws2_32.lib usp10.lib $
- + psapi.lib dbghelp.lib winmm.lib shlwapi.lib kernel32.lib gdi32.lib $
- + winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib $
- + oleaut32.lib user32.lib uuid.lib odbc32.lib odbccp32.lib delayimp.lib $
- + credui.lib netapi32.lib /NXCOMPAT /MANIFEST $
- /ManifestFile:obj\base\allocator\allocator_unittests.allocator_unittests.exe.intermediate.manifest $
- /MANIFESTUAC:NO /ALLOWISOLATION
- libs =
- build allocator_unittests.exe allocator_unittests.exe.pdb: link_embed $
- obj\base\profiler\allocator_unittests.alternate_timer.obj $
- obj\base\allocator\allocator_unittests.allocator_unittest.obj $
- - obj\base\allocator\allocator.lib $
- obj\base\allocator\allocator_extension_thunks.lib obj\testing\gtest.lib $
- - obj\base\third_party\dynamic_annotations\dynamic_annotations.lib | $
- + | $
- obj\base\allocator\allocator_unittests.allocator_unittests.exe.generated.manifest $
- - ..\..\build\win\compatibility.manifest gen\allocator\libcmt.lib
- + ..\..\build\win\compatibility.manifest
- binary = allocator_unittests.exe
- diff --git a/Release/obj/base/allocator/allocator.ninja b/Release/obj/base/allocator/allocator.ninja
- index b5c839f..591d776 100644
- --- a/Release/obj/base/allocator/allocator.ninja
- +++ b/Release/obj/base/allocator/allocator.ninja
- @@ -4,52 +4,3 @@ cxx = $cl_x86
- cc_host = $cl_x86
- cxx_host = $cl_x86
- asm = $ml_x86
- -pdbname_c = obj\base\allocator\allocator.c.pdb
- -pdbname_cc = obj\base\allocator\allocator.cc.pdb
- -pchprefix = allocator
- -defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
- - -DWINVER=0x0603 -DWIN32 -D_WINDOWS -DNOMINMAX -DPSAPI_VERSION=1 $
- - -D_CRT_RAND_S -DCERT_CHAIN_PARA_HAS_EXTRA_FIELDS -DWIN32_LEAN_AND_MEAN $
- - -D_ATL_NO_OPENGL -D_SECURE_ATL -D_HAS_EXCEPTIONS=0 $
- - -D_WINSOCK_DEPRECATED_NO_WARNINGS -DCHROMIUM_BUILD $
- - -DCR_CLANG_REVISION=254049-1 -DUSE_AURA=1 -DUSE_ASH=1 $
- - -DUSE_DEFAULT_RENDER_THEME=1 -DUSE_LIBJPEG_TURBO=1 $
- - -DENABLE_ONE_CLICK_SIGNIN -DENABLE_WEBRTC=1 -DENABLE_MEDIA_ROUTER=1 $
- - -DENABLE_PEPPER_CDMS -DENABLE_CONFIGURATION_POLICY $
- - -DENABLE_NOTIFICATIONS -DENABLE_HIDPI=1 -DENABLE_TOPCHROME_MD=1 $
- - -DDONT_EMBED_BUILD_METADATA -DFIELDTRIAL_TESTING_ENABLED -DNO_TCMALLOC $
- - -D__STD_C -D_CRT_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_DEPRECATE $
- - -DNTDDI_VERSION=0x06030000 -D_USING_V110_SDK71_ -DENABLE_TASK_MANAGER=1 $
- - -DENABLE_EXTENSIONS=1 -DENABLE_PDF=1 -DENABLE_PLUGIN_INSTALLATION=1 $
- - -DENABLE_PLUGINS=1 -DENABLE_SESSION_SERVICE=1 -DENABLE_THEMES=1 $
- - -DENABLE_AUTOFILL_DIALOG=1 -DENABLE_BACKGROUND=1 -DENABLE_PRINTING=1 $
- - -DENABLE_BASIC_PRINTING=1 -DENABLE_PRINT_PREVIEW=1 $
- - -DENABLE_SPELLCHECK=1 -DENABLE_CAPTIVE_PORTAL_DETECTION=1 $
- - -DENABLE_APP_LIST=1 -DENABLE_SETTINGS_APP=1 -DENABLE_SUPERVISED_USERS=1 $
- - -DENABLE_MDNS=1 -DENABLE_SERVICE_DISCOVERY=1 $
- - -DV8_USE_EXTERNAL_STARTUP_DATA -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD $
- - -DSAFE_BROWSING_DB_LOCAL -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
- - -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE -DNDEBUG $
- - -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
- -asmflags =
- -rcflags = /I..\.. /Igen /I..\..\base\allocator /l409
- -includes = -Igen -I..\..\third_party\wtl\include -I..\..\base\allocator $
- - -I..\..
- -midl_includes =
- -cflags = /wd4091 /wd4127 /wd4351 /wd4355 /wd4503 /wd4589 /wd4611 /wd4100 $
- - /wd4121 /wd4244 /wd4481 /wd4505 /wd4510 /wd4512 /wd4610 /wd4838 /wd4995 $
- - /wd4996 /wd4456 /wd4457 /wd4458 /wd4459 /wd4702 /wd4800 /O2 /Ob2 /GF $
- - /Oy- /fp:precise /W3 /WX /Zi /GR- /Gy /GS /MT /bigobj /Zc:sizedDealloc- $
- - /d2Zi+ /Zc:inline /Oy- /Gw /FS
- -cflags_c =
- -cflags_cc = /TP
- -arflags =
- -
- -build obj\base\allocator\allocator.allocator_shim_win.obj: cxx $
- - ..\..\base\allocator\allocator_shim_win.cc || gen\allocator\libcmt.lib
- -
- -build obj\base\allocator\allocator.lib: alink $
- - obj\base\allocator\allocator.allocator_shim_win.obj || $
- - gen\allocator\libcmt.lib
- - libflags = /LIBPATH:"C:\Program Files (x86)\Windows $
- - Kits\8.1\Lib\win8\um\x86" /MACHINE:X86 /ignore:4221 /ignore:4006,4221
- diff --git a/Release/obj/base/allocator/allocator_unittests.ninja b/Release/obj/base/allocator/allocator_unittests.ninja
- index 62cfccb..4602291 100644
- --- a/Release/obj/base/allocator/allocator_unittests.ninja
- +++ b/Release/obj/base/allocator/allocator_unittests.ninja
- @@ -5,13 +5,7 @@ cc_host = $cl_x86
- cxx_host = $cl_x86
- asm = $ml_x86
- build obj\base\allocator\allocator_unittests.actions_depends.stamp: stamp $
- - obj\base\allocator\allocator.lib $
- - obj\base\allocator\allocator_extension_thunks.lib obj\testing\gtest.lib $
- - gen\allocator\libcmt.lib $
- - obj\base\third_party\dynamic_annotations\dynamic_annotations.lib
- -
- -build obj\base\allocator\allocator_unittests.compile_depends.stamp: stamp $
- - gen\allocator\libcmt.lib gen\allocator\libcmt.lib
- + obj\base\allocator\allocator_extension_thunks.lib obj\testing\gtest.lib
- pdbname_c = obj\base\allocator\allocator_unittests.c.pdb
- pdbname_cc = obj\base\allocator\allocator_unittests.cc.pdb
- @@ -38,9 +32,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
- -DENABLE_MDNS=1 -DENABLE_SERVICE_DISCOVERY=1 $
- -DV8_USE_EXTERNAL_STARTUP_DATA -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD $
- -DSAFE_BROWSING_DB_LOCAL -DGTEST_HAS_POSIX_RE=0 -DGTEST_LANG_CXX11=0 $
- - -DPERFTOOLS_DLL_DECL= -DUNIT_TEST -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
- - -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE -DNDEBUG $
- - -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
- + -DUNIT_TEST -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D_CRT_NONSTDC_NO_WARNINGS $
- + -D_CRT_NONSTDC_NO_DEPRECATE -DNDEBUG -DNVALGRIND $
- + -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
- asmflags =
- rcflags = /I..\.. /Igen /I..\..\base\allocator /l409
- includes = -Igen -I..\..\third_party\wtl\include -I..\..\base\allocator $
- @@ -56,11 +50,9 @@ cflags_cc = /TP
- arflags =
- build obj\base\profiler\allocator_unittests.alternate_timer.obj: cxx $
- - ..\..\base\profiler\alternate_timer.cc || $
- - obj\base\allocator\allocator_unittests.compile_depends.stamp
- + ..\..\base\profiler\alternate_timer.cc
- build obj\base\allocator\allocator_unittests.allocator_unittest.obj: cxx $
- - ..\..\base\allocator\allocator_unittest.cc || $
- - obj\base\allocator\allocator_unittests.compile_depends.stamp
- + ..\..\base\allocator\allocator_unittest.cc
- manifests = $
- obj\base\allocator\allocator_unittests.allocator_unittests.exe.generated.manifest $
- @@ -73,21 +65,19 @@ ldflags = /DEBUG /MACHINE:X86 /LIBPATH:"C:\Program Files (x86)\Windows $
- /PDB:allocator_unittests.exe.pdb /maxilksize:0x7ff00000 /safeseh $
- /dynamicbase /ignore:4199 /ignore:4221 /nxcompat /largeaddressaware $
- /SUBSYSTEM:CONSOLE,5.01 /INCREMENTAL:NO /FIXED:NO /OPT:REF /OPT:ICF $
- - /NODEFAULTLIB:libcmtd.lib /NODEFAULTLIB:libcmt.lib /PROFILE wininet.lib $
- - dnsapi.lib version.lib msimg32.lib ws2_32.lib usp10.lib psapi.lib $
- - dbghelp.lib winmm.lib shlwapi.lib kernel32.lib gdi32.lib winspool.lib $
- - comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib user32.lib $
- - uuid.lib odbc32.lib odbccp32.lib delayimp.lib credui.lib netapi32.lib $
- - gen/allocator/libcmt.lib /SAFESEH /DYNAMICBASE /NXCOMPAT /MANIFEST $
- + /PROFILE wininet.lib dnsapi.lib version.lib msimg32.lib ws2_32.lib $
- + usp10.lib psapi.lib dbghelp.lib winmm.lib shlwapi.lib kernel32.lib $
- + gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib $
- + oleaut32.lib user32.lib uuid.lib odbc32.lib odbccp32.lib delayimp.lib $
- + credui.lib netapi32.lib /SAFESEH /DYNAMICBASE /NXCOMPAT /MANIFEST $
- /ManifestFile:obj\base\allocator\allocator_unittests.allocator_unittests.exe.intermediate.manifest $
- /MANIFESTUAC:NO /ALLOWISOLATION
- libs =
- build allocator_unittests.exe allocator_unittests.exe.pdb: link_embed $
- obj\base\profiler\allocator_unittests.alternate_timer.obj $
- obj\base\allocator\allocator_unittests.allocator_unittest.obj $
- - obj\base\allocator\allocator.lib $
- obj\base\allocator\allocator_extension_thunks.lib obj\testing\gtest.lib $
- - obj\base\third_party\dynamic_annotations\dynamic_annotations.lib | $
- + | $
- obj\base\allocator\allocator_unittests.allocator_unittests.exe.generated.manifest $
- - ..\..\build\win\compatibility.manifest gen\allocator\libcmt.lib
- + ..\..\build\win\compatibility.manifest
- binary = allocator_unittests.exe
- diff --git a/Release_x64/obj/base/allocator/allocator.ninja b/Release_x64/obj/base/allocator/allocator.ninja
- index 51ddbbb..692b1b3 100644
- --- a/Release_x64/obj/base/allocator/allocator.ninja
- +++ b/Release_x64/obj/base/allocator/allocator.ninja
- @@ -4,52 +4,3 @@ cxx = $cl_x64
- cc_host = $cl_x64
- cxx_host = $cl_x64
- asm = $ml_x64
- -pdbname_c = obj\base\allocator\allocator.c.pdb
- -pdbname_cc = obj\base\allocator\allocator.cc.pdb
- -pchprefix = allocator
- -defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
- - -DWINVER=0x0603 -DWIN32 -D_WINDOWS -DNOMINMAX -DPSAPI_VERSION=1 $
- - -D_CRT_RAND_S -DCERT_CHAIN_PARA_HAS_EXTRA_FIELDS -DWIN32_LEAN_AND_MEAN $
- - -D_ATL_NO_OPENGL -D_SECURE_ATL -D_HAS_EXCEPTIONS=0 $
- - -D_WINSOCK_DEPRECATED_NO_WARNINGS -DCHROMIUM_BUILD $
- - -DCR_CLANG_REVISION=254049-1 -DUSE_AURA=1 -DUSE_ASH=1 $
- - -DUSE_DEFAULT_RENDER_THEME=1 -DUSE_LIBJPEG_TURBO=1 $
- - -DENABLE_ONE_CLICK_SIGNIN -DENABLE_WEBRTC=1 -DENABLE_MEDIA_ROUTER=1 $
- - -DENABLE_PEPPER_CDMS -DENABLE_CONFIGURATION_POLICY $
- - -DENABLE_NOTIFICATIONS -DENABLE_HIDPI=1 -DENABLE_TOPCHROME_MD=1 $
- - -DDONT_EMBED_BUILD_METADATA -DFIELDTRIAL_TESTING_ENABLED -DNO_TCMALLOC $
- - -D__STD_C -D_CRT_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_DEPRECATE $
- - -DNTDDI_VERSION=0x06030000 -D_USING_V110_SDK71_ -DENABLE_TASK_MANAGER=1 $
- - -DENABLE_EXTENSIONS=1 -DENABLE_PDF=1 -DENABLE_PLUGIN_INSTALLATION=1 $
- - -DENABLE_PLUGINS=1 -DENABLE_SESSION_SERVICE=1 -DENABLE_THEMES=1 $
- - -DENABLE_AUTOFILL_DIALOG=1 -DENABLE_BACKGROUND=1 -DENABLE_PRINTING=1 $
- - -DENABLE_BASIC_PRINTING=1 -DENABLE_PRINT_PREVIEW=1 $
- - -DENABLE_SPELLCHECK=1 -DENABLE_CAPTIVE_PORTAL_DETECTION=1 $
- - -DENABLE_APP_LIST=1 -DENABLE_SETTINGS_APP=1 -DENABLE_SUPERVISED_USERS=1 $
- - -DENABLE_MDNS=1 -DENABLE_SERVICE_DISCOVERY=1 $
- - -DV8_USE_EXTERNAL_STARTUP_DATA -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD $
- - -DSAFE_BROWSING_DB_LOCAL -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
- - -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE -DNDEBUG $
- - -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
- -asmflags =
- -rcflags = /I..\.. /Igen /I..\..\base\allocator /l409
- -includes = -Igen -I..\..\third_party\wtl\include -I..\..\base\allocator $
- - -I..\..
- -midl_includes =
- -cflags = /wd4091 /wd4127 /wd4351 /wd4355 /wd4503 /wd4589 /wd4611 /wd4100 $
- - /wd4121 /wd4244 /wd4481 /wd4505 /wd4510 /wd4512 /wd4610 /wd4838 /wd4995 $
- - /wd4996 /wd4456 /wd4457 /wd4458 /wd4459 /wd4702 /wd4800 /O2 /Ob2 /GF $
- - /Oy- /fp:precise /W3 /WX /Zi /GR- /Gy /GS /MT /bigobj /Zc:sizedDealloc- $
- - /d2Zi+ /Zc:inline /Oy- /Gw /FS
- -cflags_c =
- -cflags_cc = /TP
- -arflags =
- -
- -build obj\base\allocator\allocator.allocator_shim_win.obj: cxx $
- - ..\..\base\allocator\allocator_shim_win.cc || gen\allocator\libcmt.lib
- -
- -build obj\base\allocator\allocator.lib: alink $
- - obj\base\allocator\allocator.allocator_shim_win.obj || $
- - gen\allocator\libcmt.lib
- - libflags = /LIBPATH:"C:\Program Files (x86)\Windows $
- - Kits\8.1\Lib\win8\um\x64" /MACHINE:X64 /ignore:4221 /ignore:4006,4221
- diff --git a/Release_x64/obj/base/allocator/allocator_unittests.ninja b/Release_x64/obj/base/allocator/allocator_unittests.ninja
- index 3a32d54..e27fc20 100644
- --- a/Release_x64/obj/base/allocator/allocator_unittests.ninja
- +++ b/Release_x64/obj/base/allocator/allocator_unittests.ninja
- @@ -5,13 +5,7 @@ cc_host = $cl_x64
- cxx_host = $cl_x64
- asm = $ml_x64
- build obj\base\allocator\allocator_unittests.actions_depends.stamp: stamp $
- - obj\base\allocator\allocator.lib $
- - obj\base\allocator\allocator_extension_thunks.lib obj\testing\gtest.lib $
- - gen\allocator\libcmt.lib $
- - obj\base\third_party\dynamic_annotations\dynamic_annotations.lib
- -
- -build obj\base\allocator\allocator_unittests.compile_depends.stamp: stamp $
- - gen\allocator\libcmt.lib gen\allocator\libcmt.lib
- + obj\base\allocator\allocator_extension_thunks.lib obj\testing\gtest.lib
- pdbname_c = obj\base\allocator\allocator_unittests.c.pdb
- pdbname_cc = obj\base\allocator\allocator_unittests.cc.pdb
- @@ -38,9 +32,9 @@ defines = -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_WIN32_WINNT=0x0603 $
- -DENABLE_MDNS=1 -DENABLE_SERVICE_DISCOVERY=1 $
- -DV8_USE_EXTERNAL_STARTUP_DATA -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD $
- -DSAFE_BROWSING_DB_LOCAL -DGTEST_HAS_POSIX_RE=0 -DGTEST_LANG_CXX11=0 $
- - -DPERFTOOLS_DLL_DECL= -DUNIT_TEST -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 $
- - -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE -DNDEBUG $
- - -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
- + -DUNIT_TEST -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D_CRT_NONSTDC_NO_WARNINGS $
- + -D_CRT_NONSTDC_NO_DEPRECATE -DNDEBUG -DNVALGRIND $
- + -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_UNICODE -DUNICODE
- asmflags =
- rcflags = /I..\.. /Igen /I..\..\base\allocator /l409
- includes = -Igen -I..\..\third_party\wtl\include -I..\..\base\allocator $
- @@ -56,11 +50,9 @@ cflags_cc = /TP
- arflags =
- build obj\base\profiler\allocator_unittests.alternate_timer.obj: cxx $
- - ..\..\base\profiler\alternate_timer.cc || $
- - obj\base\allocator\allocator_unittests.compile_depends.stamp
- + ..\..\base\profiler\alternate_timer.cc
- build obj\base\allocator\allocator_unittests.allocator_unittest.obj: cxx $
- - ..\..\base\allocator\allocator_unittest.cc || $
- - obj\base\allocator\allocator_unittests.compile_depends.stamp
- + ..\..\base\allocator\allocator_unittest.cc
- manifests = $
- obj\base\allocator\allocator_unittests.allocator_unittests.exe.generated.manifest $
- @@ -72,23 +64,20 @@ ldflags = /DEBUG /MACHINE:X64 /LIBPATH:"C:\Program Files (x86)\Windows $
- /DELAYLOAD:shell32.dll /DELAYLOAD:uxtheme.dll $
- /PDB:allocator_unittests.exe.pdb /maxilksize:0x7ff00000 /dynamicbase $
- /ignore:4199 /ignore:4221 /nxcompat /SUBSYSTEM:CONSOLE,5.02 $
- - /INCREMENTAL:NO /FIXED:NO /OPT:REF /OPT:ICF /NODEFAULTLIB:libcmtd.lib $
- - /NODEFAULTLIB:libcmt.lib /NODEFAULTLIB:olepro32.lib /PROFILE $
- - wininet.lib dnsapi.lib version.lib msimg32.lib ws2_32.lib usp10.lib $
- - psapi.lib dbghelp.lib winmm.lib shlwapi.lib kernel32.lib gdi32.lib $
- - winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib $
- + /INCREMENTAL:NO /FIXED:NO /OPT:REF /OPT:ICF /NODEFAULTLIB:olepro32.lib $
- + /PROFILE wininet.lib dnsapi.lib version.lib msimg32.lib ws2_32.lib $
- + usp10.lib psapi.lib dbghelp.lib winmm.lib shlwapi.lib kernel32.lib $
- + gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib $
- oleaut32.lib user32.lib uuid.lib odbc32.lib odbccp32.lib delayimp.lib $
- - credui.lib netapi32.lib gen/allocator/libcmt.lib /DYNAMICBASE /NXCOMPAT $
- - /MANIFEST $
- + credui.lib netapi32.lib /DYNAMICBASE /NXCOMPAT /MANIFEST $
- /ManifestFile:obj\base\allocator\allocator_unittests.allocator_unittests.exe.intermediate.manifest $
- /MANIFESTUAC:NO /ALLOWISOLATION
- libs =
- build allocator_unittests.exe allocator_unittests.exe.pdb: link_embed $
- obj\base\profiler\allocator_unittests.alternate_timer.obj $
- obj\base\allocator\allocator_unittests.allocator_unittest.obj $
- - obj\base\allocator\allocator.lib $
- obj\base\allocator\allocator_extension_thunks.lib obj\testing\gtest.lib $
- - obj\base\third_party\dynamic_annotations\dynamic_annotations.lib | $
- + | $
- obj\base\allocator\allocator_unittests.allocator_unittests.exe.generated.manifest $
- - ..\..\build\win\compatibility.manifest gen\allocator\libcmt.lib
- + ..\..\build\win\compatibility.manifest
- binary = allocator_unittests.exe
Advertisement
Add Comment
Please, Sign In to add comment