X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2f93912677c9c5df63406a714b031993a7455d6c..92b5df93e3d02736a7bc4982c2ba897a066f8d44:/buildtools/Cmake/MakeLibWin.cmake

diff --git a/buildtools/Cmake/MakeLibWin.cmake b/buildtools/Cmake/MakeLibWin.cmake
index fea8907d32..8e3f46308c 100644
--- a/buildtools/Cmake/MakeLibWin.cmake
+++ b/buildtools/Cmake/MakeLibWin.cmake
@@ -3,28 +3,18 @@
 add_library(simgrid STATIC ${simgrid_sources})
 add_library(gras STATIC ${gras_sources})
 
-if(MSVC)
-    set_target_properties(gras     PROPERTIES COMPILE_FLAGS "/D _XBT_DLL_STATIC"
+set_target_properties(gras     PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_STATIC"
                                                      OUTPUT_NAME   "gras")
-    set_target_properties(simgrid  PROPERTIES COMPILE_FLAGS "/D _XBT_DLL_STATIC"
-                                                     OUTPUT_NAME   "simgrid")
-else(MSVC)
-    if(CMAKE_COMPILER_IS_GNUCC)
-        set_target_properties(gras     PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_STATIC"
-                                                         OUTPUT_NAME   "gras")
-        set_target_properties(simgrid  PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_STATIC"
-                                                         OUTPUT_NAME   "simgrid")
-    else(CMAKE_COMPILER_IS_GNUCC)
-        message(FATAL_ERROR "Compilateur non connu!!!")
-    endif(CMAKE_COMPILER_IS_GNUCC)
-endif(MSVC)
+set_target_properties(simgrid  PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_STATIC"                                                  OUTPUT_NAME   "simgrid")
 
-set(GRAS_DEP "ws2_32")
-set(SIMGRID_DEP "ws2_32")
+set(GRAS_DEP "ws2_32 -lpthread")
+set(SIMGRID_DEP "ws2_32 -lpcre -lpthread")
 
-if(HAVE_PCRE_LIB)
-       SET(SIMGRID_DEP "${SIMGRID_DEP} -lpcre")
-endif(HAVE_PCRE_LIB)
+if(ARCH_32_BITS)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32 -march=i486")
+else(ARCH_32_BITS)
+        message(FATAL_ERROR "Sorry, Simgrid fails with full 64bits for now! Please contact us.")
+endif(ARCH_32_BITS)
 
 target_link_libraries(simgrid 	${SIMGRID_DEP})
-target_link_libraries(gras 	${GRAS_DEP})
+target_link_libraries(gras 	${GRAS_DEP})
\ No newline at end of file