From e639e9bcdc6b4215c22c0209abaa481a7aade6a4 Mon Sep 17 00:00:00 2001 From: kgv Date: Thu, 2 Sep 2021 09:03:55 +0300 Subject: [PATCH] 0032553: Configuration, CMake - unable to building with ActiveTcl Removed linkage with "tcl8.6.lib" with help of pragma lib specific to msvc. Tcl libraries should be configured as normal external dependencies via CSF_TclLibs by CMake and genproj, which is already done (information was duplicated). --- src/Draw/Draw.cxx | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/Draw/Draw.cxx b/src/Draw/Draw.cxx index 957aec927a..cb43f83d8e 100644 --- a/src/Draw/Draw.cxx +++ b/src/Draw/Draw.cxx @@ -43,18 +43,6 @@ #include -// on MSVC, use #pragma to define name of the Tcl library to link with, -// depending on Tcl version number -#ifdef _MSC_VER -// two helper macros are needed to convert version number macro to string literal -#define STRINGIZE1(a) #a -#define STRINGIZE2(a) STRINGIZE1(a) -#pragma comment (lib, "tcl" STRINGIZE2(TCL_MAJOR_VERSION) STRINGIZE2(TCL_MINOR_VERSION) ".lib") -#pragma comment (lib, "tk" STRINGIZE2(TCL_MAJOR_VERSION) STRINGIZE2(TCL_MINOR_VERSION) ".lib") -#undef STRINGIZE2 -#undef STRINGIZE1 -#endif - extern Standard_Boolean Draw_ParseFailed; Standard_EXPORT Draw_Viewer dout;