change the output directories

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3390 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/build/builder6/context_usage.mak b/build/builder6/context_usage.mak
index 6bc3590..715505c 100644 (file)
--- a/build/builder6/context_usage.mak
+++ b/build/builder6/context_usage.mak
@@ -5,18 +5,18 @@
 BCB = $(MAKEDIR)\..
 !endif
 
-PROJECT = bin\context_usage.exe
+PROJECT = simgrid\tests\context_usage.exe
 OBJFILES = context_usage.obj
-LIBFILES = lib\debug\simgrid.lib
+LIBFILES = simgrid\lib\debug\simgrid.lib
 
 USERDEFINES = _DEBUG
 SYSDEFINES = NO_STRICT;_NO_VCL;_RTLDLL
 INCLUDEPATH = $(BCB)\include;$(BCB)\include\vcl;..\..\include;..\..\src\include;..\..\src
-LIBPATH = $(BCB)\lib\obj;$(BCB)\lib;lib\debug;obj
+LIBPATH = $(BCB)\lib\obj;$(BCB)\lib;simgrid\lib\debug;simgrid\tests\obj
 WARNINGS= -w-sus -w-rvl -w-rch -w-pia -w-pch -w-par -w-csu -w-ccc -w-aus
 SRCDIR = .;..\..\testsuite\xbt
 
-CFLAGS = -Od -H=$(BCB)\lib\vcl60.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC -tWM- -c -p- -nobj
+CFLAGS = -Od -H=$(BCB)\lib\vcl60.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC -tWM- -c -p- -nsimgrid\tests\obj
 
 LFLAGS = -Iobj -ap -Tpe -x -Gn -v
 

diff --git a/build/builder6/datadesc_usage.mak b/build/builder6/datadesc_usage.mak
index af61144..43c789c 100644 (file)
--- a/build/builder6/datadesc_usage.mak
+++ b/build/builder6/datadesc_usage.mak
@@ -13,7 +13,7 @@ BCB = $(MAKEDIR)\..
 
 VERSION = BCB.06.00
 # ---------------------------------------------------------------------------
-PROJECT = bin\datadesc_usage.exe
+PROJECT = simgrid\tests\datadesc_usage.exe
 OBJFILES = ..\..\win32_testsuite\borland\builder6\realistic\obj\datadesc_usage.obj \
     ..\..\win32_testsuite\borland\builder6\realistic\obj\graphxml_parse.obj \
     ..\..\win32_testsuite\borland\builder6\realistic\obj\heap.obj \
@@ -79,7 +79,7 @@ SPARELIBS =
 DEFFILE = 
 OTHERFILES = 
 # ---------------------------------------------------------------------------
-DEBUGLIBPATH = $(BCB)\lib\debug
+DEBUGLIBPATH = $(BCB)\simgrid\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 USERDEFINES = _DEBUG
 SYSDEFINES = NO_STRICT;_NO_VCL

diff --git a/build/builder6/graphxml_usage.mak b/build/builder6/graphxml_usage.mak
index 24dce67..ea863b0 100644 (file)
--- a/build/builder6/graphxml_usage.mak
+++ b/build/builder6/graphxml_usage.mak
@@ -5,18 +5,18 @@
 BCB = $(MAKEDIR)\..
 !endif
 
-PROJECT = bin\graphxml_usage.exe
+PROJECT = simgrid\tests\graphxml_usage.exe
 OBJFILES = graphxml_usage.obj
-LIBFILES = lib\debug\simgrid.lib
+LIBFILES = simgrid\lib\debug\simgrid.lib
 
 USERDEFINES = _DEBUG
 SYSDEFINES = NO_STRICT;_NO_VCL;_RTLDLL
 INCLUDEPATH = $(BCB)\include;$(BCB)\include\vcl;..\..\include;..\..\src\include;..\..\src
-LIBPATH = $(BCB)\lib\obj;$(BCB)\lib;lib\debug;obj
+LIBPATH = $(BCB)\lib\obj;$(BCB)\lib;simgrid\lib\debug;simgrid\tests\obj
 WARNINGS= -w-sus -w-rvl -w-rch -w-pia -w-pch -w-par -w-csu -w-ccc -w-aus
 SRCDIR = .;..\..\testsuite\xbt
 
