hdf5 1.8.6 used with VS2010 80/3280/2
Allan CORNET [Sat, 26 Feb 2011 08:02:41 +0000 (09:02 +0100)]
Change-Id: I19e605301d53faf392a96ec61f1c7ebb1910dcc7

scilab/modules/hdf5/src/c/DllmainHdf5.c
scilab/modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java

index af28cd0..bb7a622 100644 (file)
@@ -14,7 +14,6 @@
 /*--------------------------------------------------------------------------*/ 
 #pragma comment(lib,"../../../../bin/libintl.lib")
 #pragma comment(lib,"../../../../bin/hdf5dll.lib")
-#pragma comment(lib,"../../../../bin/hdf5_cppdll.lib")
 /*--------------------------------------------------------------------------*/ 
 int WINAPI DllMain (HINSTANCE hInstance , DWORD reason, PVOID pvReserved)
 {
index 259b457..0647e48 100644 (file)
@@ -62,7 +62,7 @@ public final class Xcos {
         * Dependencies version
         */
        private static final List<String> MXGRAPH_VERSIONS = Arrays.asList("1.4.1.0");
-       private static final List<String> HDF5_VERSIONS = Arrays.asList("[1, 8, 4]", "[1, 8, 5]");
+       private static final List<String> HDF5_VERSIONS = Arrays.asList("[1, 8, 4]", "[1, 8, 5]", "[1, 8, 6]");
        private static final List<String> BATIK_VERSIONS = Arrays.asList("1.7");
        
        private static final String UNABLE_TO_LOAD_JGRAPHX =