diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-01-16 20:53:17 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-01-16 20:57:11 +0200 |
| commit | 086ce69a835841c36d264d3ea92e8350100f23bb (patch) | |
| tree | e600dd3db07f08e4eb5cac45ace9d291f1907759 /solenv/inc/wnt.mk | |
| parent | bc04a7600c5057957ed8805f1c9b7d14811e3e72 (diff) | |
Cleanups and improvements on the nascent support for 64-bit Windows build
* solenc/inc/settings.mk: Drop MSVC 2003 section.
* solenc/inc/tg_compv.mk: Set COMNAME appropriately for 64-bit build.
* solenc/inc/wnt.mk: Drop unsupported compiler version sections.
* solenc/inc/wntmsci11.mk: Look for the CL_X64 make variable, not
cl_x64. Drop duplicate definitions already put in the environment by
set_soenv.in.
Diffstat (limited to 'solenv/inc/wnt.mk')
| -rw-r--r-- | solenv/inc/wnt.mk | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/solenv/inc/wnt.mk b/solenv/inc/wnt.mk index f369bd15ad30..4635fc197b6c 100644 --- a/solenv/inc/wnt.mk +++ b/solenv/inc/wnt.mk @@ -30,14 +30,10 @@ # --- Compiler --- -.IF "$(OS)$(COM)$(CPU)" == "WNTMSCI" -.IF "$(COMEX)" == "10" -.INCLUDE : wntmsci10.mk -.ELSE -# for wntmsci11 (.Net 2005) and wntmsci12 (.Net 2008) +.IF "$(OS)$(COM)" == "WNTMSC" +# for wntmsci12 (MSVC 2005) and wntmsci13 (MSVC 2010), 32- and 64-bit .INCLUDE : wntmsci11.mk -.ENDIF # "$(COMEX)" == "10" -.ENDIF # "$(OS)$(COM)$(CPU)" == "WNTMSCI" +.ENDIF # "$(OS)$(COM)" == "WNTMSC" .IF "$(COM)$(OS)$(CPU)" == "GCCWNTI" .INCLUDE : wntgcci.mk |