<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[23921] branches/wx-port-alpha/trunk</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/23921">23921</a></dd>
<dt>Author</dt> <dd>kevino</dd>
<dt>Date</dt> <dd>2007-07-01 17:51:22 -0700 (Sun, 01 Jul 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>Restore the Windows build after libpng/libjpeg and Python extension changes.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#brancheswxportalphatrunkWebCoreProjectswxwebcorewxbkl">branches/wx-port-alpha/trunk/WebCore/Projects/wx/webcore-wx.bkl</a></li>
<li><a href="#brancheswxportalphatrunkWebCorewebcorebasebkl">branches/wx-port-alpha/trunk/WebCore/webcore-base.bkl</a></li>
<li><a href="#brancheswxportalphatrunkWebKitwxWebFrameh">branches/wx-port-alpha/trunk/WebKit/wx/WebFrame.h</a></li>
<li><a href="#brancheswxportalphatrunkWebKitwxWebViewh">branches/wx-port-alpha/trunk/WebKit/wx/WebView.h</a></li>
<li><a href="#brancheswxportalphatrunkWebKitwxbindingspythonwxwebkitpybkl">branches/wx-port-alpha/trunk/WebKit/wx/bindings/python/wxwebkit-py.bkl</a></li>
<li><a href="#brancheswxportalphatrunkWebKitwxwxwebkitbkl">branches/wx-port-alpha/trunk/WebKit/wx/wxwebkit.bkl</a></li>
<li><a href="#brancheswxportalphatrunkWebKitToolsScriptsbuildwxwebkit">branches/wx-port-alpha/trunk/WebKitTools/Scripts/build-wxwebkit</a></li>
<li><a href="#brancheswxportalphatrunkWebKitToolsScriptsinstallwinextras">branches/wx-port-alpha/trunk/WebKitTools/Scripts/install-win-extras</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="brancheswxportalphatrunkWebCoreProjectswxwebcorewxbkl"></a>
<div class="modfile"><h4>Modified: branches/wx-port-alpha/trunk/WebCore/Projects/wx/webcore-wx.bkl (23920 => 23921)</h4>
<pre class="diff"><span>
<span class="info">--- branches/wx-port-alpha/trunk/WebCore/Projects/wx/webcore-wx.bkl 2007-07-02 00:44:15 UTC (rev 23920)
+++ branches/wx-port-alpha/trunk/WebCore/Projects/wx/webcore-wx.bkl 2007-07-02 00:51:22 UTC (rev 23921)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-<?xml version="1.0" ?>
</del><ins>+<?xml version="1.0" ?>
</ins><span class="cx"> <!--
</span><span class="cx"> Copyright (C) 2007 Kevin Ollivier <kevino@theolliviers.com>
</span><span class="cx">
</span><span class="lines">@@ -71,6 +71,7 @@
</span><span class="cx">
</span><span class="cx"> <define>BUILDING_WX__=1</define>
</span><span class="cx"> <define>WTF_USE_ICU_UNICODE=1</define>
</span><ins>+ <define>UNICODE=1</define>
</ins><span class="cx">
</span><span class="cx"> <if cond="PLATFORM_WIN32=='0'">
</span><span class="cx"> <ldlibs>`$(WX_CONFIG) --libs`</ldlibs>
</span><span class="lines">@@ -81,6 +82,8 @@
</span><span class="cx"> <include>$(SRCDIR)/platform/wx/wxcode</include>
</span><span class="cx"> <include>$(SRCDIR)/bridge/wx</include>
</span><span class="cx"> <include>$(SRCDIR)/page/wx</include>
</span><ins>+ <include>$(WK_ROOT)/libpng</include>
+ <include>$(WK_ROOT)/libjpeg</include>
</ins><span class="cx">
</span><span class="cx"> <sources>
</span><span class="cx"> editing/wx/EditorWx.cpp
</span></span></pre></div>
<a id="brancheswxportalphatrunkWebCorewebcorebasebkl"></a>
<div class="modfile"><h4>Modified: branches/wx-port-alpha/trunk/WebCore/webcore-base.bkl (23920 => 23921)</h4>
<pre class="diff"><span>
<span class="info">--- branches/wx-port-alpha/trunk/WebCore/webcore-base.bkl 2007-07-02 00:44:15 UTC (rev 23920)
+++ branches/wx-port-alpha/trunk/WebCore/webcore-base.bkl 2007-07-02 00:51:22 UTC (rev 23921)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-<?xml version="1.0" ?>
</del><ins>+<?xml version="1.0" ?>
</ins><span class="cx"> <!--
</span><span class="cx"> Copyright (C) 2005, 2006 Apple Computer, Inc. All rights reserved.
</span><span class="cx">
</span></span></pre></div>
<a id="brancheswxportalphatrunkWebKitwxWebFrameh"></a>
<div class="modfile"><h4>Modified: branches/wx-port-alpha/trunk/WebKit/wx/WebFrame.h (23920 => 23921)</h4>
<pre class="diff"><span>
<span class="info">--- branches/wx-port-alpha/trunk/WebKit/wx/WebFrame.h 2007-07-02 00:44:15 UTC (rev 23920)
+++ branches/wx-port-alpha/trunk/WebKit/wx/WebFrame.h 2007-07-02 00:51:22 UTC (rev 23921)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class wxPageSourceViewFrame : public wxFrame
</del><ins>+class WXDLLIMPEXP_WEBKIT wxPageSourceViewFrame : public wxFrame
</ins><span class="cx"> {
</span><span class="cx"> public:
</span><span class="cx"> wxPageSourceViewFrame(const wxString& source);
</span></span></pre></div>
<a id="brancheswxportalphatrunkWebKitwxWebViewh"></a>
<div class="modfile"><h4>Modified: branches/wx-port-alpha/trunk/WebKit/wx/WebView.h (23920 => 23921)</h4>
<pre class="diff"><span>
<span class="info">--- branches/wx-port-alpha/trunk/WebKit/wx/WebView.h 2007-07-02 00:44:15 UTC (rev 23920)
+++ branches/wx-port-alpha/trunk/WebKit/wx/WebView.h 2007-07-02 00:51:22 UTC (rev 23921)
</span><span class="lines">@@ -37,16 +37,17 @@
</span><span class="cx"> class WebViewFrameData;
</span><span class="cx">
</span><span class="cx"> #ifndef SWIG
</span><del>-#if WXMAKINGDLL
</del><ins>+
+#if WXMAKINGDLL_WEBKIT
</ins><span class="cx"> #define WXDLLIMPEXP_WEBKIT WXEXPORT
</span><del>-#endif
-
-#if WXUSINGDLL
</del><ins>+#elif defined(WXUSINGDLL_WEBKIT)
</ins><span class="cx"> #define WXDLLIMPEXP_WEBKIT WXIMPORT
</span><ins>+#else
+#define WXDLLIMPEXP_WEBKIT
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #else
</span><del>-#define WXDLLIMPEXP_WEBKIT
</del><ins>+#define WXDLLIMPEXP_WEBKIT
</ins><span class="cx"> #endif // SWIG
</span><span class="cx">
</span><span class="cx"> class WXDLLIMPEXP_WEBKIT wxWebView : public wxScrolledWindow
</span><span class="lines">@@ -142,7 +143,7 @@
</span><span class="cx">
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class wxWebViewDOMElementInfo
</del><ins>+class WXDLLIMPEXP_WEBKIT wxWebViewDOMElementInfo
</ins><span class="cx"> {
</span><span class="cx"> public:
</span><span class="cx"> wxWebViewDOMElementInfo();
</span><span class="lines">@@ -173,7 +174,7 @@
</span><span class="cx"> wxString m_link;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class wxWebViewBeforeLoadEvent : public wxCommandEvent
</del><ins>+class WXDLLIMPEXP_WEBKIT wxWebViewBeforeLoadEvent : public wxCommandEvent
</ins><span class="cx"> {
</span><span class="cx"> #ifndef SWIG
</span><span class="cx"> DECLARE_DYNAMIC_CLASS( wxWebViewBeforeLoadEvent )
</span><span class="lines">@@ -196,7 +197,7 @@
</span><span class="cx"> int m_navType;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class wxWebViewStateChangedEvent : public wxCommandEvent
</del><ins>+class WXDLLIMPEXP_WEBKIT wxWebViewStateChangedEvent : public wxCommandEvent
</ins><span class="cx"> {
</span><span class="cx"> #ifndef SWIG
</span><span class="cx"> DECLARE_DYNAMIC_CLASS( wxWebViewStateChangedEvent )
</span><span class="lines">@@ -216,7 +217,7 @@
</span><span class="cx"> wxString m_url;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class wxWebViewNewWindowEvent : public wxCommandEvent
</del><ins>+class WXDLLIMPEXP_WEBKIT wxWebViewNewWindowEvent : public wxCommandEvent
</ins><span class="cx"> {
</span><span class="cx"> #ifndef SWIG
</span><span class="cx"> DECLARE_DYNAMIC_CLASS( wxWebViewNewWindowEvent )
</span><span class="lines">@@ -233,7 +234,7 @@
</span><span class="cx"> wxString m_url;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class wxWebViewRightClickEvent : public wxCommandEvent
</del><ins>+class WXDLLIMPEXP_WEBKIT wxWebViewRightClickEvent : public wxCommandEvent
</ins><span class="cx"> {
</span><span class="cx"> #ifndef SWIG
</span><span class="cx"> DECLARE_DYNAMIC_CLASS( wxWebViewRightClickEvent )
</span></span></pre></div>
<a id="brancheswxportalphatrunkWebKitwxbindingspythonwxwebkitpybkl"></a>
<div class="modfile"><h4>Modified: branches/wx-port-alpha/trunk/WebKit/wx/bindings/python/wxwebkit-py.bkl (23920 => 23921)</h4>
<pre class="diff"><span>
<span class="info">--- branches/wx-port-alpha/trunk/WebKit/wx/bindings/python/wxwebkit-py.bkl 2007-07-02 00:44:15 UTC (rev 23920)
+++ branches/wx-port-alpha/trunk/WebKit/wx/bindings/python/wxwebkit-py.bkl 2007-07-02 00:51:22 UTC (rev 23921)
</span><span class="lines">@@ -13,11 +13,20 @@
</span><span class="cx"> <set var="WX_PYTHON">1</set>
</span><span class="cx"> </if>
</span><span class="cx">
</span><ins>+ <if cond="not isdefined('PYTHON_VERSION')">
+ <option name="PYTHON_VERSION" category="path">
+ <default-value>25</default-value>
+ <description>
+ Python version we're building against.
+ </description>
+ </option>
+ </if>
+
</ins><span class="cx"> <if cond="not isdefined('PYTHON_LIBDIR')">
</span><span class="cx"> <option name="PYTHON_LIBDIR" category="path">
</span><del>- <default-value>`python -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib()"`</default-value>
</del><ins>+ <default-value>C:/Python25/Libs</default-value>
</ins><span class="cx"> <description>
</span><del>- The root directory for Python extensions.
</del><ins>+ The directory containing the Python library to link against.
</ins><span class="cx"> </description>
</span><span class="cx"> </option>
</span><span class="cx"> </if>
</span><span class="lines">@@ -57,15 +66,20 @@
</span><span class="cx"> <include>$(WK_ROOT)/WebKit/wx</include>
</span><span class="cx"> <include>$(WK_ROOT)/WebKit/wx/WebKitSupport</include>
</span><span class="cx">
</span><del>- <sys-lib>png</sys-lib>
-
</del><span class="cx"> <if cond="FORMAT=='gnu'">
</span><ins>+ <sys-lib>png</sys-lib>
</ins><span class="cx"> <set var="MAC_FLAGS">
</span><span class="cx"> <if cond="PLATFORM_OS=='mac'">-bundle</if>
</span><span class="cx"> </set>
</span><span class="cx">
</span><span class="cx"> <ldflags>$(MAC_FLAGS) -undefined dynamic_lookup</ldflags>
</span><span class="cx"> </if>
</span><ins>+ <if cond="FORMAT in ['msvc','msvs2005prj']">
+ <sys-lib>libpng</sys-lib>
+ <sys-lib>python$(PYTHON_VERSION)</sys-lib>
+ <lib-path>$(WK_ROOT)/libpng</lib-path>
+ <lib-path>$(PYTHON_LIBDIR)</lib-path>
+ </if>
</ins><span class="cx">
</span><span class="cx"> <sys-lib>wxwebkit</sys-lib>
</span><span class="cx"> <lib-path>$(WKOUTPUTDIR)</lib-path>
</span></span></pre></div>
<a id="brancheswxportalphatrunkWebKitwxwxwebkitbkl"></a>
<div class="modfile"><h4>Modified: branches/wx-port-alpha/trunk/WebKit/wx/wxwebkit.bkl (23920 => 23921)</h4>
<pre class="diff"><span>
<span class="info">--- branches/wx-port-alpha/trunk/WebKit/wx/wxwebkit.bkl 2007-07-02 00:44:15 UTC (rev 23920)
+++ branches/wx-port-alpha/trunk/WebKit/wx/wxwebkit.bkl 2007-07-02 00:51:22 UTC (rev 23921)
</span><span class="lines">@@ -64,14 +64,15 @@
</span><span class="cx"> <include>$(WK_ROOT)/WebKit/wx</include>
</span><span class="cx"> <include>$(WK_ROOT)/WebKit/wx/WebKitSupport</include>
</span><span class="cx">
</span><del>- <sys-lib>png</sys-lib>
-
</del><span class="cx"> <if cond="FORMAT=='gnu'">
</span><ins>+ <sys-lib>png</sys-lib>
</ins><span class="cx"> <ldflags>$(WKOUTPUTDIR)/libwebcore-wx.a</ldflags>
</span><span class="cx"> </if>
</span><span class="cx"> <if cond="FORMAT in ['msvc','msvs2005prj']">
</span><span class="cx"> <sys-lib>webcore-wx</sys-lib>
</span><ins>+ <sys-lib>libpng</sys-lib>
</ins><span class="cx"> <lib-path>$(WKOUTPUTDIR)</lib-path>
</span><ins>+ <lib-path>$(WK_ROOT)/libpng</lib-path>
</ins><span class="cx"> </if>
</span><span class="cx">
</span><span class="cx"> <define>BUILDING_WX__=1</define>
</span></span></pre></div>
<a id="brancheswxportalphatrunkWebKitToolsScriptsbuildwxwebkit"></a>
<div class="modfile"><h4>Modified: branches/wx-port-alpha/trunk/WebKitTools/Scripts/build-wxwebkit (23920 => 23921)</h4>
<pre class="diff"><span>
<span class="info">--- branches/wx-port-alpha/trunk/WebKitTools/Scripts/build-wxwebkit 2007-07-02 00:44:15 UTC (rev 23920)
+++ branches/wx-port-alpha/trunk/WebKitTools/Scripts/build-wxwebkit 2007-07-02 00:51:22 UTC (rev 23921)
</span><span class="lines">@@ -98,18 +98,6 @@
</span><span class="cx"> done
</span><span class="cx">
</span><span class="cx">
</span><del>-SWIG=`which swig`
-
-if [ $wxpython == 1 ]; then
- # Run swig so that we can spit out an error if it doesn't exist.
-
- if [ ! -f "$SWIG" ]; then
- echo "ERROR: Cannot find SWIG. Make sure that SWIG 1.3.29 is located on your path.";
- exit 1;
- fi
-fi
-
-
</del><span class="cx"> #----------------------------------------------------------------------
</span><span class="cx">
</span><span class="cx"> # if no arguments were passed, do a full build.
</span><span class="lines">@@ -236,21 +224,39 @@
</span><span class="cx">
</span><span class="cx"> do_make $WK_ROOT/JavaScriptCore "-DBUILDING_WX__=1 $WXGC_DEFINE" WX_DEBUG=$wxdebug WEBKIT_ROOT=$WK_ROOTDIR PLATFORM_OS=$PLATFORM_OS $other_args
</span><span class="cx"> do_make $WK_ROOT/WebCore/Projects/wx "-DBUILDING_WX__=1 $WXGC_DEFINE" WX_DEBUG=$wxdebug WEBKIT_ROOT=$WK_ROOTDIR PLATFORM_OS=$PLATFORM_OS $other_args
</span><del>- do_make $WK_ROOT/WebKit/wx "-DBUILDING_WX__=1 -DWXMAKINGDLL=1 $WXGC_DEFINE" WX_DEBUG=$wxdebug WEBKIT_ROOT=$WK_ROOTDIR PLATFORM_OS=$PLATFORM_OS $other_args
- do_make $WK_ROOT/WebKitTools/wxBrowser "-DBUILDING_WX__=1 -DWXUSINGDLL=1 $WXGC_DEFINE" WX_DEBUG=$wxdebug WEBKIT_ROOT=$WK_ROOTDIR PLATFORM_OS=$PLATFORM_OS $other_args
-
</del><ins>+ do_make $WK_ROOT/WebKit/wx "-DBUILDING_WX__=1 -DWXMAKINGDLL_WEBKIT=1 $WXGC_DEFINE" WX_DEBUG=$wxdebug WEBKIT_ROOT=$WK_ROOTDIR PLATFORM_OS=$PLATFORM_OS $other_args
+ do_make $WK_ROOT/WebKitTools/wxBrowser "-DBUILDING_WX__=1 -DWXUSINGDLL_WEBKIT=1 $WXGC_DEFINE" WX_DEBUG=$wxdebug WEBKIT_ROOT=$WK_ROOTDIR PLATFORM_OS=$PLATFORM_OS $other_args
</ins><span class="cx">
</span><span class="cx"> if [ $do_build == 1 ]; then
</span><span class="cx"> if [ $wxpython == 1 ]; then
</span><ins>+ SWIG=`which swig`
+
+ if [ ! -f "$SWIG" ]; then
+ echo "ERROR: Cannot find SWIG. Make sure that SWIG 1.3.29 is located on your path.";
+ exit 1;
+ fi
+
</ins><span class="cx"> cd $WK_ROOT/WebKit/wx/bindings/python
</span><span class="cx">
</span><del>- WX_VERSION=`wx-config --version`
- WX_VERSION="${WX_VERSION:0:3}"
</del><span class="cx"> SWIG_FLAGS=`python -c "import wx.build.config; import string; print string.join(wx.build.config.swig_args, ' ')"`
</span><del>- $SWIG $SWIG_FLAGS -I$WK_ROOT/WebKit/wx -o webview.cpp webview.i
</del><ins>+ WEBKIT_INCLUDE="-I$WK_ROOT/WebKit/wx"
+ if [ "${OSTYPE:0:6}" == "cygwin" ]; then
+ WEBKIT_INCLUDE="-I`cygpath -d $WK_ROOT/WebKit/wx`"
+ fi
+ $SWIG $SWIG_FLAGS -I$WXWIN/include/wx/wxPython/i_files $WEBKIT_INCLUDE -o webview.cpp webview.i
</ins><span class="cx">
</span><span class="cx"> PY_INCLUDE=`python -c "import distutils.sysconfig; print distutils.sysconfig.get_python_inc()"`
</span><del>- do_make $WK_ROOT/WebKit/wx/bindings/python "-DBUILDING_WX__=1 -DWXUSINGDLL=1 -I$PY_INCLUDE $WXGC_DEFINE" WX_DEBUG=$wxdebug WEBKIT_ROOT=$WK_ROOTDIR PLATFORM_OS=$PLATFORM_OS $other_args
</del><ins>+ PY_VERSION=`python -c "import sys; print str(sys.version_info[0]) + str(sys.version_info[1])"`
+ PY_LIBDIR=`python -c "import distutils.sysconfig; print distutils.sysconfig.PREFIX"`
+
+ if [ "${OSTYPE:0:6}" == "cygwin" ]; then
+ PY_LIBDIR="$PY_LIBDIR\\Libs"
+ else
+ PY_LIBDIR="$PY_LIBDIR/lib"
+ fi
+
+ do_make $WK_ROOT/WebKit/wx/bindings/python "-DBUILDING_WX__=1 -DWXUSINGDLL=1 -DWXUSINGDLL_WEBKIT=1 -I$PY_INCLUDE $WXGC_DEFINE" \
+ WX_DEBUG=$wxdebug WEBKIT_ROOT=$WK_ROOTDIR PLATFORM_OS=$PLATFORM_OS PYTHON_VERSION=$PY_VERSION PYTHON_LIBDIR=$PY_LIBDIR $other_args
</ins><span class="cx"> fi
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="brancheswxportalphatrunkWebKitToolsScriptsinstallwinextras"></a>
<div class="modfile"><h4>Modified: branches/wx-port-alpha/trunk/WebKitTools/Scripts/install-win-extras (23920 => 23921)</h4>
<pre class="diff"><span>
<span class="info">--- branches/wx-port-alpha/trunk/WebKitTools/Scripts/install-win-extras 2007-07-02 00:44:15 UTC (rev 23920)
+++ branches/wx-port-alpha/trunk/WebKitTools/Scripts/install-win-extras 2007-07-02 00:51:22 UTC (rev 23921)
</span><span class="lines">@@ -151,7 +151,23 @@
</span><span class="cx"> }
</span><span class="cx"> `chmod 755 ../pthreads/lib/*.dll`;
</span><span class="cx">
</span><ins>+my $LIBPNG_ZIP="lpng1218.zip";
+my $LIBPNG_URL="ftp://ftp.simplesystems.org/pub/libpng/png/src/" . $LIBPNG_ZIP;
</ins><span class="cx">
</span><ins>+if (! -e $LIBPNG_ZIP) {
+ print "Downloading " . $LIBPNG_ZIP . "...\n\n";
+ `rm -rf lpng*`;
+ `curl -O $LIBPNG_URL`;
+ print "\nInstalling " . $LIBPNG_ZIP . "...\n";
+ `unzip $LIBPNG_ZIP`;
+ `ls -la .`;
+ chdir "lpng1218";
+ `nmake -f scripts/makefile.vcwin32 CFLAGS="-I..\\zlib-1.2.3.win32\\include"`;
+ chdir "..";
+ `rm -rf ../libpng`;
+ `cp -rp lpng1218 ../libpng`;
+}
+
</ins><span class="cx"> my $PROGRAMFILES = $ENV{"PROGRAMFILES"};
</span><span class="cx"> my $unixProgramFiles = `cygpath -u "$PROGRAMFILES"`;
</span><span class="cx"> chomp $unixProgramFiles;
</span></span></pre>
</div>
</div>
</body>
</html>