[windows] pass -m64 when needed

diff --git a/tools/cmake/GCCFlags.cmake b/tools/cmake/GCCFlags.cmake
index 936283a..76e5322 100644 (file)
--- a/tools/cmake/GCCFlags.cmake
+++ b/tools/cmake/GCCFlags.cmake
@@ -177,4 +177,13 @@ if(MINGW)
   # JNI searches for stdcalls
   set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -Wl,--add-stdcall-alias")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--add-stdcall-alias")
+  
+  # Specify the data model that we are using (yeah it helps. eg Java)
+  if(ARCH_32_BITS) 
+    set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -m32")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
+  else()
+    set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -m64")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64")
+  endif()  
 endif()

diff --git a/tools/cmake/Java.cmake b/tools/cmake/Java.cmake
index 4b8f501..46a3227 100644 (file)
--- a/tools/cmake/Java.cmake
+++ b/tools/cmake/Java.cmake
@@ -35,18 +35,11 @@ target_link_libraries(simgrid-java simgrid)
 
 
 if(WIN32)
-  exec_program("java -d32 -version"
-                OUTPUT_VARIABLE IS_32_BITS_JVM)
+  exec_program("java -d32 -version" OUTPUT_VARIABLE IS_32_BITS_JVM)
   STRING( FIND ${IS_32_BITS_JVM} "Error" POSITION )
   if(NOT ${POSITION} GREATER -1)
     message(fatal_error "SimGrid can only use Java 64 bits")
   endif()
-
-# Already passed to all targets in GCCFlags.cmake
-#  set_target_properties(simgrid-java PROPERTIES
-#    LINK_FLAGS "-Wl,--subsystem,windows,--kill-at")
-#  set_target_properties(surf-java PROPERTIES
-#    LINK_FLAGS "-Wl,--subsystem,windows,--kill-at")
 endif()
 
 # Rules to build simgrid.jar