!54 Bugs: 处理一些在 Visual Studio 中引发无法构建的问题

Merge pull request !54 from zinface/officil-develop
This commit is contained in:
爬山虎 2023-02-20 13:03:33 +00:00 committed by Gitee
commit 3a93873e14
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 6 additions and 5 deletions

View File

@ -20,7 +20,7 @@ if(TRUE)
# FAIL: only *.ui will spark_file_glob(MOC_HEADER ...)
)
spark_add_library(QSci STATIC ${QSciSources} ${MOC_HEADER})
target_compile_definitions(QSci PRIVATE SCINTILLA_QT SCI_LEXER INCLUDE_DEPRECATED_FEATURES)
target_compile_definitions(QSci PRIVATE SCINTILLA_QT SCI_LEXER INCLUDE_DEPRECATED_FEATURES QSCINTILLA_MAKE_DLL)
target_include_directories(QSci PRIVATE
src/qscint/scintilla/boostregex
src/qscint/scintilla/lexlib)

View File

@ -24,9 +24,10 @@
#ifdef Q_OS_WIN
#pragma comment(lib, "user32.lib")
#if _DEBUG
#pragma comment(lib, "qmyedit_qt5d.lib")
// Bug: 在 Visual Studio 中引发无法构建的问题,此处为无法找到 qmyedit_x 库
//#pragma comment(lib, "qmyedit_qt5d.lib")
#else
#pragma comment(lib, "qmyedit_qt5.lib")
//#pragma comment(lib, "qmyedit_qt5.lib")
#endif
#include <qt_windows.h>
const ULONG_PTR CUSTOM_TYPE = 10000;

View File

@ -14,8 +14,8 @@ static const char* VersionStr = u8"(内部测试非稳定) v1.22.1";
static const char* VersionStr = "v1.22.2";
#endif // TEST_PRE
#define NO_PLUGIN 1
// Bug: 在 Visual Studio 中引发无法构建的问题,此处被重复定义(在 cmake 中已对其定义)
// #define NO_PLUGIN 1
#define CMP_CODE_NOEQUAL