diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-09-25 12:12:16 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-09-25 12:12:16 +0000 |
| commit | 92e87d43591902041d2ed89fb99df4c948b1ff98 (patch) | |
| tree | 4ffe50d9c9b21985ccfa7ee79fcfab31b683ae59 /stlport/makefile.mk | |
| parent | c6b1013901e80b1e272c10181c88629b4e15f6c3 (diff) | |
INTEGRATION: CWS obo05 (1.34.2); FILE MERGED
2006/06/27 10:42:03 obo 1.34.2.2: #i53611# .net 2005 port
2006/06/27 09:52:21 obo 1.34.2.1: #i53611# port for .net 2005
Diffstat (limited to 'stlport/makefile.mk')
| -rw-r--r-- | stlport/makefile.mk | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/stlport/makefile.mk b/stlport/makefile.mk index 0e1385ac0777..b27158a4b60a 100644 --- a/stlport/makefile.mk +++ b/stlport/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.34 $ +# $Revision: 1.35 $ # -# last change: $Author: hr $ $Date: 2006-06-20 04:08:44 $ +# last change: $Author: vg $ $Date: 2006-09-25 13:12:16 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -121,11 +121,11 @@ BUILD_DIR=src .IF "$(COM)"=="MSC" BUILD_ACTION=nmake -.IF "$(CCNUMVER)"<="001300000000" -BUILD_FLAGS=-f vc6.mak -.ELSE # "$(CCNUMVER)"<="001300000000" -BUILD_FLAGS=-f vc7.mak -.ENDIF # "$(CCNUMVER)"<="001300000000" +.IF "$(CCNUMVER)"<="001400000000" +BUILD_FLAGS=-f vc7.mak EXFLAGS="/EHsc" +.ELSE # "$(CCNUMVER)"<="001400000000" +BUILD_FLAGS=-f vc7.mak EXFLAGS="/EHa /Zc:wchar_t-" CCNUMVER=$(CCNUMVER) +.ENDIF # "$(CCNUMVER)"<="001400000000" .ENDIF .IF "$(COM)"=="GCC" @@ -238,4 +238,4 @@ $(PACKAGE_DIR)$/win32_sdk_patch : $(PACKAGE_DIR)$/$(PATCH_FLAG_FILE) $(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)$/win32_sdk_patch .ENDIF # "$(USE_NEW_SDK)"!="" .ENDIF # COMVER<=001300000000 -.ENDIF # "$(GUI)"=="WNT" +.ENDIF # "$(GUI)"=="WNT"
\ No newline at end of file |