diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-09-20 15:33:47 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-09-20 15:33:47 +0000 |
| commit | e6172cc07315fe36c198882163ac2400cf195305 (patch) | |
| tree | e8dfea592d909276a62663bc2e23ec3acfb600e2 /curl | |
| parent | cf506aad229fd93388a0eceae396e22f41aa6e3d (diff) | |
INTEGRATION: CWS os2port01 (1.17.4); FILE MERGED
2007/09/02 03:38:35 obr 1.17.4.3: RESYNC: (1.17-1.20); FILE MERGED
2007/02/15 13:10:21 ydario 1.17.4.2: Additional files must be for all platforms, otherwise gnu patch wil fail.
2006/12/28 14:54:01 ydario 1.17.4.1: OS/2 initial import.
Diffstat (limited to 'curl')
| -rw-r--r-- | curl/makefile.mk | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/curl/makefile.mk b/curl/makefile.mk index 1b31634b479a..1a9a9e4ec1b8 100644 --- a/curl/makefile.mk +++ b/curl/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.20 $ +# $Revision: 1.21 $ # -# last change: $Author: vg $ $Date: 2007-03-26 15:00:23 $ +# last change: $Author: vg $ $Date: 2007-09-20 16:33:47 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -54,6 +54,8 @@ PATCH_FILE_NAME=curl-7.12.2.patch CONVERTFILES= \ lib$/Makefile.vc6 +ADDITIONAL_FILES= lib$/config-os2.h lib$/Makefile.os2 + .IF "$(GUI)"=="UNX" .IF "$(SYSBASE)"!="" @@ -115,6 +117,21 @@ OUT2LIB=$(BUILD_DIR)$/libcurl.lib .ENDIF .ENDIF # "$(GUI)"=="WNT" +.IF "$(GUI)"=="OS2" +# make use of stlport headerfiles +EXT_USE_STLPORT=TRUE + +BUILD_DIR=.$/lib +.IF "$(debug)"=="" +BUILD_ACTION=make -f Makefile.os2 +.ELSE +BUILD_ACTION=make -f Makefile.os2 +.ENDIF + +OUT2BIN=$(BUILD_DIR)$/libcurl.dll +OUT2LIB=$(BUILD_DIR)$/libcurl.lib + +.ENDIF # "$(GUI)"=="OS2" OUT2INC= \ include$/curl$/easy.h \ |