OSDN Git Service
(root)
/
tortoisegit
/
TortoiseGitJp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed CRT linkage options.
[tortoisegit/TortoiseGitJp.git]
/
src
/
TortoiseUDiff
/
TortoiseUDiff.vcproj
diff --git
a/src/TortoiseUDiff/TortoiseUDiff.vcproj
b/src/TortoiseUDiff/TortoiseUDiff.vcproj
index
910d186
..
fa80b31
100644
(file)
--- a/
src/TortoiseUDiff/TortoiseUDiff.vcproj
+++ b/
src/TortoiseUDiff/TortoiseUDiff.vcproj
@@
-95,12
+95,11
@@
/>
\r
</Configuration>
\r
<Configuration
\r
/>
\r
</Configuration>
\r
<Configuration
\r
- Name="
Release|Win32
"
\r
- OutputDirectory="..\..\bin\
$(ConfigurationName)
\bin"
\r
- IntermediateDirectory="..\..\obj\TortoiseUDiff\
$(ConfigurationName)
"
\r
+ Name="
Debug|x64
"
\r
+ OutputDirectory="..\..\bin\
Debug64
\bin"
\r
+ IntermediateDirectory="..\..\obj\TortoiseUDiff\
Debug64
"
\r
ConfigurationType="1"
\r
CharacterSet="1"
\r
ConfigurationType="1"
\r
CharacterSet="1"
\r
- WholeProgramOptimization="1"
\r
>
\r
<Tool
\r
Name="VCPreBuildEventTool"
\r
>
\r
<Tool
\r
Name="VCPreBuildEventTool"
\r
@@
-116,16
+115,19
@@
/>
\r
<Tool
\r
Name="VCMIDLTool"
\r
/>
\r
<Tool
\r
Name="VCMIDLTool"
\r
+ TargetEnvironment="3"
\r
/>
\r
<Tool
\r
Name="VCCLCompilerTool"
\r
/>
\r
<Tool
\r
Name="VCCLCompilerTool"
\r
+ Optimization="0"
\r
AdditionalIncludeDirectories="..\..\ext\scintilla\include;..\Utils;..\Utils\MiscUI"
\r
AdditionalIncludeDirectories="..\..\ext\scintilla\include;..\Utils;..\Utils\MiscUI"
\r
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
\r
- RuntimeLibrary="2"
\r
+ PreprocessorDefinitions="WIN64;_DEBUG;_WINDOWS"
\r
+ MinimalRebuild="true"
\r
+ BasicRuntimeChecks="3"
\r
+ RuntimeLibrary="3"
\r
UsePrecompiledHeader="2"
\r
WarningLevel="4"
\r
DebugInformationFormat="3"
\r
UsePrecompiledHeader="2"
\r
WarningLevel="4"
\r
DebugInformationFormat="3"
\r
- DisableSpecificWarnings="4018"
\r
/>
\r
<Tool
\r
Name="VCManagedResourceCompilerTool"
\r
/>
\r
<Tool
\r
Name="VCManagedResourceCompilerTool"
\r
@@
-138,15
+140,12
@@
/>
\r
<Tool
\r
Name="VCLinkerTool"
\r
/>
\r
<Tool
\r
Name="VCLinkerTool"
\r
- LinkIncremental="
1
"
\r
+ LinkIncremental="
2
"
\r
GenerateDebugInformation="true"
\r
SubSystem="2"
\r
GenerateDebugInformation="true"
\r
SubSystem="2"
\r
- OptimizeReferences="2"
\r
- EnableCOMDATFolding="2"
\r
- OptimizeForWindows98="0"
\r
RandomizedBaseAddress="1"
\r
DataExecutionPrevention="0"
\r
RandomizedBaseAddress="1"
\r
DataExecutionPrevention="0"
\r
- TargetMachine="1"
\r
+ TargetMachine="1
7
"
\r
/>
\r
<Tool
\r
Name="VCALinkTool"
\r
/>
\r
<Tool
\r
Name="VCALinkTool"
\r
@@
-171,11
+170,12
@@
/>
\r
</Configuration>
\r
<Configuration
\r
/>
\r
</Configuration>
\r
<Configuration
\r
- Name="
Debug|x64
"
\r
- OutputDirectory="..\..\bin\
Debug64
\bin"
\r
- IntermediateDirectory="..\..\obj\TortoiseUDiff\
Debug64
"
\r
+ Name="
Release|Win32
"
\r
+ OutputDirectory="..\..\bin\
$(ConfigurationName)
\bin"
\r
+ IntermediateDirectory="..\..\obj\TortoiseUDiff\
$(ConfigurationName)
"
\r
ConfigurationType="1"
\r
CharacterSet="1"
\r
ConfigurationType="1"
\r
CharacterSet="1"
\r
+ WholeProgramOptimization="1"
\r
>
\r
<Tool
\r
Name="VCPreBuildEventTool"
\r
>
\r
<Tool
\r
Name="VCPreBuildEventTool"
\r
@@
-191,19
+191,16
@@
/>
\r
<Tool
\r
Name="VCMIDLTool"
\r
/>
\r
<Tool
\r
Name="VCMIDLTool"
\r
- TargetEnvironment="3"
\r
/>
\r
<Tool
\r
Name="VCCLCompilerTool"
\r
/>
\r
<Tool
\r
Name="VCCLCompilerTool"
\r
- Optimization="0"
\r
AdditionalIncludeDirectories="..\..\ext\scintilla\include;..\Utils;..\Utils\MiscUI"
\r
AdditionalIncludeDirectories="..\..\ext\scintilla\include;..\Utils;..\Utils\MiscUI"
\r
- PreprocessorDefinitions="WIN64;_DEBUG;_WINDOWS"
\r
- MinimalRebuild="true"
\r
- BasicRuntimeChecks="3"
\r
- RuntimeLibrary="3"
\r
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
\r
+ RuntimeLibrary="2"
\r
UsePrecompiledHeader="2"
\r
WarningLevel="4"
\r
DebugInformationFormat="3"
\r
UsePrecompiledHeader="2"
\r
WarningLevel="4"
\r
DebugInformationFormat="3"
\r
+ DisableSpecificWarnings="4018"
\r
/>
\r
<Tool
\r
Name="VCManagedResourceCompilerTool"
\r
/>
\r
<Tool
\r
Name="VCManagedResourceCompilerTool"
\r
@@
-216,12
+213,15
@@
/>
\r
<Tool
\r
Name="VCLinkerTool"
\r
/>
\r
<Tool
\r
Name="VCLinkerTool"
\r
- LinkIncremental="
2
"
\r
+ LinkIncremental="
1
"
\r
GenerateDebugInformation="true"
\r
SubSystem="2"
\r
GenerateDebugInformation="true"
\r
SubSystem="2"
\r
+ OptimizeReferences="2"
\r
+ EnableCOMDATFolding="2"
\r
+ OptimizeForWindows98="0"
\r
RandomizedBaseAddress="1"
\r
DataExecutionPrevention="0"
\r
RandomizedBaseAddress="1"
\r
DataExecutionPrevention="0"
\r
- TargetMachine="1
7
"
\r
+ TargetMachine="1"
\r
/>
\r
<Tool
\r
Name="VCALinkTool"
\r
/>
\r
<Tool
\r
Name="VCALinkTool"
\r
@@
-366,7
+366,7
@@
/>
\r
</FileConfiguration>
\r
<FileConfiguration
\r
/>
\r
</FileConfiguration>
\r
<FileConfiguration
\r
- Name="
Release|Win32
"
\r
+ Name="
Debug|x64
"
\r
>
\r
<Tool
\r
Name="VCCLCompilerTool"
\r
>
\r
<Tool
\r
Name="VCCLCompilerTool"
\r
@@
-374,7
+374,7
@@
/>
\r
</FileConfiguration>
\r
<FileConfiguration
\r
/>
\r
</FileConfiguration>
\r
<FileConfiguration
\r
- Name="
Debug|x64
"
\r
+ Name="
Release|Win32
"
\r
>
\r
<Tool
\r
Name="VCCLCompilerTool"
\r
>
\r
<Tool
\r
Name="VCCLCompilerTool"
\r