Skip to content

Commit 58cb800

Browse files
committed
EdytorNC->GCodeWorkShop: rename the modules
1 parent b3f515a commit 58cb800

File tree

227 files changed

+130
-130
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

227 files changed

+130
-130
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build/
44
doc/html
55
lang/*.qm
66

7-
/edytornc.pro.user*
7+
/gcodeworkshop_top.pro.user*
88
*.autosave
99

1010
/Makefile

addons/addons.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ TARGET = addons
55
CONFIG += staticlib
66

77
QT *= widgets
8-
MODULES *= edytornc edytornc-common basic
8+
MODULES *= GCodeWorkShop GCodeShared basic
99

1010
include(../common.pri)
1111

common.pri

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -55,24 +55,24 @@ contains(MODULES, addons) {
5555
LIBS += -L$$shadowed($${PROJECT_ROOT_PATH}/addons)
5656
}
5757

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
6464
}
6565

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
7070
}
7171

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
7676
}
7777

7878
contains(MODULES, basic) {

sfs/sfs.pro renamed to gcodefileserver/gcodefileserver.pro

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
VERSION = 0.1.0.0
44
TEMPLATE = app
5-
TARGET = sfs
5+
TARGET = gcodefileserver
66

77
include(../common.pri)
88

99
QT *= widgets serialport network
10-
MODULES *= kdiff3 qtsingleapplication edytornc-common
10+
MODULES *= kdiff3 qtsingleapplication GCodeShared
1111

1212
include(../common.pri)
1313

0 commit comments

Comments
 (0)