Fixed bug (found by Andy Mueller): added GMP library invocations to swig Makefile
authorJoris Mooij <j.mooij@cs.ru.nl>
Wed, 16 May 2012 13:50:19 +0000 (15:50 +0200)
committerJoris Mooij <j.mooij@cs.ru.nl>
Wed, 16 May 2012 13:50:19 +0000 (15:50 +0200)
ChangeLog
Makefile.LINUX
swig/Makefile

index 90ef64c..0fddd79 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 git master
 ----------
+* Fixed bug (found by Andy Mueller): added GMP library invocations to swig Makefile
 * Fixed bug (found by Yan): replaced GNU extension __PRETTY_FUNCTION__ by __FUNCTION (Visual Studio) or __func__ (other compilers)
 * Fixed bug (found by cax): when building MatLab MEX files, GMP libraries were not linked
 * [Arman Aksoy] Added Makefile.MACOSX64
index fd85131..9169a7c 100644 (file)
@@ -71,7 +71,7 @@ MEXLIB=
 # The following should resolve to the SWIG command
 SWIG=swig
 # Location of Python header files
-INCLUDE_PYTHON=/usr/include/python2.5
+INCLUDE_PYTHON=/usr/include/python2.7
 # Location of Boost C++ library header files
 INCLUDE_BOOST=/usr/include/boost
 
index f652223..4329760 100644 (file)
@@ -13,12 +13,12 @@ all:                        _dai.so dai.oct
 
 _dai.so:               ../lib/libdai.a dai.i
                        $(SWIG) -python -classic -c++ dai.i
-                       g++ -Wall -c -O3 -g -fPIC dai_wrap.cxx -I$(INCLUDE_PYTHON) -I$(INCLUDE_BOOST) -I../include
-                       g++ -shared dai_wrap.o -o _dai.so ../lib/libdai.a
+                       g++ -Wall -c -O3 -g -fPIC dai_wrap.cxx -I$(INCLUDE_PYTHON) -I$(INCLUDE_BOOST) -I../include -lgmpxx -lgmp
+                       g++ -shared dai_wrap.o -o _dai.so ../lib/libdai.a -lgmpxx -lgmp
 
 dai.oct:               ../lib/libdai.a dai.i
                        $(SWIG) -octave -c++ -o dai_wrap.cpp dai.i
-                       mkoctfile -I$(INCLUDE_BOOST) -I../include -o dai.oct dai_wrap.cpp ../lib/libdai.a
+                       mkoctfile -I$(INCLUDE_BOOST) -I../include -o dai.oct dai_wrap.cpp ../lib/libdai.a -lgmpxx -lgmp 
 
 .PHONY: clean