diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-09-25 12:34:04 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-09-25 12:34:04 +0000 |
| commit | f969e114a26abf7f07b577e838150d005c74ada8 (patch) | |
| tree | 5554829eb1ce1144d62abfb231df7fee75f2ce8c /curl | |
| parent | efd7c363052cf301411dd298a2e7792c21f82047 (diff) | |
INTEGRATION: CWS obo05 (1.16.4); FILE MERGED
2006/08/09 13:49:12 obo 1.16.4.2: RESYNC: (1.16-1.17); FILE MERGED
2006/06/22 14:00:20 obo 1.16.4.1: #i53611# .net 2005
Diffstat (limited to 'curl')
| -rw-r--r-- | curl/makefile.mk | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/curl/makefile.mk b/curl/makefile.mk index cd6020ff0f4f..d6fe9bdfbbf4 100644 --- a/curl/makefile.mk +++ b/curl/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.17 $ +# $Revision: 1.18 $ # -# last change: $Author: ihi $ $Date: 2006-08-04 12:39:31 $ +# last change: $Author: vg $ $Date: 2006-09-25 13:34:04 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -82,11 +82,17 @@ OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl*$(DLLPOST)* # make use of stlport headerfiles EXT_USE_STLPORT=TRUE +.IF "$(COMEX)"=="11" +EXCFLAGS="/EHa /Zc:wchar_t- /D "_CRT_SECURE_NO_DEPRECATE"" +.ELSE +EXCFLAGS="/EHsc /YX" +.ENDIF + BUILD_DIR=.$/lib .IF "$(debug)"=="" -BUILD_ACTION=nmake -f Makefile.vc6 cfg=release-dll +BUILD_ACTION=nmake -f Makefile.vc6 cfg=release-dll EXCFLAGS=$(EXCFLAGS) .ELSE -BUILD_ACTION=nmake -f Makefile.vc6 cfg=debug-dll +BUILD_ACTION=nmake -f Makefile.vc6 cfg=debug-dll EXCFLAGS=$(EXCFLAGS) .ENDIF OUT2BIN=$(BUILD_DIR)$/libcurl.dll @@ -108,4 +114,4 @@ OUT2INC= \ .INCLUDE : set_ext.mk .INCLUDE : target.mk -.INCLUDE : tg_ext.mk +.INCLUDE : tg_ext.mk
\ No newline at end of file |