/>\r
</Configuration>\r
<Configuration\r
- Name="Release|Win32"\r
- OutputDirectory="$(ConfigurationName)"\r
- IntermediateDirectory="$(ConfigurationName)"\r
+ Name="Debug|x64"\r
+ OutputDirectory="../bin/$(ConfigurationName)/bin"\r
+ IntermediateDirectory="../obj/lang/$(ConfigurationName)64/"\r
ConfigurationType="0"\r
>\r
<Tool\r
Name="VCNMakeTool"\r
- BuildCommandLine="adfad"\r
- ReBuildCommandLine=""\r
- CleanCommandLine=""\r
- Output="TortoiseLangs.exe"\r
- PreprocessorDefinitions="WIN32;NDEBUG"\r
+ BuildCommandLine="nmake /f Makefile outdir=$(OutDir) ConfigurationName=$(ConfigurationName)"\r
+ ReBuildCommandLine="nmake /f Makefile outdir=$(OutDir) ConfigurationName=$(ConfigurationName)"\r
+ CleanCommandLine="nmake /f Makefile clean "\r
+ Output=""\r
+ PreprocessorDefinitions="WIN32;_DEBUG"\r
IncludeSearchPath=""\r
ForcedIncludes=""\r
AssemblySearchPath=""\r
/>\r
</Configuration>\r
<Configuration\r
- Name="Debug|x64"\r
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+ Name="Release|Win32"\r
+ OutputDirectory="../bin/$(ConfigurationName)/bin"\r
+ IntermediateDirectory="../obj/lang/$(ConfigurationName)/"\r
ConfigurationType="0"\r
>\r
<Tool\r
Name="VCNMakeTool"\r
- BuildCommandLine="nmake /f Makefile outdir=$(OutDir) ConfigurationName=$(ConfigurationName)"\r
- ReBuildCommandLine="nmake /f Makefile outdir=$(OutDir) ConfigurationName=$(ConfigurationName)"\r
- CleanCommandLine="nmake /f Makefile clean "\r
- Output=""\r
- PreprocessorDefinitions="WIN32;_DEBUG"\r
+ BuildCommandLine="adfad"\r
+ ReBuildCommandLine=""\r
+ CleanCommandLine=""\r
+ Output="TortoiseLangs.exe"\r
+ PreprocessorDefinitions="WIN32;NDEBUG"\r
IncludeSearchPath=""\r
ForcedIncludes=""\r
AssemblySearchPath=""\r
</Configuration>\r
<Configuration\r
Name="Release|x64"\r
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+ OutputDirectory="../bin/$(ConfigurationName)/bin"\r
+ IntermediateDirectory="../obj/lang/$(ConfigurationName)64/"\r
ConfigurationType="0"\r
>\r
<Tool\r
/>\r
</Configuration>\r
<Configuration\r
- Name="Debug|Win32"\r
- OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
- IntermediateDirectory="..\..\obj\ResizeableLib\$(ConfigurationName)\"\r
+ Name="Release|x64"\r
+ OutputDirectory="..\..\bin\$(ConfigurationName)64\bin"\r
+ IntermediateDirectory="..\..\obj\ResizeableLib\$(ConfigurationName)64\"\r
ConfigurationType="4"\r
UseOfMFC="2"\r
ATLMinimizesCRunTimeLibraryUsage="false"\r
CharacterSet="1"\r
+ WholeProgramOptimization="1"\r
>\r
<Tool\r
Name="VCPreBuildEventTool"\r
/>\r
<Tool\r
Name="VCMIDLTool"\r
+ TargetEnvironment="3"\r
/>\r
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="0"\r
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"\r
- BasicRuntimeChecks="0"\r
- RuntimeLibrary="3"\r
- DisableLanguageExtensions="false"\r
+ Optimization="3"\r
+ InlineFunctionExpansion="1"\r
+ FavorSizeOrSpeed="2"\r
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"\r
+ StringPooling="true"\r
+ RuntimeLibrary="2"\r
+ EnableFunctionLevelLinking="true"\r
TreatWChar_tAsBuiltInType="true"\r
ForceConformanceInForLoopScope="true"\r
UsePrecompiledHeader="2"\r
ProgramDataBaseFileName="$(IntDir)/vc70.pdb"\r
WarningLevel="4"\r
SuppressStartupBanner="true"\r
- DebugInformationFormat="4"\r
- DisableSpecificWarnings="4018"\r
/>\r
<Tool\r
Name="VCManagedResourceCompilerTool"\r
/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="_AFXDLL;_DEBUG"\r
+ PreprocessorDefinitions="_AFXDLL;NDEBUG"\r
Culture="0"\r
/>\r
<Tool\r
/>\r
</Configuration>\r
<Configuration\r
- Name="Release|x64"\r
- OutputDirectory="..\..\obj\ResizableLib\Release64"\r
- IntermediateDirectory="..\..\obj\ResizableLib\Release64"\r
+ Name="Debug|Win32"\r
+ OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+ IntermediateDirectory="..\..\obj\ResizeableLib\$(ConfigurationName)\"\r
ConfigurationType="4"\r
UseOfMFC="2"\r
ATLMinimizesCRunTimeLibraryUsage="false"\r
CharacterSet="1"\r
- WholeProgramOptimization="1"\r
>\r
<Tool\r
Name="VCPreBuildEventTool"\r
/>\r
<Tool\r
Name="VCMIDLTool"\r
- TargetEnvironment="3"\r
/>\r
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="3"\r
- InlineFunctionExpansion="1"\r
- FavorSizeOrSpeed="2"\r
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"\r
- StringPooling="true"\r
- RuntimeLibrary="2"\r
- EnableFunctionLevelLinking="true"\r
+ Optimization="0"\r
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"\r
+ BasicRuntimeChecks="0"\r
+ RuntimeLibrary="3"\r
+ DisableLanguageExtensions="false"\r
TreatWChar_tAsBuiltInType="true"\r
ForceConformanceInForLoopScope="true"\r
UsePrecompiledHeader="2"\r
ProgramDataBaseFileName="$(IntDir)/vc70.pdb"\r
WarningLevel="4"\r
SuppressStartupBanner="true"\r
+ DebugInformationFormat="4"\r
+ DisableSpecificWarnings="4018"\r
/>\r
<Tool\r
Name="VCManagedResourceCompilerTool"\r
/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="_AFXDLL;NDEBUG"\r
+ PreprocessorDefinitions="_AFXDLL;_DEBUG"\r
Culture="0"\r
/>\r
<Tool\r
</Configuration>\r
<Configuration\r
Name="Debug|x64"\r
- OutputDirectory="..\..\obj\ResizableLib\Debug64"\r
- IntermediateDirectory="..\..\obj\ResizableLib\Debug64"\r
+ OutputDirectory="..\..\bin\$(ConfigurationName)64\bin"\r
+ IntermediateDirectory="..\..\obj\ResizeableLib\$(ConfigurationName)64\"\r
ConfigurationType="4"\r
UseOfMFC="2"\r
ATLMinimizesCRunTimeLibraryUsage="false"\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Debug|Win32"\r
+ Name="Release|x64"\r
>\r
<Tool\r
Name="VCCLCompilerTool"\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Release|x64"\r
+ Name="Debug|Win32"\r
>\r
<Tool\r
Name="VCCLCompilerTool"\r
/>\r
</Configuration>\r
<Configuration\r
- Name="Debug|Win32"\r
- OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
- IntermediateDirectory="..\..\obj\hunspell\$(ConfigurationName)"\r
+ Name="Release|x64"\r
+ OutputDirectory="..\..\bin\$(ConfigurationName)64\bin"\r
+ IntermediateDirectory="..\..\obj\hunspell\$(ConfigurationName)64"\r
ConfigurationType="4"\r
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"\r
UseOfMFC="0"\r
/>\r
<Tool\r
Name="VCMIDLTool"\r
+ TargetEnvironment="3"\r
/>\r
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="0"\r
- PreprocessorDefinitions="W32;_DEBUG;_LIB"\r
- MinimalRebuild="true"\r
- BasicRuntimeChecks="3"\r
- RuntimeLibrary="1"\r
- PrecompiledHeaderFile=".\Debug/hunspell.pch"\r
+ Optimization="2"\r
+ InlineFunctionExpansion="1"\r
+ PreprocessorDefinitions="W32;NDEBUG;_LIB"\r
+ StringPooling="true"\r
+ RuntimeLibrary="0"\r
+ EnableFunctionLevelLinking="true"\r
+ PrecompiledHeaderFile=".\Release/hunspell.pch"\r
AssemblerListingLocation="$(IntDir)\"\r
ObjectFile="$(IntDir)\"\r
WarningLevel="3"\r
SuppressStartupBanner="true"\r
- DebugInformationFormat="4"\r
- DisableSpecificWarnings="4996,4018"\r
/>\r
<Tool\r
Name="VCManagedResourceCompilerTool"\r
/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="_DEBUG"\r
+ PreprocessorDefinitions="NDEBUG"\r
Culture="1038"\r
/>\r
<Tool\r
<Tool\r
Name="VCBscMakeTool"\r
SuppressStartupBanner="true"\r
- OutputFile=".\Debug/hunspell.bsc"\r
+ OutputFile=".\Release/hunspell.bsc"\r
/>\r
<Tool\r
Name="VCFxCopTool"\r
/>\r
</Configuration>\r
<Configuration\r
- Name="Release|x64"\r
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+ Name="Debug|Win32"\r
+ OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+ IntermediateDirectory="..\..\obj\hunspell\$(ConfigurationName)"\r
ConfigurationType="4"\r
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"\r
UseOfMFC="0"\r
/>\r
<Tool\r
Name="VCMIDLTool"\r
- TargetEnvironment="3"\r
/>\r
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="2"\r
- InlineFunctionExpansion="1"\r
- PreprocessorDefinitions="W32;NDEBUG;_LIB"\r
- StringPooling="true"\r
- RuntimeLibrary="0"\r
- EnableFunctionLevelLinking="true"\r
- PrecompiledHeaderFile=".\Release/hunspell.pch"\r
+ Optimization="0"\r
+ PreprocessorDefinitions="W32;_DEBUG;_LIB"\r
+ MinimalRebuild="true"\r
+ BasicRuntimeChecks="3"\r
+ RuntimeLibrary="1"\r
+ PrecompiledHeaderFile=".\Debug/hunspell.pch"\r
AssemblerListingLocation="$(IntDir)\"\r
ObjectFile="$(IntDir)\"\r
WarningLevel="3"\r
SuppressStartupBanner="true"\r
+ DebugInformationFormat="4"\r
+ DisableSpecificWarnings="4996,4018"\r
/>\r
<Tool\r
Name="VCManagedResourceCompilerTool"\r
/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="NDEBUG"\r
+ PreprocessorDefinitions="_DEBUG"\r
Culture="1038"\r
/>\r
<Tool\r
<Tool\r
Name="VCBscMakeTool"\r
SuppressStartupBanner="true"\r
- OutputFile=".\Release/hunspell.bsc"\r
+ OutputFile=".\Debug/hunspell.bsc"\r
/>\r
<Tool\r
Name="VCFxCopTool"\r
</Configuration>\r
<Configuration\r
Name="Debug|x64"\r
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+ OutputDirectory="..\..\bin\$(ConfigurationName)64\bin"\r
+ IntermediateDirectory="..\..\obj\hunspell\$(ConfigurationName)64"\r
ConfigurationType="4"\r
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"\r
UseOfMFC="0"\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Debug|Win32"\r
+ Name="Release|x64"\r
>\r
<Tool\r
Name="VCCLCompilerTool"\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Release|x64"\r
+ Name="Debug|Win32"\r
>\r
<Tool\r
Name="VCCLCompilerTool"\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Debug|Win32"\r
+ Name="Release|x64"\r
>\r
<Tool\r
Name="VCCLCompilerTool"\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Release|x64"\r
+ Name="Debug|Win32"\r
>\r
<Tool\r
Name="VCCLCompilerTool"\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Debug|Win32"\r
+ Name="Release|x64"\r
>\r
<Tool\r
Name="VCCLCompilerTool"\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Release|x64"\r
+ Name="Debug|Win32"\r
>\r
<Tool\r
Name="VCCLCompilerTool"\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Debug|Win32"\r
+ Name="Release|x64"\r
>\r
<Tool\r
Name="VCCLCompilerTool"\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Release|x64"\r
+ Name="Debug|Win32"\r
>\r
<Tool\r
Name="VCCLCompilerTool"\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Debug|Win32"\r
+ Name="Release|x64"\r
>\r
<Tool\r
Name="VCCLCompilerTool"\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Release|x64"\r
+ Name="Debug|Win32"\r
>\r
<Tool\r
Name="VCCLCompilerTool"\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Debug|Win32"\r
+ Name="Release|x64"\r
>\r
<Tool\r
Name="VCCLCompilerTool"\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Release|x64"\r
+ Name="Debug|Win32"\r
>\r
<Tool\r
Name="VCCLCompilerTool"\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Debug|Win32"\r
+ Name="Release|x64"\r
>\r
<Tool\r
Name="VCCLCompilerTool"\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Release|x64"\r
+ Name="Debug|Win32"\r
>\r
<Tool\r
Name="VCCLCompilerTool"\r
/>\r
</Configuration>\r
<Configuration\r
- Name="Release|Win32"\r
- OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
- IntermediateDirectory="..\..\obj\git\$(ConfigurationName)"\r
+ Name="Debug|x64"\r
+ OutputDirectory="..\..\bin\$(ConfigurationName)64\bin"\r
+ IntermediateDirectory="..\..\obj\git\$(ConfigurationName)64"\r
ConfigurationType="4"\r
UseOfMFC="2"\r
+ UseOfATL="1"\r
CharacterSet="1"\r
- WholeProgramOptimization="1"\r
>\r
<Tool\r
Name="VCPreBuildEventTool"\r
/>\r
<Tool\r
Name="VCMIDLTool"\r
+ TargetEnvironment="3"\r
/>\r
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="2"\r
- EnableIntrinsicFunctions="true"\r
+ Optimization="0"\r
AdditionalIncludeDirectories="../utils"\r
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB"\r
- RuntimeLibrary="2"\r
- EnableFunctionLevelLinking="true"\r
+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB"\r
+ MinimalRebuild="true"\r
+ BasicRuntimeChecks="3"\r
+ RuntimeLibrary="3"\r
UsePrecompiledHeader="2"\r
WarningLevel="3"\r
DebugInformationFormat="3"\r
- DisableSpecificWarnings="4018"\r
/>\r
<Tool\r
Name="VCManagedResourceCompilerTool"\r
/>\r
<Tool\r
Name="VCLibrarianTool"\r
- AdditionalLibraryDirectories=""\r
/>\r
<Tool\r
Name="VCALinkTool"\r
/>\r
</Configuration>\r
<Configuration\r
- Name="Debug|x64"\r
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+ Name="Release|Win32"\r
+ OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+ IntermediateDirectory="..\..\obj\git\$(ConfigurationName)"\r
ConfigurationType="4"\r
UseOfMFC="2"\r
- UseOfATL="1"\r
CharacterSet="1"\r
+ WholeProgramOptimization="1"\r
>\r
<Tool\r
Name="VCPreBuildEventTool"\r
/>\r
<Tool\r
Name="VCMIDLTool"\r
- TargetEnvironment="3"\r
/>\r
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="0"\r
+ Optimization="2"\r
+ EnableIntrinsicFunctions="true"\r
AdditionalIncludeDirectories="../utils"\r
- PreprocessorDefinitions="WIN32;_DEBUG;_LIB"\r
- MinimalRebuild="true"\r
- BasicRuntimeChecks="3"\r
- RuntimeLibrary="3"\r
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB"\r
+ RuntimeLibrary="2"\r
+ EnableFunctionLevelLinking="true"\r
UsePrecompiledHeader="2"\r
WarningLevel="3"\r
DebugInformationFormat="3"\r
+ DisableSpecificWarnings="4018"\r
/>\r
<Tool\r
Name="VCManagedResourceCompilerTool"\r
/>\r
<Tool\r
Name="VCLibrarianTool"\r
+ AdditionalLibraryDirectories=""\r
/>\r
<Tool\r
Name="VCALinkTool"\r
</Configuration>\r
<Configuration\r
Name="Release|x64"\r
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+ OutputDirectory="..\..\bin\$(ConfigurationName)64\bin"\r
+ IntermediateDirectory="..\..\obj\git\$(ConfigurationName)64"\r
ConfigurationType="4"\r
UseOfMFC="2"\r
CharacterSet="1"\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Release|Win32"\r
+ Name="Debug|x64"\r
>\r
<Tool\r
Name="VCCLCompilerTool"\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Debug|x64"\r
+ Name="Release|Win32"\r
>\r
<Tool\r
Name="VCCLCompilerTool"\r
return CAppUtils::SetListCtrlBackgroundImage(GetSafeHwnd(), nID);\r
}\r
\r
-BOOL CGitStatusListCtrl::GetStatus ( const CTGitPathList& pathList\r
+BOOL CGitStatusListCtrl::GetStatus ( const CTGitPathList* pathList\r
, bool bUpdate /* = FALSE */\r
, bool bShowIgnores /* = false */\r
, bool bShowUnRev\r
mask|= CGitStatusListCtrl::FILELIST_IGNORE;\r
if(bShowUnRev)\r
mask|= CGitStatusListCtrl::FILELIST_UNVER;\r
- this->UpdateFileList(mask,bUpdate,(CTGitPathList*)&pathList);\r
+ this->UpdateFileList(mask,bUpdate,pathList);\r
\r
\r
#if 0\r
TCHAR groupname[1024];\r
int groupindex = 0;\r
\r
- if(bHasGroups);\r
+ if(bHasGroups)\r
{\r
LVGROUP grp = {0};\r
grp.cbSize = sizeof(LVGROUP);\r
* \param bUpdate TRUE if the remote status is requested too.\r
* \return TRUE on success.\r
*/\r
- BOOL GetStatus ( const CTGitPathList& pathList\r
+ BOOL GetStatus ( const CTGitPathList* pathList=NULL\r
, bool bUpdate = false\r
, bool bShowIgnores = false\r
, bool bShowUnRev=false\r
/>\r
</Configuration>\r
<Configuration\r
- Name="Release|Win32"\r
- OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
- IntermediateDirectory="..\..\obj\TortoiseGitBlame\$(ConfigurationName)"\r
+ Name="Debug|x64"\r
+ OutputDirectory="..\..\bin\$(ConfigurationName)64\bin"\r
+ IntermediateDirectory="..\..\obj\TortoiseGitBlame\$(ConfigurationName)64"\r
ConfigurationType="1"\r
UseOfMFC="2"\r
CharacterSet="1"\r
- WholeProgramOptimization="1"\r
>\r
<Tool\r
Name="VCPreBuildEventTool"\r
/>\r
<Tool\r
Name="VCMIDLTool"\r
- PreprocessorDefinitions="NDEBUG"\r
+ PreprocessorDefinitions="_DEBUG"\r
MkTypLibCompatible="false"\r
- ValidateParameters="true"\r
+ TargetEnvironment="3"\r
/>\r
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="2"\r
- EnableIntrinsicFunctions="true"\r
+ Optimization="0"\r
AdditionalIncludeDirectories="..\Git;..\TortoiseProc;..\..\ext\scintilla\include;..\Utils;..\Utils\MiscUI;..\..\ext\hunspell;..\..\ext\ResizableLib;..\Resources"\r
- PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG"\r
- MinimalRebuild="false"\r
- RuntimeLibrary="2"\r
- EnableFunctionLevelLinking="true"\r
+ PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG"\r
+ MinimalRebuild="true"\r
+ BasicRuntimeChecks="3"\r
+ RuntimeLibrary="3"\r
UsePrecompiledHeader="2"\r
WarningLevel="3"\r
DebugInformationFormat="3"\r
- DisableSpecificWarnings="4996,4018"\r
/>\r
<Tool\r
Name="VCManagedResourceCompilerTool"\r
/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="NDEBUG"\r
+ PreprocessorDefinitions="_DEBUG"\r
Culture="1033"\r
AdditionalIncludeDirectories="$(IntDir);..\TortoiseShell"\r
/>\r
<Tool\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
- AdditionalLibraryDirectories="../../ext/wingit"\r
+ LinkIncremental="2"\r
+ IgnoreDefaultLibraryNames="LIBCMTD"\r
GenerateDebugInformation="true"\r
SubSystem="2"\r
- OptimizeReferences="2"\r
- EnableCOMDATFolding="2"\r
- TargetMachine="1"\r
+ TargetMachine="17"\r
/>\r
<Tool\r
Name="VCALinkTool"\r
/>\r
</Configuration>\r
<Configuration\r
- Name="Debug|x64"\r
- OutputDirectory="..\..\bin\debug64\bin"\r
+ Name="Release|Win32"\r
+ OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
IntermediateDirectory="..\..\obj\TortoiseGitBlame\$(ConfigurationName)"\r
ConfigurationType="1"\r
UseOfMFC="2"\r
CharacterSet="1"\r
+ WholeProgramOptimization="1"\r
>\r
<Tool\r
Name="VCPreBuildEventTool"\r
/>\r
<Tool\r
Name="VCMIDLTool"\r
- PreprocessorDefinitions="_DEBUG"\r
+ PreprocessorDefinitions="NDEBUG"\r
MkTypLibCompatible="false"\r
- TargetEnvironment="3"\r
+ ValidateParameters="true"\r
/>\r
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="0"\r
+ Optimization="2"\r
+ EnableIntrinsicFunctions="true"\r
AdditionalIncludeDirectories="..\Git;..\TortoiseProc;..\..\ext\scintilla\include;..\Utils;..\Utils\MiscUI;..\..\ext\hunspell;..\..\ext\ResizableLib;..\Resources"\r
- PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG"\r
- MinimalRebuild="true"\r
- BasicRuntimeChecks="3"\r
- RuntimeLibrary="3"\r
+ PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG"\r
+ MinimalRebuild="false"\r
+ RuntimeLibrary="2"\r
+ EnableFunctionLevelLinking="true"\r
UsePrecompiledHeader="2"\r
WarningLevel="3"\r
DebugInformationFormat="3"\r
+ DisableSpecificWarnings="4996,4018"\r
/>\r
<Tool\r
Name="VCManagedResourceCompilerTool"\r
/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="_DEBUG"\r
+ PreprocessorDefinitions="NDEBUG"\r
Culture="1033"\r
AdditionalIncludeDirectories="$(IntDir);..\TortoiseShell"\r
/>\r
<Tool\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="LIBCMTD"\r
+ LinkIncremental="1"\r
+ AdditionalLibraryDirectories="../../ext/wingit"\r
GenerateDebugInformation="true"\r
SubSystem="2"\r
- TargetMachine="17"\r
+ OptimizeReferences="2"\r
+ EnableCOMDATFolding="2"\r
+ TargetMachine="1"\r
/>\r
<Tool\r
Name="VCALinkTool"\r
</Configuration>\r
<Configuration\r
Name="Release|x64"\r
- OutputDirectory="..\..\bin\Release64\bin"\r
- IntermediateDirectory="..\..\obj\TortoiseGitBlame\$(ConfigurationName)"\r
+ OutputDirectory="..\..\bin\$(ConfigurationName)64\bin"\r
+ IntermediateDirectory="..\..\obj\TortoiseGitBlame\$(ConfigurationName)64"\r
ConfigurationType="1"\r
UseOfMFC="2"\r
CharacterSet="1"\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Release|Win32"\r
+ Name="Debug|x64"\r
>\r
<Tool\r
Name="VCCLCompilerTool"\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Debug|x64"\r
+ Name="Release|Win32"\r
>\r
<Tool\r
Name="VCCLCompilerTool"\r
>\r
</File>\r
<File\r
- RelativePath="..\Resources\blameres\output_wnd.ico"\r
+ RelativePath=".\res\output_wnd.ico"\r
>\r
</File>\r
<File\r
- RelativePath=".\res\output_wnd.ico"\r
+ RelativePath="..\Resources\blameres\output_wnd.ico"\r
>\r
</File>\r
<File\r
- RelativePath="..\Resources\blameres\output_wnd_hc.ico"\r
+ RelativePath=".\res\output_wnd_hc.ico"\r
>\r
</File>\r
<File\r
- RelativePath=".\res\output_wnd_hc.ico"\r
+ RelativePath="..\Resources\blameres\output_wnd_hc.ico"\r
>\r
</File>\r
<File\r
>\r
</File>\r
<File\r
- RelativePath=".\res\properties_hc.bmp"\r
+ RelativePath="..\Resources\blameres\properties_hc.bmp"\r
>\r
</File>\r
<File\r
- RelativePath="..\Resources\blameres\properties_hc.bmp"\r
+ RelativePath=".\res\properties_hc.bmp"\r
>\r
</File>\r
<File\r
- RelativePath=".\res\properties_wnd.ico"\r
+ RelativePath="..\Resources\blameres\properties_wnd.ico"\r
>\r
</File>\r
<File\r
- RelativePath="..\Resources\blameres\properties_wnd.ico"\r
+ RelativePath=".\res\properties_wnd.ico"\r
>\r
</File>\r
<File\r
>\r
</File>\r
<File\r
- RelativePath=".\res\Toolbar.bmp"\r
+ RelativePath="..\Resources\blameres\Toolbar.bmp"\r
>\r
</File>\r
<File\r
- RelativePath="..\Resources\blameres\Toolbar.bmp"\r
+ RelativePath=".\res\Toolbar.bmp"\r
>\r
</File>\r
<File\r
- RelativePath=".\res\Toolbar256.bmp"\r
+ RelativePath="..\Resources\blameres\Toolbar256.bmp"\r
>\r
</File>\r
<File\r
- RelativePath="..\Resources\blameres\Toolbar256.bmp"\r
+ RelativePath=".\res\Toolbar256.bmp"\r
>\r
</File>\r
<File\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Release|Win32"\r
+ Name="Debug|x64"\r
>\r
<Tool\r
Name="VCResourceCompilerTool"\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Debug|x64"\r
+ Name="Release|Win32"\r
>\r
<Tool\r
Name="VCResourceCompilerTool"\r
</FileConfiguration>\r
</File>\r
<File\r
- RelativePath=".\res\TortoiseGitBlameDoc.ico"\r
+ RelativePath="..\Resources\blameres\TortoiseGitBlameDoc.ico"\r
>\r
</File>\r
<File\r
- RelativePath="..\Resources\blameres\TortoiseGitBlameDoc.ico"\r
+ RelativePath=".\res\TortoiseGitBlameDoc.ico"\r
>\r
</File>\r
<File\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Release|Win32"\r
+ Name="Debug|x64"\r
>\r
<Tool\r
Name="VCCustomBuildTool"\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Debug|x64"\r
+ Name="Release|Win32"\r
>\r
<Tool\r
Name="VCCustomBuildTool"\r
DialogEnableWindow(IDOK, false);\r
m_bCancelled = false;\r
m_addListCtrl.Clear();\r
- if (!m_addListCtrl.GetStatus(m_pathList,false,false,true,true))\r
+ if (!m_addListCtrl.GetStatus(&m_pathList,false,false,true,true))\r
{\r
m_addListCtrl.SetEmptyString(m_addListCtrl.GetLastErrorMessage());\r
}\r
DialogEnableWindow(IDC_SHOWIGNORED, FALSE);\r
DialogEnableWindow(IDC_SHOWUSERPROPS, FALSE);\r
CString temp;\r
- if (!m_FileListCtrl.GetStatus(m_pathList, m_bRemote, m_bShowIgnored != FALSE, m_bShowUnversioned,m_bShowUserProps != FALSE))\r
+ if (!m_FileListCtrl.GetStatus(&m_pathList, m_bRemote, m_bShowIgnored != FALSE, m_bShowUnversioned,m_bShowUserProps != FALSE))\r
{\r
if (!m_FileListCtrl.GetLastErrorMessage().IsEmpty())\r
m_FileListCtrl.SetEmptyString(m_FileListCtrl.GetLastErrorMessage());\r
, m_bThreadRunning(FALSE)\r
, m_bRunThread(FALSE)\r
, m_pThread(NULL)\r
- , m_bKeepLocks(FALSE)\r
+ , m_bWholeProject(FALSE)\r
, m_bKeepChangeList(TRUE)\r
, m_itemsCount(0)\r
, m_bSelectFilesForCommit(TRUE)\r
DDX_Check(pDX, IDC_SHOWUNVERSIONED, m_bShowUnversioned);\r
DDX_Control(pDX, IDC_SELECTALL, m_SelectAll);\r
DDX_Text(pDX, IDC_BUGID, m_sBugID);\r
- DDX_Check(pDX, IDC_KEEPLOCK, m_bKeepLocks);\r
+ DDX_Check(pDX, IDC_WHOLE_PROJECT, m_bWholeProject);\r
DDX_Control(pDX, IDC_SPLITTER, m_wndSplitter);\r
DDX_Check(pDX, IDC_KEEPLISTS, m_bKeepChangeList);\r
DDX_Check(pDX,IDC_COMMIT_AMEND,m_bCommitAmend);\r
m_bKeepChangeList = m_regKeepChangelists;\r
\r
// GitConfig config;\r
-// m_bKeepLocks = config.KeepLocks();\r
+// m_bWholeProject = config.KeepLocks();\r
\r
UpdateData(FALSE);\r
\r
\r
AdjustControlSize(IDC_SHOWUNVERSIONED);\r
AdjustControlSize(IDC_SELECTALL);\r
- AdjustControlSize(IDC_KEEPLOCK);\r
+ AdjustControlSize(IDC_WHOLE_PROJECT);\r
\r
GetClientRect(m_DlgOrigRect);\r
m_cLogMessage.GetClientRect(m_LogMsgOrigRect);\r
AddAnchor(IDC_SELECTALL, BOTTOM_LEFT);\r
AddAnchor(IDC_EXTERNALWARNING, BOTTOM_RIGHT);\r
AddAnchor(IDC_STATISTICS, BOTTOM_LEFT, BOTTOM_RIGHT);\r
- AddAnchor(IDC_KEEPLOCK, BOTTOM_LEFT);\r
+ AddAnchor(IDC_WHOLE_PROJECT, BOTTOM_LEFT);\r
AddAnchor(IDC_KEEPLISTS, BOTTOM_LEFT);\r
AddAnchor(IDOK, BOTTOM_RIGHT);\r
AddAnchor(IDCANCEL, BOTTOM_RIGHT);\r
#endif\r
UpdateData();\r
m_regAddBeforeCommit = m_bShowUnversioned;\r
- if (!GetDlgItem(IDC_KEEPLOCK)->IsWindowEnabled())\r
- m_bKeepLocks = FALSE;\r
+ if (!GetDlgItem(IDC_WHOLE_PROJECT)->IsWindowEnabled())\r
+ m_bWholeProject = FALSE;\r
m_regKeepChangelists = m_bKeepChangeList;\r
if (!GetDlgItem(IDC_KEEPLISTS)->IsWindowEnabled())\r
m_bKeepChangeList = FALSE;\r
#endif\r
// Initialise the list control with the status of the files/folders below us\r
m_ListCtrl.Clear();\r
- BOOL success = m_ListCtrl.GetStatus(m_pathList);\r
+ BOOL success = m_ListCtrl.GetStatus(&m_pathList);\r
\r
//m_ListCtrl.UpdateFileList(git_revnum_t(GIT_REV_ZERO));\r
if(this->m_bShowUnversioned)\r
if (m_ListCtrl.HasChangeLists())\r
DialogEnableWindow(IDC_KEEPLISTS, true);\r
if (m_ListCtrl.HasLocks())\r
- DialogEnableWindow(IDC_KEEPLOCK, true);\r
+ DialogEnableWindow(IDC_WHOLE_PROJECT, true);\r
// we have the list, now signal the main thread about it\r
SendMessage(WM_AUTOLISTREADY); // only send the message if the thread wasn't told to quit!\r
}\r
dwShow &= ~SVNSLC_SHOWUNVERSIONED;\r
if(dwShow & SVNSLC_SHOWUNVERSIONED)\r
{\r
- m_ListCtrl.GetStatus(this->m_pathList,false,false,true);\r
+ m_ListCtrl.GetStatus(&this->m_pathList,false,false,true);\r
}\r
m_ListCtrl.Show(dwShow);\r
}\r
BOOL m_bRecursive;\r
CSciEdit m_cLogMessage;\r
CString m_sLogMessage;\r
- BOOL m_bKeepLocks;\r
+ BOOL m_bWholeProject;\r
CString m_sBugID;\r
CString m_sChangeList;\r
BOOL m_bKeepChangeList;\r
DialogEnableWindow(IDOK, false);\r
m_bCancelled = false;\r
\r
- if (!m_RevertList.GetStatus(m_pathList))\r
+ if (!m_RevertList.GetStatus(&m_pathList))\r
{\r
m_RevertList.SetEmptyString(m_RevertList.GetLastErrorMessage());\r
}\r
/>\r
</Configuration>\r
<Configuration\r
- Name="Release|Win32"\r
- OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
- IntermediateDirectory="..\..\obj\Utils\$(ConfigurationName)\"\r
+ Name="Debug|x64"\r
+ OutputDirectory="..\..\bin\$(ConfigurationName)64\bin"\r
+ IntermediateDirectory="..\..\obj\Utils\$(ConfigurationName)64\"\r
ConfigurationType="4"\r
UseOfMFC="2"\r
+ UseOfATL="1"\r
CharacterSet="1"\r
- WholeProgramOptimization="1"\r
>\r
<Tool\r
Name="VCPreBuildEventTool"\r
/>\r
<Tool\r
Name="VCMIDLTool"\r
+ TargetEnvironment="3"\r
/>\r
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="2"\r
- EnableIntrinsicFunctions="true"\r
+ Optimization="0"\r
AdditionalIncludeDirectories="../git;../;../ext/scintilla/include;../ext/hunspell;./MiscUi"\r
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB"\r
- RuntimeLibrary="2"\r
- EnableFunctionLevelLinking="true"\r
+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB"\r
+ MinimalRebuild="true"\r
+ BasicRuntimeChecks="3"\r
+ RuntimeLibrary="3"\r
UsePrecompiledHeader="2"\r
WarningLevel="3"\r
DebugInformationFormat="3"\r
- DisableSpecificWarnings="4996,4018"\r
/>\r
<Tool\r
Name="VCManagedResourceCompilerTool"\r
/>\r
</Configuration>\r
<Configuration\r
- Name="Debug|x64"\r
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+ Name="Release|Win32"\r
+ OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+ IntermediateDirectory="..\..\obj\Utils\$(ConfigurationName)\"\r
ConfigurationType="4"\r
UseOfMFC="2"\r
- UseOfATL="1"\r
CharacterSet="1"\r
+ WholeProgramOptimization="1"\r
>\r
<Tool\r
Name="VCPreBuildEventTool"\r
/>\r
<Tool\r
Name="VCMIDLTool"\r
- TargetEnvironment="3"\r
/>\r
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="0"\r
+ Optimization="2"\r
+ EnableIntrinsicFunctions="true"\r
AdditionalIncludeDirectories="../git;../;../ext/scintilla/include;../ext/hunspell;./MiscUi"\r
- PreprocessorDefinitions="WIN32;_DEBUG;_LIB"\r
- MinimalRebuild="true"\r
- BasicRuntimeChecks="3"\r
- RuntimeLibrary="3"\r
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB"\r
+ RuntimeLibrary="2"\r
+ EnableFunctionLevelLinking="true"\r
UsePrecompiledHeader="2"\r
WarningLevel="3"\r
DebugInformationFormat="3"\r
+ DisableSpecificWarnings="4996,4018"\r
/>\r
<Tool\r
Name="VCManagedResourceCompilerTool"\r
</Configuration>\r
<Configuration\r
Name="Release|x64"\r
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+ OutputDirectory="..\..\bin\$(ConfigurationName)64\bin"\r
+ IntermediateDirectory="..\..\obj\Utils\$(ConfigurationName)64\"\r
ConfigurationType="4"\r
UseOfMFC="2"\r
CharacterSet="1"\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Release|Win32"\r
+ Name="Debug|x64"\r
>\r
<Tool\r
Name="VCCLCompilerTool"\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Debug|x64"\r
+ Name="Release|Win32"\r
>\r
<Tool\r
Name="VCCLCompilerTool"\r