diff --git a/MAKE-UDOO/UdooServer.pro b/MAKE-UDOO/UdooServer.pro deleted file mode 100644 index f68ed17..0000000 --- a/MAKE-UDOO/UdooServer.pro +++ /dev/null @@ -1,64 +0,0 @@ -QT += core gui serialport - -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets serialport - -TARGET = UdooServer -TEMPLATE = app - -QMAKE_CXXFLAGS += -std=c++1y - -QMAKE_CXXFLAGS_RELEASE -= -O2 -QMAKE_CXXFLAGS_RELEASE += -Ofast -march=armv6 -flto -fopenmp -QMAKE_LFLAGS_RELEASE -= -Wl,-O1 -QMAKE_LFLAGS_RELEASE += -Wl,-O3 -Wl,-flto - -QMAKE_CXXFLAGS_DEBUG -= -O1 -QMAKE_CXXFLAGS_DEBUG -= -O2 -QMAKE_CXXFLAGS_DEBUG += -O0 -Wno-unknown-pragmas - -SOURCES += main.cpp\ - Server.cpp \ - Track.cpp \ - PlayThread.cpp \ - SaveManager.cpp \ - SerialManager.cpp - -HEADERS += Server.h \ - Track.h \ - PlayThread.h \ - SongData.h \ - SaveManager.h \ - SerialManager.h - -FORMS += - -INCLUDEPATH += $$PWD/../deps/libwatermark -DEPENDPATH += $$PWD/../deps/libwatermark - -INCLUDEPATH += /usr/include/oscpack/ /home/pi/boiteselec-interfaceqt/deps/rtaudio-4.1.2/ - - -LIBS+= -lgomp -lsndfile -LIBS+= -lrtaudio -LIBS+= -lasound -LIBS+= -loscpack -LIBS+= -lwiringPi - -LIBS+= -L$$PWD/../deps/karchive-5.17.0/src -L$$PWD/../deps/karchive-5.17.0/build/src -lKF5Archive -INCLUDEPATH += $$PWD/../deps/karchive-5.17.0/src $$PWD/../deps/karchive-5.17.0/build/src -DEPENDPATH += $$PWD/../deps/karchive-5.17.0/src $$PWD/../deps/karchive-5.17.0/build/src -PRE_TARGETDEPS += $$PWD/../deps/karchive-5.17.0/build/src/libKF5Archive.so.5 - -RESOURCES += - -OTHER_FILES += - - -#### Libraries #### - ## Oscpack ## -# unix:!macx: LIBS += -L$$PWD/../../../git/oscpack/build/ -loscpack - -# INCLUDEPATH += $$PWD/../../../git/oscpack/src -# DEPENDPATH += $$PWD/../../../git/oscpack/src - -#unix:!macx: PRE_TARGETDEPS += $$PWD/../../../git/oscpack/build/liboscpack.a diff --git a/src/SerialManager.cpp b/src/SerialManager.cpp index 7cfa05b..ca2ebf5 100644 --- a/src/SerialManager.cpp +++ b/src/SerialManager.cpp @@ -25,7 +25,7 @@ void SerialManager::stop() { void SerialManager::run() { -#ifdef UDOO_BUILD +#ifdef UDOO_BUILD // On UDOO // Port opening port = std::make_shared(SERIAL_PORT); @@ -50,7 +50,7 @@ void SerialManager::run() { } } } -#else +#else // On Raspberry Pi int PadCutOff[8] = {300,300,300,300,300,300,300,300}; int MaxPlayTime[8] = {90,90,90,90,90,90,90,90}; bool ActivePad[8] = {0,0,0,0,0,0,0,0}; diff --git a/src/UdooServer.pro b/src/UdooServer.pro deleted file mode 100644 index 13855af..0000000 --- a/src/UdooServer.pro +++ /dev/null @@ -1,57 +0,0 @@ -QT += core gui serialport -CONFIG += console - -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets serialport - -TARGET = UdooServer -TEMPLATE = app - -QMAKE_CXXFLAGS += -std=c++1y - -QMAKE_CXXFLAGS_RELEASE -= -O2 -QMAKE_CXXFLAGS_RELEASE += -Ofast -march=native -flto -fopenmp -QMAKE_LFLAGS_RELEASE -= -Wl,-O1 -QMAKE_LFLAGS_RELEASE += -Wl,-O3 -Wl,-flto - -QMAKE_CXXFLAGS_DEBUG -= -O1 -QMAKE_CXXFLAGS_DEBUG -= -O2 -QMAKE_CXXFLAGS_DEBUG += -O0 -Wno-unknown-pragmas - -SOURCES += main.cpp\ - Track.cpp \ - PlayThread.cpp \ - SaveManager.cpp \ - SerialManager.cpp \ - Server.cpp - -HEADERS += \ - Track.h \ - PlayThread.h \ - SongData.h \ - SaveManager.h \ - SerialManager.h \ - Server.h - -INCLUDEPATH += $$PWD/../../libaudiotool/src/libwatermark -DEPENDPATH += $$PWD/../../libaudiotool/src/libwatermark - -LIBS+= -lgomp -lsndfile -#LIBS+= -lportaudiocpp -lportaudio -LIBS+= -lrtaudio -LIBS+= -lasound -#LIBS+= -lgcov -lavcodec -lavformat -lavutil - - -INCLUDEPATH += /usr/local/include/KF5/KArchive /usr/include/KF5/KArchive -LIBS += -lKF5Archive - -#### Libraries #### - ## Oscpack ## -linux-g++ { -unix:!macx: LIBS += -L$$PWD/../../deps/linux/oscpack/ -loscpack - -INCLUDEPATH += $$PWD/../../deps/src/oscpack -DEPENDPATH += $$PWD/../../deps/src/oscpack - -unix:!macx: PRE_TARGETDEPS += $$PWD/../../deps/linux/oscpack/liboscpack.a -}