Fixed bug (found by cax): when building MatLab MEX files, GMP libraries were not...

diff --git a/ChangeLog b/ChangeLog
index 4c865ba..9e422a0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 git master
 ----------
+* Fixed bug (found by cax): when building MatLab MEX files, GMP libraries were not linked
 * [Arman Aksoy] Added Makefile.MACOSX64
 * Fixed bug in findMaximum (it only considered a single connected component of the factor graph)
 * [Benjamin Piwowarski] Renamed "foreach" macro into "bforeach" to avoid conflicts with newer Boost library versions

diff --git a/Makefile b/Makefile
index 14b0ee0..3f911d0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -110,7 +110,7 @@ ifdef NEW_MATLAB
 else
   MEXFLAGS:=$(MEXFLAGS) -DSMALLMEM
 endif
-MEX:=$(MEX) $(MEXINC) $(MEXFLAGS) $(WITHFLAGS) $(MEXLIB)
+MEX:=$(MEX) $(MEXINC) $(MEXFLAGS) $(WITHFLAGS) $(MEXLIBS) $(MEXLIB)
 
 
 # META TARGETS

diff --git a/Makefile.CYGWIN b/Makefile.CYGWIN
index 14a3c9c..f2eda58 100644 (file)
--- a/Makefile.CYGWIN
+++ b/Makefile.CYGWIN
@@ -61,6 +61,8 @@ MEX=$(MATLABDIR)/bin/mex
 MEXFLAGS:=CXX\#$(CC) CXXFLAGS\#'$(CCFLAGS)'
 # Standard include directories for MEX
 MEXINC:=$(CCINC)
+# Standard libraries to include
+MEXLIBS=-lgmpxx -lgmp
 # Additional library search paths for MEX
 MEXLIB=
 

diff --git a/Makefile.LINUX b/Makefile.LINUX
index f11ca17..fd85131 100644 (file)
--- a/Makefile.LINUX
+++ b/Makefile.LINUX
@@ -55,14 +55,15 @@ CCLIB=-Llib
 # MatLab version 7.3 (R2006b) or newer?
 NEW_MATLAB=true
 # Replace the following by the directory where MatLab has been installed
-MATLABDIR=/agbs/share/sw/matlab
+MATLABDIR=/opt/Matlab-R2010b
 # The following should resolve to the MatLab mex compile command
 MEX=$(MATLABDIR)/bin/mex
 # Specify the C++ compiler and flags for MEX
-# (MatLab R2008b only works with older versions of g++)
-MEXFLAGS:=CXX\#g++-4.1 CXXFLAGS\#'$(CCFLAGS)'
+MEXFLAGS:=CXX\#$(CC) CXXFLAGS\#'$(CCFLAGS)'
 # Standard include directories for MEX
 MEXINC:=$(CCINC)
+# Standard libraries to include
+MEXLIBS=-lgmpxx -lgmp
 # Additional library search paths for MEX
 MEXLIB=
 

diff --git a/Makefile.MACOSX b/Makefile.MACOSX
index 5f34611..71524f5 100644 (file)
--- a/Makefile.MACOSX
+++ b/Makefile.MACOSX
@@ -52,13 +52,15 @@ CCLIB=-Llib -L/opt/local/lib
 # MatLab version 7.3 (R2006b) or newer?
 NEW_MATLAB=true
 # Replace the following by the directory where MatLab has been installed
-MATLABDIR=/agbs/share/sw/matlab
+MATLABDIR=/opt/Matlab-R2010b
 # The following should resolve to the MatLab mex compile command
 MEX=$(MATLABDIR)/bin/mex
-# Specify the same C++ compiler and flags to mex
+# Specify the C++ compiler and flags for MEX
 MEXFLAGS:=CXX\#$(CC) CXXFLAGS\#'$(CCFLAGS)'
 # Standard include directories for MEX
 MEXINC:=$(CCINC)
+# Standard libraries to include
+MEXLIBS=-lgmpxx -lgmp
 # Additional library search paths for MEX
 MEXLIB=
 

diff --git a/Makefile.MACOSX64 b/Makefile.MACOSX64
index f0ceaf6..d32bc43 100644 (file)
--- a/Makefile.MACOSX64
+++ b/Makefile.MACOSX64
@@ -52,13 +52,15 @@ CCLIB=-Llib -L/opt/local/lib
 # MatLab version 7.3 (R2006b) or newer?
 NEW_MATLAB=true
 # Replace the following by the directory where MatLab has been installed
-MATLABDIR=/agbs/share/sw/matlab
+MATLABDIR=/opt/Matlab-R2010b
 # The following should resolve to the MatLab mex compile command
 MEX=$(MATLABDIR)/bin/mex
-# Specify the same C++ compiler and flags to mex
+# Specify the C++ compiler and flags for MEX
 MEXFLAGS:=CXX\#$(CC) CXXFLAGS\#'$(CCFLAGS)'
 # Standard include directories for MEX
 MEXINC:=$(CCINC)
+# Standard libraries to include
+MEXLIBS=-lgmpxx -lgmp
 # Additional library search paths for MEX
 MEXLIB=
 

diff --git a/Makefile.WINDOWS b/Makefile.WINDOWS
index 32f9edd..b3c8c26 100644 (file)
--- a/Makefile.WINDOWS
+++ b/Makefile.WINDOWS
@@ -67,6 +67,8 @@ MEX=$(MATLABDIR)\bin\mex
 MEXFLAGS:=-DWINDOWS -DNOMINMAX
 # Standard include directories for MEX
 MEXINC:=$(CCINC)
+# Standard libraries to include
+MEXLIBS=
 # Additional library search paths for MEX
 MEXLIB=