Kaydet (Commit) 15b90d9f authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Just use name wntmsc.mk for the MSVC .mk file

üst 086ce69a
...@@ -31,8 +31,9 @@ ...@@ -31,8 +31,9 @@
# --- Compiler --- # --- Compiler ---
.IF "$(OS)$(COM)" == "WNTMSC" .IF "$(OS)$(COM)" == "WNTMSC"
# for wntmsci12 (MSVC 2005) and wntmsci13 (MSVC 2010), 32- and 64-bit # for wntmsci12, wntmscx12, wntmsci13 and wntmscx13
.INCLUDE : wntmsci11.mk # (MSVC 2008 and MSVC 2010, 32- and 64-bit)
.INCLUDE : wntmsc.mk
.ENDIF # "$(OS)$(COM)" == "WNTMSC" .ENDIF # "$(OS)$(COM)" == "WNTMSC"
.IF "$(COM)$(OS)$(CPU)" == "GCCWNTI" .IF "$(COM)$(OS)$(CPU)" == "GCCWNTI"
......
#************************************************************************* #*************************************************************************
# #
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# Copyright 2000, 2010 Oracle and/or its affiliates. # Copyright 2000, 2010 Oracle and/or its affiliates.
# #
# OpenOffice.org - a multi-platform office productivity suite # OpenOffice.org - a multi-platform office productivity suite
...@@ -26,8 +26,6 @@ ...@@ -26,8 +26,6 @@
#************************************************************************* #*************************************************************************
# mk file for $(OS)$(COM)$(CPU)$(COMEX) == WNTMSC[IX]{12,13} # mk file for $(OS)$(COM)$(CPU)$(COMEX) == WNTMSC[IX]{12,13}
# yes, despite the "11" in this file name, note that we don't actually
# support the WNTMSCI11 (MSVC 2005) compiler any more
SOLAR_JAVA*=TRUE SOLAR_JAVA*=TRUE
FULL_DESK=TRUE FULL_DESK=TRUE
...@@ -384,4 +382,3 @@ WININETLIB=wininet.lib ...@@ -384,4 +382,3 @@ WININETLIB=wininet.lib
OLDNAMESLIB=oldnames.lib OLDNAMESLIB=oldnames.lib
MSIMG32LIB=msimg32.lib MSIMG32LIB=msimg32.lib
PROPSYSLIB=propsys.lib PROPSYSLIB=propsys.lib
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment