Unified Diff: AdBlocker/AdBlocker.vcxproj
Issue 9998007:
Initial libadblockplus integration (Closed)
Patch Set:
Created April 1, 2013, 9:55 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
AdPlugin.sln » ('j')
|
AdPlugin.sln » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: AdBlocker/AdBlocker.vcxproj |
| =================================================================== |
| --- a/AdBlocker/AdBlocker.vcxproj |
| +++ b/AdBlocker/AdBlocker.vcxproj |
| @@ -159,7 +159,7 @@ |
| <IntDir>$(Configuration)\</IntDir> |
| <LinkIncremental>true</LinkIncremental> |
| <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild> |
| - <LibraryPath>$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);$(WINDDKDIR)\lib\ATL\i386</LibraryPath> |
| + <LibraryPath>$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);$(WINDDKDIR)\lib\ATL\i386;C:\projects\v8\build\debug\lib</LibraryPath> |
| <IncludePath>$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath);$(WINDDKDIR)\inc\atl71</IncludePath> |
| </PropertyGroup> |
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Production|Win32'"> |
| @@ -344,7 +344,7 @@ |
| <ClCompile> |
| <Optimization>Disabled</Optimization> |
| <AdditionalIncludeDirectories>../Shared;$(SolutionDir)..\v8\include;$(SolutionDir)..\V8\third_party\v8\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| - <PreprocessorDefinitions>WIN32;PRODUCT_ADBLOCKPLUS;_DEBUG;_WINDOWS;_USRDLL;ADPLUGIN_TEST_MODE;_CRTDBG_MAPALLOC;_CRTDBG_MAP_ALLOC;ABP;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| + <PreprocessorDefinitions>WIN32;PRODUCT_ADBLOCKPLUS;_DEBUG;_WINDOWS;_USRDLL;ADPLUGIN_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> |
| @@ -364,7 +364,7 @@ |
| </ResourceCompile> |
| <Link> |
| <RegisterOutput>true</RegisterOutput> |
| - <AdditionalDependencies>odbc32.lib;odbccp32.lib;winhttp.lib;comsuppwd.lib;comDlg32.lib;shlwapi.lib;iepmapi.lib;Msi.lib;%(AdditionalDependencies);atlthunk.lib;v8.lib</AdditionalDependencies> |
| + <AdditionalDependencies>odbc32.lib;odbccp32.lib;winhttp.lib;comsuppwd.lib;comDlg32.lib;shlwapi.lib;iepmapi.lib;Msi.lib;%(AdditionalDependencies);atlthunk.lib;libadblockplus.lib;v8_base.lib;v8_snapshot.lib</AdditionalDependencies> |
| <OutputFile>$(OutDir)Adblock.dll</OutputFile> |
| <SuppressStartupBanner>true</SuppressStartupBanner> |
| <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> |
| @@ -589,7 +589,7 @@ |
| <ClCompile> |
| <Optimization>Disabled</Optimization> |
| <AdditionalIncludeDirectories>../Shared;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| - <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;ADPLUGIN_PRODUCTION_MODE;PRODUCT_SIMPLEADBLOCK;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| + <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;ADPLUGIN_PRODUCTION_MODE;PRODUCT_ADBLOCKPLUS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| <StringPooling>false</StringPooling> |
| <MinimalRebuild>true</MinimalRebuild> |
| <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> |
| @@ -646,8 +646,8 @@ |
| <Optimization>Disabled</Optimization> |
| <InlineFunctionExpansion>Default</InlineFunctionExpansion> |
| <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed> |
| - <AdditionalIncludeDirectories>../Shared;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| - <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;ADPLUGIN_PRODUCTION_MODE;PRODUCT_SIMPLEADBLOCK;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| + <AdditionalIncludeDirectories>../Shared;$(SolutionDir)..\v8\include;$(SolutionDir)..\V8\third_party\v8\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;ADPLUGIN_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> |
| @@ -668,7 +668,7 @@ |
| <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| </ResourceCompile> |
| <Link> |
| - <AdditionalDependencies>odbc32.lib;odbccp32.lib;winhttp.lib;atlthunk.lib;comsuppwd.lib;comDlg32.lib;shlwapi.lib;iepmapi.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| + <AdditionalDependencies>odbc32.lib;odbccp32.lib;winhttp.lib;atlthunk.lib;comsuppwd.lib;comDlg32.lib;shlwapi.lib;iepmapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| <OutputFile>$(OutDir)Adblock.dll</OutputFile> |
| <SuppressStartupBanner>true</SuppressStartupBanner> |
| <IgnoreSpecificDefaultLibraries>nafxcwd.lib LIBCMTD.lib;olepro32.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> |
| @@ -733,6 +733,7 @@ |
| <ClCompile Include="..\Shared\PluginUserSettings.cpp" /> |
| <ClCompile Include="..\Shared\PluginUtil.cpp" /> |
| <ClCompile Include="..\Shared\PluginWbPassThrough.cpp" /> |
| + <ClCompile Include="CABPFilter.cpp" /> |
| </ItemGroup> |
| <ItemGroup> |
| <ClInclude Include="..\Shared\abp.h" /> |
| @@ -777,6 +778,7 @@ |
| <ClInclude Include="..\Shared\ProtocolCF.h" /> |
| <ClInclude Include="..\Shared\ProtocolImpl.h" /> |
| <ClInclude Include="BuildVariant.h" /> |
| + <ClInclude Include="CABPFilter.h" /> |
| <ClInclude Include="Resource.h" /> |
| <ClInclude Include="Version.h" /> |
| </ItemGroup> |
| @@ -804,6 +806,25 @@ |
| <Image Include="res\deactivated.ico" /> |
| <Image Include="res\not-blocking.ico" /> |
| </ItemGroup> |
| + <ItemGroup> |
| + <ProjectReference Include="..\..\V8\MSVS\libadblockplus.vcxproj"> |
|
Felix Dahlke
2013/04/03 05:35:27
Is this a relative file system path? If so, should
Wladimir Palant
2013/04/03 12:42:19
Actually, this seems to assume a particular direct
Felix Dahlke
2013/04/03 12:51:04
I'm to blame, I told Oleksandr it's fine to use a
|
| + <Project>{e60284dc-2131-d9a9-d19c-b792b7f5f727}</Project> |
| + <Private>true</Private> |
| + <ReferenceOutputAssembly>true</ReferenceOutputAssembly> |
| + <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies> |
| + <LinkLibraryDependencies>true</LinkLibraryDependencies> |
| + <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs> |
| + </ProjectReference> |
| + <ProjectReference Include="..\..\V8\MSVS\third_party\v8\tools\gyp\v8.vcxproj"> |
| + <Project>{fbb6cb62-ddee-671e-d69f-37e0f0a1b214}</Project> |
| + </ProjectReference> |
| + <ProjectReference Include="..\..\V8\MSVS\third_party\v8\tools\gyp\v8_base.vcxproj"> |
| + <Project>{c782df61-6ef9-0352-cb91-68298a8e12db}</Project> |
| + </ProjectReference> |
| + <ProjectReference Include="..\..\V8\MSVS\third_party\v8\tools\gyp\v8_snapshot.vcxproj"> |
| + <Project>{675d727d-f234-e4dd-20c1-85aaa5df715b}</Project> |
| + </ProjectReference> |
| + </ItemGroup> |
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
| <ImportGroup Label="ExtensionTargets"> |
| </ImportGroup> |
