Re-implement the tab.

[simgrid.git] / doc / FAQ.doc

diff --git a/doc/FAQ.doc b/doc/FAQ.doc
index 3db2cce..2953a56 100644 (file)
--- a/doc/FAQ.doc
+++ b/doc/FAQ.doc
@@ -113,21 +113,9 @@ For Unix and MacOS:
 
 For Windows :
   \li cmake 2.8.3 <a href="http://www.cmake.org/files/v2.8/cmake-2.8.3-win32-x86.exe">(download page)</a>
-  \li Dev-c++ <a href="http://sourceforge.net/projects/dev-cpp/files/Binaries/Dev-C%2B%2B%204.9.9.2/devcpp-4.9.9.2_nomingw_setup.exe/download">(download page)</a>
   \li perl strawberry <a href="http://www.strawberryperl.com/download/5.12.2.0/strawberry-perl-5.12.2.0.msi">(download page)</a>
   \li pcre-7.0 <a href="http://sourceforge.net/projects/gnuwin32/files/pcre/7.0/pcre-7.0.exe/download">(download page)</a>
 
-  \li Set environment variables.
-
-\verbatim
-CC                to   C:\Dev-Cpp\bin\gcc
-CXX               to   C:\Dev-Cpp\bin\g++
-INCLUDE                   to   C:\Dev-Cpp\include
-LIB               to   C:\Dev-Cpp\lib
-PCRE_LIBRARY_PATH  to  C:\
-PATH              to   C:\Dev-Cpp\bin
-\endverbatim
-
 \subsubsection faq_cmakeoption1 Liste of options
 
 \verbatim
@@ -222,6 +210,13 @@ cmake -D[name]=[value] ... ./
 make
 \endverbatim
 
+On Windows
+
+\verbatim
+cmake -G"Unix Makefiles" -D[name]=[value] ... ./
+gmake
+\endverbatim
+
 \subsubsection faq_cmakecompilation2 With ccmake tool.
 
 \verbatim
@@ -924,7 +919,7 @@ int sender()
                                   calloc(1,sizeof(double)));
   *((double*) task->data) = MSG_get_clock();
   MSG_task_put(task, slaves[i % slaves_count], PORT_22);
-  INFO0("Send completed");
+  XBT_INFO("Send completed");
   return 0;
 }
 int receiver()
@@ -937,7 +932,7 @@ int receiver()
   time2 = MSG_get_clock();
   if(time1<*((double *)task->data))
      time1 = *((double *) task->data);
-  INFO1("Communication time :  \"%f\" ", time2-time1);
+  XBT_INFO("Communication time :  \"%f\" ", time2-time1);
   free(task->data);
   MSG_task_destroy(task);
   return 0;
@@ -1343,7 +1338,7 @@ workstation_ptask_L07.c:
                 
   /* Parse the file */
   surf_parse_open(file);
-  xbt_assert1((!surf_parse()), "Parse error in %s", file);
+  xbt_assert(!surf_parse(), "Parse error in %s", file);
   surf_parse_close();
 \endverbatim
     
@@ -1472,7 +1467,7 @@ and build/install it from scratch
 
  - <b>Enable GTNetS support in SimGrid</b>
  
-In order to enable gtnets with simgrid you have to give where is gtnets. (path to <gtnets_path>/lib and <gtnets_path>/include)
+In order to enable gtnets with simgrid you have to give where is gtnets. (path to \<gtnets_path\>/lib and \<gtnets_path\>/include)
 
    \verbatim
    Since v3.4 (with cmake)