Skip to content

Commit bd3aa86

Browse files
authored
Merge branch 'modelica:master' into master
2 parents 09ef3d5 + 658c22d commit bd3aa86

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

Modelica/Resources/BuildProjects/CMake/Modelica_platform.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ function(get_modelica_platform_name_with_compiler_version var)
7676
set(PLATFORM_PATH_SUFFIX "${PLATFORM_PATH_SUFFIX}/vs2019")
7777
elseif(MSVC_VERSION GREATER_EQUAL 1930 AND MSVC_VERSION LESS 1950)
7878
set(PLATFORM_PATH_SUFFIX "${PLATFORM_PATH_SUFFIX}/vs2022")
79+
elseif(MSVC_VERSION GREATER_EQUAL 1950 AND MSVC_VERSION LESS 1960)
80+
set(PLATFORM_PATH_SUFFIX "${PLATFORM_PATH_SUFFIX}/vs2026")
7981
endif()
8082
endif()
8183

Modelica/Resources/C-Sources/ModelicaInternal.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,10 +384,12 @@ void ModelicaInternal_mkdir(_In_z_ const char* directoryName) {
384384

385385
void ModelicaInternal_rmdir(_In_z_ const char* directoryName) {
386386
/* Remove directory */
387-
#if defined(__WATCOMC__) || defined(__LCC__) || defined(_POSIX_) || defined(__GNUC__)
387+
#if defined(__WATCOMC__) || defined(__LCC__)
388388
int result = rmdir(directoryName);
389389
#elif defined(__BORLANDC__) || defined(_WIN32)
390390
int result = _rmdir(directoryName);
391+
#elif defined(_POSIX_) || defined(__GNUC__)
392+
int result = rmdir(directoryName);
391393
#else
392394
ModelicaNotExistError("ModelicaInternal_rmdir");
393395
#endif

0 commit comments

Comments
 (0)