diff --git a/OSGFramework/src/OSGFramework.pro b/OSGFramework/src/OSGFramework.pro index c82c0f4..00a079c 100644 --- a/OSGFramework/src/OSGFramework.pro +++ b/OSGFramework/src/OSGFramework.pro @@ -17,6 +17,7 @@ TEMPLATE = lib # deprecated API in order to know how to port your code away from it. DEFINES += OSGFRAMEWORK_LIB DEFINES += _WINDOWS +DEFINES += _TIMESPEC_DEFINED # You can also make your code fail to compile if you use deprecated APIs. # In order to do so, uncomment the following line. @@ -59,6 +60,12 @@ INCLUDEPATH += ../../common INCLUDEPATH += ../../BaseFun/include INCLUDEPATH += ../../OSGDataModel/include INCLUDEPATH += ../../DataMgr/include +INCLUDEPATH += ../../Workflow/include \ + ../../Workflow/WFEngine/IOService/include \ + ../../Workflow/WFEngine/Module/include \ + ../../Workflow/WFCrystal/SysUtility/utils/include \ + ../../Workflow/WFEngine/ObjectModel/ObjectModel/include \ + ../../Workflow/WFEngine/ObjectModel/ObjectModelBase/include CONFIG(debug, debug|release){ LIBS += -L../../Bin -lslfiod diff --git a/Workflow/WFWidget/src/WFWidget.pro b/Workflow/WFWidget/src/WFWidget.pro index 2216b42..f3e84f0 100644 --- a/Workflow/WFWidget/src/WFWidget.pro +++ b/Workflow/WFWidget/src/WFWidget.pro @@ -38,10 +38,10 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin !isEmpty(target.path): INSTALLS += target CONFIG(debug, debug|release){ - DESTDIR = ../../Bin + DESTDIR = ../../../Bin TARGET = $$join(TARGET,,,d) #为debug版本生成的文件增加d的后缀 } else { - DESTDIR = ../../Bin + DESTDIR = ../../../Bin TARGET = $$join(TARGET,,,) } @@ -109,7 +109,7 @@ INCLUDEPATH += ../../WFCrystal/SysUtility/configuration/include INCLUDEPATH += ../../WFCrystal/SysUtility/utils/include CONFIG(debug, debug|release){ - LIBS += -L../../Bin -lWFCrystald + LIBS += -L../../../Bin -lWFCrystald } else { - LIBS += -L../../Bin -lWFCrystal + LIBS += -L../../../Bin -lWFCrystal } diff --git a/编译说明.txt b/编译说明.txt index 1111919..cca230c 100644 --- a/编译说明.txt +++ b/编译说明.txt @@ -6,12 +6,12 @@ https://www.cnblogs.com/ys0103/p/4562493.html 3.HPluginManage 4.CallPlugin 5.qtpropertybrowser -6.OSGDataModel -7.DataMgr -8.OSGFramework -9.Workflow\WFCrystal -10.Workflow\WFEngine -11.Workflow\WFWidget +6.Workflow\WFCrystal +7.Workflow\WFEngine +8.Workflow\WFWidget +9.OSGDataModel +10.DataMgr +11.OSGFramework 12.WellLogModule 13.WellLogUI--删除WellLogUI\include\PaiTableWidget.h后编译 14.ModuleConsole