-CFLAGS = -Od -H=$(BCB)\lib\vcl60.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC -tWM- -c -p- -nobj
+CFLAGS = -Od -H=$(BCB)\lib\vcl60.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC -tWM- -c -p- -nsimgrid\tests\obj
 
 LFLAGS = -Iobj -ap -Tpe -x -Gn -v
 

diff --git a/build/builder6/heap_bench.mak b/build/builder6/heap_bench.mak
index 743389a..1f65619 100644 (file)
--- a/build/builder6/heap_bench.mak
+++ b/build/builder6/heap_bench.mak
@@ -5,18 +5,18 @@
 BCB = $(MAKEDIR)\..
 !endif
 
-PROJECT = bin\heap_bench.exe
+PROJECT = simgrid\tests\heap_bench.exe
 OBJFILES = heap_bench.obj
-LIBFILES = lib\debug\simgrid.lib
+LIBFILES = simgrid\lib\debug\simgrid.lib
 
 USERDEFINES = _DEBUG
 SYSDEFINES = NO_STRICT;_NO_VCL;_RTLDLL
 INCLUDEPATH = $(BCB)\include;$(BCB)\include\vcl;..\..\include;..\..\src\include;..\..\src
-LIBPATH = $(BCB)\lib\obj;$(BCB)\lib;lib\debug;obj
+LIBPATH = $(BCB)\lib\obj;$(BCB)\lib;simgrid\lib\debug;simgrid\tests\obj
 WARNINGS= -w-sus -w-rvl -w-rch -w-pia -w-pch -w-par -w-csu -w-ccc -w-aus
 SRCDIR = .;..\..\testsuite\xbt
 
-CFLAGS = -Od -H=$(BCB)\lib\vcl60.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC -tWM- -c -p- -nobj
+CFLAGS = -Od -H=$(BCB)\lib\vcl60.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC -tWM- -c -p- -nsimgrid\tests\obj
 
 LFLAGS = -Iobj -ap -Tpe -x -Gn -v
 

diff --git a/build/builder6/log_usage.mak b/build/builder6/log_usage.mak
index f866a17..a901d75 100644 (file)
--- a/build/builder6/log_usage.mak
+++ b/build/builder6/log_usage.mak
@@ -5,18 +5,18 @@
 BCB = $(MAKEDIR)\..
 !endif
 
-PROJECT = bin\log_usage.exe
+PROJECT = simgrid\tests\log_usage.exe
 OBJFILES = log_usage.obj
-LIBFILES = lib\debug\simgrid.lib
+LIBFILES = simgrid\lib\debug\simgrid.lib
 
 USERDEFINES = _DEBUG
 SYSDEFINES = NO_STRICT;_NO_VCL;_RTLDLL
 INCLUDEPATH = $(BCB)\include;$(BCB)\include\vcl;..\..\include;..\..\src\include;..\..\src
-LIBPATH = $(BCB)\lib\obj;$(BCB)\lib;lib\debug;obj
+LIBPATH = $(BCB)\lib\obj;$(BCB)\lib;simgrid\lib\debug;simgrid\tests\obj
 WARNINGS= -w-sus -w-rvl -w-rch -w-pia -w-pch -w-par -w-csu -w-ccc -w-aus
 SRCDIR = .;..\..\testsuite\xbt
 
-CFLAGS = -Od -H=$(BCB)\lib\vcl60.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC -tWM- -c -p- -nobj
+CFLAGS = -Od -H=$(BCB)\lib\vcl60.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC -tWM- -c -p- -nsimgrid\tests\obj
 
 LFLAGS = -Iobj -ap -Tpe -x -Gn -v
 

diff --git a/build/builder6/maxmin_bench.mak b/build/builder6/maxmin_bench.mak
index 59961c8..45d2293 100644 (file)
--- a/build/builder6/maxmin_bench.mak
+++ b/build/builder6/maxmin_bench.mak
@@ -5,18 +5,18 @@
 BCB = $(MAKEDIR)\..
 !endif
 
-PROJECT = bin\maxmin_bench.exe
+PROJECT = simgrid\tests\maxmin_bench.exe
 OBJFILES = maxmin_bench.obj
