library tweaks

(bzr r1966)

3 files changed, 14 insertions, 18 deletions

diff --git a/build.xml b/build.xml
index f40afe4f0..1ffee9d10 100644
--- a/build.xml
+++ b/build.xml
@@ -85,7 +85,7 @@
 	        <exclude name="removeoverlap/remove_rectangle_overlap-test.h"/>

 	    </fileset>

         <flags>

-            -Wall -O3

+            -Wall -g -O3

 			-mms-bitfields

         </flags>

         <defines>

@@ -181,7 +181,7 @@
            -lgc -mwindows -lws2_32 -lintl -lm

 	   </libs>

 	</link>

-	<strip file="${build}/inkscape.exe"/>

+	<!--<strip file="${build}/inkscape.exe"/>-->

   </target>

 

   <target name="dist" depends="link,i18n"

@@ -220,15 +220,14 @@
     <copy file="${gtk}/bin/libxml2.dll" todir="${dist}"/>

     <copy file="${gtk}/bin/xmlparse.dll" todir="${dist}"/>

     <copy file="${gtk}/bin/jpeg62.dll" todir="${dist}"/>

-    <copy file="${gtk}/bin/libintl-2.dll" todir="${dist}"/>

-    <copy file="${gtk}/bin/libintl-2.dll" tofile="${dist}/intl.dll"/>

-    <copy file="${gtk}/bin/libpng13.dlll" todir="${dist}"/>

+    <copy file="${gtk}/bin/libpng13.dll" todir="${dist}"/>

     <copy file="${gtk}/bin/msvcr70.dll" todir="${dist}"/>

     <copy file="${gtk}/bin/msvcr71.dll" todir="${dist}"/>

     <copy file="${gtk}/bin/zlib1.dll" todir="${dist}"/>

     <copy file="${gtk}/bin/iconv.dll" todir="${dist}"/>

     <copy file="${gtk}/bin/popt1.dll" todir="${dist}"/>

     <copy file="${gtk}/bin/liblcms-1.dll" todir="${dist}"/>

+    <copy file="${gtk}/bin/intl.dll" todir="${dist}"/>

     <copy file="${gtk}/bin/intl.dll" tofile="${dist}/libintl-2.dll"/>

 

     <!-- MSGFMT files -->

diff --git a/build28.xml b/build28.xml
index dcd2813f7..fcae72ee9 100644
--- a/build28.xml
+++ b/build28.xml
@@ -218,15 +218,15 @@
     <copy file="${gtk}/bin/libxml2.dll" todir="${dist}"/>

     <copy file="${gtk}/bin/xmlparse.dll" todir="${dist}"/>

     <copy file="${gtk}/bin/jpeg62.dll" todir="${dist}"/>

-    <copy file="${gtk}/bin/libintl-2.dll" todir="${dist}"/>

-    <copy file="${gtk}/bin/libintl-2.dll" tofile="${dist}/intl.dll"/>

-    <copy file="${gtk}/bin/libpng13.dlll" todir="${dist}"/>

+    <copy file="${gtk}/bin/libpng13.dll" todir="${dist}"/>

     <copy file="${gtk}/bin/msvcr70.dll" todir="${dist}"/>

     <copy file="${gtk}/bin/msvcr71.dll" todir="${dist}"/>

     <copy file="${gtk}/bin/zlib1.dll" todir="${dist}"/>

     <copy file="${gtk}/bin/iconv.dll" todir="${dist}"/>

     <copy file="${gtk}/bin/popt1.dll" todir="${dist}"/>

     <copy file="${gtk}/bin/liblcms-1.dll" todir="${dist}"/>

+    <copy file="${gtk}/bin/intl.dll" todir="${dist}"/>

+    <copy file="${gtk}/bin/intl.dll" tofile="${dist}/libintl-2.dll"/>

 

     <!-- MSGFMT files -->

     <copy todir="${dist}"> <fileset dir="${build}/po"/> </copy>

diff --git a/buildtool.cpp b/buildtool.cpp
index bcec40c93..11d6b7fa9 100644
--- a/buildtool.cpp
+++ b/buildtool.cpp
@@ -4416,21 +4416,18 @@ std::vector<DepRec> DepTool::loadDepFile(const String &depFile)
             std::vector<DepRec>::iterator iter;
             for (iter = result.begin() ; iter != result.end() ; iter++)
                 {
-                if (iter->path > depObject.path)
+                String vpath = iter->path;
+                vpath.append("/");
+                vpath.append(iter->name);
+                String opath = depObject.path;
+                opath.append("/");
+                opath.append(depObject.name);
+                if (vpath > opath)
                     {
                     inserted = true;
                     iter = result.insert(iter, depObject);
                     break;
                     }
-                else if (iter->path == depObject.path)
-                    {
-                    if (iter->name > depObject.name)
-                        {
-                        inserted = true;
-                        iter = result.insert(iter, depObject);
-                        break;
-                        }
-                    }
                 }
             if (!inserted)
                 result.push_back(depObject);