Update matio to v1.5.28

modelica-3rdparty · Jan 4, 2025 · cecf6f1 · cecf6f1
1 parent e085947
commit cecf6f1
Show file tree

Hide file tree

Showing 11 changed files with 9,192 additions and 10,338 deletions.
diff --git a/ExternData/Resources/BuildProjects/VisualStudio2010/ED_MATFile.vcxproj b/ExternData/Resources/BuildProjects/VisualStudio2010/ED_MATFile.vcxproj
@@ -226,14 +226,18 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\C-Sources\ED_MATFile.c" />
+    <ClCompile Include="..\..\C-Sources\modelica\snprintf.c" />
     <ClInclude Include="..\..\C-Sources\ED_ptrtrack.h" />
-    <ClInclude Include="..\..\C-Sources\modelica\ModelicaIO.c" />
-    <ClInclude Include="..\..\C-Sources\modelica\ModelicaMatIO.c" />
+    <ClCompile Include="..\..\C-Sources\modelica\ModelicaIO.c" />
+    <ClCompile Include="..\..\C-Sources\modelica\ModelicaMatIO.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\C-Sources\modelica\ModelicaIO.h" />
     <ClInclude Include="..\..\C-Sources\modelica\ModelicaMatIO.h" />
     <ClInclude Include="..\..\C-Sources\modelica\ModelicaUtilities.h" />
+    <ClInclude Include="..\..\C-Sources\modelica\read_data_impl.h" />
+    <ClInclude Include="..\..\C-Sources\modelica\safe-math.h" />
+    <ClInclude Include="..\..\C-Sources\modelica\stdint_msvc.h" />
     <ClInclude Include="..\..\Include\ED_MATFile.h" />
   </ItemGroup>
   <ItemGroup>

diff --git a/ExternData/Resources/BuildProjects/VisualStudio2010/ED_MATFile.vcxproj.filters b/ExternData/Resources/BuildProjects/VisualStudio2010/ED_MATFile.vcxproj.filters
@@ -18,6 +18,15 @@
     <ClCompile Include="..\..\C-Sources\ED_MATFile.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\C-Sources\modelica\snprintf.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\C-Sources\modelica\ModelicaIO.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\C-Sources\modelica\ModelicaMatIO.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\Include\ED_MATFile.h">
@@ -32,13 +41,16 @@
     <ClInclude Include="..\..\C-Sources\modelica\ModelicaIO.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\C-Sources\modelica\ModelicaIO.c">
+    <ClInclude Include="..\..\C-Sources\ED_ptrtrack.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\C-Sources\ED_ptrtrack.h">
+    <ClInclude Include="..\..\C-Sources\modelica\read_data_impl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\C-Sources\modelica\safe-math.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\C-Sources\modelica\ModelicaMatIO.c">
+    <ClInclude Include="..\..\C-Sources\modelica\stdint_msvc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>

diff --git a/ExternData/Resources/BuildProjects/autotools/Makefile.am b/ExternData/Resources/BuildProjects/autotools/Makefile.am
@@ -13,6 +13,9 @@ libED_JSONFile_la_SOURCES = \
 	../../C-Sources/ED_JSONFile.c
 
 libED_MATFile_la_SOURCES = \
+	../../C-Sources/modelica/ModelicaIO.c \
+	../../C-Sources/modelica/ModelicaMatIO.c \
+	../../C-Sources/modelica/snprintf.c \
 	../../C-Sources/ED_MATFile.c
 
 libED_XLSFile_la_SOURCES = \

diff --git a/ExternData/Resources/C-Sources/ED_MATFile.c b/ExternData/Resources/C-Sources/ED_MATFile.c
@@ -16,11 +16,10 @@
 #define strdup _strdup
 #endif
 #include "ED_ptrtrack.h"
-#include "ModelicaUtilities.h"
-#define MODELICA_EXPORT static
-#define MATIO_EXTERN static
-#include "ModelicaIO.c"
 #include "../Include/ED_MATFile.h"
+#include "ModelicaIO.h"
+#include "ModelicaMatIO.h"
+#include "ModelicaUtilities.h"
 
 typedef struct {
 	char* fileName;