-LIBFILES = lib\debug\simgrid.lib
+LIBFILES = simgrid\lib\debug\simgrid.lib
 
 USERDEFINES = _DEBUG
 SYSDEFINES = NO_STRICT;_NO_VCL;_RTLDLL
 INCLUDEPATH = $(BCB)\include;$(BCB)\include\vcl;..\..\include;..\..\src\include;..\..\src
-LIBPATH = $(BCB)\lib\obj;$(BCB)\lib;lib\debug;obj
+LIBPATH = $(BCB)\lib\obj;$(BCB)\lib;simgrid\lib\debug;simgrid\tests\obj
 WARNINGS= -w-sus -w-rvl -w-rch -w-pia -w-pch -w-par -w-csu -w-ccc -w-aus
 SRCDIR = .;..\..\testsuite\surf
 
-CFLAGS = -Od -H=$(BCB)\lib\vcl60.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC -tWM- -c -p- -nobj
+CFLAGS = -Od -H=$(BCB)\lib\vcl60.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC -tWM- -c -p- -nsimgrid\tests\obj
 
 LFLAGS = -Iobj -ap -Tpe -x -Gn -v
 

diff --git a/build/builder6/maxmin_usage.mak b/build/builder6/maxmin_usage.mak
index a251eb9..2bdd243 100644 (file)
--- a/build/builder6/maxmin_usage.mak
+++ b/build/builder6/maxmin_usage.mak
@@ -5,18 +5,18 @@
 BCB = $(MAKEDIR)\..
 !endif
 
-PROJECT = bin\maxmin_usage.exe
+PROJECT = simgrid\tests\maxmin_usage.exe
 OBJFILES = maxmin_usage.obj
-LIBFILES = lib\debug\simgrid.lib
+LIBFILES = simgrid\lib\debug\simgrid.lib
 
 USERDEFINES = _DEBUG
 SYSDEFINES = NO_STRICT;_NO_VCL;_RTLDLL
 INCLUDEPATH = $(BCB)\include;$(BCB)\include\vcl;..\..\include;..\..\src\include;..\..\src
-LIBPATH = $(BCB)\lib\obj;$(BCB)\lib;lib\debug;obj
+LIBPATH = $(BCB)\lib\obj;$(BCB)\lib;simgrid\lib\debug;simgrid\tests\obj
 WARNINGS= -w-sus -w-rvl -w-rch -w-pia -w-pch -w-par -w-csu -w-ccc -w-aus
 SRCDIR = .;..\..\testsuite\surf
 
-CFLAGS = -Od -H=$(BCB)\lib\vcl60.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC -tWM- -c -p- -nobj
+CFLAGS = -Od -H=$(BCB)\lib\vcl60.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC -tWM- -c -p- -nsimgrid\tests\obj
 
 LFLAGS = -Iobj -ap -Tpe -x -Gn -v
 

diff --git a/build/builder6/msg_test.mak b/build/builder6/msg_test.mak
index c693897..4c9c927 100644 (file)
--- a/build/builder6/msg_test.mak
+++ b/build/builder6/msg_test.mak
@@ -5,18 +5,18 @@
 BCB = $(MAKEDIR)\..
 !endif
 
-PROJECT = bin\msg_test.exe
+PROJECT = simgrid\examples\msg_test.exe
 OBJFILES = msg_test.obj
-LIBFILES = lib\debug\simgrid.lib
+LIBFILES = simgrid\lib\debug\simgrid.lib
 
 USERDEFINES = _DEBUG
 SYSDEFINES = NO_STRICT;_NO_VCL;_RTLDLL
 INCLUDEPATH = $(BCB)\include;$(BCB)\include\vcl;..\..\include;..\..\src\include;..\..\src
-LIBPATH = $(BCB)\lib\obj;$(BCB)\lib;lib\debug;obj
+LIBPATH = $(BCB)\lib\obj;$(BCB)\lib;simgrid\lib\debug;simgrid\examples\obj
 WARNINGS= -w-sus -w-rvl -w-rch -w-pia -w-pch -w-par -w-csu -w-ccc -w-aus
 SRCDIR = .;..\..\examples\msg
 
-CFLAGS = -Od -H=$(BCB)\lib\vcl60.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC -tWM- -c -p- -nobj
+CFLAGS = -Od -H=$(BCB)\lib\vcl60.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC -tWM- -c -p- -nsimgrid\examples\obj
 
 LFLAGS = -Iobj -ap -Tpe -x -Gn -v
 

