<Tool\r
Name="VCCLCompilerTool"\r
Optimization="0"\r
- AdditionalIncludeDirectories="..\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;..\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;..\TortoiseShell"\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
UsePrecompiledHeader="2"\r
WarningLevel="4"\r
DebugInformationFormat="4"\r
+ DisableSpecificWarnings="4996,4018"\r
/>\r
<Tool\r
Name="VCManagedResourceCompilerTool"\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="libcd.lib;libc;shell32;LIBCMTD;"\r
+ AdditionalLibraryDirectories=""\r
+ IgnoreDefaultLibraryNames=""\r
DelayLoadDLLs="gdiplus.dll"\r
GenerateDebugInformation="true"\r
SubSystem="2"\r
/>\r
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="1"\r
- InlineFunctionExpansion="1"\r
- FavorSizeOrSpeed="2"\r
- AdditionalIncludeDirectories="..\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;..\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;..\TortoiseShell"\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
UsePrecompiledHeader="2"\r
WarningLevel="4"\r
DebugInformationFormat="3"\r
+ DisableSpecificWarnings="4996,4018"\r
/>\r
<Tool\r
Name="VCManagedResourceCompilerTool"\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;LIBCMT"\r
+ AdditionalLibraryDirectories="../../ext/wingit"\r
+ IgnoreDefaultLibraryNames=""\r
DelayLoadDLLs="gdiplus.dll"\r
GenerateDebugInformation="true"\r
SubSystem="2"\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=""\r
DelayLoadDLLs="gdiplus.dll"\r
GenerateDebugInformation="true"\r
SubSystem="2"\r
/>\r
<Tool\r
Name="VCCLCompilerTool"\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=""\r
DelayLoadDLLs="gdiplus.dll"\r
GenerateDebugInformation="true"\r
SubSystem="2"\r
>\r
</File>\r
<File\r
+ RelativePath=".\LogFile.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\LogFile.h"\r
+ >\r
+ </File>\r
+ <File\r
RelativePath=".\ProjectProperties.cpp"\r
>\r
</File>\r
RelativePath=".\AppUtils.cpp"\r
>\r
</File>\r
+ <File\r
+ RelativePath=".\DeleteConflictDlg.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\DeleteConflictDlg.h"\r
+ >\r
+ </File>\r
</Filter>\r
<Filter\r
Name="UI"\r
Name="Log"\r
>\r
<File\r
+ RelativePath=".\GitLogCache.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\gitlogcache.h"\r
+ >\r
+ </File>\r
+ <File\r
RelativePath=".\GitLogList.h"\r
>\r
</File>\r
</File>\r
</Filter>\r
<Filter\r
- Name="Rename"\r
+ Name="RefLog"\r
>\r
<File\r
- RelativePath=".\Commands\RenameCommand.cpp"\r
+ RelativePath=".\Commands\RefLogCommand.cpp"\r
>\r
</File>\r
<File\r
- RelativePath=".\Commands\RenameCommand.h"\r
+ RelativePath=".\Commands\RefLogCommand.h"\r
>\r
</File>\r
<File\r
- RelativePath=".\RenameDlg.cpp"\r
+ RelativePath=".\RefLogDlg.cpp"\r
>\r
</File>\r
<File\r
- RelativePath=".\RenameDlg.h"\r
+ RelativePath=".\RefLogDlg.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\RefLoglist.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\RefLoglist.h"\r
>\r
</File>\r
</Filter>\r
<Filter\r
- Name="ReposStatus"\r
+ Name="Submodule"\r
>\r
<File\r
- RelativePath=".\Commands\RepoStatusCommand.cpp"\r
+ RelativePath=".\SubmoduleAddDlg.cpp"\r
>\r
</File>\r
<File\r
- RelativePath=".\Commands\RepoStatusCommand.h"\r
+ RelativePath=".\SubmoduleAddDlg.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\Commands\SubmoduleCommand.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\Commands\SubmoduleCommand.h"\r
+ >\r
+ </File>\r
+ </Filter>\r
+ <Filter\r
+ Name="Rename"\r
+ >\r
+ <File\r
+ RelativePath=".\Commands\DropMoveCommand.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\Commands\DropMoveCommand.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\Commands\RenameCommand.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\Commands\RenameCommand.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\RenameDlg.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\RenameDlg.h"\r
>\r
</File>\r
</Filter>\r
</File>\r
</Filter>\r
<Filter\r
+ Name="Stash"\r
+ >\r
+ <File\r
+ RelativePath=".\Commands\StashCommand.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\Commands\StashCommand.h"\r
+ >\r
+ </File>\r
+ </Filter>\r
+ <Filter\r
Name="Clean"\r
>\r
<File\r
</File>\r
</Filter>\r
<Filter\r
- Name="merge"\r
+ Name="Export"\r
>\r
<File\r
- RelativePath=".\Commands\MergeCommand.cpp"\r
- >\r
- </File>\r
- <File\r
- RelativePath=".\Commands\MergeCommand.h"\r
+ RelativePath=".\Commands\DropExportCommand.cpp"\r
>\r
</File>\r
<File\r
- RelativePath=".\MergeDlg.cpp"\r
+ RelativePath=".\Commands\DropExportCommand.h"\r
>\r
</File>\r
<File\r
- RelativePath=".\MergeDlg.h"\r
- >\r
- </File>\r
- </Filter>\r
- <Filter\r
- Name="Export"\r
- >\r
- <File\r
RelativePath=".\Commands\ExportCommand.cpp"\r
>\r
</File>\r
>\r
</File>\r
<File\r
+ RelativePath=".\Settings\SettingGitConfig.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\Settings\SettingGitConfig.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\Settings\SettingGitRemote.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\Settings\SettingGitRemote.h"\r
+ >\r
+ </File>\r
+ <File\r
RelativePath=".\Settings\Settings.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\SettingsProgsDiff.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\Settings\SettingsProgsMerge.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\Settings\SettingsProgsUniDiff.cpp"\r
+ >\r
+ </File>\r
+ <File\r
RelativePath=".\Settings\SettingsPropPage.cpp"\r
>\r
</File>\r
>\r
</File>\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
+ <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
+ <File\r
+ RelativePath=".\Commands\ResolveCommand.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\Commands\ResolveCommand.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\ResolveDlg.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\ResolveDlg.h"\r
+ >\r
+ </File>\r
+ </Filter>\r
+ <Filter\r
+ Name="Rebase"\r
+ >\r
+ <File\r
+ RelativePath=".\Commands\RebaseCommand.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\Commands\RebaseCommand.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\RebaseDlg.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\RebaseDlg.h"\r
+ >\r
+ </File>\r
+ </Filter>\r
+ <Filter\r
+ Name="merge"\r
+ >\r
+ <File\r
+ RelativePath=".\Commands\MergeCommand.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\Commands\MergeCommand.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\MergeDlg.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\MergeDlg.h"\r
+ >\r
+ </File>\r
+ </Filter>\r
+ <Filter\r
+ Name="ReposStatus"\r
+ >\r
+ <File\r
+ RelativePath=".\Commands\RepoStatusCommand.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\Commands\RepoStatusCommand.h"\r
+ >\r
+ </File>\r
+ </Filter>\r
+ <Filter\r
+ Name="Copy"\r
+ >\r
+ <File\r
+ RelativePath=".\Commands\DropCopyAddCommand.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\Commands\DropCopyAddCommand.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\Commands\DropCopyCommand.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\Commands\DropCopyCommand.h"\r
+ >\r
+ </File>\r
+ </Filter>\r
</Filter>\r
<Filter\r
Name="Utility Dialogs"\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=".\StatGraphDlg.h"\r
>\r
</File>\r
+ <File\r
+ RelativePath=".\SVNProgressDlg.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\SVNProgressDlg.h"\r
+ >\r
+ </File>\r
</Filter>\r
<Filter\r
Name="Git"\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
RelativePath="TortoiseProc.h"\r
>\r
</File>\r
+ <File\r
+ RelativePath=".\TortoiseProcLang.vcproj"\r
+ >\r
+ </File>\r
</Files>\r
<Globals>\r
<Global\r
/>\r
<Global\r
Name="RESOURCE_FILE"\r
- Value="\Profiles\b20596\tortoisegit\src\Resources\TortoiseProcENG.rc"\r
+ Value="\build\x64\TortoiseGit\src\Resources\TortoiseProcENG.rc"\r
/>\r
</Globals>\r
</VisualStudioProject>\r