[Peter Rockett] Improved Makefiles for image segmentation example.

diff --git a/AUTHORS b/AUTHORS
index 844c302..95eadcd 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -15,6 +15,7 @@ Sebastian Nowozin
 Alexander Schwing
 Ofer Meshi
 Alejandro Lage
+Peter Rockett
 
 Part of this work was part of the Interactive Collaborative Information Systems (ICIS) 
 project, supported by the Dutch Ministry of Economic Affairs, grant BSIK03024.

diff --git a/ChangeLog b/ChangeLog
index 611badb..b39f939 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 git HEAD
 --------
+* [Peter Rockett] Improved Makefiles for image segmentation example.
 * Removed deprecated interfaces.
 * Added FactorGraph::isMaximal(size_t) and FactorGraph::maximalFactor(size_t).
 * Added optional reverse argument to Permute::Permute( const std::vector<Var>& )

diff --git a/Makefile b/Makefile
index 3851768..8b84af2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -190,7 +190,7 @@ else
 endif
 
 examples/example_imagesegmentation$(EE) : examples/example_imagesegmentation.cpp $(HEADERS) $(LIB)/libdai$(LE)
-       -$(CC) $(CCO)$@ $< $(LIBS) -lpthread -lX11
+       -$(CC) $(CIMGINC) $(CCO)$@ $< $(LIBS) $(CIMGLIBS)
 
 
 # UNIT TESTS

diff --git a/Makefile.CYGWIN b/Makefile.CYGWIN
index 474f144..a0f230f 100644 (file)
--- a/Makefile.CYGWIN
+++ b/Makefile.CYGWIN
@@ -42,6 +42,8 @@ CCDEBUGFLAGS=-O3 -g -DDAI_DEBUG
 CCNODEBUGFLAGS=-O3
 # Standard include directories
 CCINC=-Iinclude -I/cygdrive/e/cygwin/boost_1_42_0
+# Include directory for image segmentation example
+CIMGINC=-I/cygdrive/e/cygwin/CImg-1.3.9
 
 # LINKER
 # Standard libraries to include
@@ -49,6 +51,8 @@ LIBS=-ldai
 # For linking with BOOST libraries
 BOOSTLIBS_PO=-lboost_program_options
 BOOSTLIBS_UTF=-lboost_unit_test_framework
+# Libraries for image segmentation example
+CIMGLIBS=-lpthread -lX11
 # Additional library search paths for linker
 CCLIB=-Llib -L/cygdrive/e/cygwin/boost_1_42_0/stage/lib
 

diff --git a/Makefile.LINUX b/Makefile.LINUX
index e5bf70c..9c2d436 100644 (file)
--- a/Makefile.LINUX
+++ b/Makefile.LINUX
@@ -43,6 +43,8 @@ CCDEBUGFLAGS=-O3 -g -DDAI_DEBUG
 CCNODEBUGFLAGS=-O3
 # Standard include directories
 CCINC=-Iinclude
+# Include directory for image segmentation example
+CIMGINC=
 
 # LINKER
 # Standard libraries to include
@@ -50,6 +52,8 @@ LIBS=-ldai
 # For linking with BOOST libraries
 BOOSTLIBS_PO=-lboost_program_options-mt
 BOOSTLIBS_UTF=-lboost_unit_test_framework-mt
+# Libraries for image segmentation example
+CIMGLIBS=-lpthread -lX11
 # Additional library search paths for linker
 CCLIB=-Llib
 

diff --git a/Makefile.MACOSX b/Makefile.MACOSX
index e009a7d..82d37f1 100644 (file)
--- a/Makefile.MACOSX
+++ b/Makefile.MACOSX
@@ -40,6 +40,8 @@ CCDEBUGFLAGS=-O3 -g -DDAI_DEBUG
 CCNODEBUGFLAGS=-O3
 # Standard include directories
 CCINC=-Iinclude -I/opt/local/include
+# Include directory for image segmentation example
+CIMGINC=
 
 # LINKER
 # Standard libraries to include
@@ -47,6 +49,8 @@ LIBS=-ldai
 # For linking with BOOST libraries
 BOOSTLIBS_PO=-lboost_program_options
 BOOSTLIBS_UTF=-lboost_unit_test_framework
+# Libraries for image segmentation example
+CIMGLIBS=-lpthread -lX11
 # Additional library search paths for linker
 CCLIB=-Llib -L/opt/local/lib
 

