included inkview into new win32 build system btool

diff --git a/Makefile.am b/Makefile.am
index 3399161c9b5d114919719d7e8b080c69303d91d8..650f1d3f820c368e2a4bb9cc538d3f78ee75a751 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -137,7 +137,7 @@ EXTRA_DIST = \
        po/Makefile.mingw \
         po/inkscape.pot \
         po/update_po_files.sh \
-       src/Makefile.mingw src/inkscape_version.h.mingw src/inkscape.rc src/makedef.pl \
+       src/Makefile.mingw src/inkscape_version.h.mingw src/inkscape.rc src/inkview.rc  src/makedef.pl \
        src/helper/sp-marshal.h.mingw src/helper/sp-marshal.cpp.mingw
 
 # We want the built inkscape.1 to go in the distributed .tar.gz so

diff --git a/build.xml b/build.xml
index c8ea0c17f07cdf64d0af41bc88a799de1640b803..77f89ae6ab7c87b17b82dc5b04501fcbff1310c0 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -111,7 +111,7 @@
                <exclude name="extension/plugin/.*"/>
                <exclude name="extract-uri-test.cpp"/>
                <exclude name="helper/units-test.cpp"/>
-               <exclude name="inkview.cpp"/>
+               <!-- exclude name="inkview.cpp"/-->
                <exclude name="libnr/in-svg-plane-test.cpp"/>
                <exclude name="libnr/nr-compose-reference.cpp"/>
                <exclude name="libnr/nr-compose-test.cpp"/>
@@ -204,6 +204,7 @@
           <fileset dir="${build}/obj">
               <exclude name="main,o"/>
               <exclude name="winmain,o"/>
+              <exclude name="inkview,o"/>
           </fileset>
        </staticlib>
   </target>
@@ -258,12 +259,57 @@
           </libs>
        </link>
   </target>
+  
+  <target name="linkinkview" depends="lib">
+    <rc command="${archutil}windres" 
+           file="${src}/inkview.rc"
+           out="${build}/inkviewres.o">
+               <flags>
+               --include-dir=${src}
+               </flags>
+       </rc>
+    <link command="${arch}g++" out="${build}/inkview.exe"
+              strip="true" symfile="${build}/inkview.dbg"
+              stripcommand="${archutil}strip"
+              objcopycommand="${archutil}objcopy"
+              >
+       <flags>
+       </flags>
+          <fileset dir="${build}">
+              < include name="inkviewres.o"/ >
+              <include name="obj/inkview.o"/>
+              <include name="libinkscape.a"/>
+          </fileset>
+          <libs>
+              -L${gtk}/lib
+           -lgtkmm-2.4 -lgdkmm-2.4 -lglibmm-2.4
+           -latkmm-1.6 -lpangomm-1.4 -lsigc-2.0
+           -lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0
+           -lgdk_pixbuf-2.0
+           -lpangocairo-1.0 -lpangoft2-1.0 -lpangowin32-1.0 -lpango-1.0
+           -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lcairo
+           <!-- PERL -->
+                  -L${gtk}/perl/lib/CORE -lperl58
+           <!-- PYTHON -->
+           -L${gtk}/python/libs -lpython24
+           ${gtk}/bin/libxml2.dll
+           ${gtk}/lib/iconv.lib
+           -lfreetype.dll -lfontconfig.dll
+           -llcms.dll
+           -lssl -lcrypto
+           -lpng -lpopt ${gtk}/lib/zdll.lib
+           -lgc -mwindows -lws2_32 -lintl -lm
+          </libs>
+       </link>
+  </target>
 
-  <target name="dist" depends="link,i18n"
+  <target name="dist" depends="link,i18n,linkinkview"
         description="generate the distribution" >
     <!-- Create the distribution directory -->
     <copy file="${build}/inkscape.exe" todir="${dist}"/>
     <copy file="${build}/inkscape.dbg" todir="${dist}"/>
+    <copy file="${build}/inkview.exe" todir="${dist}"/>
+    <copy file="${build}/inkview.dbg" todir="${dist}"/>
     <copy file="AUTHORS" todir="${dist}"/>
     <copy file="COPYING" todir="${dist}"/>
     <copy file="COPYING.LIB" todir="${dist}"/>