diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-09-25 12:13:56 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-09-25 12:13:56 +0000 |
| commit | 72558af47aaeb2e2c41fcaed1c5fe37129f51d9c (patch) | |
| tree | 7f2567a5e9a3b7a54dc67f16e9963e19d6a3bc6d | |
| parent | fd1f2a824dd038521134f12b1988d9ae08630aac (diff) | |
INTEGRATION: CWS obo05 (1.13.112); FILE MERGED
2006/06/28 10:21:55 obo 1.13.112.1: #i53611# port to net 2005
| -rw-r--r-- | sal/osl/w32/MAKEFILE.MK | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sal/osl/w32/MAKEFILE.MK b/sal/osl/w32/MAKEFILE.MK index 048269718037..b41e746a00a7 100644 --- a/sal/osl/w32/MAKEFILE.MK +++ b/sal/osl/w32/MAKEFILE.MK @@ -4,9 +4,9 @@ # # $RCSfile: MAKEFILE.MK,v $ # -# $Revision: 1.13 $ +# $Revision: 1.14 $ # -# last change: $Author: rt $ $Date: 2005-09-08 15:04:54 $ +# last change: $Author: vg $ $Date: 2006-09-25 13:13:56 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -49,7 +49,7 @@ MULTITHREAD_OBJ=TRUE .INCLUDE : settings.mk -# Uncomment the following line if you want to compile with -Wall +# Uncomment the following line if you want to compile with -Wall # it disables lots of unnecessary warnings comming from the Win32 # header files (disabling warnings via command line only works with # MSVC >= 7.x) @@ -57,6 +57,9 @@ MULTITHREAD_OBJ=TRUE # CFLAGS+=/wd4668 /wd4711 /wd4201 /wd4710 /wd4619 /wd4514 /wd4820 # --- Files -------------------------------------------------------- +.IF "$(CCNUMVER)" >= "001400000000" +CDEFS+=-D_CRT_NON_CONFORMING_SWPRINTFS +.ENDIF .IF "$(header)" == "" @@ -111,4 +114,3 @@ OBJFILES= $(OBJ)$/conditn.obj \ .INCLUDE : target.mk - |