diff --git a/build/builder6/msg_test_communication_time.mak b/build/builder6/msg_test_communication_time.mak
index 85992ef..128c246 100644 (file)
--- a/build/builder6/msg_test_communication_time.mak
+++ b/build/builder6/msg_test_communication_time.mak
@@ -5,18 +5,18 @@
 BCB = $(MAKEDIR)\..
 !endif
 
-PROJECT = bin\msg_test_communication_time.exe
+PROJECT = simgrid\examples\msg_test_communication_time.exe
 OBJFILES = msg_test_communication_time.obj
-LIBFILES = lib\debug\simgrid.lib
+LIBFILES = simgrid\lib\debug\simgrid.lib
 
 USERDEFINES = _DEBUG
 SYSDEFINES = NO_STRICT;_NO_VCL;_RTLDLL
 INCLUDEPATH = $(BCB)\include;$(BCB)\include\vcl;..\..\include;..\..\src\include;..\..\src
-LIBPATH = $(BCB)\lib\obj;$(BCB)\lib;lib\debug;obj
+LIBPATH = $(BCB)\lib\obj;$(BCB)\lib;simgrid\lib\debug;simgrid\examples\obj
 WARNINGS= -w-sus -w-rvl -w-rch -w-pia -w-pch -w-par -w-csu -w-ccc -w-aus
 SRCDIR = .;..\..\examples\msg
 
-CFLAGS = -Od -H=$(BCB)\lib\vcl60.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC -tWM- -c -p- -nobj
+CFLAGS = -Od -H=$(BCB)\lib\vcl60.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC -tWM- -c -p- -nsimgrid\examples\obj
 
 LFLAGS = -Iobj -ap -Tpe -x -Gn -v
 

diff --git a/build/builder6/msg_test_suspend.mak b/build/builder6/msg_test_suspend.mak
index 4a1cc95..42b9e22 100644 (file)
--- a/build/builder6/msg_test_suspend.mak
+++ b/build/builder6/msg_test_suspend.mak
@@ -5,18 +5,18 @@
 BCB = $(MAKEDIR)\..
 !endif
 
-PROJECT = bin\msg_test_suspend.exe
+PROJECT = simgrid\examples\msg_test_suspend.exe
 OBJFILES = msg_test_suspend.obj
-LIBFILES = lib\debug\simgrid.lib
+LIBFILES = simgrid\lib\debug\simgrid.lib
 
 USERDEFINES = _DEBUG
 SYSDEFINES = NO_STRICT;_NO_VCL;_RTLDLL
 INCLUDEPATH = $(BCB)\include;$(BCB)\include\vcl;..\..\include;..\..\src\include;..\..\src
-LIBPATH = $(BCB)\lib\obj;$(BCB)\lib;lib\debug;obj
+LIBPATH = $(BCB)\lib\obj;$(BCB)\lib;simgrid\lib\debug;simgrid\examples\obj
 WARNINGS= -w-sus -w-rvl -w-rch -w-pia -w-pch -w-par -w-csu -w-ccc -w-aus
 SRCDIR = .;..\..\examples\msg
 
-CFLAGS = -Od -H=$(BCB)\lib\vcl60.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC -tWM- -c -p- -nobj
+CFLAGS = -Od -H=$(BCB)\lib\vcl60.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC -tWM- -c -p- -nsimgrid\examples\obj
 
 LFLAGS = -Iobj -ap -Tpe -x -Gn -v
 

diff --git a/build/builder6/ping_pong.mak b/build/builder6/ping_pong.mak
index 4651f12..01a3eab 100644 (file)
--- a/build/builder6/ping_pong.mak
+++ b/build/builder6/ping_pong.mak
@@ -5,18 +5,18 @@
 BCB = $(MAKEDIR)\..
 !endif
 
-PROJECT = bin\ping_pong.exe
+PROJECT = simgrid\examples\ping_pong.exe
 OBJFILES = ping_pong.obj
-LIBFILES = lib\debug\simgrid.lib
+LIBFILES = simgrid\lib\debug\simgrid.lib
 
 USERDEFINES = _DEBUG
 SYSDEFINES = NO_STRICT;_NO_VCL;_RTLDLL
 INCLUDEPATH = $(BCB)\include;$(BCB)\include\vcl;..\..\include;..\..\src\include;..\..\src
