From: navarro <navarro@caraja.(none)>
Date: Thu, 16 Feb 2012 10:29:38 +0000 (+0100)
Subject: Load SG_java but rename libSG_java for SG_java on windows.
X-Git-Tag: v3_9_90~569^2~19^2~140
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/af9f946f903c301d6dee36f3a2f692c8eb266f80

Load SG_java but rename libSG_java for SG_java on windows.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f945dcf16f..4f35374624 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -189,12 +189,12 @@ add_library(SG_java SHARED ${JMSG_C_SRC})
 target_link_libraries(SG_java pcre pthread)
 set_target_properties(SG_java PROPERTIES LINK_FLAGS "${SIMGRID_LIB} -L$ENV{SIMGRID_PCRE_LIBRARY_PATH}/lib")
 if(WIN32)
-    set_target_properties(SG_java PROPERTIES LINK_FLAGS "-Wl,--subsystem,windows,--kill-at")
+    set_target_properties(SG_java PROPERTIES LINK_FLAGS "-Wl,--subsystem,windows,--kill-at" PREFIX "")
     find_path(PEXPORTS_PATH NAMES pexports.exe PATHS NO_DEFAULT_PATHS)
     message(STATUS "pexports: ${PEXPORTS_PATH}")
     if(PEXPORTS_PATH)
     add_custom_command(TARGET SG_java POST_BUILD
-    COMMAND ${PEXPORTS_PATH}/pexports.exe ${CMAKE_BINARY_DIR}/libSG_java.dll > ${CMAKE_BINARY_DIR}/libSG_java.def)
+    COMMAND ${PEXPORTS_PATH}/pexports.exe ${CMAKE_BINARY_DIR}/SG_java.dll > ${CMAKE_BINARY_DIR}/SG_java.def)
     endif(PEXPORTS_PATH)
 endif(WIN32)
 
diff --git a/org/simgrid/msg/Msg.java b/org/simgrid/msg/Msg.java
index 557d2b4805..c9dcc48cdf 100644
--- a/org/simgrid/msg/Msg.java
+++ b/org/simgrid/msg/Msg.java
@@ -15,7 +15,7 @@ public final class Msg {
 	/* Statically load the library which contains all native functions used in here */
 	static {
 		try {
-			System.loadLibrary("libSG_java");
+			System.loadLibrary("SG_java");
 		} catch(UnsatisfiedLinkError e) {
 			System.err.println("Cannot load the bindings to the simgrid library: ");
 			e.printStackTrace();