summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan B. C. Engelen <jbc.engelen@swissonline.ch>2014-06-01 13:23:26 +0000
committerJohan B. C. Engelen <j.b.c.engelen@alumnus.utwente.nl>2014-06-01 13:23:26 +0000
commit818d83ed67b287ef6e04a7abb7ff7e6453075816 (patch)
treeb89772a224e5dc75b5cc6218aac5679e66b4fdf6
parentUnquote names in 'font-family' lists. Partial fix for #1029080 (diff)
downloadinkscape-818d83ed67b287ef6e04a7abb7ff7e6453075816.tar.gz
inkscape-818d83ed67b287ef6e04a7abb7ff7e6453075816.zip
win64: add aspell and stand-alone gdb to builds. (x64 version should now be feature complete)
(bzr r13403)
-rw-r--r--build-x64.xml13
1 files 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"/>