Kaydet (Commit) 4e06bafe authored tarafından Fridrich Strba's avatar Fridrich Strba Kaydeden (comit) Fridrich Štrba

Try to fix Windows build of curl

Change-Id: Ifd760cf91ef6c9afe10a110e9b8db2dcc53fd3c8
üst c34ef6b7
--- misc/curl-7.19.7/lib/Makefile.vc9 2009-11-04 13:35:39.000000000 +0100
+++ misc/build/curl-7.19.7/lib/Makefile.vc9 2009-11-18 12:32:57.234375000 +0100
@@ -46,13 +46,13 @@
# Stem for static libs and DLLs
#
LIB_NAME = libcurl
-LIB_NAME_DEBUG = libcurld
+LIB_NAME_DEBUG = libcurl
#
# Stem for DLL import libs
#
-IMPLIB_NAME = libcurl_imp
-IMPLIB_NAME_DEBUG = libcurld_imp
+IMPLIB_NAME = libcurl
+IMPLIB_NAME_DEBUG = libcurl
!IFNDEF OPENSSL_PATH
OPENSSL_PATH = ../../openssl-0.9.8g
--- misc/curl-7.19.7/lib/setup.h 2009-10-29 05:21:58.000000000 +0900 --- misc/curl-7.26.0/lib/setup.h 2009-10-29 05:21:58.000000000 +0900
+++ misc/build/curl-7.19.7/lib/setup.h 2010-03-02 06:03:10.009500000 +0900 +++ misc/build/curl-7.26.0/lib/setup.h 2010-03-02 06:03:10.009500000 +0900
@@ -40,6 +40,21 @@ @@ -40,6 +40,21 @@
#include "curl_config.h" #include "curl_config.h"
......
--- misc/curl-7.26.0/Makefile.msvc.names 2011-03-19 09:17:12.000000000 -0600
+++ misc/build/curl-7.26.0/Makefile.msvc.names 2012-07-02 07:20:39.323448800 -0600
@@ -43,7 +43,7 @@
!ENDIF
!IF !DEFINED(LIB_NAME_STA_DBG) || "$(LIB_NAME_STA_DBG)" == ""
-LIB_NAME_STA_DBG = $(LIB_NAME_STA_REL)d
+LIB_NAME_STA_DBG = $(LIB_NAME_STA_REL)
!ENDIF
!IF !DEFINED(LIB_NAME_DYN_REL) || "$(LIB_NAME_DYN_REL)" == ""
@@ -51,7 +51,7 @@
!ENDIF
!IF !DEFINED(LIB_NAME_DYN_DBG) || "$(LIB_NAME_DYN_DBG)" == ""
-LIB_NAME_DYN_DBG = $(LIB_NAME_DYN_REL)d
+LIB_NAME_DYN_DBG = $(LIB_NAME_DYN_REL)
!ENDIF
# --------------------------------------------
@@ -59,11 +59,11 @@
# --------------------------------------------
!IF !DEFINED(LIB_NAME_IMP_REL) || "$(LIB_NAME_IMP_REL)" == ""
-LIB_NAME_IMP_REL = $(LIB_NAME_DYN_REL)_imp
+LIB_NAME_IMP_REL = $(LIB_NAME_DYN_REL)
!ENDIF
!IF !DEFINED(LIB_NAME_IMP_DBG) || "$(LIB_NAME_IMP_DBG)" == ""
-LIB_NAME_IMP_DBG = $(LIB_NAME_DYN_DBG)_imp
+LIB_NAME_IMP_DBG = $(LIB_NAME_DYN_DBG)
!ENDIF
# --------------------------------------
...@@ -48,9 +48,9 @@ PATCH_FILES=\ ...@@ -48,9 +48,9 @@ PATCH_FILES=\
curl-aix.patch curl-aix.patch
.IF "$(GUI)"=="WNT" .IF "$(GUI)"=="WNT"
PATCH_FILES+=curl-7.19.7_win.patch PATCH_FILES+=curl-7.26.0_win.patch
.IF "$(COM)"=="GCC" .IF "$(COM)"=="GCC"
PATCH_FILES+=curl-7.19.7_mingw.patch PATCH_FILES+=curl-7.26.0_mingw.patch
.ENDIF .ENDIF
.ENDIF .ENDIF
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment