fix win build

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

diff --git a/tools/gras/Makefile.am b/tools/gras/Makefile.am
index c6cf25c..0bafc4b 100644 (file)
--- a/tools/gras/Makefile.am
+++ b/tools/gras/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS = -g
+AM_CFLAGS = -g3
 
 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/include -I$(top_srcdir)/src
 

diff --git a/tools/gras/Makefile.in b/tools/gras/Makefile.in
index a9578d1..e3bad74 100644 (file)
--- a/tools/gras/Makefile.in
+++ b/tools/gras/Makefile.in
@@ -216,7 +216,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-AM_CFLAGS = -g
+AM_CFLAGS = -g3
 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/include -I$(top_srcdir)/src
 # skel_rewriter
 gras_stub_generator_SOURCES = stub_generator.c unix_stub_generator.c windows_stub_generator.c

diff --git a/tools/gras/gras_stub_generator.h b/tools/gras/gras_stub_generator.h
index 82a6b6b..01c6688 100644 (file)
--- a/tools/gras/gras_stub_generator.h
+++ b/tools/gras/gras_stub_generator.h
@@ -34,6 +34,8 @@ void generate_rl(char *project);
 void generate_makefile_am(char *project, char *deployment);
 void generate_makefile_local(char *project, char *deployment);
 
+/* the gras.h header directory (used only in windows)*/
+extern char* __gras_path;
 
 /*
  * Generate a borland simulation poject file.

diff --git a/tools/gras/unix_stub_generator.c b/tools/gras/unix_stub_generator.c
index 580b420..1c322f7 100644 (file)
--- a/tools/gras/unix_stub_generator.c
+++ b/tools/gras/unix_stub_generator.c
@@ -25,7 +25,13 @@
 #include <stdarg.h>
 
 
-
+#ifdef _WIN32
+/* stupid stubs so that it compiles on windows */
+void generate_sim(char *project) {}
+void generate_rl(char *project) {}
+void generate_makefile_local(char *project, char *deployment) {}
+#else 
+/* real implementation */
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(stubgen);
 
 
@@ -450,3 +456,4 @@ static void print(void *p)
 {
   printf("%p",p);
 }
+#endif

diff --git a/tools/gras/windows_stub_generator.c b/tools/gras/windows_stub_generator.c
index 67c941a..360352a 100644 (file)
--- a/tools/gras/windows_stub_generator.c
+++ b/tools/gras/windows_stub_generator.c
@@ -31,15 +31,12 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(stubgen);
 
 #ifdef _WIN32
 
+char* __gras_path = NULL;
+
 /* tabulation level (used to indent the lines of the borland project file */
 static unsigned int level = 0;
 
 
-
-/* the gras.h header directory */
-static char* __gras_path = NULL;
-
-
 #ifndef MAX_PATH
 #define MAX_PATH 260
 #endif
@@ -681,7 +678,6 @@ generate_borland_real_life_project(const char* name)
     borland_project.encoding ="utf-8";
     borland_project.comment ="C++Builder XML Project";
     borland_project.version = "BCB.06.00";
-    borland_project.lib_dir = " ";
 
     borland_project.lib_dir = xbt_new0(char,MAX_PATH);