Commit 9e907080 by Amnes1a

拉取后提交

parents f244afa9 9235ada3
...@@ -56,9 +56,14 @@ unix { ...@@ -56,9 +56,14 @@ unix {
#Target name #Target name
VER = $$system($$PWD/../fmprc.bat $$TARGET) VER = $$system($$PWD/../fmprc.bat $$TARGET)
#VER = 0.1.1
ORIGIN_TARGET = $$TARGET ORIGIN_TARGET = $$TARGET
TARGET = $${TARGET}_$${VER} win32{
TARGET = $${TARGET}_$${VER}
}
else{
TARGET = $${TARGET}
}
#Header path #Header path
INCLUDEPATH += $$PWD/../include/ctk \ INCLUDEPATH += $$PWD/../include/ctk \
...@@ -69,7 +74,11 @@ LIBS += -L$$PWD/../lib ...@@ -69,7 +74,11 @@ LIBS += -L$$PWD/../lib
CONFIG(debug, debug|release) { CONFIG(debug, debug|release) {
#Linking library #Linking library
win32 {
LIBS += -lCTKCored -lCTKPluginFrameworkd LIBS += -lCTKCored -lCTKPluginFrameworkd
}else{
LIBS += -lCTKCore -lCTKPluginFramework
}
#Destination path #Destination path
DESTDIR = $$PWD/../debug/plugins DESTDIR = $$PWD/../debug/plugins
} else { } else {
......
#include "fmp_home_settings.h" #include "fmp_home_settings.h"
#include <fmp_settings_i.h> #include <fmp_settings_i.h>
#include <QDebug> #include <QDebug>
#include<qpoint.h>
FMPHomeSettings::FMPHomeSettings(QObject *parent) : QObject(parent) FMPHomeSettings::FMPHomeSettings(QObject *parent) : QObject(parent)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment