win32 cross-compil needs love

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

diff --git a/examples/gras/chrono/Makefile.am b/examples/gras/chrono/Makefile.am
index ec47f5c..211f840 100644 (file)
--- a/examples/gras/chrono/Makefile.am
+++ b/examples/gras/chrono/Makefile.am
@@ -19,7 +19,7 @@ CLEANFILES= _chrono_simulator.c _chrono_multiplier.c
 # generate temps
 
 # A rule to generate the source file each time the deployment file changes
-_chrono_multiplier.c _chrono_simulator.c: chrono_deployment.xml ../../../tools/gras/gras_stub_generator
-       ../../../tools/gras/gras_stub_generator chrono $(srcdir)/chrono_deployment.xml >/dev/null
+_chrono_multiplier.c _chrono_simulator.c: chrono_deployment.xml ../../../tools/gras/gras_stub_generator@EXEEXT@
+       [ x@EXEEXT@ = x ] || exenv=wine; $$exenv ../../../tools/gras/gras_stub_generator chrono $(srcdir)/chrono_deployment.xml >/dev/null
 
 include $(top_srcdir)/acmacro/dist-files.mk

diff --git a/examples/gras/ping/test_sg.in b/examples/gras/ping/test_sg.in
index 3d050c6..09e5469 100755 (executable)
--- a/examples/gras/ping/test_sg.in
+++ b/examples/gras/ping/test_sg.in
@@ -1,5 +1,9 @@
 #! @BASH@
-if test -x ./ping_simulator ; then
-  exec ./ping_simulator @top_srcdir@/examples/msg/small_platform.xml @srcdir@/ping_deployment.xml $@
+if [ x@EXEEXT@ = x ] ; then 
+  exenv=
+else
+  exenv=wine
 fi
-exit 77
+
+exec $exenv ./ping_simulator@EXEEXT@ @top_srcdir@/examples/msg/small_platform.xml @srcdir@/ping_deployment.xml $@
+

diff --git a/examples/gras/timer/Makefile.am b/examples/gras/timer/Makefile.am
index f037422..4450e00 100644 (file)
--- a/examples/gras/timer/Makefile.am
+++ b/examples/gras/timer/Makefile.am
@@ -20,7 +20,7 @@ MAINTAINERCLEANFILES = _$(NAME)_simulator.c _$(NAME)_client.c _$(NAME)_server.c
 
 # generate temps
 
-$(foreach proc, $(PROCESSES), _$(NAME)_$(proc).c) _$(NAME)_simulator.c: $(srcdir)/$(NAME)_deployment.xml ../../../tools/gras/gras_stub_generator
-       ../../../tools/gras/gras_stub_generator $(NAME) $(srcdir)/$(NAME)_deployment.xml >/dev/null
+$(foreach proc, $(PROCESSES), _$(NAME)_$(proc).c) _$(NAME)_simulator.c: $(srcdir)/$(NAME)_deployment.xml ../../../tools/gras/gras_stub_generator@EXEEXT@
+       [ x@EXEEXT@ = x ] || exenv=wine; $$exenv ../../../tools/gras/gras_stub_generator $(NAME) $(srcdir)/$(NAME)_deployment.xml >/dev/null
 
 include $(top_srcdir)/acmacro/dist-files.mk