diff --git a/Makefile.WINDOWS b/Makefile.WINDOWS
index 6dfe772..63920e5 100644 (file)
--- a/Makefile.WINDOWS
+++ b/Makefile.WINDOWS
@@ -45,6 +45,8 @@ CCFLAGS=/EHac /GR /W3 /DWINDOWS /DNOMINMAX /MD
 CCDEBUGFLAGS=/Ox /Zi /DDAI_DEBUG
 # Flags to add in non-debugging mode (if DEBUG=false)
 CCNODEBUGFLAGS=/Ox
+# Include directory for image segmentation example
+CIMGINC=-IE:\windows\CImg-1.3.9
 # Standard include directories
 CCINC=-Iinclude -IE:\windows\boost_1_42_0
 
@@ -54,6 +56,8 @@ LIBS=/link $(LIB)/libdai$(LE)
 # For linking with BOOST libraries
 BOOSTLIBS_PO=/LIBPATH:E:\windows\boost_1_42_0\stage\lib
 BOOSTLIBS_UTF=/LIBPATH:E:\windows\boost_1_42_0\stage\lib
+# Libraries for image segmentation example
+CIMGLIBS=gdi32.lib
 # Additional library search paths for linker
 # (For some reason, we have to add the VC library path, although it is in the environment)
 CCLIB=/LIBPATH:"C:\Program Files\Microsoft Visual Studio 9.0\VC\ATLMFC\LIB" /LIBPATH:"C:\Program Files\Microsoft Visual Studio 9.0\VC\LIB" /LIBPATH:"C:\Program Files\Microsoft SDKs\Windows\v6.0A\lib"

diff --git a/README b/README
index fc7ddae..1fa7815 100644 (file)
--- a/README
+++ b/README
@@ -163,11 +163,12 @@ You need:
     shipped with Ubuntu 9.04 is known not to work)
   * doxygen (only for building the documentation)
   * graphviz (only for using some of the libDAI command line utilities)
+  * CImg library (only for building the image segmentation example)
 
 On Debian/Ubuntu, you can easily install the required packages with a single
 command:
 
-  apt-get install g++ make doxygen graphviz libboost-dev libboost-graph-dev libboost-program-options-dev libboost-test-dev
+  apt-get install g++ make doxygen graphviz libboost-dev libboost-graph-dev libboost-program-options-dev libboost-test-dev cimg-dev
 
 (root permissions needed).
 
@@ -227,6 +228,7 @@ You need:
   * A recent version of MicroSoft Visual Studio (2008 is known to work)
   * recent boost C++ libraries (version 1.37 or higher)
   * GNU make (can be obtained from http://gnuwin32.sourceforge.net)
+  * CImg library (only for building the image segmentation example)
 
 For the regression test, you need:
 

diff --git a/include/dai/doc.h b/include/dai/doc.h
index f511b2e..b08a337 100644 (file)
--- a/include/dai/doc.h
+++ b/include/dai/doc.h
@@ -207,9 +207,10 @@
  *      version 1.37 shipped with Ubuntu 9.04 is known not to work)
  *    - doxygen (only for building the documentation)
  *    - graphviz (only for using some of the libDAI command line utilities)
+ *    - CImg library (only for building the image segmentation example)
  * 
  *  On Debian/Ubuntu, you can easily install the required packages with a single command:
- *  <pre>  apt-get install g++ make doxygen graphviz libboost-dev libboost-graph-dev libboost-program-options-dev libboost-test-dev</pre>
+ *  <pre>  apt-get install g++ make doxygen graphviz libboost-dev libboost-graph-dev libboost-program-options-dev libboost-test-dev cimg-dev</pre>
  *  (root permissions needed).
  *
  *  On Mac OS X (10.4 is known to work), these packages can be installed easily via MacPorts.
@@ -260,6 +261,7 @@
  *  - A recent version of MicroSoft Visual Studio (2008 is known to work)
  *  - recent boost C++ libraries (version 1.37 or higher)
  *  - GNU make (can be obtained from http://gnuwin32.sourceforge.net)
+ *  - CImg library (only for building the image segmentation example)
  *
  *  For the regression test, you need:
  *  - GNU diff, GNU sed (can be obtained from http://gnuwin32.sourceforge.net)