Unified Diff: AdblockPlusPlugin.vcxproj
Issue 10845030:
Marshal all libadblockplus calls to the engine process (Closed)
Patch Set:
Created May 31, 2013, 2:20 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« .hgsubstate ('k')
|
src/engine/main.cpp » ('j')
|
src/engine/main.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: AdblockPlusPlugin.vcxproj |
| =================================================================== |
| --- a/AdblockPlusPlugin.vcxproj |
| +++ b/AdblockPlusPlugin.vcxproj |
| @@ -217,17 +217,16 @@ echo regsvr32 exec. time > "$(OutDir) |
| <ClCompile> |
| <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions> |
| <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> |
| <IntrinsicFunctions>true</IntrinsicFunctions> |
| <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> |
| <OmitFramePointers>true</OmitFramePointers> |
| <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> |
| <WholeProgramOptimization>true</WholeProgramOptimization> |
| - <AdditionalIncludeDirectories>$(ProjectDir)libadblockplus\include;$(ProjectDir)libadblockplus\third_party\v8\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>WIN32;PRECOMPILED_HEADER_FILE="PluginStdAfx.h";PRODUCT_ADBLOCKPLUS;NDEBUG;_WINDOWS;_USRDLL;ADBLOCKPLUS_PRODUCTION_MODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> |
| <FloatingPointModel>Fast</FloatingPointModel> |
| <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> |
| <RuntimeTypeInfo>false</RuntimeTypeInfo> |
| <PrecompiledHeader>Use</PrecompiledHeader> |
| <PrecompiledHeaderFile>PluginStdAfx.h</PrecompiledHeaderFile> |
| <PrecompiledHeaderOutputFile>$(IntDir)Plugin.pch</PrecompiledHeaderOutputFile> |
| @@ -237,32 +236,31 @@ echo regsvr32 exec. time > "$(OutDir) |
| <SuppressStartupBanner>true</SuppressStartupBanner> |
| </ClCompile> |
| <ResourceCompile> |
| <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| <Culture>0x0409</Culture> |
| </ResourceCompile> |
| <Link> |
| <RegisterOutput>true</RegisterOutput> |
| - <AdditionalDependencies>winhttp.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)atlthunk.lib;libadblockplus.lib;v8_base.lib;v8_snapshot.lib</AdditionalDependencies> |
| + <AdditionalDependencies>winhttp.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)atlthunk.lib</AdditionalDependencies> |
| <OutputFile>$(OutDir)AdblockPlus.dll</OutputFile> |
| <SuppressStartupBanner>true</SuppressStartupBanner> |
| <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> |
| <IgnoreSpecificDefaultLibraries>nafxcw.lib LIBCMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> |
| <ModuleDefinitionFile>src\plugin\$(TargetName).def</ModuleDefinitionFile> |
| <GenerateDebugInformation>false</GenerateDebugInformation> |
| <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile> |
| <SubSystem>Windows</SubSystem> |
| <OptimizeReferences>true</OptimizeReferences> |
| <EnableCOMDATFolding>true</EnableCOMDATFolding> |
| <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> |
| <BaseAddress>0x66000000</BaseAddress> |
| <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary> |
| <TargetMachine>MachineX86</TargetMachine> |
| - <AdditionalLibraryDirectories>$(ProjectDir)libadblockplus\build\ia32\build\Release\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
| </Link> |
| <Bscmake> |
| <SuppressStartupBanner>true</SuppressStartupBanner> |
| <OutputFile>$(IntDir)$(TargetName).bsc</OutputFile> |
| </Bscmake> |
| <PostBuildEvent> |
| <Command>copy "$(ProjectDir)files\settings.ini" "$(TargetDir)settings.ini" |
| copy /y /D "$(ProjectDir)files\settings_page_w.ini" "$(TargetDir)settings_page_w.ini" |
| @@ -281,17 +279,16 @@ echo regsvr32 exec. time > "$(OutDir) |
| <Midl> |
| <TypeLibraryName>$(TargetName).tlb</TypeLibraryName> |
| <OutputDirectory>build</OutputDirectory> |
| </Midl> |
| <ClCompile> |
| <Optimization>MaxSpeed</Optimization> |
| <InlineFunctionExpansion>Default</InlineFunctionExpansion> |
| <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> |
| - <AdditionalIncludeDirectories>$(ProjectDir)libadblockplus\include;$(ProjectDir)libadblockplus\third_party\v8\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>WIN32;PRECOMPILED_HEADER_FILE="PluginStdAfx.h";NDEBUG;_WINDOWS;_USRDLL;ADBLOCKPLUS_PRODUCTION_MODE;PRODUCT_ADBLOCKPLUS;ENABLE_LATIN_1;ENABLE_DEBUGGER_SUPPORT;V8_TARGET_ARCH_IA32;WIN32;DEBUG;ENABLE_DISASSEMBLER;V8_ENABLE_CHECKS;OBJECT_PRINT;VERIFY_HEAP;ENABLE_EXTRA_CHECKS;FILTER_ENGINE_STUBS=0;HAVE_WININET;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| <StringPooling>true</StringPooling> |
| <RuntimeLibrary>MultiThreaded</RuntimeLibrary> |
| <FunctionLevelLinking>true</FunctionLevelLinking> |
| <AdditionalOptions /> |
| <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> |
| <PrecompiledHeader>Use</PrecompiledHeader> |
| <PrecompiledHeaderFile>PluginStdAfx.h</PrecompiledHeaderFile> |
| @@ -301,32 +298,31 @@ echo regsvr32 exec. time > "$(OutDir) |
| <WarningLevel>Level3</WarningLevel> |
| <SuppressStartupBanner>true</SuppressStartupBanner> |
| </ClCompile> |
| <ResourceCompile> |
| <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| </ResourceCompile> |
| <Link> |
| <RegisterOutput>true</RegisterOutput> |
| - <AdditionalDependencies>winhttp.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)atlthunk.lib;libadblockplus.lib;v8_base.lib;v8_snapshot.lib</AdditionalDependencies> |
| + <AdditionalDependencies>winhttp.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)atlthunk.lib</AdditionalDependencies> |
| <OutputFile>$(OutDir)AdblockPlus.dll</OutputFile> |
| <SuppressStartupBanner>true</SuppressStartupBanner> |
| <IgnoreSpecificDefaultLibraries>nafxcw.lib LIBCMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> |
| <ModuleDefinitionFile>src\plugin\$(TargetName).def</ModuleDefinitionFile> |
| <GenerateDebugInformation>true</GenerateDebugInformation> |
| <AssemblyDebug>true</AssemblyDebug> |
| <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile> |
| <GenerateMapFile>true</GenerateMapFile> |
| <MapExports>true</MapExports> |
| <SubSystem>Windows</SubSystem> |
| <RandomizedBaseAddress>false</RandomizedBaseAddress> |
| <DataExecutionPrevention /> |
| <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary> |
| <TargetMachine>MachineX86</TargetMachine> |
| - <AdditionalLibraryDirectories>$(ProjectDir)libadblockplus\build\ia32\build\Release\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
| <ShowProgress>LinkVerboseLib</ShowProgress> |
| </Link> |
| <Bscmake> |
| <SuppressStartupBanner>true</SuppressStartupBanner> |
| <OutputFile>$(IntDir)$(TargetName).bsc</OutputFile> |
| </Bscmake> |
| <PostBuildEvent> |
| <Command>copy "$(ProjectDir)files\settings.ini" "$(TargetDir)settings.ini" |
| @@ -344,17 +340,16 @@ xcopy /s /I /y /D "$(ProjectDir)html\*" |
| <Command /> |
| </CustomBuildStep> |
| <Midl> |
| <TypeLibraryName>$(TargetName).tlb</TypeLibraryName> |
| <OutputDirectory>build</OutputDirectory> |
| </Midl> |
| <ClCompile> |
| <Optimization>Disabled</Optimization> |
| - <AdditionalIncludeDirectories>$(ProjectDir)libadblockplus\include;$(ProjectDir)libadblockplus\third_party\v8\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>WIN32;PRECOMPILED_HEADER_FILE="PluginStdAfx.h";PRODUCT_ADBLOCKPLUS;_DEBUG;_WINDOWS;_USRDLL;ADBLOCKPLUS_TEST_MODE;ENABLE_LATIN_1;ENABLE_DEBUGGER_SUPPORT;V8_TARGET_ARCH_X64;DEBUG;ENABLE_DISASSEMBLER;V8_ENABLE_CHECKS;OBJECT_PRINT;VERIFY_HEAP;ENABLE_EXTRA_CHECKS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| <MinimalRebuild>true</MinimalRebuild> |
| <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> |
| <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> |
| <PrecompiledHeader>Use</PrecompiledHeader> |
| <PrecompiledHeaderFile>PluginStdAfx.h</PrecompiledHeaderFile> |
| <PrecompiledHeaderOutputFile>$(IntDir)Plugin.pch</PrecompiledHeaderOutputFile> |
| <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> |
| @@ -365,30 +360,29 @@ xcopy /s /I /y /D "$(ProjectDir)html\*" |
| <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> |
| </ClCompile> |
| <ResourceCompile> |
| <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| <Culture>0x0409</Culture> |
| </ResourceCompile> |
| <Link> |
| <RegisterOutput>true</RegisterOutput> |
| - <AdditionalDependencies>winhttp.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)atlthunk.lib;libadblockplus.lib;v8_base.lib;v8_snapshot.lib</AdditionalDependencies> |
| + <AdditionalDependencies>winhttp.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)atlthunk.lib</AdditionalDependencies> |
| <OutputFile>$(OutDir)AdblockPlus.dll</OutputFile> |
| <SuppressStartupBanner>true</SuppressStartupBanner> |
| <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> |
| <IgnoreSpecificDefaultLibraries>nafxcwd.lib LIBCMTD.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> |
| <ModuleDefinitionFile>src\plugin\$(TargetName).def</ModuleDefinitionFile> |
| <GenerateDebugInformation>true</GenerateDebugInformation> |
| <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile> |
| <SubSystem>Windows</SubSystem> |
| <RandomizedBaseAddress>false</RandomizedBaseAddress> |
| <DataExecutionPrevention /> |
| <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary> |
| <TargetMachine>MachineX86</TargetMachine> |
| - <AdditionalLibraryDirectories>$(ProjectDir)libadblockplus\build\ia32\build\Debug\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
| </Link> |
| <Bscmake> |
| <SuppressStartupBanner>true</SuppressStartupBanner> |
| <OutputFile>$(IntDir)$(TargetName).bsc</OutputFile> |
| </Bscmake> |
| <PostBuildEvent> |
| <Command>copy "$(ProjectDir)files\settings.ini" "$(TargetDir)settings.ini" |
| copy /y /D "$(ProjectDir)files\settings_page_w.ini" "$(TargetDir)settings_page_w.ini" |
| @@ -407,17 +401,16 @@ echo regsvr32 exec. time > "$(OutDir) |
| <Midl> |
| <TypeLibraryName>$(TargetName).tlb</TypeLibraryName> |
| <OutputDirectory>build</OutputDirectory> |
| </Midl> |
| <ClCompile> |
| <Optimization>Disabled</Optimization> |
| <InlineFunctionExpansion>Default</InlineFunctionExpansion> |
| <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed> |
| - <AdditionalIncludeDirectories>$(ProjectDir)libadblockplus\include;$(ProjectDir)libadblockplus\third_party\v8\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>WIN32;PRECOMPILED_HEADER_FILE="PluginStdAfx.h";_DEBUG;_WINDOWS;_USRDLL;ADBLOCKPLUS_PRODUCTION_MODE;PRODUCT_ADBLOCKPLUS;ENABLE_LATIN_1;ENABLE_DEBUGGER_SUPPORT;V8_TARGET_ARCH_IA32;WIN32;DEBUG;ENABLE_DISASSEMBLER;V8_ENABLE_CHECKS;OBJECT_PRINT;VERIFY_HEAP;ENABLE_EXTRA_CHECKS;FILTER_ENGINE_STUBS=0;HAVE_WININET;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| <StringPooling>false</StringPooling> |
| <MinimalRebuild>true</MinimalRebuild> |
| <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> |
| <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> |
| <FunctionLevelLinking>false</FunctionLevelLinking> |
| <AdditionalOptions /> |
| <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> |
| @@ -431,31 +424,30 @@ echo regsvr32 exec. time > "$(OutDir) |
| <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> |
| <MultiProcessorCompilation>true</MultiProcessorCompilation> |
| </ClCompile> |
| <ResourceCompile> |
| <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| </ResourceCompile> |
| <Link> |
| <RegisterOutput>true</RegisterOutput> |
| - <AdditionalDependencies>winhttp.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)atlthunk.lib;libadblockplus.lib;v8_base.lib;v8_snapshot.lib</AdditionalDependencies> |
| + <AdditionalDependencies>winhttp.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)atlthunk.lib</AdditionalDependencies> |
| <OutputFile>$(OutDir)AdblockPlus.dll</OutputFile> |
| <SuppressStartupBanner>true</SuppressStartupBanner> |
| <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> |
| <IgnoreSpecificDefaultLibraries>nafxcwd.lib LIBCMTD.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> |
| <ModuleDefinitionFile>src\plugin\$(TargetName).def</ModuleDefinitionFile> |
| <GenerateDebugInformation>true</GenerateDebugInformation> |
| <AssemblyDebug /> |
| <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile> |
| <SubSystem>Windows</SubSystem> |
| <RandomizedBaseAddress>false</RandomizedBaseAddress> |
| <DataExecutionPrevention /> |
| <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary> |
| <TargetMachine>MachineX86</TargetMachine> |
| - <AdditionalLibraryDirectories>$(ProjectDir)libadblockplus\build\ia32\build\Debug\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
| </Link> |
| <Bscmake> |
| <SuppressStartupBanner>true</SuppressStartupBanner> |
| <OutputFile>$(IntDir)$(TargetName).bsc</OutputFile> |
| </Bscmake> |
| <PostBuildEvent> |
| <Command>copy "$(ProjectDir)files\settings.ini" "$(TargetDir)settings.ini" |
| copy /y /D "$(ProjectDir)files\settings_page_w.ini" "$(TargetDir)settings_page_w.ini" |
| @@ -474,17 +466,16 @@ echo regsvr32 exec. time > "$(OutDir) |
| <Midl> |
| <TypeLibraryName>$(TargetName).tlb</TypeLibraryName> |
| <OutputDirectory>build</OutputDirectory> |
| </Midl> |
| <ClCompile> |
| <Optimization>MaxSpeed</Optimization> |
| <InlineFunctionExpansion>Default</InlineFunctionExpansion> |
| <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> |
| - <AdditionalIncludeDirectories>$(ProjectDir)libadblockplus\include;$(ProjectDir)libadblockplus\third_party\v8\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;ADBLOCKPLUS_PRODUCTION_MODE;PRODUCT_SIMPLEADBLOCK;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| <StringPooling>false</StringPooling> |
| <RuntimeLibrary>MultiThreaded</RuntimeLibrary> |
| <FunctionLevelLinking>true</FunctionLevelLinking> |
| <AdditionalOptions /> |
| <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> |
| <PrecompiledHeader>Use</PrecompiledHeader> |
| <PrecompiledHeaderFile>PluginStdAfx.h</PrecompiledHeaderFile> |
| @@ -493,29 +484,28 @@ echo regsvr32 exec. time > "$(OutDir) |
| <ObjectFileName>$(IntDir)</ObjectFileName> |
| <WarningLevel>Level3</WarningLevel> |
| <SuppressStartupBanner>true</SuppressStartupBanner> |
| </ClCompile> |
| <ResourceCompile> |
| <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| </ResourceCompile> |
| <Link> |
| - <AdditionalDependencies>winhttp.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)atlthunk.lib;libadblockplus.lib;v8_base.lib;v8_snapshot.lib</AdditionalDependencies> |
| + <AdditionalDependencies>winhttp.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)atlthunk.lib</AdditionalDependencies> |
| <OutputFile>$(OutDir)AdblockPlusx64.dll</OutputFile> |
| <SuppressStartupBanner>true</SuppressStartupBanner> |
| <IgnoreSpecificDefaultLibraries>nafxcw.lib LIBCMT.lib;olepro32.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> |
| <ModuleDefinitionFile>src\plugin\$(TargetName).def</ModuleDefinitionFile> |
| <GenerateDebugInformation>false</GenerateDebugInformation> |
| <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile> |
| <SubSystem>Windows</SubSystem> |
| <RandomizedBaseAddress>false</RandomizedBaseAddress> |
| <DataExecutionPrevention /> |
| <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary> |
| <TargetMachine>MachineX64</TargetMachine> |
| - <AdditionalLibraryDirectories>$(ProjectDir)libadblockplus\build\x64\build\Release\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
| </Link> |
| <Bscmake> |
| <SuppressStartupBanner>true</SuppressStartupBanner> |
| <OutputFile>$(IntDir)$(TargetName).bsc</OutputFile> |
| </Bscmake> |
| <PostBuildEvent> |
| <Command>copy "$(ProjectDir)files\settings.ini" "$(TargetDir)settings.ini" |
| copy /y /D "$(ProjectDir)files\settings_page_w.ini" "$(TargetDir)settings_page_w.ini" |
| @@ -534,17 +524,16 @@ echo regsvr32 exec. time > "$(OutDir) |
| <Midl> |
| <TypeLibraryName>$(TargetName).tlb</TypeLibraryName> |
| <OutputDirectory>build</OutputDirectory> |
| </Midl> |
| <ClCompile> |
| <Optimization>MaxSpeed</Optimization> |
| <InlineFunctionExpansion>Default</InlineFunctionExpansion> |
| <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> |
| - <AdditionalIncludeDirectories>$(ProjectDir)libadblockplus\include;$(ProjectDir)libadblockplus\third_party\v8\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>WIN64;PRODUCT_ADBLOCKPLUS;NDEBUG;_WINDOWS;_USRDLL;ADBLOCKPLUS_TEST_MODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| <StringPooling>true</StringPooling> |
| <RuntimeLibrary>MultiThreaded</RuntimeLibrary> |
| <FunctionLevelLinking>true</FunctionLevelLinking> |
| <AdditionalOptions /> |
| <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> |
| <PrecompiledHeader>Use</PrecompiledHeader> |
| <PrecompiledHeaderFile>PluginStdAfx.h</PrecompiledHeaderFile> |
| @@ -553,29 +542,28 @@ echo regsvr32 exec. time > "$(OutDir) |
| <ObjectFileName>$(IntDir)</ObjectFileName> |
| <WarningLevel>Level3</WarningLevel> |
| <SuppressStartupBanner>true</SuppressStartupBanner> |
| </ClCompile> |
| <ResourceCompile> |
| <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| </ResourceCompile> |
| <Link> |
| - <AdditionalDependencies>winhttp.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)atlthunk.lib;libadblockplus.lib;v8_base.lib;v8_snapshot.lib</AdditionalDependencies> |
| + <AdditionalDependencies>winhttp.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)atlthunk.lib</AdditionalDependencies> |
| <OutputFile>$(OutDir)AdblockPlusx64.dll</OutputFile> |
| <SuppressStartupBanner>true</SuppressStartupBanner> |
| <IgnoreSpecificDefaultLibraries>nafxcw.lib LIBCMT.lib;olepro32.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> |
| <ModuleDefinitionFile>src\plugin\$(TargetName).def</ModuleDefinitionFile> |
| <GenerateDebugInformation>false</GenerateDebugInformation> |
| <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile> |
| <SubSystem>Windows</SubSystem> |
| <RandomizedBaseAddress>false</RandomizedBaseAddress> |
| <DataExecutionPrevention /> |
| <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary> |
| <TargetMachine>MachineX64</TargetMachine> |
| - <AdditionalLibraryDirectories>$(ProjectDir)libadblockplus\build\x64\build\Release\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
| </Link> |
| <Bscmake> |
| <SuppressStartupBanner>true</SuppressStartupBanner> |
| <OutputFile>$(IntDir)$(TargetName).bsc</OutputFile> |
| </Bscmake> |
| <PostBuildEvent> |
| <Command>copy "$(ProjectDir)files\settings.ini" "$(TargetDir)settings.ini" |
| copy /y /D "$(ProjectDir)files\settings_page_w.ini" "$(TargetDir)settings_page_w.ini" |
| @@ -589,17 +577,16 @@ xcopy /s /I /y /D "$(ProjectDir)html\*" |
| <Command /> |
| </CustomBuildStep> |
| <Midl> |
| <TypeLibraryName>$(TargetName).tlb</TypeLibraryName> |
| <OutputDirectory>build</OutputDirectory> |
| </Midl> |
| <ClCompile> |
| <Optimization>Disabled</Optimization> |
| - <AdditionalIncludeDirectories>$(ProjectDir)libadblockplus\include;$(ProjectDir)libadblockplus\third_party\v8\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;ADBLOCKPLUS_PRODUCTION_MODE;PRODUCT_ADBLOCKPLUS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| <StringPooling>false</StringPooling> |
| <MinimalRebuild>true</MinimalRebuild> |
| <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> |
| <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> |
| <PrecompiledHeader>Use</PrecompiledHeader> |
| <PrecompiledHeaderFile>PluginStdAfx.h</PrecompiledHeaderFile> |
| <PrecompiledHeaderOutputFile>$(IntDir)Plugin.pch</PrecompiledHeaderOutputFile> |
| @@ -609,29 +596,28 @@ xcopy /s /I /y /D "$(ProjectDir)html\*" |
| <WarningLevel>Level3</WarningLevel> |
| <SuppressStartupBanner>true</SuppressStartupBanner> |
| <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> |
| </ClCompile> |
| <ResourceCompile> |
| <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| </ResourceCompile> |
| <Link> |
| - <AdditionalDependencies>winhttp.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)atlthunk.lib;libadblockplus.lib;v8_base.lib;v8_snapshot.lib</AdditionalDependencies> |
| + <AdditionalDependencies>winhttp.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)atlthunk.lib</AdditionalDependencies> |
| <OutputFile>$(OutDir)AdblockPlusx64.dll</OutputFile> |
| <SuppressStartupBanner>true</SuppressStartupBanner> |
| <IgnoreSpecificDefaultLibraries>nafxcwd.lib LIBCMTD.lib;olepro32.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> |
| <ModuleDefinitionFile>src\plugin\$(TargetName).def</ModuleDefinitionFile> |
| <GenerateDebugInformation>true</GenerateDebugInformation> |
| <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile> |
| <SubSystem>Windows</SubSystem> |
| <RandomizedBaseAddress>false</RandomizedBaseAddress> |
| <DataExecutionPrevention /> |
| <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary> |
| <TargetMachine>MachineX64</TargetMachine> |
| - <AdditionalLibraryDirectories>$(ProjectDir)libadblockplus\build\x64\build\Debug\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
| </Link> |
| <Bscmake> |
| <SuppressStartupBanner>true</SuppressStartupBanner> |
| <OutputFile>$(IntDir)$(TargetName).bsc</OutputFile> |
| </Bscmake> |
| <PostBuildEvent> |
| <Command>copy "$(ProjectDir)files\settings.ini" "$(TargetDir)settings.ini" |
| copy /y /D "$(ProjectDir)files\settings_page_w.ini" "$(TargetDir)settings_page_w.ini" |
| @@ -647,17 +633,16 @@ xcopy /s /I /y /D "$(ProjectDir)html\*" |
| <Midl> |
| <TypeLibraryName>$(TargetName).tlb</TypeLibraryName> |
| <OutputDirectory>build</OutputDirectory> |
| </Midl> |
| <ClCompile> |
| <Optimization>Disabled</Optimization> |
| <InlineFunctionExpansion>Default</InlineFunctionExpansion> |
| <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed> |
| - <AdditionalIncludeDirectories>$(ProjectDir)libadblockplus\include;$(ProjectDir)libadblockplus\third_party\v8\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;ADBLOCKPLUS_PRODUCTION_MODE;PRODUCT_ADBLOCKPLUS;ENABLE_LATIN_1;ENABLE_DEBUGGER_SUPPORT;V8_TARGET_ARCH_X64;WIN32;DEBUG;ENABLE_DISASSEMBLER;V8_ENABLE_CHECKS;OBJECT_PRINT;VERIFY_HEAP;ENABLE_EXTRA_CHECKS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| <StringPooling>false</StringPooling> |
| <MinimalRebuild>true</MinimalRebuild> |
| <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> |
| <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> |
| <FunctionLevelLinking>false</FunctionLevelLinking> |
| <AdditionalOptions /> |
| <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> |
| @@ -669,29 +654,28 @@ xcopy /s /I /y /D "$(ProjectDir)html\*" |
| <WarningLevel>Level3</WarningLevel> |
| <SuppressStartupBanner>true</SuppressStartupBanner> |
| <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> |
| </ClCompile> |
| <ResourceCompile> |
| <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| </ResourceCompile> |
| <Link> |
| - <AdditionalDependencies>winhttp.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)atlthunk.lib;libadblockplus.lib;v8_base.lib;v8_snapshot.lib</AdditionalDependencies> |
| + <AdditionalDependencies>winhttp.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)atlthunk.lib</AdditionalDependencies> |
| <OutputFile>$(OutDir)AdblockPlusx64.dll</OutputFile> |
| <SuppressStartupBanner>true</SuppressStartupBanner> |
| <IgnoreSpecificDefaultLibraries>nafxcwd.lib LIBCMTD.lib;olepro32.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> |
| <ModuleDefinitionFile>src\plugin\$(TargetName).def</ModuleDefinitionFile> |
| <GenerateDebugInformation>false</GenerateDebugInformation> |
| <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile> |
| <SubSystem>Windows</SubSystem> |
| <RandomizedBaseAddress>false</RandomizedBaseAddress> |
| <DataExecutionPrevention /> |
| <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary> |
| <TargetMachine>MachineX64</TargetMachine> |
| - <AdditionalLibraryDirectories>$(ProjectDir)libadblockplus\build\x64\build\Debug\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
| </Link> |
| <Bscmake> |
| <SuppressStartupBanner>true</SuppressStartupBanner> |
| <OutputFile>$(IntDir)$(TargetName).bsc</OutputFile> |
| </Bscmake> |
| <PostBuildEvent> |
| <Command>copy "$(ProjectDir)files\settings.ini" "$(TargetDir)settings.ini" |
| copy /y /D "$(ProjectDir)files\settings_page_w.ini" "$(TargetDir)settings_page_w.ini" |
« no previous file with comments
|
« .hgsubstate ('k')
|
src/engine/main.cpp » ('j')
|
src/engine/main.cpp » ('J')
