From: jackie <kjackie@gmail.com>
Date: Thu, 26 Feb 2009 07:56:33 +0000 (+0800)
Subject: .
X-Git-Url: http://git.sourceforge.jp/view?p=tortoisegit%2FTortoiseGitJp.git;a=commitdiff_plain;h=d843f5964c68fea57e547294a7177d0ed2a2b696

.
---

diff --git a/src/TGitCache/TSVNCache.vcproj b/src/TGitCache/TSVNCache.vcproj
index 80a16e4..c34fec5 100644
--- a/src/TGitCache/TSVNCache.vcproj
+++ b/src/TGitCache/TSVNCache.vcproj
@@ -76,7 +76,7 @@
 				OutputFile="$(OutDir)/TGitCache.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=""
-				IgnoreDefaultLibraryNames="libc"
+				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/TGitCache.pdb"
 				SubSystem="2"
@@ -161,7 +161,7 @@
 				AdditionalDependencies="Crypt32.lib"
 				OutputFile="$(OutDir)/TGitCache.exe"
 				LinkIncremental="2"
-				IgnoreDefaultLibraryNames="LIBC"
+				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/TSVNCache.pdb"
 				SubSystem="2"
@@ -242,6 +242,7 @@
 				OutputFile="$(OutDir)/TGitCache.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
+				IgnoreDefaultLibraryNames=""
 				DelayLoadDLLs=""
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -325,6 +326,7 @@
 				AdditionalDependencies="Crypt32.lib"
 				OutputFile="$(OutDir)/TGitCache.exe"
 				LinkIncremental="1"
+				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
diff --git a/src/TortoiseGit.sln b/src/TortoiseGit.sln
index 0fc9ae6..bf757c1 100644
--- a/src/TortoiseGit.sln
+++ b/src/TortoiseGit.sln
@@ -325,8 +325,8 @@ Global
 		{72EFB681-1397-4193-BBF9-CA05AC52B75D}.debug_static|x64.ActiveCfg = debug_static|Win32
 		{72EFB681-1397-4193-BBF9-CA05AC52B75D}.Debug|Win32.ActiveCfg = Debug|Win32
 		{72EFB681-1397-4193-BBF9-CA05AC52B75D}.Debug|Win32.Build.0 = Debug|Win32
-		{72EFB681-1397-4193-BBF9-CA05AC52B75D}.Debug|x64.ActiveCfg = Debug|x64
-		{72EFB681-1397-4193-BBF9-CA05AC52B75D}.Debug|x64.Build.0 = Debug|x64
+		{72EFB681-1397-4193-BBF9-CA05AC52B75D}.Debug|x64.ActiveCfg = Debug|Win32
+		{72EFB681-1397-4193-BBF9-CA05AC52B75D}.Debug|x64.Build.0 = Debug|Win32
 		{72EFB681-1397-4193-BBF9-CA05AC52B75D}.release_static|Win32.ActiveCfg = release_static|Win32
 		{72EFB681-1397-4193-BBF9-CA05AC52B75D}.release_static|Win32.Build.0 = release_static|Win32
 		{72EFB681-1397-4193-BBF9-CA05AC52B75D}.release_static|x64.ActiveCfg = release_static|Win32
diff --git a/src/TortoiseGitBlame/TortoiseGitBlame.vcproj b/src/TortoiseGitBlame/TortoiseGitBlame.vcproj
index c953805..82e1234 100644
--- a/src/TortoiseGitBlame/TortoiseGitBlame.vcproj
+++ b/src/TortoiseGitBlame/TortoiseGitBlame.vcproj
@@ -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"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=""
-				IgnoreDefaultLibraryNames="LIBCMTD"
+				IgnoreDefaultLibraryNames=""
 				DelayLoadDLLs=""
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -158,6 +158,7 @@
 				AdditionalDependencies="Crypt32.lib gdiplus.lib shfolder.lib shell32.lib comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib wininet.lib version.lib"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
+				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="17"
@@ -240,6 +241,7 @@
 				AdditionalDependencies="Crypt32.lib gdiplus.lib shfolder.lib shell32.lib comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib wininet.lib version.lib"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="../../ext/wingit"
+				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -322,6 +324,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="Crypt32.lib gdiplus.lib shfolder.lib shell32.lib comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib wininet.lib version.lib"
 				LinkIncremental="1"
