Improved documentation of bipgraph.h and added example_bipgraph.cpp

[libdai.git] / Makefile.win

diff --git a/Makefile.win b/Makefile.win
index ec700eb..2a3dfa7 100755 (executable)
--- a/Makefile.win
+++ b/Makefile.win
@@ -41,7 +41,7 @@ INC=include/dai
 SRC=src\r
 LIB=lib\r
 \r
 SRC=src\r
 LIB=lib\r
 \r

-# Extensions (library, object, executable, MEX file extensions)\r
+# Extensions (library, object, executable, matlab compiled MEX file)\r

 LE=.lib\r
 OE=.obj\r
 EE=.exe\r
 LE=.lib\r
 OE=.obj\r
 EE=.exe\r


@@ -59,7 +59,7 @@ CC=cl
 CCO=/Fe\r
 \r
 # Flags for the C++ compiler\r
 CCO=/Fe\r
 \r
 # Flags for the C++ compiler\r

-CCFLAGS=/I./include /IC:\boost_1_36_0 /EHsc /Ox\r
+CCFLAGS=/Iinclude /IC:\boost_1_36_0 /EHsc /Ox\r

 !IFDEF DEBUG\r
 CCFLAGS=$(CCFLAGS) /Zi /DDAI_DEBUG\r
 !ENDIF\r
 !IFDEF DEBUG\r
 CCFLAGS=$(CCFLAGS) /Zi /DDAI_DEBUG\r
 !ENDIF\r


@@ -100,10 +100,9 @@ OBJECTS=$(OBJECTS) mr$(OE)
 \r
 !IFDEF WITH_MATLAB\r
 # Replace the following by the directory where Matlab has been installed\r
 \r
 !IFDEF WITH_MATLAB\r
 # Replace the following by the directory where Matlab has been installed\r

-MATLABDIR=/opt/matlab/bin\r
-# Replace the following with the extension of compiled MEX files on this platform, e.g. .mexglx for x86\r
-MEX=$(MATLABDIR)/mex\r
-MEXFLAGS=-I.\r
+MATLABDIR=c:\matlab\r
+MEX=$(MATLABDIR)\bin\mex\r
+MEXFLAGS=-Iinclude CXX\#$(CC) CXXFLAGS\#"/EHsc /Ox"\r

 !IFDEF DEBUG\r
 MEXFLAGS=$(MEXFLAGS) -g /DDAI_DEBUG\r
 !ENDIF\r
 !IFDEF DEBUG\r
 MEXFLAGS=$(MEXFLAGS) -g /DDAI_DEBUG\r
 !ENDIF\r


@@ -141,6 +140,6 @@ doc : $(INC)/*.h $(SRC)/*.cpp doxygen.conf
        doxygen doxygen.conf\r
 \r
 clean :\r
        doxygen doxygen.conf\r
 \r
 clean :\r

-       del *$(OE) *.ilk *.pdb *$(EE) matlab\*$(ME) matlab\*$(OE) tests\testdai$(EE) tests\*.pdb tests\*.ilk utils\*$(EE) utils\*.pdb utils\*.ilk $(LIB)\libdai$(LE)\r
+       del *$(OE) *.ilk *.pdb *$(EE) matlab\*$(ME) tests\testdai$(EE) tests\*.pdb tests\*.ilk utils\*$(EE) utils\*.pdb utils\*.ilk $(LIB)\libdai$(LE)\r

 \r
 !INCLUDE Makefile.shared\r
 \r
 !INCLUDE Makefile.shared\r