| Index: AdblockPlusPlugin.vcxproj |
| =================================================================== |
| --- a/AdblockPlusPlugin.vcxproj |
| +++ b/AdblockPlusPlugin.vcxproj |
| @@ -259,19 +259,18 @@ echo regsvr32 exec. time > "$(OutDir) |
| <TargetMachine>MachineX86</TargetMachine> |
| </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" |
| -copy /y /D "$(ProjectDir)files\dictionary_w.ini" "$(TargetDir)dictionary_w.ini" |
| -xcopy /s /I /y /D "$(ProjectDir)html\*" "$(TargetDir)html" </Command> |
| +xcopy /s /I /y /D "$(ProjectDir)html\*" "$(TargetDir)html" |
| +xcopy /s /I /y /D "$(ProjectDir)locales\*" "$(TargetDir)locales" </Command> |
| </PostBuildEvent> |
| </ItemDefinitionGroup> |
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Test|Win32'"> |
| <CustomBuildStep> |
| <Message>Performing registration</Message> |
| <Command>regsvr32 /s /c "$(TargetPath)" |
| echo regsvr32 exec. time > "$(OutDir)regsvr32.trg" |
| </Command> |
| @@ -322,19 +321,18 @@ echo regsvr32 exec. time > "$(OutDir) |
| <ShowProgress>LinkVerboseLib</ShowProgress> |
| </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" |
| -copy /y /D "$(ProjectDir)files\dictionary_w.ini" "$(TargetDir)dictionary_w.ini" |
| -xcopy /s /I /y /D "$(ProjectDir)html\*" "$(TargetDir)html" </Command> |
| +xcopy /s /I /y /D "$(ProjectDir)html\*" "$(TargetDir)html" |
| +xcopy /s /I /y /D "$(ProjectDir)locales\*" "$(TargetDir)locales" </Command> |
| </PostBuildEvent> |
| <ProjectReference> |
| <LinkLibraryDependencies>false</LinkLibraryDependencies> |
| </ProjectReference> |
| </ItemDefinitionGroup> |
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Test|Win32'"> |
| <CustomBuildStep> |
| <Message /> |
| @@ -381,19 +379,18 @@ xcopy /s /I /y /D "$(ProjectDir)html\*" |
| <TargetMachine>MachineX86</TargetMachine> |
| </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" |
| -copy /y /D "$(ProjectDir)files\dictionary_w.ini" "$(TargetDir)dictionary_w.ini" |
| -xcopy /s /I /y /D "$(ProjectDir)html\*" "$(TargetDir)html" </Command> |
| +xcopy /s /I /y /D "$(ProjectDir)html\*" "$(TargetDir)html" |
| +xcopy /s /I /y /D "$(ProjectDir)locales\*" "$(TargetDir)locales" </Command> |
| </PostBuildEvent> |
| </ItemDefinitionGroup> |
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Production|Win32'"> |
| <CustomBuildStep> |
| <Message>Performing registration</Message> |
| <Command>regsvr32 /s /c "$(TargetPath)" |
| echo regsvr32 exec. time > "$(OutDir)regsvr32.trg" |
| </Command> |
| @@ -446,19 +443,18 @@ echo regsvr32 exec. time > "$(OutDir) |
| <TargetMachine>MachineX86</TargetMachine> |
| </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" |
| -copy /y /D "$(ProjectDir)files\dictionary_w.ini" "$(TargetDir)dictionary_w.ini" |
| -xcopy /s /I /y /D "$(ProjectDir)html\*" "$(TargetDir)html" </Command> |
| +xcopy /s /I /y /D "$(ProjectDir)html\*" "$(TargetDir)html" |
| +xcopy /s /I /y /D "$(ProjectDir)locales\*" "$(TargetDir)locales" </Command> |
| </PostBuildEvent> |
| </ItemDefinitionGroup> |
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Production|x64'"> |
| <CustomBuildStep> |
| <Message>Performing registration</Message> |
| <Command>regsvr32 /s /c "$(TargetPath)" |
| echo regsvr32 exec. time > "$(OutDir)regsvr32.trg" |
| </Command> |
| @@ -504,19 +500,18 @@ echo regsvr32 exec. time > "$(OutDir) |
| <TargetMachine>MachineX64</TargetMachine> |
| </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" |
| -copy /y /D "$(ProjectDir)files\dictionary_w.ini" "$(TargetDir)dictionary_w.ini" |
| -xcopy /s /I /y /D "$(ProjectDir)html\*" "$(TargetDir)html" </Command> |
| +xcopy /s /I /y /D "$(ProjectDir)html\*" "$(TargetDir)html" |
| +xcopy /s /I /y /D "$(ProjectDir)locales\*" "$(TargetDir)locales" </Command> |
| </PostBuildEvent> |
| </ItemDefinitionGroup> |
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Test|x64'"> |
| <CustomBuildStep> |
| <Message>Performing registration</Message> |
| <Command>regsvr32 /s /c "$(TargetPath)" |
| echo regsvr32 exec. time > "$(OutDir)regsvr32.trg" |
| </Command> |
| @@ -562,19 +557,18 @@ echo regsvr32 exec. time > "$(OutDir) |
| <TargetMachine>MachineX64</TargetMachine> |
| </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" |
| -copy /y /D "$(ProjectDir)files\dictionary_w.ini" "$(TargetDir)dictionary_w.ini" |
| -xcopy /s /I /y /D "$(ProjectDir)html\*" "$(TargetDir)html" </Command> |
| +xcopy /s /I /y /D "$(ProjectDir)html\*" "$(TargetDir)html" |
| +xcopy /s /I /y /D "$(ProjectDir)locales\*" "$(TargetDir)locales" </Command> |
| </PostBuildEvent> |
| </ItemDefinitionGroup> |
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Test|x64'"> |
| <CustomBuildStep> |
| <Message /> |
| <Command /> |
| </CustomBuildStep> |
| <Midl> |
| @@ -616,19 +610,18 @@ xcopy /s /I /y /D "$(ProjectDir)html\*" |
| <TargetMachine>MachineX64</TargetMachine> |
| </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" |
| -copy /y /D "$(ProjectDir)files\dictionary_w.ini" "$(TargetDir)dictionary_w.ini" |
| -xcopy /s /I /y /D "$(ProjectDir)html\*" "$(TargetDir)html" </Command> |
| +xcopy /s /I /y /D "$(ProjectDir)html\*" "$(TargetDir)html" |
| +xcopy /s /I /y /D "$(ProjectDir)locales\*" "$(TargetDir)locales" </Command> |
| </PostBuildEvent> |
| </ItemDefinitionGroup> |
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Production|x64'"> |
| <CustomBuildStep> |
| <Message /> |
| <Command /> |
| </CustomBuildStep> |
| <Midl> |
| @@ -674,19 +667,18 @@ xcopy /s /I /y /D "$(ProjectDir)html\*" |
| <TargetMachine>MachineX64</TargetMachine> |
| </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" |
| -copy /y /D "$(ProjectDir)files\dictionary_w.ini" "$(TargetDir)dictionary_w.ini" |
| -xcopy /s /I /y /D "$(ProjectDir)html\*" "$(TargetDir)html" </Command> |
| +xcopy /s /I /y /D "$(ProjectDir)html\*" "$(TargetDir)html" |
| +xcopy /s /I /y /D "$(ProjectDir)locales\*" "$(TargetDir)locales" </Command> |
| </PostBuildEvent> |
| </ItemDefinitionGroup> |
| <ItemGroup> |
| <Midl Include="src\plugin\AdblockPlus.idl" /> |
| </ItemGroup> |
| <ItemGroup> |
| <ClCompile Include="src\plugin\AdblockPlusClient.cpp" /> |
| <ClCompile Include="src\plugin\AdblockPlusDomTraverser.cpp" /> |
| @@ -694,17 +686,16 @@ xcopy /s /I /y /D "$(ProjectDir)html\*" |
| <ClCompile Include="src\plugin\Plugin.cpp" /> |
| <ClCompile Include="src\plugin\PluginChecksum.cpp" /> |
| <ClCompile Include="src\plugin\PluginClass.cpp" /> |
| <ClCompile Include="src\plugin\PluginClassThread.cpp" /> |
| <ClCompile Include="src\plugin\PluginClientBase.cpp" /> |
| <ClCompile Include="src\plugin\PluginClientFactory.cpp" /> |
| <ClCompile Include="src\plugin\PluginConfiguration.cpp" /> |
| <ClCompile Include="src\plugin\PluginDebug.cpp" /> |
| - <ClCompile Include="src\plugin\PluginDictionary.cpp" /> |
| <ClCompile Include="src\plugin\PluginFilter.cpp" /> |
| <ClCompile Include="src\plugin\PluginHttpRequest.cpp" /> |
| <ClCompile Include="src\plugin\PluginIniFile.cpp" /> |
| <ClCompile Include="src\plugin\PluginIniFileW.cpp" /> |
| <ClCompile Include="src\plugin\PluginMimeFilterClient.cpp" /> |
| <ClCompile Include="src\plugin\PluginMutex.cpp" /> |
| <ClCompile Include="src\plugin\PluginSettings.cpp" /> |
| <ClCompile Include="src\plugin\PluginSha1.cpp" /> |
| @@ -724,16 +715,19 @@ xcopy /s /I /y /D "$(ProjectDir)html\*" |
| <ClCompile Include="src\plugin\PluginUtil.cpp" /> |
| <ClCompile Include="src\plugin\PluginWbPassThrough.cpp" /> |
| <ClCompile Include="src\shared\Communication.cpp"> |
| <PrecompiledHeader>NotUsing</PrecompiledHeader> |
| </ClCompile> |
| <ClCompile Include="src\shared\AutoHandle.cpp"> |
| <PrecompiledHeader>NotUsing</PrecompiledHeader> |
| </ClCompile> |
| + <ClCompile Include="src\shared\Dictionary.cpp"> |
| + <PrecompiledHeader>NotUsing</PrecompiledHeader> |
| + </ClCompile> |
| <ClCompile Include="src\shared\Utils.cpp"> |
| <PrecompiledHeader>NotUsing</PrecompiledHeader> |
| </ClCompile> |
| </ItemGroup> |
| <ItemGroup> |
| <ClInclude Include="src\plugin\abp.h" /> |
| <ClInclude Include="src\plugin\AdblockPlus.h" /> |
| <ClInclude Include="src\plugin\AdblockPlusClient.h" /> |
| @@ -746,17 +740,16 @@ xcopy /s /I /y /D "$(ProjectDir)html\*" |
| <ClInclude Include="src\plugin\PluginChecksum.h" /> |
| <ClInclude Include="src\plugin\PluginClass.h" /> |
| <ClInclude Include="src\plugin\PluginClient.h" /> |
| <ClInclude Include="src\plugin\PluginClientBase.h" /> |
| <ClInclude Include="src\plugin\PluginClientFactory.h" /> |
| <ClInclude Include="src\plugin\PluginConfiguration.h" /> |
| <ClInclude Include="src\plugin\PluginDebug.h" /> |
| <ClInclude Include="src\plugin\PluginDebugMacros.h" /> |
| - <ClInclude Include="src\plugin\PluginDictionary.h" /> |
| <ClInclude Include="src\plugin\PluginDomTraverser.h" /> |
| <ClInclude Include="src\plugin\PluginDomTraverserBase.h" /> |
| <ClInclude Include="src\plugin\PluginErrorCodes.h" /> |
| <ClInclude Include="src\plugin\PluginFilter.h" /> |
| <ClInclude Include="src\plugin\PluginHttpRequest.h" /> |
| <ClInclude Include="src\plugin\PluginIniFile.h" /> |
| <ClInclude Include="src\plugin\PluginIniFileW.h" /> |
| <ClInclude Include="src\plugin\PluginMimeFilterClient.h" /> |
| @@ -772,16 +765,17 @@ xcopy /s /I /y /D "$(ProjectDir)html\*" |
| <ClInclude Include="src\plugin\PluginUserSettings.h" /> |
| <ClInclude Include="src\plugin\PluginUtil.h" /> |
| <ClInclude Include="src\plugin\ProtocolCF.h" /> |
| <ClInclude Include="src\plugin\ProtocolImpl.h" /> |
| <ClInclude Include="src\plugin\BuildVariant.h" /> |
| <ClInclude Include="src\plugin\Resource.h" /> |
| <ClInclude Include="src\shared\AutoHandle.h" /> |
| <ClInclude Include="src\shared\Communication.h" /> |
| + <ClInclude Include="src\shared\Dictionary.h" /> |
| <ClInclude Include="src\shared\Utils.h" /> |
| <ClInclude Include="src\shared\Version.h" /> |
| </ItemGroup> |
| <ItemGroup> |
| <None Include="src\plugin\ProtocolCF.inl" /> |
| <None Include="src\plugin\ProtocolImpl.inl" /> |
| <None Include="src\plugin\AdblockPlus.rgs" /> |
| <None Include="src\plugin\AdblockPlus.def" /> |