Win32: Updated libpng and libcurl

Both of these are dependent on zlib 1.2.5, which is now included
in doomsday/external/zlib. libpng is version 1.5.5 and libcurl
is version 7.22. They have been compiled with MSVC 2010.

An external libcurl SDK is no longer being used by dep_curl.pri.

distrib/platform_release.py

@@ -7,7 +7,7 @@
 import glob
 import build_version
 
-LAUNCH_DIR = os.getcwd()
+LAUNCH_DIR = os.path.abspath(os.getcwd())
 DOOMSDAY_DIR = os.path.abspath(os.path.join(os.getcwd(), '..', 'doomsday'))
 SNOWBERRY_DIR = os.path.abspath(os.path.join(LAUNCH_DIR, '..', 'snowberry'))
 WORK_DIR = os.path.join(LAUNCH_DIR, 'work')
@@ -80,9 +80,7 @@ def prepare_work_dir():
 
 def mac_os_version():
     return platform.mac_ver()[0][:4]
-
-
-
+
 
 """The Mac OS X release procedure."""
 def mac_release():
@@ -198,6 +196,11 @@ def mac_release():
 
 """The Mac OS X release procedure."""
 def win_release():
+    PROD_DIR = os.path.join(LAUNCH_DIR, 'products')
+    if not os.path.exists(PROD_DIR):
+        print "Creating the products directory."
+        os.mkdir(PROD_DIR)
+
     # Generate the Inno Setup configuration file.
     script = file('win32\setup.iss.template', 'rt').read()
     file('win32\setup.iss', 'wt').write(script

distrib/win32/setup.iss.template

@@ -68,12 +68,9 @@ 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: "zlib1.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
-Source: "libpng13.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
+Source: "libpng15.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
+Source: "libcurl.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
 
 ; Snowberry
 Source: "..\..\snowberry\dist\*"; DestDir: "{app}\snowberry"; Flags: ignoreversion; Components: Launcher

doomsday/dep_curl.pri

@@ -1,19 +1,13 @@
 # Build configuration for cURL.
 win32 {
-    isEmpty(CURL_DIR) {
-        error("dep_curl: cURL SDK path not defined, check your config_user.pri")
-    }
-
-    INCLUDEPATH += $$CURL_DIR/include
-    LIBS += -l$$CURL_DIR/libcurl_imp
+    CURL_DIR = $$PWD/external/libcurl
+
+    INCLUDEPATH += $$CURL_DIR/portable/include
+    LIBS += -l$$CURL_DIR/win32/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/win32/libcurl.dll 
     curllibs.path = $$DENG_WIN_PRODUCTS_DIR
 }
 else:macx {

doomsday/dep_libpng.pri

@@ -1,11 +1,11 @@
 # Build configuration for libpng.
 win32 {
     INCLUDEPATH += $$PWD/external/libpng/portable/include
-    LIBS += -L$$PWD/external/libpng/win32 -llibpng13
+    LIBS += -L$$PWD/external/libpng/win32 -llibpng15
 
     # Installed shared libraries.
     INSTALLS += pnglibs
-    pnglibs.files = $$PWD/external/libpng/win32/libpng13.dll
+    pnglibs.files = $$PWD/external/libpng/win32/libpng15.dll
     pnglibs.path = $$DENG_WIN_PRODUCTS_DIR
 }
 else:macx {