+				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -540,19 +543,19 @@
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\blameres\output_wnd.ico"
+				RelativePath=".\res\output_wnd.ico"
 				>
 			</File>
 			<File
-				RelativePath=".\res\output_wnd.ico"
+				RelativePath="..\Resources\blameres\output_wnd.ico"
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\blameres\output_wnd_hc.ico"
+				RelativePath=".\res\output_wnd_hc.ico"
 				>
 			</File>
 			<File
-				RelativePath=".\res\output_wnd_hc.ico"
+				RelativePath="..\Resources\blameres\output_wnd_hc.ico"
 				>
 			</File>
 			<File
@@ -564,19 +567,19 @@
 				>
 			</File>
 			<File
-				RelativePath=".\res\properties_hc.bmp"
+				RelativePath="..\Resources\blameres\properties_hc.bmp"
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\blameres\properties_hc.bmp"
+				RelativePath=".\res\properties_hc.bmp"
 				>
 			</File>
 			<File
-				RelativePath=".\res\properties_wnd.ico"
+				RelativePath="..\Resources\blameres\properties_wnd.ico"
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\blameres\properties_wnd.ico"
+				RelativePath=".\res\properties_wnd.ico"
 				>
 			</File>
 			<File
@@ -588,19 +591,19 @@
 				>
 			</File>
 			<File
-				RelativePath=".\res\Toolbar.bmp"
+				RelativePath="..\Resources\blameres\Toolbar.bmp"
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\blameres\Toolbar.bmp"
+				RelativePath=".\res\Toolbar.bmp"
 				>
 			</File>
 			<File
-				RelativePath=".\res\Toolbar256.bmp"
+				RelativePath="..\Resources\blameres\Toolbar256.bmp"
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\blameres\Toolbar256.bmp"
+				RelativePath=".\res\Toolbar256.bmp"
 				>
 			</File>
 			<File
@@ -648,11 +651,11 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\res\TortoiseGitBlameDoc.ico"
+				RelativePath="..\Resources\blameres\TortoiseGitBlameDoc.ico"
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\blameres\TortoiseGitBlameDoc.ico"
+				RelativePath=".\res\TortoiseGitBlameDoc.ico"
 				>
 			</File>
 			<File
diff --git a/src/TortoisePlink/Windows/MSVC/Plink/TortoisePlink.vcproj b/src/TortoisePlink/Windows/MSVC/Plink/TortoisePlink.vcproj
index 29b8032..3316b7a 100644
--- a/src/TortoisePlink/Windows/MSVC/Plink/TortoisePlink.vcproj
+++ b/src/TortoisePlink/Windows/MSVC/Plink/TortoisePlink.vcproj
@@ -80,6 +80,7 @@
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
+				IgnoreDefaultLibraryNames=""
 				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
 				SubSystem="2"
 				OptimizeForWindows98="0"
@@ -172,6 +173,7 @@
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
+				IgnoreDefaultLibraryNames=""
 				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
 				SubSystem="2"
 				OptimizeForWindows98="1"
@@ -267,6 +269,7 @@
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
+				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
 				SubSystem="2"
@@ -361,6 +364,7 @@
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
+				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
 				SubSystem="2"
diff --git a/src/TortoiseProc/TortoiseProc.vcproj b/src/TortoiseProc/TortoiseProc.vcproj
index eb422d5..8d83425 100644
--- a/src/TortoiseProc/TortoiseProc.vcproj
+++ b/src/TortoiseProc/TortoiseProc.vcproj
@@ -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"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=""
-				IgnoreDefaultLibraryNames="libcd.lib;libc;shell32;LIBCMTD;"
+				IgnoreDefaultLibraryNames=""
 				DelayLoadDLLs="gdiplus.dll"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -166,7 +166,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="Crypt32.lib gdiplus.lib shfolder.lib shell32.lib comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib wininet.lib version.lib"
 				LinkIncremental="2"
-				IgnoreDefaultLibraryNames="libcd.lib;libc;shell32;LIBCMT"
+				IgnoreDefaultLibraryNames=""
 				DelayLoadDLLs="gdiplus.dll"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -580,11 +580,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\explorer.ico"
