diff --git a/build-dw2.xml b/build-dw2.xml
index cf0f1c51ed62073fee66f7c3568bce5a08001a86..bd9d18a45c14474e24acf5ba33f29b845b5ec433 100644 (file)
--- a/build-dw2.xml
+++ b/build-dw2.xml
</description>
<!-- set global properties for this build -->
</description>
<!-- set global properties for this build -->
- <property name="version" value="0.46dev"/>
- <property name="arch" value="mingw32-"/>
- <!--<property name="archutil" value="${arch}"/>-->
- <property name="archutil" value=""/>
+ <property name="version" value="0.45+devel"/>
+ <property name="arch" value="i686-pc-mingw32-"/>
+ <property name="archutil" value="${arch}"/>
+ <!--<property name="archutil" value=""/>-->
<property name="src" location="src"/>
<property name="src" location="src"/>
- <property name="gtk" location="c:/gtk210"/>
+ <property name="gtk" location="c:/devlibs"/>
+ <!--<property name="gtk" location="/target"/>-->
<property name="lib" location="lib"/>
<property name="build" location="build"/>
<property name="dist" location="inkscape"/>
<property name="lib" location="lib"/>
<property name="build" location="build"/>
<property name="dist" location="inkscape"/>
/* do we want bitmap manipulation? */
#define WITH_IMAGE_MAGICK 1
/* do we want bitmap manipulation? */
#define WITH_IMAGE_MAGICK 1
+ /* Allow reading WordPerfect? */
+ #define WITH_LIBWPG 1
+
#endif /* _CONFIG_H_ */
</makefile>
</target>
#endif /* _CONFIG_H_ */
</makefile>
</target>
<exclude name="extension/api.cpp"/>
<exclude name="extension/dxf2svg/.*"/>
<exclude name="extension/implementation/plugin.cpp"/>
<exclude name="extension/api.cpp"/>
<exclude name="extension/dxf2svg/.*"/>
<exclude name="extension/implementation/plugin.cpp"/>
- <exclude name="extension/internal/gnome.cpp"/>
<exclude name="extension/script/bindtest.cpp"/>
<exclude name="extension/script/cpptest.cpp"/>
<exclude name="extension/plugin/.*"/>
<exclude name="extension/script/bindtest.cpp"/>
<exclude name="extension/script/cpptest.cpp"/>
<exclude name="extension/plugin/.*"/>
<exclude name="dialogs/whiteboard-sharewithuser-dialog.cpp"/>
<exclude name="jabber_whiteboard/node-tracker.cpp"/>
<exclude name="jabber_whiteboard/node-utilities.cpp"/>
<exclude name="dialogs/whiteboard-sharewithuser-dialog.cpp"/>
<exclude name="jabber_whiteboard/node-tracker.cpp"/>
<exclude name="jabber_whiteboard/node-utilities.cpp"/>
- <!--WHITEBOARD-->
+ <!--OVERLAP-->
<exclude name="removeoverlap/placement_SolveVPSC.cpp"/>
<exclude name="removeoverlap/placement_SolveVPSC.h"/>
<exclude name="removeoverlap/test.cpp"/>
<exclude name="removeoverlap/placement_SolveVPSC.cpp"/>
<exclude name="removeoverlap/placement_SolveVPSC.h"/>
<exclude name="removeoverlap/test.cpp"/>
-I${gtk}/include/cairo
-I${gtk}/include/poppler
-I${gtk}/include/gc
-I${gtk}/include/cairo
-I${gtk}/include/poppler
-I${gtk}/include/gc
+ -I${gtk}/include/libwpg-0.1
+ -I${gtk}/include/libwpd-0.8
<!-- PERL -->
-Wno-comment -I${gtk}/perl/lib/CORE
<!-- PYTHON -->
<!-- PERL -->
-Wno-comment -I${gtk}/perl/lib/CORE
<!-- PYTHON -->
-L${gtk}/perl/lib/CORE -lperl58
<!-- PYTHON -->
-L${gtk}/python/libs -lpython25
-L${gtk}/perl/lib/CORE -lperl58
<!-- PYTHON -->
-L${gtk}/python/libs -lpython25
- ${gtk}/bin/libxml2-2.dll
+ ${gtk}/bin/libxml2.dll
${gtk}/bin/libxslt.dll
-lpoppler-cairo -lpoppler
-lcairo.dll
${gtk}/bin/libxslt.dll
-lpoppler-cairo -lpoppler
-lcairo.dll
+ -lwpg-0.1.dll -lwpg-stream-0.1.dll
+ -lwpd-0.8.dll -lwpd-stream-0.8.dll
${gtk}/lib/iconv.lib
-lMagick++ -lWand -lMagick
-lfreetype.dll -lfontconfig.dll
${gtk}/lib/iconv.lib
-lMagick++ -lWand -lMagick
-lfreetype.dll -lfontconfig.dll
-L${gtk}/perl/lib/CORE -lperl58
<!-- PYTHON -->
-L${gtk}/python/libs -lpython24
-L${gtk}/perl/lib/CORE -lperl58
<!-- PYTHON -->
-L${gtk}/python/libs -lpython24
- ${gtk}/bin/libxml2-2.dll
+ ${gtk}/bin/libxml2.dll
${gtk}/bin/libxslt.dll
${gtk}/lib/iconv.lib
-lfreetype.dll -lfontconfig.dll
${gtk}/bin/libxslt.dll
${gtk}/lib/iconv.lib
-lfreetype.dll -lfontconfig.dll
<copy file="${gtk}/bin/libpangowin32-1.0-0.dll" todir="${dist}"/>
<copy file="${gtk}/bin/freetype6.dll" todir="${dist}"/>
<copy file="${gtk}/bin/libfontconfig-1.dll" todir="${dist}"/>
<copy file="${gtk}/bin/libpangowin32-1.0-0.dll" todir="${dist}"/>
<copy file="${gtk}/bin/freetype6.dll" todir="${dist}"/>
<copy file="${gtk}/bin/libfontconfig-1.dll" todir="${dist}"/>
- <copy file="${gtk}/bin/libxml2-2.dll" todir="${dist}"/>
+ <copy file="${gtk}/bin/libxml2.dll" todir="${dist}"/>
<copy file="${gtk}/bin/libxslt.dll" todir="${dist}"/>
<copy file="${gtk}/bin/libexpat.dll" todir="${dist}"/>
<!--<copy file="${gtk}/bin/libexpat.dll" tofile="${dist}/xmlparse.dll"/>-->
<copy file="${gtk}/bin/libxslt.dll" todir="${dist}"/>
<copy file="${gtk}/bin/libexpat.dll" todir="${dist}"/>
<!--<copy file="${gtk}/bin/libexpat.dll" tofile="${dist}/xmlparse.dll"/>-->
+ <copy file="${gtk}/bin/libwpg-0.1.dll" todir="${dist}"/>
+ <copy file="${gtk}/bin/libwpg-stream-0.1.dll" todir="${dist}"/>
+ <copy file="${gtk}/bin/libwpd-0.8.dll" todir="${dist}"/>
+ <copy file="${gtk}/bin/libwpd-stream-0.8.dll" todir="${dist}"/>
<copy file="${gtk}/bin/jpeg62.dll" todir="${dist}"/>
<copy file="${gtk}/bin/libpng13.dll" todir="${dist}"/>
<copy file="${gtk}/bin/libtiff3.dll" todir="${dist}"/>
<copy file="${gtk}/bin/jpeg62.dll" todir="${dist}"/>
<copy file="${gtk}/bin/libpng13.dll" todir="${dist}"/>
<copy file="${gtk}/bin/libtiff3.dll" todir="${dist}"/>
<!--<copy file="${gtk}/share/themes/MS-Windows/gtk-2.0/gtkrc" todir="${dist}/etc/gtk-2.0"/>-->
<makefile file="${dist}/etc/gtk-2.0/gtkrc">
<!--<copy file="${gtk}/share/themes/MS-Windows/gtk-2.0/gtkrc" todir="${dist}/etc/gtk-2.0"/>-->
<makefile file="${dist}/etc/gtk-2.0/gtkrc">
- gtk-icon-sizes = "gtk-menu=13,13:gtk-small-toolbar=16,16:gtk-large-toolbar=24,24:gtk-dnd=32,32:inkscape-decoration=16,16"
+ gtk-icon-sizes = "gtk-menu=16,16:gtk-small-toolbar=16,16:gtk-large-toolbar=24,24:gtk-dnd=32,32:inkscape-decoration=16,16"
gtk-toolbar-icon-size = small-toolbar
# disable images in buttons. i've only seen ugly delphi apps use this feature.
gtk-toolbar-icon-size = small-toolbar
# disable images in buttons. i've only seen ugly delphi apps use this feature.