X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=build.xml;h=bd798ea685fe236e26bf0e33c0acbc027a0bd620;hb=ec8021b96ba181202dd19e74997e97d2c5f1ecf3;hp=8a55b523b377e5ff378223571f6a5141932a81ac;hpb=8b1cddd505b54e5cea167a94e04f00b8058604c3;p=inkscape.git

diff --git a/build.xml b/build.xml
index 8a55b523b..bd798ea68 100644
--- a/build.xml
+++ b/build.xml
@@ -62,7 +62,7 @@
   -->
   <target name="init"
       description=
-      "Do all prepatory tasks, like make directories and copy files">
+      "Do all preparatory tasks, like make directories and copy files">
 
 
     <!-- example of the <pkg-config> task
@@ -144,6 +144,9 @@
         /* shared whiteboard */
         #define WITH_INKBOARD                 1
         #define HAVE_SSL                      1
+        
+        /* use poppler for pdf import? */
+        #define HAVE_POPPLER                  1
 
         #endif /* _CONFIG_H_ */
     </makefile>
@@ -256,6 +259,7 @@
             -DHAVE_CONFIG_H
             -DXP_WIN <!-- for JS -->
             -D_INTL_REDIRECT_INLINE
+            -DHAVE_SSL
             -DRELAYTOOL_SSL="static const int libssl_is_present=1; static int __attribute__((unused)) libssl_symbol_is_present(char *s){ return 1; }" <!-- inkboard -->
         </defines>
         <includes>
@@ -282,6 +286,7 @@
             -I${gtk}/include/libxml2 
             -I${gtk}/include/freetype2
             -I${gtk}/include/cairo
+            -I${gtk}/include/poppler
             <!-- PERL -->
             -Wno-comment -I${gtk}/perl/lib/CORE
             <!-- PYTHON -->
@@ -370,11 +375,12 @@
            <!-- PYTHON -->
            -L${gtk}/python/libs -lpython25
            ${gtk}/bin/libxml2.dll
+           -lpoppler
            ${gtk}/lib/iconv.lib
            -lfreetype.dll -lfontconfig.dll
            -llcms.dll
            -lssl -lcrypto
-           -lpng -lpopt ${gtk}/lib/zdll.lib
+           -lpng -ljpeg.dll -lpopt ${gtk}/lib/zdll.lib
            -lgc -mwindows -lws2_32 -lintl -lm
        </libs>
     </link>