Index: AdblockPlusEngine.vcxproj |
=================================================================== |
--- a/AdblockPlusEngine.vcxproj |
+++ b/AdblockPlusEngine.vcxproj |
@@ -176,105 +176,123 @@ |
<OutDir>$(ProjectDir)build\x64\$(Configuration)\</OutDir> |
<IntDir>$(ProjectDir)build\x64\$(Configuration)\</IntDir> |
</PropertyGroup> |
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Production|Win32'"> |
<ClCompile> |
<PrecompiledHeader>NotUsing</PrecompiledHeader> |
<WarningLevel>Level3</WarningLevel> |
<Optimization>Disabled</Optimization> |
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;ADBLOCK_PLUS_PRODUCTION_MODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;ADBLOCK_PLUS_PRODUCTION_MODE;$(ExternalPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions> |
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> |
</ClCompile> |
+ <ResourceCompile> |
+ <PreprocessorDefinitions>$(ExternalPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions> |
+ </ResourceCompile> |
<Link> |
<SubSystem>Windows</SubSystem> |
<GenerateDebugInformation>true</GenerateDebugInformation> |
<AdditionalDependencies>libadblockplus.lib;shlwapi.lib;user32.lib;v8_base.lib;v8_snapshot.lib;winhttp.lib;winmm.lib;ws2_32.lib;msi.lib;%(AdditionalDependencies)</AdditionalDependencies> |
<OutputFile>$(ProjectDir)build\ia32\$(Configuration)\AdblockPlusEngine.exe</OutputFile> |
<DelayLoadDLLs>Shell32.dll;Msi.dll</DelayLoadDLLs> |
</Link> |
</ItemDefinitionGroup> |
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Test|Win32'"> |
<ClCompile> |
<PrecompiledHeader>NotUsing</PrecompiledHeader> |
<WarningLevel>Level3</WarningLevel> |
<Optimization>Disabled</Optimization> |
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;ADBLOCK_PLUS_TEST_MODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;ADBLOCK_PLUS_TEST_MODE;$(ExternalPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions> |
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> |
</ClCompile> |
+ <ResourceCompile> |
+ <PreprocessorDefinitions>$(ExternalPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions> |
+ </ResourceCompile> |
<Link> |
<SubSystem>Windows</SubSystem> |
<GenerateDebugInformation>true</GenerateDebugInformation> |
<AdditionalDependencies>libadblockplus.lib;shlwapi.lib;user32.lib;v8_base.lib;v8_snapshot.lib;winhttp.lib;winmm.lib;ws2_32.lib;msi.lib;%(AdditionalDependencies)</AdditionalDependencies> |
<OutputFile>$(ProjectDir)build\ia32\$(Configuration)\AdblockPlusEngine.exe</OutputFile> |
<DelayLoadDLLs>Shell32.dll;Msi.dll</DelayLoadDLLs> |
</Link> |
</ItemDefinitionGroup> |
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Test|Win32'"> |
<ClCompile> |
<WarningLevel>Level3</WarningLevel> |
<PrecompiledHeader>NotUsing</PrecompiledHeader> |
<Optimization>MaxSpeed</Optimization> |
<FunctionLevelLinking>true</FunctionLevelLinking> |
<IntrinsicFunctions>true</IntrinsicFunctions> |
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;ADBLOCK_PLUS_TEST_MODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;ADBLOCK_PLUS_TEST_MODE;$(ExternalPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions> |
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> |
</ClCompile> |
+ <ResourceCompile> |
+ <PreprocessorDefinitions>$(ExternalPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions> |
+ </ResourceCompile> |
<Link> |
<SubSystem>Windows</SubSystem> |
<GenerateDebugInformation>true</GenerateDebugInformation> |
<EnableCOMDATFolding>true</EnableCOMDATFolding> |
<OptimizeReferences>true</OptimizeReferences> |
<AdditionalDependencies>libadblockplus.lib;shlwapi.lib;user32.lib;v8_base.lib;v8_snapshot.lib;winhttp.lib;winmm.lib;ws2_32.lib;msi.lib;%(AdditionalDependencies)</AdditionalDependencies> |
<OutputFile>$(ProjectDir)build\ia32\$(Configuration)\AdblockPlusEngine.exe</OutputFile> |
<DelayLoadDLLs>Shell32.dll;Msi.dll</DelayLoadDLLs> |
</Link> |
</ItemDefinitionGroup> |
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Production|x64'"> |
<ClCompile> |
<PrecompiledHeader>NotUsing</PrecompiledHeader> |
<WarningLevel>Level3</WarningLevel> |
<Optimization>Disabled</Optimization> |
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;ADBLOCK_PLUS_PRODUCTION_MODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;ADBLOCK_PLUS_PRODUCTION_MODE;$(ExternalPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions> |
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> |
</ClCompile> |
+ <ResourceCompile> |
+ <PreprocessorDefinitions>$(ExternalPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions> |
+ </ResourceCompile> |
<Link> |
<SubSystem>Windows</SubSystem> |
<GenerateDebugInformation>true</GenerateDebugInformation> |
<AdditionalDependencies>libadblockplus.lib;shlwapi.lib;user32.lib;v8_base.lib;v8_snapshot.lib;winhttp.lib;winmm.lib;ws2_32.lib;msi.lib;%(AdditionalDependencies)</AdditionalDependencies> |
<OutputFile>$(ProjectDir)build\x64\$(Configuration)\AdblockPlusEngine.exe</OutputFile> |
<DelayLoadDLLs>Shell32.dll;Msi.dll</DelayLoadDLLs> |
</Link> |
</ItemDefinitionGroup> |
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Test|x64'"> |
<ClCompile> |
<PrecompiledHeader>NotUsing</PrecompiledHeader> |
<WarningLevel>Level3</WarningLevel> |
<Optimization>Disabled</Optimization> |
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;ADBLOCK_PLUS_TEST_MODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;ADBLOCK_PLUS_TEST_MODE;$(ExternalPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions> |
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> |
</ClCompile> |
+ <ResourceCompile> |
+ <PreprocessorDefinitions>$(ExternalPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions> |
+ </ResourceCompile> |
<Link> |
<SubSystem>Windows</SubSystem> |
<GenerateDebugInformation>true</GenerateDebugInformation> |
<AdditionalDependencies>libadblockplus.lib;shlwapi.lib;user32.lib;v8_base.lib;v8_snapshot.lib;winhttp.lib;winmm.lib;ws2_32.lib;msi.lib;%(AdditionalDependencies)</AdditionalDependencies> |
<OutputFile>$(ProjectDir)build\x64\$(Configuration)\AdblockPlusEngine.exe</OutputFile> |
<DelayLoadDLLs>Shell32.dll;Msi.dll</DelayLoadDLLs> |
</Link> |
</ItemDefinitionGroup> |
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Test|x64'"> |
<ClCompile> |
<WarningLevel>Level3</WarningLevel> |
<PrecompiledHeader>NotUsing</PrecompiledHeader> |
<Optimization>MaxSpeed</Optimization> |
<FunctionLevelLinking>true</FunctionLevelLinking> |
<IntrinsicFunctions>true</IntrinsicFunctions> |
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;ADBLOCK_PLUS_TEST_MODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;ADBLOCK_PLUS_TEST_MODE;$(ExternalPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions> |
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> |
</ClCompile> |
+ <ResourceCompile> |
+ <PreprocessorDefinitions>$(ExternalPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions> |
+ </ResourceCompile> |
<Link> |
<SubSystem>Windows</SubSystem> |
<GenerateDebugInformation>true</GenerateDebugInformation> |
<EnableCOMDATFolding>true</EnableCOMDATFolding> |
<OptimizeReferences>true</OptimizeReferences> |
<AdditionalDependencies>libadblockplus.lib;shlwapi.lib;user32.lib;v8_base.lib;v8_snapshot.lib;winhttp.lib;winmm.lib;ws2_32.lib;msi.lib;%(AdditionalDependencies)</AdditionalDependencies> |
<OutputFile>$(ProjectDir)build\x64\$(Configuration)\AdblockPlusEngine.exe</OutputFile> |
<DelayLoadDLLs>Shell32.dll;Msi.dll</DelayLoadDLLs> |
@@ -282,19 +300,22 @@ |
</ItemDefinitionGroup> |
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Production|Win32'"> |
<ClCompile> |
<WarningLevel>Level3</WarningLevel> |
<PrecompiledHeader>NotUsing</PrecompiledHeader> |
<Optimization>MaxSpeed</Optimization> |
<FunctionLevelLinking>true</FunctionLevelLinking> |
<IntrinsicFunctions>true</IntrinsicFunctions> |
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;ADBLOCK_PLUS_PRODUCTION_MODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;ADBLOCK_PLUS_PRODUCTION_MODE;$(ExternalPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions> |
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> |
</ClCompile> |
+ <ResourceCompile> |
+ <PreprocessorDefinitions>$(ExternalPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions> |
+ </ResourceCompile> |
<Link> |
<SubSystem>Windows</SubSystem> |
<GenerateDebugInformation>true</GenerateDebugInformation> |
<EnableCOMDATFolding>true</EnableCOMDATFolding> |
<OptimizeReferences>true</OptimizeReferences> |
<AdditionalDependencies>libadblockplus.lib;shlwapi.lib;user32.lib;v8_base.lib;v8_snapshot.lib;winhttp.lib;winmm.lib;ws2_32.lib;msi.lib;%(AdditionalDependencies)</AdditionalDependencies> |
<OutputFile>$(ProjectDir)build\ia32\$(Configuration)\AdblockPlusEngine.exe</OutputFile> |
<DelayLoadDLLs>Shell32.dll;Msi.dll</DelayLoadDLLs> |
@@ -302,19 +323,22 @@ |
</ItemDefinitionGroup> |
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Production|x64'"> |
<ClCompile> |
<WarningLevel>Level3</WarningLevel> |
<PrecompiledHeader>NotUsing</PrecompiledHeader> |
<Optimization>MaxSpeed</Optimization> |
<FunctionLevelLinking>true</FunctionLevelLinking> |
<IntrinsicFunctions>true</IntrinsicFunctions> |
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;ADBLOCK_PLUS_PRODUCTION_MODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;ADBLOCK_PLUS_PRODUCTION_MODE;$(ExternalPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions> |
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> |
</ClCompile> |
+ <ResourceCompile> |
+ <PreprocessorDefinitions>$(ExternalPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions> |
+ </ResourceCompile> |
<Link> |
<SubSystem>Windows</SubSystem> |
<GenerateDebugInformation>true</GenerateDebugInformation> |
<EnableCOMDATFolding>true</EnableCOMDATFolding> |
<OptimizeReferences>true</OptimizeReferences> |
<AdditionalDependencies>libadblockplus.lib;shlwapi.lib;user32.lib;v8_base.lib;v8_snapshot.lib;winhttp.lib;winmm.lib;ws2_32.lib;msi.lib;%(AdditionalDependencies)</AdditionalDependencies> |
<OutputFile>$(ProjectDir)build\x64\$(Configuration)\AdblockPlusEngine.exe</OutputFile> |
<DelayLoadDLLs>Shell32.dll;Msi.dll</DelayLoadDLLs> |