+				RelativePath="..\Resources\explorer.ico"
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\explorer.ico"
+				RelativePath=".\explorer.ico"
 				>
 			</File>
 			<File
@@ -820,19 +820,19 @@
 				>
 			</File>
 			<File
-				RelativePath=".\newfolder.ico"
+				RelativePath="..\Resources\newfolder.ico"
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\newfolder.ico"
+				RelativePath=".\newfolder.ico"
 				>
 			</File>
 			<File
-				RelativePath=".\open.ico"
+				RelativePath="..\Resources\open.ico"
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\open.ico"
+				RelativePath=".\open.ico"
 				>
 			</File>
 			<File
@@ -936,19 +936,19 @@
 				>
 			</File>
 			<File
-				RelativePath=".\save.ico"
+				RelativePath="..\Resources\save.ico"
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\save.ico"
+				RelativePath=".\save.ico"
 				>
 			</File>
 			<File
-				RelativePath=".\saveas.ico"
+				RelativePath="..\Resources\saveas.ico"
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\saveas.ico"
+				RelativePath=".\saveas.ico"
 				>
 			</File>
 			<File
@@ -1040,11 +1040,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\up.ico"
+				RelativePath="..\Resources\up.ico"
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\up.ico"
+				RelativePath=".\up.ico"
 				>
 			</File>
 			<File
diff --git a/src/TortoiseShell/TortoiseShell.vcproj b/src/TortoiseShell/TortoiseShell.vcproj
index 47e48dc..f013e00 100644
--- a/src/TortoiseShell/TortoiseShell.vcproj
+++ b/src/TortoiseShell/TortoiseShell.vcproj
@@ -23,8 +23,8 @@
 			OutputDirectory="..\..\bin\$(ConfigurationName)\bin"
 			IntermediateDirectory="..\..\obj\TortoiseShell\$(ConfigurationName)\"
 			ConfigurationType="2"
-			UseOfMFC="0"
-			UseOfATL="1"
+			UseOfMFC="2"
+			UseOfATL="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="1"
 			>
@@ -90,7 +90,7 @@
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=""
 				IgnoreAllDefaultLibraries="false"
-				IgnoreDefaultLibraryNames="LIBC"
+				IgnoreDefaultLibraryNames=""
 				ModuleDefinitionFile=".\ShellExt.def"
 				DelayLoadDLLs="gdiplus.dll"
 				GenerateDebugInformation="true"
@@ -131,8 +131,8 @@
 			OutputDirectory="..\..\bin\Debug64\bin"
 			IntermediateDirectory="..\..\obj\TortoiseShell\Debug64"
 			ConfigurationType="2"
-			UseOfMFC="0"
-			UseOfATL="1"
+			UseOfMFC="2"
+			UseOfATL="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="1"
 			>
@@ -195,7 +195,7 @@
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
 				IgnoreAllDefaultLibraries="false"
-				IgnoreDefaultLibraryNames="LIBC"
+				IgnoreDefaultLibraryNames=""
 				ModuleDefinitionFile=".\ShellExt.def"
 				DelayLoadDLLs="gdiplus.dll"
 				GenerateDebugInformation="true"
@@ -339,7 +339,7 @@
 			IntermediateDirectory="..\..\obj\TortoiseShell\Release64"
 			ConfigurationType="2"
 			UseOfMFC="0"
-			UseOfATL="1"
+			UseOfATL="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="1"
 			WholeProgramOptimization="1"
diff --git a/src/TortoiseUDiff/TortoiseUDiff.vcproj b/src/TortoiseUDiff/TortoiseUDiff.vcproj
index 5a0fa5a..fc96bb3 100644
--- a/src/TortoiseUDiff/TortoiseUDiff.vcproj
+++ b/src/TortoiseUDiff/TortoiseUDiff.vcproj
@@ -66,6 +66,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkIncremental="2"
+				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
@@ -141,6 +142,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkIncremental="2"
+				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
@@ -214,6 +216,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkIncremental="1"
+				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -290,6 +293,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkIncremental="1"
+				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
diff --git a/src/Utils/Utils.vcproj b/src/Utils/Utils.vcproj
index 972cee3..b4498ef 100644
--- a/src/Utils/Utils.vcproj
+++ b/src/Utils/Utils.vcproj
@@ -116,7 +116,7 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="0"
+				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				DebugInformationFormat="3"