From 47d436fc133fd9a70c09be03d249c80d8b0195dd Mon Sep 17 00:00:00 2001
From: Vitor Santos Costa <vsc@dcc.fc.up.pt>
Date: Thu, 6 Mar 2014 13:34:35 +0000
Subject: [PATCH] WIN32 with threads

---
 configure                                   | 13 +++++++------
 misc/mkwin                                  |  5 ++++-
 packages/ProbLog/simplecudd/Makefile.in     |  2 +-
 packages/ProbLog/simplecudd_lfi/Makefile.in |  2 +-
 packages/bdd/Makefile.in                    |  1 +
 packages/bdd/configure.in                   |  5 +++--
 6 files changed, 17 insertions(+), 11 deletions(-)
 mode change 100644 => 100755 packages/ProbLog/simplecudd/Makefile.in
 mode change 100644 => 100755 packages/ProbLog/simplecudd_lfi/Makefile.in
 mode change 100644 => 100755 packages/bdd/Makefile.in
 mode change 100644 => 100755 packages/bdd/configure.in

diff --git a/configure b/configure
index 6199ab952..a72d4e887 100755
--- a/configure
+++ b/configure
@@ -11386,10 +11386,11 @@ elif test -d "$cudd_dir/lib"; then
   LIBS="$LIBS -L $cudd_dir/lib"
 fi
 
-if test $i_am_cross_compiling = yes
+if test "$target_os" = "mingw32"  -o "$target_os" = "mingw64"
 then
      #mingw: we know where things are
-  CUDD_LDFLAGS="-L $cudd_dir/lib -lall_cudd"
+  CUDD_LDFLAGS="$cudd_dir/lib/all_cudd.dll"
+  cudd_installed="yes"
 else
 
 if test -d "$cudd_dir/util"; then
@@ -12165,7 +12166,7 @@ else
 JAVA_TEST=Test.java
 CLASS_TEST=Test.class
 cat << \EOF > $JAVA_TEST
-/* #line 12168 "configure" */
+/* #line 12169 "configure" */
 public class Test {
 }
 EOF
@@ -12341,7 +12342,7 @@ EOF
 if uudecode$EXEEXT Test.uue; then
         ac_cv_prog_uudecode_base64=yes
 else
-        echo "configure: 12344: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
+        echo "configure: 12345: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
         echo "configure: failed file was:" >&5
         cat Test.uue >&5
         ac_cv_prog_uudecode_base64=no
@@ -12472,7 +12473,7 @@ else
 JAVA_TEST=Test.java
 CLASS_TEST=Test.class
 cat << \EOF > $JAVA_TEST
-/* #line 12475 "configure" */
+/* #line 12476 "configure" */
 public class Test {
 }
 EOF
@@ -12507,7 +12508,7 @@ JAVA_TEST=Test.java
 CLASS_TEST=Test.class
 TEST=Test
 cat << \EOF > $JAVA_TEST
-/* [#]line 12510 "configure" */
+/* [#]line 12511 "configure" */
 public class Test {
 public static void main (String args[]) {
         System.exit (0);
diff --git a/misc/mkwin b/misc/mkwin
index 9c3e7c49b..157af71fb 100755
--- a/misc/mkwin
+++ b/misc/mkwin
@@ -6,6 +6,9 @@
 # please check:
 #
 # http://sourceforge.net/projects/mingwbuilds/
+#   PS: don't install in the default location.
+#   mingw should avoid space in its directory,
+#   it freaks winres out.
 # http://nsis.sourceforge.net/Main_Page
 #
 #
@@ -61,7 +64,7 @@ fi
 
 # HOME WIN32 configuration
 if test $ABI = 32; then
-GCC_PATH="/c/Program Files (x86)/mingw-builds/x32-4.8.1-posix-dwarf-rev5/mingw32"
+GCC_PATH="/c/cygwin/Yap/mingw32/mingw32"
 CUDD=yes
 GECODE=no # install only allows one of 32 or 64 bits
 GMP=yes
diff --git a/packages/ProbLog/simplecudd/Makefile.in b/packages/ProbLog/simplecudd/Makefile.in
old mode 100644
new mode 100755
index 70aa2bfd3..29950bab5
--- a/packages/ProbLog/simplecudd/Makefile.in
+++ b/packages/ProbLog/simplecudd/Makefile.in
@@ -59,7 +59,7 @@ clean:
 	rm -f *.o problogbdd
 
 install: default
-	$(INSTALL_PROGRAM) problogbdd $(DESTDIR)$(SHAREDIR)/Yap
+	$(INSTALL_PROGRAM) problogbdd $(DESTDIR)$(BINDIR)/Yap
 
 install-examples:
 
diff --git a/packages/ProbLog/simplecudd_lfi/Makefile.in b/packages/ProbLog/simplecudd_lfi/Makefile.in
old mode 100644
new mode 100755
index b18b47052..9425f00dc
--- a/packages/ProbLog/simplecudd_lfi/Makefile.in
+++ b/packages/ProbLog/simplecudd_lfi/Makefile.in
@@ -59,7 +59,7 @@ clean:
 	rm -f *.o problogbdd_lfi
 
 install: default
-	$(INSTALL_PROGRAM) problogbdd_lfi $(DESTDIR)$(SHAREDIR)/Yap
+	$(INSTALL_PROGRAM) problogbdd_lfi $(DESTDIR)$(BINDIR)
 
 install-examples:
 
diff --git a/packages/bdd/Makefile.in b/packages/bdd/Makefile.in
old mode 100644
new mode 100755
index d8d9b64f3..6cebfd40b
--- a/packages/bdd/Makefile.in
+++ b/packages/bdd/Makefile.in
@@ -64,6 +64,7 @@ install: all install-examples
 	mkdir -p $(DESTDIR)$(SHAREDIR)
 	for h in $(BDD_PROLOG); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR); done
 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
+	@WINDOWS@ $(INSTALL_PROGRAM) @CUDD_LDFLAGS@ $(DESTDIR)$(BINDIR)
 
 install-examples:
 
diff --git a/packages/bdd/configure.in b/packages/bdd/configure.in
old mode 100644
new mode 100755
index 727fc59c1..89b9dd69e
--- a/packages/bdd/configure.in
+++ b/packages/bdd/configure.in
@@ -50,10 +50,11 @@ elif test -d "$cudd_dir/lib"; then
   LIBS="$LIBS -L $cudd_dir/lib"
 fi
 
-if test $i_am_cross_compiling = yes
+if test "$target_os" = "mingw32"  -o "$target_os" = "mingw64"
 then
      #mingw: we know where things are
-  CUDD_LDFLAGS="-L $cudd_dir/lib -lall_cudd"
+  CUDD_LDFLAGS="$cudd_dir/lib/all_cudd.dll"
+  cudd_installed="yes"
 else
 
 if test -d "$cudd_dir/util"; then