From 818d83ed67b287ef6e04a7abb7ff7e6453075816 Mon Sep 17 00:00:00 2001
From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch>
Date: Sun, 1 Jun 2014 15:23:26 +0200
Subject: win64: add aspell and stand-alone gdb to builds. (x64 version should
 now be feature complete)

(bzr r13403)
---
 build-x64.xml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/build-x64.xml b/build-x64.xml
index b83540d3f..117c8ea41 100644
--- a/build-x64.xml
+++ b/build-x64.xml
@@ -221,7 +221,7 @@
         //#define WITH_CSSBLEND              1
         //#define WITH_MESH                  1
 
-        //#define HAVE_ASPELL                   1
+        #define HAVE_ASPELL                   1
 
         #endif /* _CONFIG_H_ */
     </makefile>
@@ -501,7 +501,7 @@
            -lgc
            -lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
            -lgomp -lwinpthread-1
-           <!-- laspell -->
+           -laspell
            -lmscms  <!-- required for color profiles -->
        </libs>
     </link>
@@ -589,7 +589,7 @@
            -lgc
            -lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
            -lgomp -lwinpthread
-           <!-- laspell -->
+           -laspell
            -lmscms  <!-- required for color profiles -->
        </libs>
     </link>
@@ -640,7 +640,7 @@
            -lgc
            -lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
            -lgomp -lwinpthread-1
-           <!-- laspell -->
+           -laspell
            -lmscms  <!-- required for color profiles -->
        </libs>
     </link>
@@ -679,6 +679,7 @@
 <copy todir="${dist}" file="${devlibs}/bin/libharfbuzz-0.dll"/>
 <copy todir="${dist}" file="${devlibs}/bin/liblzma-5.dll"/>
 
+    <copy todir="${dist}" file="${devlibs}/bin/libaspell-15.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libatk-1.0-0.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libgdk-win32-2.0-0.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libgdk_pixbuf-2.0-0.dll"/>
@@ -771,10 +772,10 @@
         </fileset>
     </copy>
 <!--    <copy todir="${dist}/share"> <fileset dir="${devlibs}/share/poppler"/> </copy> -->
-    <copy todir="${dist}" file="${mingw_bin}/gdb.exe"/>
+    <copy todir="${dist}" file="${devlibs}/bin/gdb.exe"/>
 
     <!-- Aspell dictionaries -->
- <!--   <copy todir="${dist}/lib"> <fileset dir="${devlibs}/lib/aspell-0.60"/> </copy> -->
+    <copy todir="${dist}/lib"> <fileset dir="${devlibs}/lib/aspell-0.60"/> </copy>
 
     <!-- Necessary to run extensions on windows if it is not in the path -->
     <copy todir="${dist}" file="${devlibs}/bin/gspawn-win64-helper.exe"/>
-- 
cgit v1.2.3