diff options
| author | Robert Maynard <robert.maynard@kitware.com> | 2013-01-23 19:50:00 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-02-19 19:42:00 (GMT) |
| commit | badb40d0f841dcfc4d098e59c5c570e73767cf68 (patch) | |
| tree | 2282c6752a6e0b04c62e4420f795a14d7dfd4d15 /Modules/CompilerId/VS-7.vcproj.in | |
| parent | b3ae61f8338fd3b2308de0173c34a329ba46d191 (diff) | |
| parent | 378899ce8744c2e2b43d0859234eea714dcef368 (diff) | |
| download | CMake-badb40d0f841dcfc4d098e59c5c570e73767cf68.zip CMake-badb40d0f841dcfc4d098e59c5c570e73767cf68.tar.gz CMake-badb40d0f841dcfc4d098e59c5c570e73767cf68.tar.bz2 | |
Merge branch 'master' into sublime-text-2-generator
Resolve conflict in Source/cmDocumentVariables.cxx by adding both
variables.
Diffstat (limited to 'Modules/CompilerId/VS-7.vcproj.in')
| -rw-r--r-- | Modules/CompilerId/VS-7.vcproj.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/CompilerId/VS-7.vcproj.in b/Modules/CompilerId/VS-7.vcproj.in index 71bf64d..fa48cad 100644 --- a/Modules/CompilerId/VS-7.vcproj.in +++ b/Modules/CompilerId/VS-7.vcproj.in @@ -24,7 +24,6 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - PreprocessorDefinitions="" MinimalRebuild="false" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -35,9 +34,10 @@ <Tool Name="VCLinkerTool" LinkIncremental="1" + IgnoreDefaultLibraryNames="libc" GenerateDebugInformation="false" - SubSystem="1" - TargetMachine="@id_machine_7@" + SubSystem="@id_subsystem@" + EntryPointSymbol="@id_entrypoint@" /> <Tool Name="VCPostBuildEventTool" |