Unified Diff: AdblockPlusEngine.vcxproj
Issue 10920006:
Expect MSI installers (Closed)
Patch Set:
Created June 10, 2013, 3:27 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
src/engine/Updater.cpp » ('j')
|
src/engine/Updater.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: AdblockPlusEngine.vcxproj |
| =================================================================== |
| --- a/AdblockPlusEngine.vcxproj |
| +++ b/AdblockPlusEngine.vcxproj |
| @@ -180,99 +180,99 @@ |
| <WarningLevel>Level3</WarningLevel> |
| <Optimization>Disabled</Optimization> |
| <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;ADBLOCK_PLUS_PRODUCTION_MODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> |
| </ClCompile> |
| <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;%(AdditionalDependencies)</AdditionalDependencies> |
| + <AdditionalDependencies>libadblockplus.lib;shlwapi.lib;user32.lib;v8_base.lib;v8_snapshot.lib;winhttp.lib;winmm.lib;ws2_32.lib;msi.lib;%(AdditionalDependencies)</AdditionalDependencies> |
|
Oleksandr
2013/06/10 16:47:56
Is there any reason why msi is included both stati
Wladimir Palant
2013/06/11 04:29:56
We need msi.lib to compile. We delay-load msi.dll
Felix Dahlke
2013/06/11 10:07:52
I don't get this. If it's statically linked, it's
Oleksandr
2013/06/11 10:24:49
Does it not compile if you remove msi.lib?
On 201
Wladimir Palant
2013/06/11 14:42:10
It isn't statically link - you cannot link a syste
|
| <OutputFile>$(ProjectDir)build\ia32\$(Configuration)\AdblockPlusEngine.exe</OutputFile> |
| - <DelayLoadDLLs>Shell32.dll</DelayLoadDLLs> |
| + <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> |
| <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> |
| </ClCompile> |
| <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;%(AdditionalDependencies)</AdditionalDependencies> |
| + <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</DelayLoadDLLs> |
| + <DelayLoadDLLs>Shell32.dll;Msi.dll</DelayLoadDLLs> |
| </Link> |
| </ItemDefinitionGroup> |
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Test|Win32'"> |
| <ClCompile> |
| <PrecompiledHeader>NotUsing</PrecompiledHeader> |
| <WarningLevel>Level3</WarningLevel> |
| <Optimization>Disabled</Optimization> |
| <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;ADBLOCK_PLUS_TEST_MODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> |
| </ClCompile> |
| <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;%(AdditionalDependencies)</AdditionalDependencies> |
| + <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</DelayLoadDLLs> |
| + <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> |
| <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> |
| </ClCompile> |
| <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;%(AdditionalDependencies)</AdditionalDependencies> |
| + <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</DelayLoadDLLs> |
| + <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> |
| <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> |
| </ClCompile> |
| <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;%(AdditionalDependencies)</AdditionalDependencies> |
| + <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</DelayLoadDLLs> |
| + <DelayLoadDLLs>Shell32.dll;Msi.dll</DelayLoadDLLs> |
| </Link> |
| </ItemDefinitionGroup> |
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Test|x64'"> |
| <ClCompile> |
| <PrecompiledHeader>NotUsing</PrecompiledHeader> |
| <WarningLevel>Level3</WarningLevel> |
| <Optimization>Disabled</Optimization> |
| <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;ADBLOCK_PLUS_TEST_MODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> |
| </ClCompile> |
| <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;%(AdditionalDependencies)</AdditionalDependencies> |
| + <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</DelayLoadDLLs> |
| + <DelayLoadDLLs>Shell32.dll;Msi.dll</DelayLoadDLLs> |
| </Link> |
| </ItemDefinitionGroup> |
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Production|Win32'"> |
| <ClCompile> |
| <WarningLevel>Level3</WarningLevel> |
| <PrecompiledHeader>NotUsing</PrecompiledHeader> |
| <Optimization>MaxSpeed</Optimization> |
| <FunctionLevelLinking>true</FunctionLevelLinking> |
| @@ -280,19 +280,19 @@ |
| <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;ADBLOCK_PLUS_PRODUCTION_MODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| <RuntimeLibrary>MultiThreaded</RuntimeLibrary> |
| </ClCompile> |
| <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;%(AdditionalDependencies)</AdditionalDependencies> |
| + <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</DelayLoadDLLs> |
| + <DelayLoadDLLs>Shell32.dll;Msi.dll</DelayLoadDLLs> |
| </Link> |
| </ItemDefinitionGroup> |
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Production|x64'"> |
| <ClCompile> |
| <WarningLevel>Level3</WarningLevel> |
| <PrecompiledHeader>NotUsing</PrecompiledHeader> |
| <Optimization>MaxSpeed</Optimization> |
| <FunctionLevelLinking>true</FunctionLevelLinking> |
| @@ -300,19 +300,19 @@ |
| <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;ADBLOCK_PLUS_PRODUCTION_MODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| <RuntimeLibrary>MultiThreaded</RuntimeLibrary> |
| </ClCompile> |
| <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;%(AdditionalDependencies)</AdditionalDependencies> |
| + <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</DelayLoadDLLs> |
| + <DelayLoadDLLs>Shell32.dll;Msi.dll</DelayLoadDLLs> |
| </Link> |
| </ItemDefinitionGroup> |
| <ItemGroup> |
| <ClCompile Include="src\engine\main.cpp" /> |
| <ClCompile Include="src\engine\Debug.cpp" /> |
| <ClCompile Include="src\engine\Updater.cpp" /> |
| <ClCompile Include="src\shared\Communication.cpp" /> |
| <ClCompile Include="src\shared\AutoHandle.cpp" /> |
« no previous file with comments
|
« no previous file
|
src/engine/Updater.cpp » ('j')
|
src/engine/Updater.cpp » ('J')
