diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WIN32 with threads

Browse Source
This commit is contained in:
Vitor Santos Costa 2014-03-06 13:34:35 +00:00
parent 386e15c425
commit 47d436fc13
6 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
configure vendored
View File

@ -11386,10 +11386,11 @@ elif test -d "$cudd_dir/lib"; then
LIBS="$LIBS -L $cudd_dir/lib" LIBS="$LIBS -L $cudd_dir/lib"
fi fi
if test $i_am_cross_compiling = yes if test "$target_os" = "mingw32" -o "$target_os" = "mingw64"
then then
#mingw: we know where things are #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 else
if test -d "$cudd_dir/util"; then if test -d "$cudd_dir/util"; then
@ -12165,7 +12166,7 @@ else
JAVA_TEST=Test.java JAVA_TEST=Test.java
CLASS_TEST=Test.class CLASS_TEST=Test.class
cat << \EOF > $JAVA_TEST cat << \EOF > $JAVA_TEST
/* #line 12168 "configure" */ /* #line 12169 "configure" */
public class Test { public class Test {
} }
EOF EOF
@ -12341,7 +12342,7 @@ EOF
if uudecode$EXEEXT Test.uue; then if uudecode$EXEEXT Test.uue; then
ac_cv_prog_uudecode_base64=yes ac_cv_prog_uudecode_base64=yes
else 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 echo "configure: failed file was:" >&5
cat Test.uue >&5 cat Test.uue >&5
ac_cv_prog_uudecode_base64=no ac_cv_prog_uudecode_base64=no
@ -12472,7 +12473,7 @@ else
JAVA_TEST=Test.java JAVA_TEST=Test.java
CLASS_TEST=Test.class CLASS_TEST=Test.class
cat << \EOF > $JAVA_TEST cat << \EOF > $JAVA_TEST
/* #line 12475 "configure" */ /* #line 12476 "configure" */
public class Test { public class Test {
} }
EOF EOF
@ -12507,7 +12508,7 @@ JAVA_TEST=Test.java
CLASS_TEST=Test.class CLASS_TEST=Test.class
TEST=Test TEST=Test
cat << \EOF > $JAVA_TEST cat << \EOF > $JAVA_TEST
/* [#]line 12510 "configure" */ /* [#]line 12511 "configure" */
public class Test { public class Test {
public static void main (String args[]) { public static void main (String args[]) {
System.exit (0); System.exit (0);

5
misc/mkwin
View File

@ -6,6 +6,9 @@
# please check: # please check:
# #
# http://sourceforge.net/projects/mingwbuilds/ # 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 # http://nsis.sourceforge.net/Main_Page
# #
# #
@ -61,7 +64,7 @@ fi
# HOME WIN32 configuration # HOME WIN32 configuration
if test $ABI = 32; then 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 CUDD=yes
GECODE=no # install only allows one of 32 or 64 bits GECODE=no # install only allows one of 32 or 64 bits
GMP=yes GMP=yes

2
packages/ProbLog/simplecudd/Makefile.in Normal file → Executable file
View File

@ -59,7 +59,7 @@ clean:
rm -f *.o problogbdd rm -f *.o problogbdd
install: default install: default
$(INSTALL_PROGRAM) problogbdd $(DESTDIR)$(SHAREDIR)/Yap $(INSTALL_PROGRAM) problogbdd $(DESTDIR)$(BINDIR)/Yap
install-examples: install-examples:

2
packages/ProbLog/simplecudd_lfi/Makefile.in Normal file → Executable file
View File

@ -59,7 +59,7 @@ clean:
rm -f *.o problogbdd_lfi rm -f *.o problogbdd_lfi
install: default install: default
$(INSTALL_PROGRAM) problogbdd_lfi $(DESTDIR)$(SHAREDIR)/Yap $(INSTALL_PROGRAM) problogbdd_lfi $(DESTDIR)$(BINDIR)
install-examples: install-examples:

1
packages/bdd/Makefile.in Normal file → Executable file
View File

@ -64,6 +64,7 @@ install: all install-examples
mkdir -p $(DESTDIR)$(SHAREDIR) mkdir -p $(DESTDIR)$(SHAREDIR)
for h in $(BDD_PROLOG); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR); done for h in $(BDD_PROLOG); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR); done
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR) $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
@WINDOWS@ $(INSTALL_PROGRAM) @CUDD_LDFLAGS@ $(DESTDIR)$(BINDIR)
install-examples: install-examples:

5
packages/bdd/configure.in Normal file → Executable file
View File

@ -50,10 +50,11 @@ elif test -d "$cudd_dir/lib"; then
LIBS="$LIBS -L $cudd_dir/lib" LIBS="$LIBS -L $cudd_dir/lib"
fi fi
if test $i_am_cross_compiling = yes if test "$target_os" = "mingw32" -o "$target_os" = "mingw64"
then then
#mingw: we know where things are #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 else
if test -d "$cudd_dir/util"; then if test -d "$cudd_dir/util"; then