<Tool\r
Name="VCCLCompilerTool"\r
Optimization="0"\r
- AdditionalIncludeDirectories=""$InputDir";../../ext/ResizableLib;../Git;"../../ext/apr-util/include";"../../ext/apr-util/xml/expat/lib";../../ext/Subversion/subversion/include;../../ext/Subversion/subversion/libsvn_client;../../ext/apr/include;../../ext/boost;..\TortoiseProc;..\Utils;..\SVN;..\..\ext\ResizableLib;..\crashrpt;"..\..\ext\libintl\libintl3-win32\inc";..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;"../../ext/cyrus-sasl/include";../../../common/openssl/inc32;.\RevisionGraph"\r
+ AdditionalIncludeDirectories="..\TortoiseProc;..\Resources;"$InputDir";../../ext/ResizableLib;../Git;"../../ext/apr-util/include";"../../ext/apr-util/xml/expat/lib";../../ext/Subversion/subversion/include;../../ext/Subversion/subversion/libsvn_client;../../ext/apr/include;../../ext/boost;..\Utils;..\SVN;..\..\ext\ResizableLib;..\crashrpt;"..\..\ext\libintl\libintl3-win32\inc";..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;"../../ext/cyrus-sasl/include";../../../common/openssl/inc32;.\RevisionGraph;..\TortoiseShell"\r
PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;SVN_DEBUG;ENABLE_NLS;THESAURUS"\r
MinimalRebuild="true"\r
ExceptionHandling="2"\r
Optimization="1"\r
InlineFunctionExpansion="1"\r
FavorSizeOrSpeed="2"\r
- AdditionalIncludeDirectories=""$InputDir";../../ext/ResizableLib;../Git;"../../ext/apr-util/include";"../../ext/apr-util/xml/expat/lib";../../ext/Subversion/subversion/include;../../ext/Subversion/subversion/libsvn_client;../../ext/apr/include;../../ext/boost;..\TortoiseProc;..\Utils;..\SVN;..\..\ext\ResizableLib;..\crashrpt;"..\..\ext\libintl\libintl3-win32\inc";..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;"../../ext/cyrus-sasl/include";../../../common/openssl/inc32;.\RevisionGraph"\r
+ AdditionalIncludeDirectories="..\TortoiseProc;..\Resources;"$InputDir";../../ext/ResizableLib;../Git;"../../ext/apr-util/include";"../../ext/apr-util/xml/expat/lib";../../ext/Subversion/subversion/include;../../ext/Subversion/subversion/libsvn_client;../../ext/apr/include;../../ext/boost;..\Utils;..\SVN;..\..\ext\ResizableLib;..\crashrpt;"..\..\ext\libintl\libintl3-win32\inc";..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;"../../ext/cyrus-sasl/include";../../../common/openssl/inc32;.\RevisionGraph;..\TortoiseShell"\r
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;THESAURUS"\r
StringPooling="true"\r
MinimalRebuild="false"\r
<Tool\r
Name="VCCLCompilerTool"\r
Optimization="0"\r
- AdditionalIncludeDirectories=""$InputDir";../../ext/ResizableLib;../Git;"../../ext/apr-util/include";"../../ext/apr-util/xml/expat/lib";../../ext/Subversion/subversion/include;../../ext/Subversion/subversion/libsvn_client;../../ext/apr/include;../../ext/boost;..\TortoiseProc;..\Utils;..\SVN;..\..\ext\ResizableLib;..\crashrpt;"..\..\ext\libintl\libintl3-win32\inc";..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;"../../ext/cyrus-sasl/include";../../../common/openssl/inc32;.\RevisionGraph"\r
+ AdditionalIncludeDirectories="..\TortoiseProc;..\Resources;"$InputDir";../../ext/ResizableLib;../Git;"../../ext/apr-util/include";"../../ext/apr-util/xml/expat/lib";../../ext/Subversion/subversion/include;../../ext/Subversion/subversion/libsvn_client;../../ext/apr/include;../../ext/boost;..\Utils;..\SVN;..\..\ext\ResizableLib;..\crashrpt;"..\..\ext\libintl\libintl3-win32\inc";..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;"../../ext/cyrus-sasl/include";../../../common/openssl/inc32;.\RevisionGraph;..\TortoiseShell"\r
PreprocessorDefinitions="WIN64;_WINDOWS;_DEBUG;SVN_DEBUG;ENABLE_NLS;THESAURUS"\r
MinimalRebuild="true"\r
ExceptionHandling="2"\r
Name="VCLinkerTool"\r
AdditionalDependencies="Crypt32.lib gdiplus.lib shfolder.lib shell32.lib comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib wininet.lib version.lib"\r
LinkIncremental="2"\r
- IgnoreDefaultLibraryNames="shell32;msvcrt.lib"\r
+ IgnoreDefaultLibraryNames="libcd.lib;libc;shell32;LIBCMT"\r
DelayLoadDLLs="gdiplus.dll"\r
GenerateDebugInformation="true"\r
SubSystem="2"\r
Optimization="1"\r
InlineFunctionExpansion="1"\r
FavorSizeOrSpeed="2"\r
- AdditionalIncludeDirectories=""$InputDir";../../ext/ResizableLib;../Git;"../../ext/apr-util/include";"../../ext/apr-util/xml/expat/lib";../../ext/Subversion/subversion/include;../../ext/Subversion/subversion/libsvn_client;../../ext/apr/include;../../ext/boost;..\TortoiseProc;..\Utils;..\SVN;..\..\ext\ResizableLib;..\crashrpt;"..\..\ext\libintl\libintl3-win32\inc";..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;"../../ext/cyrus-sasl/include";../../../common/openssl/inc32;.\RevisionGraph"\r
+ AdditionalIncludeDirectories="..\TortoiseProc;..\Resources;"$InputDir";../../ext/ResizableLib;../Git;"../../ext/apr-util/include";"../../ext/apr-util/xml/expat/lib";../../ext/Subversion/subversion/include;../../ext/Subversion/subversion/libsvn_client;../../ext/apr/include;../../ext/boost;..\Utils;..\SVN;..\..\ext\ResizableLib;..\crashrpt;"..\..\ext\libintl\libintl3-win32\inc";..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;"../../ext/cyrus-sasl/include";../../../common/openssl/inc32;.\RevisionGraph;..\TortoiseShell"\r
PreprocessorDefinitions="WIN64;_WINDOWS;NDEBUG;THESAURUS"\r
StringPooling="true"\r
MinimalRebuild="false"\r
Name="VCLinkerTool"\r
AdditionalDependencies="Crypt32.lib gdiplus.lib shfolder.lib shell32.lib comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib wininet.lib version.lib"\r
LinkIncremental="1"\r
- IgnoreDefaultLibraryNames="libcd.lib;libc;shell32;"\r
+ IgnoreDefaultLibraryNames="libcd.lib;libc;shell32;LIBCMT"\r
DelayLoadDLLs="gdiplus.dll"\r
GenerateDebugInformation="true"\r
SubSystem="2"\r
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;h;hpp;hxx;hm;inl;inc"\r
>\r
<File\r
+ RelativePath="..\TGitCache\CacheInterface.cpp"\r
+ >\r
+ </File>\r
+ <File\r
RelativePath=".\ProjectProperties.cpp"\r
>\r
</File>\r
RelativePath=".\AppUtils.cpp"\r
>\r
</File>\r
- <File\r
- RelativePath=".\Colors.cpp"\r
- >\r
- </File>\r
</Filter>\r
<Filter\r
Name="UI"\r
>\r
<File\r
+ RelativePath=".\Colors.cpp"\r
+ >\r
+ </File>\r
+ <File\r
RelativePath="..\Utils\MiscUI\SciEdit.cpp"\r
>\r
</File>\r
>\r
</File>\r
<File\r
- RelativePath=".\explorer.ico"\r
+ RelativePath="..\Resources\explorer.ico"\r
>\r
</File>\r
<File\r
- RelativePath="..\Resources\explorer.ico"\r
+ RelativePath=".\explorer.ico"\r
>\r
</File>\r
<File\r
>\r
</File>\r
<File\r
- RelativePath=".\newfolder.ico"\r
+ RelativePath="..\Resources\newfolder.ico"\r
>\r
</File>\r
<File\r
- RelativePath="..\Resources\newfolder.ico"\r
+ RelativePath=".\newfolder.ico"\r
>\r
</File>\r
<File\r
- RelativePath=".\open.ico"\r
+ RelativePath="..\Resources\open.ico"\r
>\r
</File>\r
<File\r
- RelativePath="..\Resources\open.ico"\r
+ RelativePath=".\open.ico"\r
>\r
</File>\r
<File\r
>\r
</File>\r
<File\r
- RelativePath=".\save.ico"\r
+ RelativePath="..\Resources\save.ico"\r
>\r
</File>\r
<File\r
- RelativePath="..\Resources\save.ico"\r
+ RelativePath=".\save.ico"\r
>\r
</File>\r
<File\r
- RelativePath=".\saveas.ico"\r
+ RelativePath="..\Resources\saveas.ico"\r
>\r
</File>\r
<File\r
- RelativePath="..\Resources\saveas.ico"\r
+ RelativePath=".\saveas.ico"\r
>\r
</File>\r
<File\r
>\r
</File>\r
<File\r
- RelativePath=".\up.ico"\r
+ RelativePath="..\Resources\up.ico"\r
>\r
</File>\r
<File\r
- RelativePath="..\Resources\up.ico"\r
+ RelativePath=".\up.ico"\r
>\r
</File>\r
<File\r
Name="Log"\r
>\r
<File\r
- RelativePath=".\GitLogList.cpp"\r
+ RelativePath=".\GitLogList.h"\r
>\r
</File>\r
<File\r
- RelativePath=".\GitLogList.h"\r
+ RelativePath=".\GitLogListAction.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\GitLogListBase.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\GitLogListBase.h"\r
>\r
</File>\r
<File\r
</File>\r
</Filter>\r
<Filter\r
- Name="PrevDiff"\r
- >\r
- <File\r
- RelativePath=".\Commands\PrevDiffCommand.cpp"\r
- >\r
- </File>\r
- <File\r
- RelativePath=".\Commands\PrevDiffCommand.h"\r
- >\r
- </File>\r
- </Filter>\r
- <Filter\r
Name="Rename"\r
>\r
<File\r
</File>\r
</Filter>\r
<Filter\r
- Name="Switch"\r
- >\r
- <File\r
- RelativePath=".\GitSwitchDlg.cpp"\r
- >\r
- </File>\r
- <File\r
- RelativePath=".\GitSwitchDlg.h"\r
- >\r
- </File>\r
- <File\r
- RelativePath=".\Commands\SwitchCommand.cpp"\r
- >\r
- </File>\r
- <File\r
- RelativePath=".\Commands\SwitchCommand.h"\r
- >\r
- </File>\r
- </Filter>\r
- <Filter\r
Name="Clone"\r
>\r
<File\r
>\r
</File>\r
<File\r
- RelativePath=".\Settings\SetHooks.cpp"\r
- >\r
- </File>\r
- <File\r
- RelativePath=".\Settings\SetHooks.h"\r
- >\r
- </File>\r
- <File\r
- RelativePath=".\Settings\SetHooksAdv.cpp"\r
- >\r
- </File>\r
- <File\r
- RelativePath=".\Settings\SetHooksAdv.h"\r
- >\r
- </File>\r
- <File\r
- RelativePath=".\Settings\SetLogCache.cpp"\r
- >\r
- </File>\r
- <File\r
- RelativePath=".\Settings\SetLogCache.h"\r
- >\r
- </File>\r
- <File\r
RelativePath=".\Settings\SetLookAndFeelPage.cpp"\r
>\r
</File>\r
>\r
</File>\r
<File\r
+ RelativePath=".\Settings\SettingsColors2.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\Settings\SettingsColors2.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\Settings\SettingsColors3.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\Settings\SettingsColors3.h"\r
+ >\r
+ </File>\r
+ <File\r
RelativePath=".\Commands\SettingsCommand.cpp"\r
>\r
</File>\r
>\r
</File>\r
<File\r
- RelativePath=".\Settings\SettingsLogCaches.cpp"\r
+ RelativePath=".\Settings\SettingsPropPage.cpp"\r
>\r
</File>\r
<File\r
- RelativePath=".\Settings\SettingsLogCaches.h"\r
+ RelativePath=".\Settings\SettingsPropPage.h"\r
>\r
</File>\r
<File\r
- RelativePath=".\Settings\SettingsProgsDiff.cpp"\r
+ RelativePath=".\Settings\SettingsRevisionGraph.cpp"\r
>\r
</File>\r
<File\r
- RelativePath=".\Settings\SettingsProgsDiff.h"\r
+ RelativePath=".\Settings\SettingsRevisionGraph.h"\r
>\r
</File>\r
<File\r
- RelativePath=".\Settings\SettingsProgsMerge.cpp"\r
+ RelativePath=".\Settings\SettingsTBlame.cpp"\r
>\r
</File>\r
<File\r
- RelativePath=".\Settings\SettingsProgsMerge.h"\r
+ RelativePath=".\Settings\SettingsTBlame.h"\r
>\r
</File>\r
<File\r
- RelativePath=".\Settings\SettingsProgsUniDiff.cpp"\r
+ RelativePath=".\Settings\ToolAssocDlg.cpp"\r
>\r
</File>\r
<File\r
- RelativePath=".\Settings\SettingsProgsUniDiff.h"\r
+ RelativePath=".\Settings\ToolAssocDlg.h"\r
>\r
</File>\r
+ </Filter>\r
+ <Filter\r
+ Name="Switch"\r
+ >\r
<File\r
- RelativePath=".\Settings\SettingsPropPage.cpp"\r
+ RelativePath=".\GitSwitchDlg.cpp"\r
>\r
</File>\r
<File\r
- RelativePath=".\Settings\SettingsPropPage.h"\r
+ RelativePath=".\GitSwitchDlg.h"\r
>\r
</File>\r
<File\r
- RelativePath=".\Settings\SettingsRevisionGraph.cpp"\r
+ RelativePath=".\Commands\SwitchCommand.cpp"\r
>\r
</File>\r
<File\r
- RelativePath=".\Settings\SettingsRevisionGraph.h"\r
+ RelativePath=".\Commands\SwitchCommand.h"\r
>\r
</File>\r
+ </Filter>\r
+ <Filter\r
+ Name="PrevDiff"\r
+ >\r
<File\r
- RelativePath=".\Settings\SettingsTBlame.cpp"\r
+ RelativePath=".\Commands\PrevDiffCommand.cpp"\r
>\r
</File>\r
<File\r
- RelativePath=".\Settings\SettingsTBlame.h"\r
+ RelativePath=".\Commands\PrevDiffCommand.h"\r
>\r
</File>\r
+ </Filter>\r
+ <Filter\r
+ Name="Diff"\r
+ >\r
<File\r
- RelativePath=".\Settings\ToolAssocDlg.cpp"\r
+ RelativePath=".\Commands\DiffCommand.cpp"\r
>\r
</File>\r
<File\r
- RelativePath=".\Settings\ToolAssocDlg.h"\r
+ RelativePath=".\Commands\DiffCommand.h"\r
+ >\r
+ </File>\r
+ </Filter>\r
+ <Filter\r
+ Name="Compare"\r
+ >\r
+ <File\r
+ RelativePath=".\Commands\ShowCompareCommand.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\Commands\ShowCompareCommand.h"\r
+ >\r
+ </File>\r
+ </Filter>\r
+ <Filter\r
+ Name="Conflict"\r
+ >\r
+ <File\r
+ RelativePath=".\Commands\ConflictEditorCommand.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\Commands\ConflictEditorCommand.h"\r
>\r
</File>\r
</Filter>\r
>\r
</File>\r
<File\r
+ RelativePath=".\ResetDlg.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\ResetDlg.h"\r
+ >\r
+ </File>\r
+ <File\r
RelativePath=".\StatGraphDlg.cpp"\r
>\r
</File>\r
RelativePath=".\SwitchDlg.h"\r
>\r
</File>\r
- <Filter\r
- Name="Compare"\r
- >\r
- <File\r
- RelativePath=".\Commands\ShowCompareCommand.cpp"\r
- >\r
- </File>\r
- <File\r
- RelativePath=".\Commands\ShowCompareCommand.h"\r
- >\r
- </File>\r
- </Filter>\r
- </Filter>\r
- <Filter\r
- Name="Diff"\r
- >\r
- <File\r
- RelativePath=".\Commands\DiffCommand.cpp"\r
- >\r
- </File>\r
- <File\r
- RelativePath=".\Commands\DiffCommand.h"\r
- >\r
- </File>\r
</Filter>\r
<File\r
RelativePath="Resource.h"\r