From cbfe341e367a97acaae406fc412cc15147cebca3 Mon Sep 17 00:00:00 2001
From: Igor Skochinsky <skochinsky@gmail.com>
Date: Fri, 20 Dec 2019 15:56:56 +0100
Subject: [PATCH] Windows: fix idapyswitch build with the SDK

---
 makefile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/makefile b/makefile
index ada0082..eff6aea 100644
--- a/makefile
+++ b/makefile
@@ -24,7 +24,7 @@ include ../../allmake.mak
 
 #----------------------------------------------------------------------
 # default goals
-.PHONY: configs modules pyfiles deployed_modules idapython_modules api_contents pydoc_injections public_tree test_idc docs
+.PHONY: configs modules pyfiles deployed_modules idapython_modules api_contents pydoc_injections public_tree test_idc docs bins
 all: configs modules pyfiles deployed_modules idapython_modules api_contents pydoc_injections bins # public_tree test_idc docs
 
 ifeq ($(OUT_OF_TREE_BUILD),)
@@ -305,8 +305,6 @@ endif
 ifdef __NT__                   # os and compiler specific flags
   _SWIGFLAGS = -D__NT__ -DWIN32 -D_USRDLL -I"$(PYTHON_ROOT)/include"
   CFLAGS += /bigobj $(_SWIGFLAGS) -I$(ST_SDK) /U_DEBUG
-  # override runtime libs in CFLAGS
-  RUNTIME_LIBSW = /MD
 else # unix/mac
   ifdef __LINUX__
     PYTHON_LDFLAGS_RPATH_MAIN=-Wl,-rpath='$$ORIGIN/..'
@@ -806,11 +804,15 @@ endif
 IDAPYSWITCH_OBJS += $(F)idapyswitch$(O)
 
 ifdef __NT__
+ifneq ($(OUT_OF_TREE_BUILD),)
+   # SDK provides only MT libraries
+   $(F)idapyswitch$(O): RUNTIME_LIBSW=/MT 
+else
   ifndef NDEBUG
-    RUNTIME_LIBSW = /MDd
     $(F)idapyswitch$(O): CFLAGS := $(filter-out /U_DEBUG,$(CFLAGS))
   endif
 endif
+endif
 $(R)idapyswitch$(B): $(call dumb_target, pro, $(IDAPYSWITCH_OBJS))
 
 #----------------------------------------------------------------------