X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d4b76dc130a44f100d1fb144ba99af1b4ee434d9..fe9ec44b78f1d4b5a89db951d025bb33d0cd73d1:/buildtools/Cmake/MakeLibWin.cmake

diff --git a/buildtools/Cmake/MakeLibWin.cmake b/buildtools/Cmake/MakeLibWin.cmake
index cd41fa9e55..49a0833039 100644
--- a/buildtools/Cmake/MakeLibWin.cmake
+++ b/buildtools/Cmake/MakeLibWin.cmake
@@ -1,44 +1,49 @@
-### Make Libs
-#>gcc c:\simgrid-trunk\examples\msg\icomms\peer.c -static -Lc:\simgrid-trunk\lib -lsimgrid -Ic:\simgrid-trunk\include -lwsock32	
-add_library(simgrid SHARED ${simgrid_sources})
-add_library(gras SHARED ${gras_sources})
-
-set_target_properties(gras     PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_EXPORT -DDLL_EXPORT" VERSION ${libgras_version}    OUTPUT_NAME "gras")
-set_target_properties(simgrid  PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_EXPORT -DDLL_EXPORT" VERSION ${libsimgrid_version} OUTPUT_NAME "simgrid")
-
-# libpthreadGC2.dll
-if(ARCH_32_BITS)
-    find_library(PATH_PTHREAD_LIB 
-    	NAMES pthreadGC2.dll
-        HINTS
-        $ENV{PATH}
-        PATH_SUFFIXES bin/ c/bin
-        )
-else(ARCH_32_BITS)
-    find_library(PATH_PTHREAD_LIB 
-    	NAMES pthreadGC2-w64.dll
-        HINTS
-        $ENV{PATH}
-        PATH_SUFFIXES bin/ c/bin
-        )
-endif(ARCH_32_BITS)
-
-set(GRAS_DEP "ws2_32 ${PATH_PTHREAD_LIB}")
-set(SIMGRID_DEP "ws2_32 ${PATH_PCRE_LIB} ${PATH_PTHREAD_LIB}")
-
-if(ARCH_32_BITS)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32 -march=i486")
-else(ARCH_32_BITS)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64")
-#        message(FATAL_ERROR "Sorry, Simgrid fails with full 64bits for now! Please contact us.")
-endif(ARCH_32_BITS)
-
-target_link_libraries(gras 	${GRAS_DEP})
-target_link_libraries(simgrid 	${SIMGRID_DEP})
-
-find_path(PEXPORTS_PATH NAMES pexports.exe PATHS NO_DEFAULT_PATHS)
-message(STATUS "pexports: ${PEXPORTS_PATH}")
-if(PEXPORTS_PATH)
-add_custom_command(TARGET simgrid POST_BUILD
-COMMAND ${PEXPORTS_PATH}/pexports.exe ${CMAKE_BINARY_DIR}/lib/libsimgrid.dll > ${CMAKE_BINARY_DIR}/lib/libsimgrid.def)
-endif(PEXPORTS_PATH)
\ No newline at end of file
+### Make Libs
+#>gcc c:\simgrid-trunk\examples\msg\icomms\peer.c -static -Lc:\simgrid-trunk\lib -lsimgrid -Ic:\simgrid-trunk\include -lwsock32
+
+if(enable_java)
+  include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/MakeJava.cmake)
+endif()
+
+add_library(simgrid SHARED ${simgrid_sources})
+
+set_target_properties(simgrid  PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_EXPORT -DDLL_EXPORT" LINK_FLAGS "-shared" VERSION ${libsimgrid_version} PREFIX "lib" SUFFIX ".dll" IMPORT_PREFIX "lib" IMPORT_SUFFIX ".dll")
+
+
+# libpthreadGC2.dll
+if(ARCH_32_BITS)
+  find_library(PATH_PTHREAD_LIB
+    NAMES pthreadGC2.dll
+    HINTS
+    $ENV{PATH}
+    PATH_SUFFIXES bin/ c/bin
+    )
+else()
+  find_library(PATH_PTHREAD_LIB
+    NAMES pthreadGC2-w64.dll
+    HINTS
+    $ENV{PATH}
+    PATH_SUFFIXES bin/ c/bin
+    )
+endif()
+
+set(SIMGRID_DEP "-lws2_32 -L${PATH_PTHREAD_LIB} -lm -lpthreadGC2")
+
+
+if(ARCH_32_BITS)
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32 -march=i486 -D_I_X86_")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32 -march=i486 -D_I_X86_")
+else()
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64 -D_AMD64_")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64 -D_AMD64_")
+  #        message(FATAL_ERROR "Sorry, Simgrid fails with full 64bits for now! Please contact us.")
+endif()
+
+target_link_libraries(simgrid 	${SIMGRID_DEP})
+
+find_path(PEXPORTS_PATH NAMES pexports.exe PATHS NO_DEFAULT_PATHS)
+message(STATUS "pexports: ${PEXPORTS_PATH}")
+if(PEXPORTS_PATH)
+  add_custom_command(TARGET simgrid POST_BUILD
+    COMMAND ${PEXPORTS_PATH}/pexports.exe ${CMAKE_BINARY_DIR}/lib/libsimgrid.dll > ${CMAKE_BINARY_DIR}/lib/libsimgrid.def)
+endif()