diff options
| author | Koushik Dutta <koushd@gmail.com> | 2013-08-14 10:01:22 -0700 |
|---|---|---|
| committer | Koushik Dutta <koushd@gmail.com> | 2013-08-14 10:01:22 -0700 |
| commit | 49a02b8c916e8ef011d9f56901d208eca626b85b (patch) | |
| tree | 1148a42ede0e6661854b8f92d4bbe52a4290d02b /heimdall/heimdall.vcxproj | |
| parent | c82df274ecea32cd6528f070a21528bf80a2f466 (diff) | |
| parent | f95619028fa5c80284e6ade2ced7772e41040424 (diff) | |
| download | external_heimdall-49a02b8c916e8ef011d9f56901d208eca626b85b.zip external_heimdall-49a02b8c916e8ef011d9f56901d208eca626b85b.tar.gz external_heimdall-49a02b8c916e8ef011d9f56901d208eca626b85b.tar.bz2 | |
Merge remote-tracking branch 'bd/master' into cm-10.2
Conflicts:
Linux/README
OSX/README.txt
heimdall-frontend/doc-pak/README
heimdall/doc-pak/README
Change-Id: Ib5867d7a2be030290a3896ab82fe48a7f0a97e63
Diffstat (limited to 'heimdall/heimdall.vcxproj')
| -rw-r--r-- | heimdall/heimdall.vcxproj | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/heimdall/heimdall.vcxproj b/heimdall/heimdall.vcxproj index 790b909..558dcd7 100644 --- a/heimdall/heimdall.vcxproj +++ b/heimdall/heimdall.vcxproj @@ -68,10 +68,10 @@ <SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>libusb-1.0.lib;libpit.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(SolutionDir)libusbx-1.0\lib\$(Platform)\Release\;$(SolutionDir)$(Platform)\$(Configuration)\lib\</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(SolutionDir)libusbx-1.0\lib\$(Platform)\$(Configuration)\;$(SolutionDir)$(Platform)\$(Configuration)\lib\</AdditionalLibraryDirectories>
</Link>
<PostBuildEvent>
- <Command>xcopy /y $(SolutionDir)libusbx-1.0\lib\$(Platform)\Release\libusb-1.0.dll $(SolutionDir)$(Platform)\$(Configuration)\</Command>
+ <Command>xcopy /y $(SolutionDir)libusbx-1.0\lib\$(Platform)\$(Configuration)\libusb-1.0.dll $(SolutionDir)$(Platform)\$(Configuration)\</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -95,7 +95,7 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>libusb-1.0.lib;libpit.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(SolutionDir)libusbx-1.0\lib\$(Platform)\Release\;$(SolutionDir)$(Platform)\$(Configuration)\lib\</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(SolutionDir)libusbx-1.0\lib\$(Platform)\$(Configuration)\;$(SolutionDir)$(Platform)\$(Configuration)\lib\</AdditionalLibraryDirectories>
</Link>
<PostBuildEvent>
<Command>xcopy /y $(SolutionDir)libusbx-1.0\lib\$(Platform)\$(Configuration)\libusb-1.0.dll $(SolutionDir)$(Platform)\$(Configuration)\</Command>
@@ -109,7 +109,6 @@ <ClInclude Include="source\ClosePcScreenAction.h" />
<ClInclude Include="source\DetectAction.h" />
<ClInclude Include="source\DownloadPitAction.h" />
- <ClInclude Include="source\DumpAction.h" />
<ClInclude Include="source\FlashAction.h" />
<ClInclude Include="source\HelpAction.h" />
<ClInclude Include="source\InfoAction.h" />
@@ -151,7 +150,6 @@ <ClCompile Include="source\ClosePcScreenAction.cpp" />
<ClCompile Include="source\DetectAction.cpp" />
<ClCompile Include="source\DownloadPitAction.cpp" />
- <ClCompile Include="source\DumpAction.cpp" />
<ClCompile Include="source\FlashAction.cpp" />
<ClCompile Include="source\HelpAction.cpp" />
<ClCompile Include="source\InfoAction.cpp" />
|