From: navarrop Date: Mon, 7 Mar 2011 11:20:27 +0000 (+0000) Subject: Set win32_ucontext.c as simgrid source file X-Git-Tag: v3.6_beta2~200 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/347b2193ad200d91018ca5be4894a4679fe09e79 Set win32_ucontext.c as simgrid source file git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9760 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index c485b48317..b53ebe45ad 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -448,7 +448,6 @@ else(HAVE_GTNETS) ) endif(HAVE_GTNETS) - ### Simgrid Lib sources set(simgrid_sources ${XBT_SRC} @@ -472,6 +471,16 @@ if(HAVE_MC) ) endif(HAVE_MC) +# WINDOWS +if(WIN32) + set(simgrid_sources + ${simgrid_sources} + src/xbt/win32_ucontext.c + src/xbt/xbt_os_thread.c + src/simix/smx_context_thread.c + ) +endif(WIN32) + ### Gras Lib sources set(gras_sources ${XBT_SRC} diff --git a/src/simix/smx_context_raw.c b/src/simix/smx_context_raw.c index 647d6a6aff..239d0a75ff 100644 --- a/src/simix/smx_context_raw.c +++ b/src/simix/smx_context_raw.c @@ -16,7 +16,6 @@ #ifdef _XBT_WIN32 #include "win32_ucontext.h" -#include "win32_ucontext.c" #else #include "ucontext.h" #endif diff --git a/src/simix/smx_context_sysv.c b/src/simix/smx_context_sysv.c index 18b447b57a..568cd0f48e 100644 --- a/src/simix/smx_context_sysv.c +++ b/src/simix/smx_context_sysv.c @@ -19,7 +19,6 @@ #ifdef _XBT_WIN32 #include "win32_ucontext.h" -#include "win32_ucontext.c" #else #include "ucontext.h" #endif