diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 14:00:23 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 14:00:23 +0000 |
| commit | f1b3848fb700e084416f05eee5ca8a0a8c228535 (patch) | |
| tree | e55b0537bd806bed503407878a84c1da1122f4f9 /curl | |
| parent | e9c4e4cfb9a35c751b467369e8a99db13f5b1e3a (diff) | |
INTEGRATION: CWS mingwport03 (1.16.12); FILE MERGED
2006/11/07 13:43:00 vg 1.16.12.3: RESYNC: (1.16-1.18); FILE MERGED
2006/10/23 15:16:31 vg 1.16.12.2: #i53572# MinGW port
2006/09/13 14:20:38 vg 1.16.12.1: #i53572# MinGW port
Diffstat (limited to 'curl')
| -rw-r--r-- | curl/makefile.mk | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/curl/makefile.mk b/curl/makefile.mk index 1c1bc4620412..1b31634b479a 100644 --- a/curl/makefile.mk +++ b/curl/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.19 $ +# $Revision: 1.20 $ # -# last change: $Author: ihi $ $Date: 2007-03-26 12:26:56 $ +# last change: $Author: vg $ $Date: 2007-03-26 15:00:23 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -83,6 +83,16 @@ OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl*$(DLLPOST)* .IF "$(GUI)"=="WNT" +.IF "$(COM)"=="GCC" +CONFIGURE_DIR=.$/ +#relative to CONFIGURE_DIR +CONFIGURE_ACTION=.$/configure +CONFIGURE_FLAGS= --without-ssl --enable-ftp --enable-ipv6 --disable-http --disable-gopher --disable-file --disable-ldap --disable-telnet --disable-dict --build=i586-pc-mingw32 --host=i586-pc-mingw32 OBJDUMP="$(WRAPCMD) objdump" CFLAGS=-D_MT LDFLAGS="-L$(ILIB:s/;/ -L/)" LIBS="-lws2_32 -lwinmm -lmingwthrd" +BUILD_DIR=$(CONFIGURE_DIR)$/lib +BUILD_ACTION=make +OUT2BIN=$(BUILD_DIR)$/.libs$/libcurl*.dll +OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl*.a +.ELSE # make use of stlport headerfiles EXT_USE_STLPORT=TRUE @@ -102,6 +112,7 @@ BUILD_ACTION=nmake -f Makefile.vc6 cfg=debug-dll EXCFLAGS=$(EXCFLAGS) OUT2BIN=$(BUILD_DIR)$/libcurl.dll OUT2LIB=$(BUILD_DIR)$/libcurl.lib +.ENDIF .ENDIF # "$(GUI)"=="WNT" |