Win32: Updated cURL

skyjake · Sep 27, 2011 · c3974d6 · c3974d6
1 parent eb14304
commit c3974d6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/distrib/win32/setup.iss.template b/distrib/win32/setup.iss.template
@@ -68,10 +68,7 @@ Source: "mikmod.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: En
 Source: "SDL_mixer.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
 Source: "smpeg.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
 Source: "lzss.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
-Source: "curllib.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
-Source: "openldap.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
-Source: "ssleay32.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
-Source: "libeay32.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
+Source: "libcurl.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
 Source: "zlib1.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
 Source: "libpng13.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
 

diff --git a/doomsday/dep_curl.pri b/doomsday/dep_curl.pri
@@ -5,15 +5,11 @@ win32 {
     }
 
     INCLUDEPATH += $$CURL_DIR/include
-    LIBS += -l$$CURL_DIR/libcurl_imp
-
+    LIBS += -l$$CURL_DIR/libcurl
+    
     # Install the libcurl shared library.
     INSTALLS += curllibs
-    curllibs.files = \
-        $$CURL_DIR/curllib.dll \
-        $$CURL_DIR/openldap.dll \
-        $$CURL_DIR/ssleay32.dll \
-        $$CURL_DIR/libeay32.dll
+    curllibs.files = $$CURL_DIR/libcurl.dll 
     curllibs.path = $$DENG_WIN_PRODUCTS_DIR
 }
 else:macx {