Signed-off-by: Yuhang Zhao <2546789017@qq.com>
This commit is contained in:
Yuhang Zhao 2020-08-01 14:25:07 +08:00
parent 43012e2681
commit 88cb48b306
7 changed files with 23 additions and 10 deletions

View File

@ -66,6 +66,11 @@ if(WIN32)
WIN32_LEAN_AND_MEAN WIN32_LEAN_AND_MEAN
_CRT_SECURE_NO_WARNINGS _CRT_SECURE_NO_WARNINGS
) )
if(LINK_TO_SYSTEM_DLL)
target_compile_definitions(${PROJECT_NAME} PRIVATE
WNEF_LINK_SYSLIB
)
endif()
endif() endif()
target_link_libraries(${PROJECT_NAME} PRIVATE Qt::GuiPrivate) target_link_libraries(${PROJECT_NAME} PRIVATE Qt::GuiPrivate)
if(Qt5Widgets_FOUND) if(Qt5Widgets_FOUND)

View File

@ -9,7 +9,10 @@ qtHaveModule(quick) {
SOURCES += framelessquickhelper.cpp SOURCES += framelessquickhelper.cpp
} }
CONFIG += c++17 strict_c++ warn_on utf8_source CONFIG += c++17 strict_c++ warn_on utf8_source
DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII DEFINES += \
QT_NO_CAST_FROM_ASCII \
QT_NO_CAST_TO_ASCII \
FRAMELESSHELPER_STATIC
VERSION = 1.0.0 VERSION = 1.0.0
HEADERS += framelesshelper.h HEADERS += framelesshelper_global.h framelesshelper.h
SOURCES += framelesshelper.cpp main_unix.cpp SOURCES += framelesshelper.cpp main_unix.cpp

View File

Before

Width:  |  Height:  |  Size: 45 KiB

After

Width:  |  Height:  |  Size: 45 KiB

View File

@ -9,14 +9,19 @@ qtHaveModule(quick) {
SOURCES += framelessquickhelper.cpp SOURCES += framelessquickhelper.cpp
} }
CONFIG += c++17 strict_c++ utf8_source warn_on windeployqt CONFIG += c++17 strict_c++ utf8_source warn_on windeployqt
DEFINES += WIN32_LEAN_AND_MEAN QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII DEFINES += \
flh_link_syslib { WIN32_LEAN_AND_MEAN \
_CRT_SECURE_NO_WARNINGS \
QT_NO_CAST_FROM_ASCII \
QT_NO_CAST_TO_ASCII \
FRAMELESSHELPER_STATIC
LINK_TO_SYSTEM_DLL {
DEFINES += WNEF_LINK_SYSLIB DEFINES += WNEF_LINK_SYSLIB
LIBS += -luser32 -lgdi32 -ldwmapi -lshcore LIBS += -luser32 -lgdi32 -ldwmapi -lshcore
} }
CONFIG -= embed_manifest_exe CONFIG -= embed_manifest_exe
RC_FILE = resources.rc RC_FILE = framelesshelper_windows.rc
HEADERS += winnativeeventfilter.h HEADERS += framelesshelper_global.h winnativeeventfilter.h
SOURCES += winnativeeventfilter.cpp main_windows.cpp SOURCES += winnativeeventfilter.cpp main_windows.cpp
RESOURCES += resources.qrc RESOURCES += framelesshelper_windows.qrc
OTHER_FILES += manifest.xml OTHER_FILES += framelesshelper_windows.manifest

View File

@ -24,9 +24,9 @@
#include <windows.h> #include <windows.h>
IDI_ICON1 ICON "icon.ico" IDI_ICON1 ICON "framelesshelper_windows.ico"
CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "framelesshelper_windows.manifest"
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,0,0,0 FILEVERSION 1,0,0,0