new attempt to stabilize the use of underscores on f90/f77/f2c

[simgrid.git] / src / smpi / smpicc.in

diff --git a/src/smpi/smpicc.in b/src/smpi/smpicc.in
index a508a38..36ddd2b 100755 (executable)
--- a/src/smpi/smpicc.in
+++ b/src/smpi/smpicc.in
@@ -2,15 +2,15 @@
 
 CC=@CMAKE_C_COMPILER@
 
-INCLUDEARGS="-I@includedir@ -I@includedir@/smpi -I@CMAKE_BINARY_DIR@/include"
-CMAKE_LINKARGS="-L@CMAKE_LINKARGS@"
+INCLUDEARGS="@includeflag@"
+CMAKE_LINKARGS="-L@libdir@"
 
 if [ "@WIN32@" != "1" ]; then
-  LINKARGS="-lsimgrid -lsmpi -lm"
-  CFLAGS="-O2 -Dmain=smpi_simulated_main"
+  CFLAGS="-Dmain=smpi_simulated_main_"
+  LINKARGS="-lsimgrid"
 else
-  CFLAGS="-O2 -include @includedir@/smpi/smpi_main.h"
-  LINKARGS="@CMAKE_BINARY_DIR@\lib\libsimgrid.dll @CMAKE_BINARY_DIR@\lib\libsmpi.dll"
+  CFLAGS="-include @includedir@/smpi/smpi_main.h"
+  LINKARGS="@libdir@\libsimgrid.dll"
 fi
 
 CMDLINE=""
@@ -19,6 +19,7 @@ while [ -n "$1" ]; do
   shift
   case "${ARG}" in
    -c)
+      CMAKE_LINKARGS=""
       LINKARGS=""
       CMDLINE="${CMDLINE} -c "
       ;;