diff options
| author | Ted Gould <ted@gould.cx> | 2008-11-23 04:44:08 +0000 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2008-11-23 04:44:08 +0000 |
| commit | d36d2eed1b9a4e6085ca21e3369012786d5f693d (patch) | |
| tree | c1b89e0b96611d2d26d92a79b0f0bc085a95df40 /build.xml | |
| parent | added Guides Creator extension by Jonas Termeau (LP300877) (diff) | |
| download | inkscape-d36d2eed1b9a4e6085ca21e3369012786d5f693d.tar.gz inkscape-d36d2eed1b9a4e6085ca21e3369012786d5f693d.zip | |
Merging in the OpenMP work from the mailing list with some improved build files.
(bzr r6893)
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -375,6 +375,7 @@ -Wall -Wformat -Werror=format-security -W -Wpointer-arith -Wcast-align -Wsign-compare -Woverloaded-virtual -Wswitch -O2 -mms-bitfields + -fopenmp </flags> <defines> -DVERSION=\"${version}\" @@ -476,6 +477,7 @@ objcopycommand="${archutil}objcopy"> <flags> -mwindows + -mthreads </flags> <fileset dir="${build}"> <include name="inkres.o"/> @@ -501,6 +503,7 @@ -lpng -ljpeg.dll -ltiff.dll -lpopt ${devlibs}/lib/zdll.lib -lgc -lws2_32 -lintl -lgdi32 -lcomdlg32 -lm + -lgomp -lpthreadGC2 </libs> </link> </target> @@ -530,6 +533,7 @@ objcopycommand="${archutil}objcopy"> <flags> -mwindows + -mthreads </flags> <fileset dir="${build}"> <include name="inkviewres.o"/> @@ -553,6 +557,7 @@ -lpng -ljpeg.dll -ltiff.dll -lpopt ${devlibs}/lib/zdll.lib -lgc -lws2_32 -lintl -lgdi32 -lcomdlg32 -lm + -lgomp -lpthreadGC2 </libs> </link> </target> @@ -572,6 +577,7 @@ stripcommand="${archutil}strip" objcopycommand="${archutil}objcopy"> <flags> + -mthreads </flags> <fileset dir="${build}"> <include name="obj/test-main.o"/> @@ -602,6 +608,7 @@ -lpng -ljpeg.dll -ltiff.dll -lpopt ${devlibs}/lib/zdll.lib -lgc -lws2_32 -lintl -lgdi32 -lcomdlg32 -lm + -lgomp -lpthreadGC2 </libs> </link> </target> @@ -667,6 +674,7 @@ <copy todir="${dist}" file="${devlibs}/bin/libpopt-0.dll"/> <copy todir="${dist}" file="${devlibs}/bin/liblcms-1.dll"/> <copy todir="${dist}" file="${devlibs}/bin/intl.dll"/> + <copy todir="${dist}" file="${devlibs}/bin/pthreadGC2.dll"/> <copy file="${devlibs}/bin/intl.dll" tofile="${dist}/libintl-2.dll"/> <!-- MSGFMT files --> |