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

gecode compatibility.

Browse Source
This commit is contained in:
Vítor Santos Costa 2011-12-02 23:09:25 +00:00
parent 1a4e31e7a0
commit 514189e097
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -4337,7 +4337,7 @@ $as_echo "no" >&6; }
fi fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
GECODE_VERSION=unknown-gecode-version GECODE_VERSION=unknown-gecode-version
GECODE_EXTRALIBS= GECODE_EXTRALIBS=-lgecodesupport -lgecodekernel -lgecodeint -lgecodeset -lgecodesearch
if test "$use_gecode" = yes; then if test "$use_gecode" = yes; then

2
configure.in
View File

@ -98,7 +98,7 @@ AC_COMPILE_IFELSE([
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
]) ])
GECODE_VERSION=unknown-gecode-version GECODE_VERSION=unknown-gecode-version
GECODE_EXTRALIBS= GECODE_EXTRALIBS=-lgecodesupport -lgecodekernel -lgecodeint -lgecodeset -lgecodesearch
AC_SUBST(GECODE_VERSION) AC_SUBST(GECODE_VERSION)
AC_SUBST(GECODE_EXTRALIBS) AC_SUBST(GECODE_EXTRALIBS)
if test "$use_gecode" = yes; then if test "$use_gecode" = yes; then

4
library/gecode/Makefile.in
View File

@ -44,7 +44,7 @@ SOBJS=gecode_yap.@SO@
GECODE_VERSION = @GECODE_VERSION@ GECODE_VERSION = @GECODE_VERSION@
DISJUNCTOR = -DDISJUNCTOR DISJUNCTOR = -DDISJUNCTOR
GECODE_LIBS = @GECODE_EXTRALIBS@ -lgecodesupport -lgecodekernel -lgecodeint -lgecodeset -lgecodesearch GECODE_LIBS = @GECODE_EXTRALIBS@
all: $(SOBJS) gecode.yap all: $(SOBJS) gecode.yap
@ -59,7 +59,7 @@ gecode_yap.o: \
$(CXX) -c -I$(srcdir)/$(GECODE_VERSION) $(CXXFLAGS) $(DISJUNCTOR) -o $@ $< $(CXX) -c -I$(srcdir)/$(GECODE_VERSION) $(CXXFLAGS) $(DISJUNCTOR) -o $@ $<
@DO_SECOND_LD@gecode_yap.@SO@: gecode_yap.o @DO_SECOND_LD@gecode_yap.@SO@: gecode_yap.o
@DO_SECOND_LD@ @SHLIB_LD@ -o gecode_yap.@SO@ gecode_yap.o $(LDFLAGS) $(GECODE_LIBS) @EXTRA_LIBS_FOR_DLLS@ @DO_SECOND_LD@ @SHLIB_CXX_LD@ -o gecode_yap.@SO@ gecode_yap.o $(LDFLAGS) $(GECODE_LIBS) @EXTRA_LIBS_FOR_DLLS@
gecode.yap: $(srcdir)/gecode_yap_hand_written.yap $(srcdir)/$(GECODE_VERSION)/gecode_yap_auto_generated.yap gecode.yap: $(srcdir)/gecode_yap_hand_written.yap $(srcdir)/$(GECODE_VERSION)/gecode_yap_auto_generated.yap
cat $^ > $@ cat $^ > $@