From 88cb48b30636acb8bffa27b4f68a3985adc0bf06 Mon Sep 17 00:00:00 2001
From: Yuhang Zhao <2546789017@qq.com>
Date: Sat, 1 Aug 2020 14:25:07 +0800
Subject: [PATCH] Update.

Signed-off-by: Yuhang Zhao <2546789017@qq.com>
---
 CMakeLists.txt                                 |   5 +++++
 framelesshelper_unix.pro                       |   7 +++++--
 icon.ico => framelesshelper_windows.ico        | Bin
 ...est.xml => framelesshelper_windows.manifest |   0
 framelesshelper_windows.pro                    |  17 +++++++++++------
 resources.qrc => framelesshelper_windows.qrc   |   0
 resources.rc => framelesshelper_windows.rc     |   4 ++--
 7 files changed, 23 insertions(+), 10 deletions(-)
 rename icon.ico => framelesshelper_windows.ico (100%)
 rename manifest.xml => framelesshelper_windows.manifest (100%)
 rename resources.qrc => framelesshelper_windows.qrc (100%)
 rename resources.rc => framelesshelper_windows.rc (94%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5d918e3..59ae30e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,6 +66,11 @@ if(WIN32)
         WIN32_LEAN_AND_MEAN
         _CRT_SECURE_NO_WARNINGS
     )
+    if(LINK_TO_SYSTEM_DLL)
+        target_compile_definitions(${PROJECT_NAME} PRIVATE
+            WNEF_LINK_SYSLIB
+        )
+    endif()
 endif()
 target_link_libraries(${PROJECT_NAME} PRIVATE Qt::GuiPrivate)
 if(Qt5Widgets_FOUND)
diff --git a/framelesshelper_unix.pro b/framelesshelper_unix.pro
index 4335957..e990d1a 100644
--- a/framelesshelper_unix.pro
+++ b/framelesshelper_unix.pro
@@ -9,7 +9,10 @@ qtHaveModule(quick) {
     SOURCES += framelessquickhelper.cpp
 }
 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
-HEADERS += framelesshelper.h
+HEADERS += framelesshelper_global.h framelesshelper.h
 SOURCES += framelesshelper.cpp main_unix.cpp
diff --git a/icon.ico b/framelesshelper_windows.ico
similarity index 100%
rename from icon.ico
rename to framelesshelper_windows.ico
diff --git a/manifest.xml b/framelesshelper_windows.manifest
similarity index 100%
rename from manifest.xml
rename to framelesshelper_windows.manifest
diff --git a/framelesshelper_windows.pro b/framelesshelper_windows.pro
index 7fab934..3f920e7 100644
--- a/framelesshelper_windows.pro
+++ b/framelesshelper_windows.pro
@@ -9,14 +9,19 @@ qtHaveModule(quick) {
     SOURCES += framelessquickhelper.cpp
 }
 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
-flh_link_syslib {
+DEFINES += \
+    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
     LIBS += -luser32 -lgdi32 -ldwmapi -lshcore
 }
 CONFIG -= embed_manifest_exe
-RC_FILE = resources.rc
-HEADERS += winnativeeventfilter.h
+RC_FILE = framelesshelper_windows.rc
+HEADERS += framelesshelper_global.h winnativeeventfilter.h
 SOURCES += winnativeeventfilter.cpp main_windows.cpp
-RESOURCES += resources.qrc
-OTHER_FILES += manifest.xml
+RESOURCES += framelesshelper_windows.qrc
+OTHER_FILES += framelesshelper_windows.manifest
diff --git a/resources.qrc b/framelesshelper_windows.qrc
similarity index 100%
rename from resources.qrc
rename to framelesshelper_windows.qrc
diff --git a/resources.rc b/framelesshelper_windows.rc
similarity index 94%
rename from resources.rc
rename to framelesshelper_windows.rc
index e217e6c..3654aa6 100644
--- a/resources.rc
+++ b/framelesshelper_windows.rc
@@ -24,9 +24,9 @@
 
 #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
 FILEVERSION     1,0,0,0