Skip to content

Commit

Permalink
Fixed .pro, CRC and PropertyEditor
Browse files Browse the repository at this point in the history
  • Loading branch information
etet100 committed Nov 11, 2024
1 parent 26cea98 commit f3e685e
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 29 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ Temporary Items

# Build dir
build-*
build

# Binaries
bin/*
Expand Down
2 changes: 1 addition & 1 deletion candle.pro
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ TEMPLATE = subdirs
SUBDIRS = src/candle \
src/designerplugins \
src/vendor

# Make plugins translations
system(qmake src/candleplugins/candleplugins.pro)

Expand Down
12 changes: 0 additions & 12 deletions src/candle/Arduino.h

This file was deleted.

15 changes: 5 additions & 10 deletions src/candle/candle.pro
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ VERSION=1.0.0.0

# DEFINES += DEBUG_UCNC_COMMUNICATION=1
# DEFINES += DEBUG_RAW_TCP_COMMUNICATION=1
# QT_DEBUG_PLUGINS=1
# DEFINES += QT_DEBUG_PLUGINS=1

win32: {
DEFINES += WINDOWS
Expand Down Expand Up @@ -129,16 +131,8 @@ SOURCES += main.cpp\
drawers/selectiondrawer.cpp \
scripting/scriptvars.cpp \
widgets/dropwidget.cpp \
../vendor/CRC/src/CrcFastReverse.cpp \
../vendor/CRC/src/CRC.cpp \
../vendor/CRC/src/CRC8.cpp \
../vendor/CRC/src/CRC12.cpp \
../vendor/CRC/src/CRC16.cpp \
../vendor/CRC/src/CRC32.cpp \
../vendor/CRC/src/CRC64.cpp

HEADERS += frmmain.h \
Arduino.h \
communicator.h \
config/configuration.h \
config/module/configurationconnection.h \
Expand Down Expand Up @@ -238,10 +232,11 @@ RESOURCES += \

INCLUDEPATH += ../designerplugins/customwidgetsplugin
INCLUDEPATH += ../vendor/PropertyEditor
INCLUDEPATH += ../vendor/CRC/src

include(../vendor/CRC/CRC.pri)
include(../vendor/PropertyEditor/PropertyEditor.pri)

LIBS += -L../designerplugins/customwidgetsplugin -lcustomwidgets
LIBS += -L../vendor/PropertyEditor -lPropertyEditor

# qtPrepareTool(LRELEASE, lrelease)
# for(tsfile, TRANSLATIONS) {
Expand Down
7 changes: 1 addition & 6 deletions src/vendor/vendor.pro
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
TEMPLATE = subdirs

SUBDIRS = uCNC \
CRC \
PropertyEditor

SOURCES += CRC/src/CRC.cpp \
CRC/src/CRC8.cpp
INCLUDEPATH += CRC
HEADERS += CRC/src/CRC.h \
CRC/src/CRC8.h

0 comments on commit f3e685e

Please sign in to comment.