From e0693c46327b47c94ad5ce8294fad7ef1463b5cd Mon Sep 17 00:00:00 2001 From: Mahder Gebremedhin Date: Sat, 15 Jul 2023 12:59:36 +0200 Subject: [PATCH] Compile with /MD for MSVC. - This seems to be what is picked by default by cmake. OMTLMSimulator does not need or use CMake right now, however it links to libraries built by CMake (within OMSimulator, e.g., libxml2) which get compiled with /MD. So set it here as well to avoid link time failures. --- 3rdParty/misc/Makefile.msvc | 2 +- 3rdParty/rtime/Makefile.msvc | 2 +- common/Makefile.msvc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/3rdParty/misc/Makefile.msvc b/3rdParty/misc/Makefile.msvc index 53eb851..871bd21 100644 --- a/3rdParty/misc/Makefile.msvc +++ b/3rdParty/misc/Makefile.msvc @@ -1,4 +1,4 @@ -CC=cl -EHsc /MP +CC=cl -EHsc /MP /MD cc=cl INCLUDES= /Iinclude diff --git a/3rdParty/rtime/Makefile.msvc b/3rdParty/rtime/Makefile.msvc index 27d6598..28d6f1a 100644 --- a/3rdParty/rtime/Makefile.msvc +++ b/3rdParty/rtime/Makefile.msvc @@ -1,4 +1,4 @@ -CC=cl -EHsc /MP +CC=cl -EHsc /MP /MD cc=cl INCLUDES=/Iinclude /I../../../3rdParty/pthread/install/win/include diff --git a/common/Makefile.msvc b/common/Makefile.msvc index e6ca53d..166b43c 100644 --- a/common/Makefile.msvc +++ b/common/Makefile.msvc @@ -8,7 +8,7 @@ BUILDDIR=..\build\win TARGETDIR=..\bin TARGET=omtlmsimulator.dll -CC=cl /DMSC_VER /DWIN32 /D_WIN32 /EHsc /DNOMINMAX /GR /DUSE_THREADS /MP /c /DLIBXML_STATIC +CC=cl /DMSC_VER /DWIN32 /D_WIN32 /EHsc /DNOMINMAX /GR /DUSE_THREADS /MP /MD /c /DLIBXML_STATIC cc=cl LINK=link /DLL AR=ar