### Make Libs\r
#>gcc c:\simgrid-trunk\examples\msg\icomms\peer.c -static -Lc:\simgrid-trunk\lib -lsimgrid -Ic:\simgrid-trunk\include -lwsock32 \r
-add_library(simgrid STATIC ${simgrid_sources})\r
-add_library(simgrid_shared SHARED ${simgrid_sources})\r
-add_library(gras STATIC ${gras_sources})\r
+add_library(simgrid SHARED ${simgrid_sources})\r
+add_library(gras SHARED ${gras_sources})\r
\r
-set_target_properties(gras PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_STATIC -DDLL_STATIC" VERSION ${libgras_version} OUTPUT_NAME "gras")\r
-set_target_properties(simgrid PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_STATIC -DDLL_STATIC" VERSION ${libsimgrid_version} OUTPUT_NAME "simgrid")\r
-set_target_properties(simgrid_shared PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_EXPORT -DDLL_EXPORT" VERSION ${libsimgrid_version} OUTPUT_NAME "simgrid_shared")\r
+set_target_properties(gras PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_EXPORT -DDLL_EXPORT" VERSION ${libgras_version} OUTPUT_NAME "gras")\r
+set_target_properties(simgrid PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_EXPORT -DDLL_EXPORT" VERSION ${libsimgrid_version} OUTPUT_NAME "simgrid")\r
\r
-set(GRAS_DEP "ws2_32 -lpthread")\r
-set(SIMGRID_DEP "ws2_32 -lpcre -lpthread")\r
-set(SIMGRID_SHARED_DEP "ws2_32 -lpthread")\r
+# libpthreadGC2.dll\r
+if(ARCH_32_BITS)\r
+ find_library(PATH_PTHREAD_LIB \r
+ NAMES pthreadGC2.dll\r
+ HINTS\r
+ $ENV{PATH}\r
+ PATH_SUFFIXES bin/ c/bin\r
+ )\r
+else(ARCH_32_BITS)\r
+ find_library(PATH_PTHREAD_LIB \r
+ NAMES pthreadGC2-w64.dll\r
+ HINTS\r
+ $ENV{PATH}\r
+ PATH_SUFFIXES bin/ c/bin\r
+ )\r
+endif(ARCH_32_BITS)\r
+\r
+set(GRAS_DEP "ws2_32 ${PATH_PTHREAD_LIB}")\r
+set(SIMGRID_DEP "ws2_32 ${PATH_PCRE_LIB} ${PATH_PTHREAD_LIB}")\r
\r
if(ARCH_32_BITS)\r
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32 -march=i486")\r
else(ARCH_32_BITS)\r
- message(FATAL_ERROR "Sorry, Simgrid fails with full 64bits for now! Please contact us.")\r
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64")\r
+# message(FATAL_ERROR "Sorry, Simgrid fails with full 64bits for now! Please contact us.")
endif(ARCH_32_BITS)\r
\r
target_link_libraries(gras ${GRAS_DEP})\r
target_link_libraries(simgrid ${SIMGRID_DEP})\r
-target_link_libraries(simgrid_shared ${SIMGRID_SHARED_DEP} ${PATH_PCRE_LIB})\r
\r
find_path(PEXPORTS_PATH NAMES pexports.exe PATHS NO_DEFAULT_PATHS)\r
message(STATUS "pexports: ${PEXPORTS_PATH}")\r
if(PEXPORTS_PATH)\r
-add_custom_command(TARGET simgrid_shared POST_BUILD\r
-COMMAND ${PEXPORTS_PATH}/pexports.exe ${CMAKE_BINARY_DIR}/lib/libsimgrid_shared.dll > ${CMAKE_BINARY_DIR}/lib/libsimgrid_shared.ref)\r
+add_custom_command(TARGET simgrid POST_BUILD\r
+COMMAND ${PEXPORTS_PATH}/pexports.exe ${CMAKE_BINARY_DIR}/lib/libsimgrid.dll > ${CMAKE_BINARY_DIR}/lib/libsimgrid.def)\r
endif(PEXPORTS_PATH)
\ No newline at end of file
