Unified Diff: AdblockPlusDeveloperInstall.vcxproj
Issue 10952045:
Developer installation from within Visual Studio (Closed)
Patch Set: Took UAC out of the build loop
Created June 19, 2013, 4:54 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
BHO_add.reg » ('j')
|
Makefile.DevInstall » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: AdblockPlusDeveloperInstall.vcxproj |
| =================================================================== |
| --- a/AdblockPlusDeveloperInstall.vcxproj |
| +++ b/AdblockPlusDeveloperInstall.vcxproj |
| @@ -41,6 +41,8 @@ |
| </ProjectConfiguration> |
| </ItemGroup> |
| <ItemGroup> |
| + <None Include="BHO_add.reg" /> |
| + <None Include="BHO_remove.reg" /> |
| <None Include="Makefile.DevInstall" /> |
| </ItemGroup> |
| <PropertyGroup Label="Globals"> |
| @@ -102,69 +104,68 @@ |
| </PropertyGroup> |
| <PropertyGroup Condition="'$(Platform)'=='x64'"> |
| <OutDir>$(ProjectDir)build\x64\$(Configuration)\</OutDir> |
| - <OutDir32>$(ProjectDir)build\ia32\$(Configuration)\</OutDir32> |
| - <NMakeMacros>$(NMakeMacros) OutDir="$(OutDir)\" DLL="$(OutDir)AdblockPlusx64.dll" DLL32="$(OutDir32)AdblockPlus.dll"</NMakeMacros> |
| + <NMakeMacros>$(NMakeMacros) OutDir="$(OutDir)\" DLL="$(OutDir)AdblockPlusx64.dll"</NMakeMacros> |
| </PropertyGroup> |
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Production|Win32'"> |
| - <NMakeBuildCommandLine>nmake -nologo -f Makefile.DevInstall build $(NMakeMacros)</NMakeBuildCommandLine> |
| - <NMakeCleanCommandLine>nmake -nologo -f Makefile.DevInstall clean $(NMakeMacros)</NMakeCleanCommandLine> |
| - <NMakeReBuildCommandLine>nmake -nologo -f Makefile.DevInstall rebuild $(NMakeMacros)</NMakeReBuildCommandLine> |
| + <NMakeBuildCommandLine>nmake -nologo -f Makefile.DevInstall build32 $(NMakeMacros)</NMakeBuildCommandLine> |
| + <NMakeCleanCommandLine>nmake -nologo -f Makefile.DevInstall clean32 $(NMakeMacros)</NMakeCleanCommandLine> |
| + <NMakeReBuildCommandLine>nmake -nologo -f Makefile.DevInstall rebuild32 $(NMakeMacros)</NMakeReBuildCommandLine> |
| <NMakePreprocessorDefinitions>WIN32;$(NMakePreprocessorDefinitions);_DEBUG</NMakePreprocessorDefinitions> |
| <OutDir>$(ProjectDir)build\ia32\$(Configuration)\</OutDir> |
| <IntDir>$(ProjectDir)build\ia32\$(Configuration)\</IntDir> |
| </PropertyGroup> |
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Production|x64'"> |
| - <NMakeBuildCommandLine>nmake -nologo -f Makefile.DevInstall build $(NMakeMacros)</NMakeBuildCommandLine> |
| - <NMakeCleanCommandLine>nmake -nologo -f Makefile.DevInstall clean $(NMakeMacros)</NMakeCleanCommandLine> |
| - <NMakeReBuildCommandLine>nmake -nologo -f Makefile.DevInstall rebuild $(NMakeMacros)</NMakeReBuildCommandLine> |
| + <NMakeBuildCommandLine>nmake -nologo -f Makefile.DevInstall build64 $(NMakeMacros)</NMakeBuildCommandLine> |
| + <NMakeCleanCommandLine>nmake -nologo -f Makefile.DevInstall clean64 $(NMakeMacros)</NMakeCleanCommandLine> |
| + <NMakeReBuildCommandLine>nmake -nologo -f Makefile.DevInstall rebuild64 $(NMakeMacros)</NMakeReBuildCommandLine> |
| <NMakePreprocessorDefinitions>WIN32;$(NMakePreprocessorDefinitions);_DEBUG</NMakePreprocessorDefinitions> |
| <OutDir>$(ProjectDir)build\x64\$(Configuration)\</OutDir> |
| <IntDir>$(ProjectDir)build\x64\$(Configuration)\</IntDir> |
| </PropertyGroup> |
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Test|Win32'"> |
| - <NMakeBuildCommandLine>nmake -nologo -f Makefile.DevInstall build $(NMakeMacros)</NMakeBuildCommandLine> |
| - <NMakeCleanCommandLine>nmake -nologo -f Makefile.DevInstall clean $(NMakeMacros)</NMakeCleanCommandLine> |
| - <NMakeReBuildCommandLine>nmake -nologo -f Makefile.DevInstall rebuild $(NMakeMacros)</NMakeReBuildCommandLine> |
| + <NMakeBuildCommandLine>nmake -nologo -f Makefile.DevInstall build32 $(NMakeMacros)</NMakeBuildCommandLine> |
| + <NMakeCleanCommandLine>nmake -nologo -f Makefile.DevInstall clean32 $(NMakeMacros)</NMakeCleanCommandLine> |
| + <NMakeReBuildCommandLine>nmake -nologo -f Makefile.DevInstall rebuild32 $(NMakeMacros)</NMakeReBuildCommandLine> |
| <NMakePreprocessorDefinitions>WIN32;$(NMakePreprocessorDefinitions);_DEBUG</NMakePreprocessorDefinitions> |
| <OutDir>$(ProjectDir)build\ia32\$(Configuration)\</OutDir> |
| <IntDir>$(ProjectDir)build\ia32\$(Configuration)\</IntDir> |
| </PropertyGroup> |
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Test|x64'"> |
| - <NMakeBuildCommandLine>nmake -nologo -f Makefile.DevInstall build $(NMakeMacros)</NMakeBuildCommandLine> |
| - <NMakeCleanCommandLine>nmake -nologo -f Makefile.DevInstall clean $(NMakeMacros)</NMakeCleanCommandLine> |
| - <NMakeReBuildCommandLine>nmake -nologo -f Makefile.DevInstall rebuild $(NMakeMacros)</NMakeReBuildCommandLine> |
| + <NMakeBuildCommandLine>nmake -nologo -f Makefile.DevInstall build64 $(NMakeMacros)</NMakeBuildCommandLine> |
| + <NMakeCleanCommandLine>nmake -nologo -f Makefile.DevInstall clean64 $(NMakeMacros)</NMakeCleanCommandLine> |
| + <NMakeReBuildCommandLine>nmake -nologo -f Makefile.DevInstall rebuild64 $(NMakeMacros)</NMakeReBuildCommandLine> |
| <NMakePreprocessorDefinitions>WIN32;$(NMakePreprocessorDefinitions);_DEBUG</NMakePreprocessorDefinitions> |
| <OutDir>$(ProjectDir)build\x64\$(Configuration)\</OutDir> |
| <IntDir>$(ProjectDir)build\x64\$(Configuration)\</IntDir> |
| </PropertyGroup> |
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Production|Win32'"> |
| - <NMakeBuildCommandLine>nmake -nologo -f Makefile.DevInstall build $(NMakeMacros)</NMakeBuildCommandLine> |
| - <NMakeCleanCommandLine>nmake -nologo -f Makefile.DevInstall clean $(NMakeMacros)</NMakeCleanCommandLine> |
| - <NMakeReBuildCommandLine>nmake -nologo -f Makefile.DevInstall rebuild $(NMakeMacros)</NMakeReBuildCommandLine> |
| + <NMakeBuildCommandLine>nmake -nologo -f Makefile.DevInstall build32 $(NMakeMacros)</NMakeBuildCommandLine> |
| + <NMakeCleanCommandLine>nmake -nologo -f Makefile.DevInstall clean32 $(NMakeMacros)</NMakeCleanCommandLine> |
| + <NMakeReBuildCommandLine>nmake -nologo -f Makefile.DevInstall rebuild32 $(NMakeMacros)</NMakeReBuildCommandLine> |
| <NMakePreprocessorDefinitions>WIN32;$(NMakePreprocessorDefinitions);NDEBUG</NMakePreprocessorDefinitions> |
| <OutDir>$(ProjectDir)build\ia32\$(Configuration)\</OutDir> |
| <IntDir>$(ProjectDir)build\ia32\$(Configuration)\</IntDir> |
| </PropertyGroup> |
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Production|x64'"> |
| - <NMakeBuildCommandLine>nmake -nologo -f Makefile.DevInstall build $(NMakeMacros)</NMakeBuildCommandLine> |
| - <NMakeCleanCommandLine>nmake -nologo -f Makefile.DevInstall clean $(NMakeMacros)</NMakeCleanCommandLine> |
| - <NMakeReBuildCommandLine>nmake -nologo -f Makefile.DevInstall rebuild $(NMakeMacros)</NMakeReBuildCommandLine> |
| + <NMakeBuildCommandLine>nmake -nologo -f Makefile.DevInstall build64 $(NMakeMacros)</NMakeBuildCommandLine> |
| + <NMakeCleanCommandLine>nmake -nologo -f Makefile.DevInstall clean64 $(NMakeMacros)</NMakeCleanCommandLine> |
| + <NMakeReBuildCommandLine>nmake -nologo -f Makefile.DevInstall rebuild64 $(NMakeMacros)</NMakeReBuildCommandLine> |
| <NMakePreprocessorDefinitions>WIN32;$(NMakePreprocessorDefinitions);NDEBUG</NMakePreprocessorDefinitions> |
| <OutDir>$(ProjectDir)build\x64\$(Configuration)\</OutDir> |
| <IntDir>$(ProjectDir)build\x64\$(Configuration)\</IntDir> |
| </PropertyGroup> |
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Test|Win32'"> |
| - <NMakeBuildCommandLine>nmake -nologo -f Makefile.DevInstall build $(NMakeMacros)</NMakeBuildCommandLine> |
| - <NMakeCleanCommandLine>nmake -nologo -f Makefile.DevInstall clean $(NMakeMacros)</NMakeCleanCommandLine> |
| - <NMakeReBuildCommandLine>nmake -nologo -f Makefile.DevInstall rebuild $(NMakeMacros)</NMakeReBuildCommandLine> |
| + <NMakeBuildCommandLine>nmake -nologo -f Makefile.DevInstall build32 $(NMakeMacros)</NMakeBuildCommandLine> |
| + <NMakeCleanCommandLine>nmake -nologo -f Makefile.DevInstall clean32 $(NMakeMacros)</NMakeCleanCommandLine> |
| + <NMakeReBuildCommandLine>nmake -nologo -f Makefile.DevInstall rebuild 32$(NMakeMacros)</NMakeReBuildCommandLine> |
|
Wladimir Palant
2013/06/20 07:10:38
Space at the wrong place?
Eric
2013/06/20 14:13:47
Yes.
|
| <NMakePreprocessorDefinitions>WIN32;$(NMakePreprocessorDefinitions);NDEBUG</NMakePreprocessorDefinitions> |
| <OutDir>$(ProjectDir)build\ia32\$(Configuration)\</OutDir> |
| <IntDir>$(ProjectDir)build\ia32\$(Configuration)\</IntDir> |
| </PropertyGroup> |
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Test|x64'"> |
| - <NMakeBuildCommandLine>nmake -nologo -f Makefile.DevInstall build $(NMakeMacros)</NMakeBuildCommandLine> |
| - <NMakeCleanCommandLine>nmake -nologo -f Makefile.DevInstall clean $(NMakeMacros)</NMakeCleanCommandLine> |
| - <NMakeReBuildCommandLine>nmake -nologo -f Makefile.DevInstall rebuild $(NMakeMacros)</NMakeReBuildCommandLine> |
| + <NMakeBuildCommandLine>nmake -nologo -f Makefile.DevInstall build64 $(NMakeMacros)</NMakeBuildCommandLine> |
| + <NMakeCleanCommandLine>nmake -nologo -f Makefile.DevInstall clean64 $(NMakeMacros)</NMakeCleanCommandLine> |
| + <NMakeReBuildCommandLine>nmake -nologo -f Makefile.DevInstall rebuild64 $(NMakeMacros)</NMakeReBuildCommandLine> |
| <NMakePreprocessorDefinitions>WIN32;$(NMakePreprocessorDefinitions);NDEBUG</NMakePreprocessorDefinitions> |
| <OutDir>$(ProjectDir)build\x64\$(Configuration)\</OutDir> |
| <IntDir>$(ProjectDir)build\x64\$(Configuration)\</IntDir> |
« no previous file with comments
|
« no previous file
|
BHO_add.reg » ('j')
|
Makefile.DevInstall » ('J')