-LIBPATH = $(BCB)\lib\obj;$(BCB)\lib;lib\debug;obj
+LIBPATH = $(BCB)\lib\obj;$(BCB)\lib;simgrid\lib\debug;simgrid\examples\obj
 WARNINGS= -w-sus -w-rvl -w-rch -w-pia -w-pch -w-par -w-csu -w-ccc -w-aus
 SRCDIR = .;..\..\examples\msg
 
-CFLAGS = -Od -H=$(BCB)\lib\vcl60.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC -tWM- -c -p- -nobj
+CFLAGS = -Od -H=$(BCB)\lib\vcl60.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC -tWM- -c -p- -nsimgrid\examples\obj
 
 LFLAGS = -Iobj -ap -Tpe -x -Gn -v
 

diff --git a/build/builder6/simgrid.mak b/build/builder6/simgrid.mak
index ab31d1e..519dac6 100644 (file)
--- a/build/builder6/simgrid.mak
+++ b/build/builder6/simgrid.mak
@@ -18,7 +18,7 @@ LINKER = ilink32
 !endif
 
 # Le nom du projet de compilation (ici la DLL)
-PROJECT=C:\buildslave\projects\simgrid\builddir\build\build\builder6\bin\simgrid.dll
+PROJECT=C:\dev\cvs\simgrid\build\builder6\simgrid\dll\debug\simgrid.dll
 
 # Les options du compilateur BCC32
 # -tWD         Génèrer une DLL
@@ -37,7 +37,7 @@ PROJECT=C:\buildslave\projects\simgrid\builddir\build\build\builder6\bin\simgrid
        
  
 #CFLAGS=-tWD -Vmp -X- -tWM- -c -nobj -Od -Vx -Ve -r- -b- -k -y -v -vi- 
-CFLAGS=-tWD -X- -tWM -c -nobj -Od -r- -b- -k -y -v -vi- -a8 -p-
+CFLAGS=-tWD -X- -tWM -c -nsimgrid\obj -Od -r- -b- -k -y -v -vi- -a8 -p-
 
 # Les options du linker
 # -l           Répertoire de sortie intermédiaire
@@ -52,7 +52,7 @@ CFLAGS=-tWD -X- -tWM -c -nobj -Od -r- -b- -k -y -v -vi- -a8 -p-
 # -v           Inclure les informations de débogage complètes
 
 #LFLAGS = -l lib\debug -Iobj -D"" -c- -aa -Tpd -x -Gn -Gi -w -v
-LFLAGS = -llib\debug -Iobj -c- -aa -Tpd -x -Gn -Gi -w -v
+LFLAGS = -lsimgrid\lib\debug -Isimgrid\obj -c- -aa -Tpd -x -Gn -Gi -w -v
 
 # Liste des avertissements désactivés
 # -w-aus       Une valeur est affectée mais n'est jamais utilisée
@@ -68,7 +68,7 @@ LFLAGS = -llib\debug -Iobj -c- -aa -Tpd -x -Gn -Gi -w -v
 # -w-sus       Conversion de pointeur suspecte
 
 # Chemins des répertoires contenant des librairies (importation ou de code objet)
-LIBPATH = $(BCB)\Lib;$(BCB)\Lib\obj;obj
+LIBPATH = $(BCB)\Lib;$(BCB)\Lib\obj;simgrid\obj
 
 WARNINGS=-w-aus -w-ccc -w-csu -w-dup -w-inl -w-par -w-pch -w-pia -w-rch -w-rvl -w-sus 
 

diff --git a/build/builder6/surf_usage.mak b/build/builder6/surf_usage.mak
index db10a8a..f3f796f 100644 (file)
--- a/build/builder6/surf_usage.mak
+++ b/build/builder6/surf_usage.mak
@@ -5,18 +5,18 @@
 BCB = $(MAKEDIR)\..
 !endif
 
-PROJECT = bin\surf_usage.exe
+PROJECT = simgrid\tests\surf_usage.exe
 OBJFILES = surf_usage.obj
-LIBFILES = lib\debug\simgrid.lib
+LIBFILES = simgrid\lib\debug\simgrid.lib
 
 USERDEFINES = _DEBUG
 SYSDEFINES = NO_STRICT;_NO_VCL;_RTLDLL
 INCLUDEPATH = $(BCB)\include;$(BCB)\include\vcl;..\..\include;..\..\src\include;..\..\src
