diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-15 12:28:48 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-15 12:28:48 +0000 |
| commit | fe6de0bed7c0922bf73dac0987dae126351c9d50 (patch) | |
| tree | ef375d6b69c060a712cd80e6c1b9a45f86a2c3e8 /solenv/inc/wnt.mk | |
| parent | 3b69bc133afedcaf16cb27f921bd4e2c4e4a9c44 (diff) | |
INTEGRATION: CWS obo21 (1.80.12); FILE MERGED
2007/12/24 05:10:09 obo 1.80.12.1: #i84233# change for .Net 2008
Diffstat (limited to 'solenv/inc/wnt.mk')
| -rw-r--r-- | solenv/inc/wnt.mk | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/solenv/inc/wnt.mk b/solenv/inc/wnt.mk index 6b1d1eab2d34..44b062c8d022 100644 --- a/solenv/inc/wnt.mk +++ b/solenv/inc/wnt.mk @@ -4,9 +4,9 @@ # # $RCSfile: wnt.mk,v $ # -# $Revision: 1.81 $ +# $Revision: 1.82 $ # -# last change: $Author: obo $ $Date: 2008-01-04 16:16:43 $ +# last change: $Author: ihi $ $Date: 2008-01-15 13:28:48 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -38,13 +38,14 @@ # --- Compiler --- -.IF "$(OS)$(COM)$(CPU)$(COMEX)" == "WNTMSCI10" +.IF "$(OS)$(COM)$(CPU)" == "WNTMSCI" +.IF "$(COMEX)" == "10" .INCLUDE : wntmsci10.mk -.ENDIF - -.IF "$(OS)$(COM)$(CPU)$(COMEX)" == "WNTMSCI11" +.ELSE +# for wntmsci11 (.Net 2005) and wntmsci12 (.Net 2008) .INCLUDE : wntmsci11.mk -.ENDIF +.ENDIF # "$(COMEX)" == "10" +.ENDIF # "$(OS)$(COM)$(CPU)" == "WNTMSCI" .IF "$(COM)$(CVER)$(OS)$(CPU)" == "GCCC341WNTI" .INCLUDE : wntgcci6.mk @@ -79,3 +80,4 @@ JAVA_RUNTIME=javai.lib JAVA_RUNTIME=javai_g.lib .ENDIF .ENDIF + |