diff --git a/examples/Quick/Quick.pro b/examples/Quick/Quick.pro index 02cb2df..c7a4817 100644 --- a/examples/Quick/Quick.pro +++ b/examples/Quick/Quick.pro @@ -1,7 +1,6 @@ TARGET = Quick TEMPLATE = app QT += quick -HEADERS += $$PWD/../../framelessquickhelper.h -SOURCES += $$PWD/../../framelessquickhelper.cpp main.cpp +SOURCES += main.cpp RESOURCES += qml.qrc include($$PWD/../common.pri) diff --git a/examples/Win32Demo/Win32Demo.pro b/examples/Win32Demo/Win32Demo.pro index e18c602..c2e7031 100644 --- a/examples/Win32Demo/Win32Demo.pro +++ b/examples/Win32Demo/Win32Demo.pro @@ -1,7 +1,6 @@ TARGET = Win32Demo TEMPLATE = app QT += widgets -LIBS += -luser32 -ldwmapi HEADERS += widget.h SOURCES += widget.cpp main.cpp FORMS += widget.ui diff --git a/examples/common.pri b/examples/common.pri index f0b955f..adda94a 100644 --- a/examples/common.pri +++ b/examples/common.pri @@ -1,27 +1,24 @@ -QT += gui-private +DESTDIR = $$OUT_PWD/../../bin CONFIG += c++17 strict_c++ utf8_source warn_on DEFINES += \ QT_NO_CAST_FROM_ASCII \ - QT_NO_CAST_TO_ASCII \ - FRAMELESSHELPER_STATIC + QT_NO_CAST_TO_ASCII RESOURCES += $$PWD/images.qrc -HEADERS += \ - $$PWD/../framelesshelper_global.h \ - $$PWD/../framelesswindowsmanager.h -SOURCES += $$PWD/../framelesswindowsmanager.cpp win32 { - DEFINES += WIN32_LEAN_AND_MEAN _CRT_SECURE_NO_WARNINGS - CONFIG += windeployqt LINK_TO_SYSTEM_DLL + DEFINES += \ + WIN32_LEAN_AND_MEAN \ + _CRT_SECURE_NO_WARNINGS \ + WNEF_LINK_SYSLIB + CONFIG += windeployqt CONFIG -= embed_manifest_exe - HEADERS += $$PWD/../winnativeeventfilter.h - SOURCES += $$PWD/../winnativeeventfilter.cpp - LINK_TO_SYSTEM_DLL { - DEFINES += WNEF_LINK_SYSLIB - LIBS += -luser32 -lgdi32 -ldwmapi -lshcore -ld2d1 - } + LIBS += -luser32 -lshell32 -lgdi32 -ldwmapi -lshcore -ld2d1 RC_FILE = $$PWD/windows.rc OTHER_FILES += $$PWD/windows.manifest -} else { - HEADERS += $$PWD/../framelesshelper.h - SOURCES += $$PWD/../framelesshelper.cpp +} +CONFIG(debug, debug|release) { + LIBS += -L$$OUT_PWD/../../debug + win32: LIBS += -lFramelessHelperd + else: unix: LIBS += -lFramelessHelper_debug +} else: CONFIG(release, debug|release) { + LIBS += -L$$OUT_PWD/../../release -lFramelessHelper } diff --git a/framelesshelper.pro b/framelesshelper.pro new file mode 100644 index 0000000..9d6b14e --- /dev/null +++ b/framelesshelper.pro @@ -0,0 +1,5 @@ +TEMPLATE = subdirs +CONFIG -= ordered +SUBDIRS += lib examples +lib.file = lib.pro +examples.depends += lib diff --git a/lib.pro b/lib.pro new file mode 100644 index 0000000..81ec4b6 --- /dev/null +++ b/lib.pro @@ -0,0 +1,34 @@ +TARGET = $$qtLibraryTarget(FramelessHelper) +TEMPLATE = lib +win32: DLLDESTDIR = $$OUT_PWD/bin +else: unix: DESTDIR = $$OUT_PWD/bin +QT += gui-private +qtHaveModule(widgets): QT += widgets +qtHaveModule(quick): QT += quick +CONFIG += c++17 strict_c++ utf8_source warn_on +DEFINES += \ + QT_NO_CAST_FROM_ASCII \ + QT_NO_CAST_TO_ASCII \ + FRAMELESSHELPER_BUILD_LIBRARY +HEADERS += \ + framelesshelper_global.h \ + framelesswindowsmanager.h +SOURCES += framelesswindowsmanager.cpp +qtHaveModule(quick) { + HEADERS += framelessquickhelper.h + SOURCES += framelessquickhelper.cpp +} +win32 { + DEFINES += WIN32_LEAN_AND_MEAN _CRT_SECURE_NO_WARNINGS + CONFIG += LINK_TO_SYSTEM_DLL + HEADERS += winnativeeventfilter.h + SOURCES += winnativeeventfilter.cpp + LINK_TO_SYSTEM_DLL { + DEFINES += WNEF_LINK_SYSLIB + LIBS += -luser32 -lshell32 -lgdi32 -ldwmapi -lshcore -ld2d1 + } + RC_FILE = framelesshelper.rc +} else { + HEADERS += framelesshelper.h + SOURCES += framelesshelper.cpp +}