-LIBPATH = $(BCB)\lib\obj;$(BCB)\lib;lib\debug;obj
+LIBPATH = $(BCB)\lib\obj;$(BCB)\lib;simgrid\lib\debug;simgrid\tests\obj
 WARNINGS= -w-sus -w-rvl -w-rch -w-pia -w-pch -w-par -w-csu -w-ccc -w-aus
 SRCDIR = .;..\..\testsuite\surf
 
-CFLAGS = -Od -H=$(BCB)\lib\vcl60.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC -tWM- -c -p- -nobj
+CFLAGS = -Od -H=$(BCB)\lib\vcl60.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC -tWM- -c -p- -nsimgrid\tests\obj
 
 LFLAGS = -Iobj -ap -Tpe -x -Gn -v
 

diff --git a/build/builder6/surf_usage2.mak b/build/builder6/surf_usage2.mak
index 15b192a..6395266 100644 (file)
--- a/build/builder6/surf_usage2.mak
+++ b/build/builder6/surf_usage2.mak
@@ -5,18 +5,18 @@
 BCB = $(MAKEDIR)\..
 !endif
 
-PROJECT = bin\surf_usage2.exe
+PROJECT = simgrid\tests\surf_usage2.exe
 OBJFILES = surf_usage2.obj
-LIBFILES = lib\debug\simgrid.lib
+LIBFILES = simgrid\lib\debug\simgrid.lib
 
 USERDEFINES = _DEBUG
 SYSDEFINES = NO_STRICT;_NO_VCL;_RTLDLL
 INCLUDEPATH = $(BCB)\include;$(BCB)\include\vcl;..\..\include;..\..\src\include;..\..\src
-LIBPATH = $(BCB)\lib\obj;$(BCB)\lib;lib\debug;obj
+LIBPATH = $(BCB)\lib\obj;$(BCB)\lib;simgrid\lib\debug;simgrid\tests\obj
 WARNINGS= -w-sus -w-rvl -w-rch -w-pia -w-pch -w-par -w-csu -w-ccc -w-aus
 SRCDIR = .;..\..\testsuite\surf
 
-CFLAGS = -Od -H=$(BCB)\lib\vcl60.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC -tWM- -c -p- -nobj
+CFLAGS = -Od -H=$(BCB)\lib\vcl60.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC -tWM- -c -p- -nsimgrid\tests\obj
 
 LFLAGS = -Iobj -ap -Tpe -x -Gn -v
 

diff --git a/build/builder6/trace_usage.mak b/build/builder6/trace_usage.mak
index 448ccd2..7e4c55e 100644 (file)
--- a/build/builder6/trace_usage.mak
+++ b/build/builder6/trace_usage.mak
@@ -5,18 +5,18 @@
 BCB = $(MAKEDIR)\..
 !endif
 
-PROJECT = bin\trace_usage.exe
+PROJECT = simgrid\tests\trace_usage.exe
 OBJFILES = trace_usage.obj
-LIBFILES = lib\debug\simgrid.lib
+LIBFILES = simgrid\lib\debug\simgrid.lib
 
 USERDEFINES = _DEBUG
 SYSDEFINES = NO_STRICT;_NO_VCL;_RTLDLL
 INCLUDEPATH = $(BCB)\include;$(BCB)\include\vcl;..\..\include;..\..\src\include;..\..\src
-LIBPATH = $(BCB)\lib\obj;$(BCB)\lib;lib\debug;obj
+LIBPATH = $(BCB)\lib\obj;$(BCB)\lib;simgrid\lib\debug;simgrid\tests\obj
 WARNINGS= -w-sus -w-rvl -w-rch -w-pia -w-pch -w-par -w-csu -w-ccc -w-aus
 SRCDIR = .;..\..\testsuite\surf
 
-CFLAGS = -Od -H=$(BCB)\lib\vcl60.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC -tWM- -c -p- -nobj
+CFLAGS = -Od -H=$(BCB)\lib\vcl60.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC -tWM- -c -p- -nsimgrid\tests\obj
 
 LFLAGS = -Iobj -ap -Tpe -x -Gn -v