diff options
| author | obo <obo@openoffice.org> | 2010-06-22 16:02:44 +0200 |
|---|---|---|
| committer | obo <obo@openoffice.org> | 2010-06-22 16:02:44 +0200 |
| commit | d66343ab594fac375f4e3fc939594e9ebe5d4963 (patch) | |
| tree | b42e0b1f4044eb596050209047dfe935706a61fa /curl | |
| parent | a1004a464f08acecd70fb8465532ef65aae58bd8 (diff) | |
| parent | f49fe0bfe93b4543e0b9f0819169f474dc9ad329 (diff) | |
CWS-TOOLING: integrate CWS mingwport30
Notes
split repo tag: libs-extern-sys_ooo/DEV300_m84
split repo tag: libs-extern-sys_ooo/OOO330_m0
Diffstat (limited to 'curl')
| -rw-r--r-- | curl/makefile.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/curl/makefile.mk b/curl/makefile.mk index 1fab0c301bff..adab75f41d49 100644 --- a/curl/makefile.mk +++ b/curl/makefile.mk @@ -89,18 +89,18 @@ OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl$(DLLPOST).4 .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" -curl_CC=$(CC) +curl_CC=$(CC) -mthreads .IF "$(MINGW_SHARED_GCCLIB)"=="YES" curl_CC+=-shared-libgcc .ENDIF -curl_LIBS=-lws2_32 -lwinmm -lmingwthrd +curl_LIBS=-lws2_32 -lwinmm .IF "$(MINGW_SHARED_GXXLIB)"=="YES" curl_LIBS+=-lstdc++_s .ENDIF 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 CC="$(curl_CC)" CPPFLAGS="$(INCLUDE)" OBJDUMP="objdump" CFLAGS=-D_MT LDFLAGS="-L$(ILIB:s/;/ -L/)" LIBS="$(curl_LIBS)" +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 CC="$(curl_CC)" CPPFLAGS="$(INCLUDE)" OBJDUMP="objdump" LDFLAGS="-L$(ILIB:s/;/ -L/)" LIBS="$(curl_LIBS)" BUILD_DIR=$(CONFIGURE_DIR)$/lib BUILD_ACTION=make OUT2BIN=$(BUILD_DIR)$/.libs$/libcurl*.dll |