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
else
MEXFLAGS:=$(MEXFLAGS) -DSMALLMEM
endif
-MEX:=$(MEX) $(MEXINC) $(MEXFLAGS) $(WITHFLAGS) $(MEXLIB)
+MEX:=$(MEX) $(MEXINC) $(MEXFLAGS) $(WITHFLAGS) $(MEXLIBS) $(MEXLIB)
# META TARGETS
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=
# 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=
# 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=
# 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=
MEXFLAGS:=-DWINDOWS -DNOMINMAX
# Standard include directories for MEX
MEXINC:=$(CCINC)
+# Standard libraries to include
+MEXLIBS=
# Additional library search paths for MEX
MEXLIB=