diff options
| author | tono <tono@openoffice.org> | 2010-05-31 21:53:32 +0900 |
|---|---|---|
| committer | tono <tono@openoffice.org> | 2010-05-31 21:53:32 +0900 |
| commit | 9bc06e6ac0d2031e6ed95229b0c1e1cf7d86ee90 (patch) | |
| tree | 8e969c864bf1b0d87370851d03bf019f8c8cc535 /curl | |
| parent | d1d09abe2763b4dffe63db568cc1472505f057d5 (diff) | |
i#111958: MinGW port enhancement: runtime-pseude-reloc-v2
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 |