From d36d2eed1b9a4e6085ca21e3369012786d5f693d Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Sat, 22 Nov 2008 22:44:08 -0600
Subject: Merging in the OpenMP work from the mailing list with some improved
 build files.

(bzr r6893)
---
 build.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'build.xml')

diff --git a/build.xml b/build.xml
index 8b8965680..f65b6e20f 100644
--- a/build.xml
+++ b/build.xml
@@ -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 -->
-- 
cgit v1.2.3