A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
model-checker : new files forgotten
[simgrid.git]
/
buildtools
/
Cmake
/
MakeLibWin.cmake
diff --git
a/buildtools/Cmake/MakeLibWin.cmake
b/buildtools/Cmake/MakeLibWin.cmake
index
081c6e0
..
49a0833
100644
(file)
--- a/
buildtools/Cmake/MakeLibWin.cmake
+++ b/
buildtools/Cmake/MakeLibWin.cmake
@@
-1,6
+1,9
@@
### Make Libs
#>gcc c:\simgrid-trunk\examples\msg\icomms\peer.c -static -Lc:\simgrid-trunk\lib -lsimgrid -Ic:\simgrid-trunk\include -lwsock32
### 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})
add_library(simgrid SHARED ${simgrid_sources})
@@
-24,12
+27,15
@@
else()
)
endif()
)
endif()
-set(SIMGRID_DEP "-lws2_32 -L${PATH_PCRE_LIB} -L${PATH_PTHREAD_LIB} -lm -lpcre -lpthreadGC2")
+set(SIMGRID_DEP "-lws2_32 -L${PATH_PTHREAD_LIB} -lm -lpthreadGC2")
+
if(ARCH_32_BITS)
if(ARCH_32_BITS)
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32 -march=i486")
+ 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()
else()
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64")
+ 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()
# message(FATAL_ERROR "Sorry, Simgrid fails with full 64bits for now! Please contact us.")
endif()