OSDN Git Service

.
authorjackie <kjackie@gmail.com>
Thu, 26 Feb 2009 07:56:33 +0000 (15:56 +0800)
committerjackie <kjackie@gmail.com>
Thu, 26 Feb 2009 07:56:33 +0000 (15:56 +0800)
src/TGitCache/TSVNCache.vcproj
src/TortoiseGit.sln
src/TortoiseGitBlame/TortoiseGitBlame.vcproj
src/TortoisePlink/Windows/MSVC/Plink/TortoisePlink.vcproj
src/TortoiseProc/TortoiseProc.vcproj
src/TortoiseShell/TortoiseShell.vcproj
src/TortoiseUDiff/TortoiseUDiff.vcproj
src/Utils/Utils.vcproj

index 80a16e4..c34fec5 100644 (file)
@@ -76,7 +76,7 @@
                                OutputFile="$(OutDir)/TGitCache.exe"\r
                                LinkIncremental="2"\r
                                AdditionalLibraryDirectories=""\r
-                               IgnoreDefaultLibraryNames="libc"\r
+                               IgnoreDefaultLibraryNames=""\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(OutDir)/TGitCache.pdb"\r
                                SubSystem="2"\r
                                AdditionalDependencies="Crypt32.lib"\r
                                OutputFile="$(OutDir)/TGitCache.exe"\r
                                LinkIncremental="2"\r
-                               IgnoreDefaultLibraryNames="LIBC"\r
+                               IgnoreDefaultLibraryNames=""\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(OutDir)/TSVNCache.pdb"\r
                                SubSystem="2"\r
                                OutputFile="$(OutDir)/TGitCache.exe"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories=""\r
+                               IgnoreDefaultLibraryNames=""\r
                                DelayLoadDLLs=""\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                AdditionalDependencies="Crypt32.lib"\r
                                OutputFile="$(OutDir)/TGitCache.exe"\r
                                LinkIncremental="1"\r
+                               IgnoreDefaultLibraryNames=""\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r
index 0fc9ae6..bf757c1 100644 (file)
@@ -325,8 +325,8 @@ Global
                {72EFB681-1397-4193-BBF9-CA05AC52B75D}.debug_static|x64.ActiveCfg = debug_static|Win32\r
                {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Debug|Win32.Build.0 = Debug|Win32\r
-               {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Debug|x64.ActiveCfg = Debug|x64\r
-               {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Debug|x64.Build.0 = Debug|x64\r
+               {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Debug|x64.ActiveCfg = Debug|Win32\r
+               {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Debug|x64.Build.0 = Debug|Win32\r
                {72EFB681-1397-4193-BBF9-CA05AC52B75D}.release_static|Win32.ActiveCfg = release_static|Win32\r
                {72EFB681-1397-4193-BBF9-CA05AC52B75D}.release_static|Win32.Build.0 = release_static|Win32\r
                {72EFB681-1397-4193-BBF9-CA05AC52B75D}.release_static|x64.ActiveCfg = release_static|Win32\r
index c953805..82e1234 100644 (file)
@@ -75,7 +75,7 @@
                                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
                                AdditionalLibraryDirectories=""\r
-                               IgnoreDefaultLibraryNames="LIBCMTD"\r
+                               IgnoreDefaultLibraryNames=""\r
                                DelayLoadDLLs=""\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\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=""\r
+                               IgnoreDefaultLibraryNames=""\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                TargetMachine="17"\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
+                               IgnoreDefaultLibraryNames=""\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="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="1"\r
+                               IgnoreDefaultLibraryNames=""\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\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
                                </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
index 29b8032..3316b7a 100644 (file)
@@ -80,6 +80,7 @@
                                OutputFile="$(OutDir)\$(ProjectName).exe"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
+                               IgnoreDefaultLibraryNames=""\r
                                ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"\r
                                SubSystem="2"\r
                                OptimizeForWindows98="0"\r
                                OutputFile="$(OutDir)\$(ProjectName).exe"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
+                               IgnoreDefaultLibraryNames=""\r
                                ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"\r
                                SubSystem="2"\r
                                OptimizeForWindows98="1"\r
                                OutputFile="$(OutDir)\$(ProjectName).exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
+                               IgnoreDefaultLibraryNames=""\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"\r
                                SubSystem="2"\r
                                OutputFile="$(OutDir)\$(ProjectName).exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
+                               IgnoreDefaultLibraryNames=""\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"\r
                                SubSystem="2"\r
index eb422d5..8d83425 100644 (file)
@@ -78,7 +78,7 @@
                                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
                                AdditionalLibraryDirectories=""\r
-                               IgnoreDefaultLibraryNames="libcd.lib;libc;shell32;LIBCMTD;"\r
+                               IgnoreDefaultLibraryNames=""\r
                                DelayLoadDLLs="gdiplus.dll"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="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="libcd.lib;libc;shell32;LIBCMT"\r
+                               IgnoreDefaultLibraryNames=""\r
                                DelayLoadDLLs="gdiplus.dll"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\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
index 47e48dc..f013e00 100644 (file)
@@ -23,8 +23,8 @@
                        OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
                        IntermediateDirectory="..\..\obj\TortoiseShell\$(ConfigurationName)\"\r
                        ConfigurationType="2"\r
-                       UseOfMFC="0"\r
-                       UseOfATL="1"\r
+                       UseOfMFC="2"\r
+                       UseOfATL="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r
                        >\r
@@ -90,7 +90,7 @@
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=""\r
                                IgnoreAllDefaultLibraries="false"\r
-                               IgnoreDefaultLibraryNames="LIBC"\r
+                               IgnoreDefaultLibraryNames=""\r
                                ModuleDefinitionFile=".\ShellExt.def"\r
                                DelayLoadDLLs="gdiplus.dll"\r
                                GenerateDebugInformation="true"\r
                        OutputDirectory="..\..\bin\Debug64\bin"\r
                        IntermediateDirectory="..\..\obj\TortoiseShell\Debug64"\r
                        ConfigurationType="2"\r
-                       UseOfMFC="0"\r
-                       UseOfATL="1"\r
+                       UseOfMFC="2"\r
+                       UseOfATL="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r
                        >\r
                                LinkIncremental="0"\r
                                SuppressStartupBanner="true"\r
                                IgnoreAllDefaultLibraries="false"\r
-                               IgnoreDefaultLibraryNames="LIBC"\r
+                               IgnoreDefaultLibraryNames=""\r
                                ModuleDefinitionFile=".\ShellExt.def"\r
                                DelayLoadDLLs="gdiplus.dll"\r
                                GenerateDebugInformation="true"\r
                        IntermediateDirectory="..\..\obj\TortoiseShell\Release64"\r
                        ConfigurationType="2"\r
                        UseOfMFC="0"\r
-                       UseOfATL="1"\r
+                       UseOfATL="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
index 5a0fa5a..fc96bb3 100644 (file)
@@ -66,6 +66,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkIncremental="2"\r
+                               IgnoreDefaultLibraryNames=""\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                RandomizedBaseAddress="1"\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkIncremental="2"\r
+                               IgnoreDefaultLibraryNames=""\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                RandomizedBaseAddress="1"\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkIncremental="1"\r
+                               IgnoreDefaultLibraryNames=""\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkIncremental="1"\r
+                               IgnoreDefaultLibraryNames=""\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r
index 972cee3..b4498ef 100644 (file)
                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="0"\r
+                               RuntimeLibrary="3"\r
                                UsePrecompiledHeader="2"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="3"\r