{{ message }}
Commit 58cb800
File tree
- addons
- gcodefileserver
- images
- gcodeworkshop
- images
- include
- utils
- src
- utils
- lang
- src
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -4,7 +4,7 @@ build/ | |||
| 4 | 4 | doc/html | |
| 5 | 5 | lang/*.qm | |
| 6 | 6 | ||
| 7 | - /edytornc.pro.user* | ||
| 7 | + /gcodeworkshop_top.pro.user* | ||
| 8 | 8 | *.autosave | |
| 9 | 9 | ||
| 10 | 10 | /Makefile | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -5,7 +5,7 @@ TARGET = addons | |||
| 5 | 5 | CONFIG += staticlib | |
| 6 | 6 | ||
| 7 | 7 | QT *= widgets | |
| 8 | - MODULES *= edytornc edytornc-common basic | ||
| 8 | + MODULES *= GCodeWorkShop GCodeShared basic | ||
| 9 | 9 | ||
| 10 | 10 | include(../common.pri) | |
| 11 | 11 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -55,24 +55,24 @@ contains(MODULES, addons) { | |||
| 55 | 55 | LIBS += -L$$shadowed($${PROJECT_ROOT_PATH}/addons) | |
| 56 | 56 | } | |
| 57 | 57 | ||
| 58 | - contains(MODULES, edytornc-common) { | ||
| 59 | - INCLUDEPATH += $${PROJECT_ROOT_PATH}/src-common \ | ||
| 60 | - $${PROJECT_ROOT_PATH}/src-common/include \ | ||
| 61 | - $$shadowed($${PROJECT_ROOT_PATH}/src-common) | ||
| 62 | - LIBS += -L$$shadowed($${PROJECT_ROOT_PATH}/src-common) | ||
| 63 | - LIBS += -ledytornc-common | ||
| 58 | + contains(MODULES, GCodeShared) { | ||
| 59 | + INCLUDEPATH += $${PROJECT_ROOT_PATH}/gcodeshared \ | ||
| 60 | + $${PROJECT_ROOT_PATH}/gcodeshared/include \ | ||
| 61 | + $$shadowed($${PROJECT_ROOT_PATH}/gcodeshared) | ||
| 62 | + LIBS += -L$$shadowed($${PROJECT_ROOT_PATH}/gcodeshared) | ||
| 63 | + LIBS += -lgcodeshared | ||
| 64 | 64 | } | |
| 65 | 65 | ||
| 66 | - contains(MODULES, edytornc) { | ||
| 67 | - INCLUDEPATH += $${PROJECT_ROOT_PATH}/src/include | ||
| 68 | - # LIBS += -L$$shadowed($${PROJECT_ROOT_PATH}/src) | ||
| 69 | - # LIBS += -ledytornc | ||
| 66 | + contains(MODULES, GCodeWorkShop) { | ||
| 67 | + INCLUDEPATH += $${PROJECT_ROOT_PATH}/gcodeworkshop/include | ||
| 68 | + # LIBS += -L$$shadowed($${PROJECT_ROOT_PATH}/gcodeworkshop) | ||
| 69 | + # LIBS += -lgcodeworkshop | ||
| 70 | 70 | } | |
| 71 | 71 | ||
| 72 | - contains(MODULES, sfs) { | ||
| 73 | - INCLUDEPATH += $${PROJECT_ROOT_PATH}/sfs | ||
| 74 | - # LIBS += -L$$shadowed($${PROJECT_ROOT_PATH}/sfs) | ||
| 75 | - # LIBS += -lsfs | ||
| 72 | + contains(MODULES, GCodeFileServer) { | ||
| 73 | + INCLUDEPATH += $${PROJECT_ROOT_PATH}/gcodefileserver | ||
| 74 | + # LIBS += -L$$shadowed($${PROJECT_ROOT_PATH}/gcodefileserver) | ||
| 75 | + # LIBS += -lgcodefileserver | ||
| 76 | 76 | } | |
| 77 | 77 | ||
| 78 | 78 | contains(MODULES, basic) { | |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -2,12 +2,12 @@ | |||
| 2 | 2 | ||
| 3 | 3 | VERSION = 0.1.0.0 | |
| 4 | 4 | TEMPLATE = app | |
| 5 | - TARGET = sfs | ||
| 5 | + TARGET = gcodefileserver | ||
| 6 | 6 | ||
| 7 | 7 | include(../common.pri) | |
| 8 | 8 | ||
| 9 | 9 | QT *= widgets serialport network | |
| 10 | - MODULES *= kdiff3 qtsingleapplication edytornc-common | ||
| 10 | + MODULES *= kdiff3 qtsingleapplication GCodeShared | ||
| 11 | 11 | ||
| 12 | 12 | include(../common.pri) | |
| 13 | 13 | ||
File renamed without changes.
0 commit comments