From f66536d84b38aa0eb46e928fdaf13d7da790b2ee Mon Sep 17 00:00:00 2001 From: daniel-Jones Date: Sun, 4 Jun 2017 16:26:56 +0930 Subject: added HTML/JS/PHP pages/scripts to allow RGB changes over a web page. Integrated a server into the application to allow incoming connections and receive commands --- qt/RGBController/Makefile | 45 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 34 insertions(+), 11 deletions(-) (limited to 'qt/RGBController/Makefile') diff --git a/qt/RGBController/Makefile b/qt/RGBController/Makefile index f615390..4f437ac 100644 --- a/qt/RGBController/Makefile +++ b/qt/RGBController/Makefile @@ -50,13 +50,17 @@ OBJECTS_DIR = ./ SOURCES = main.cpp \ controllerwindow.cpp \ - irc.cpp moc_controllerwindow.cpp \ - moc_irc.cpp + irc.cpp \ + server.cpp moc_controllerwindow.cpp \ + moc_irc.cpp \ + moc_server.cpp OBJECTS = main.o \ controllerwindow.o \ irc.o \ + server.o \ moc_controllerwindow.o \ - moc_irc.o + moc_irc.o \ + moc_server.o DIST = /usr/lib/qt/mkspecs/features/spec_pre.prf \ /usr/lib/qt/mkspecs/common/unix.conf \ /usr/lib/qt/mkspecs/common/linux.conf \ @@ -281,9 +285,11 @@ DIST = /usr/lib/qt/mkspecs/features/spec_pre.prf \ /usr/lib/qt/mkspecs/features/yacc.prf \ /usr/lib/qt/mkspecs/features/lex.prf \ RGBController.pro controllerwindow.h \ - irc.h main.cpp \ + irc.h \ + server.h main.cpp \ controllerwindow.cpp \ - irc.cpp + irc.cpp \ + server.cpp QMAKE_TARGET = RGBController DESTDIR = TARGET = RGBController @@ -769,8 +775,8 @@ distdir: FORCE @test -d $(DISTDIR) || mkdir -p $(DISTDIR) $(COPY_FILE) --parents $(DIST) $(DISTDIR)/ $(COPY_FILE) --parents /usr/lib/qt/mkspecs/features/data/dummy.cpp $(DISTDIR)/ - $(COPY_FILE) --parents controllerwindow.h irc.h $(DISTDIR)/ - $(COPY_FILE) --parents main.cpp controllerwindow.cpp irc.cpp $(DISTDIR)/ + $(COPY_FILE) --parents controllerwindow.h irc.h server.h $(DISTDIR)/ + $(COPY_FILE) --parents main.cpp controllerwindow.cpp irc.cpp server.cpp $(DISTDIR)/ $(COPY_FILE) --parents controllerwindow.ui $(DISTDIR)/ @@ -803,10 +809,12 @@ compiler_moc_predefs_clean: moc_predefs.h: /usr/lib/qt/mkspecs/features/data/dummy.cpp g++ -pipe -O2 -march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -Wall -W -dM -E -o moc_predefs.h /usr/lib/qt/mkspecs/features/data/dummy.cpp -compiler_moc_header_make_all: moc_controllerwindow.cpp moc_irc.cpp +compiler_moc_header_make_all: moc_controllerwindow.cpp moc_irc.cpp moc_server.cpp compiler_moc_header_clean: - -$(DEL_FILE) moc_controllerwindow.cpp moc_irc.cpp + -$(DEL_FILE) moc_controllerwindow.cpp moc_irc.cpp moc_server.cpp moc_controllerwindow.cpp: ui_controllerwindow.h \ + irc.h \ + server.h \ controllerwindow.h \ moc_predefs.h \ /usr/bin/moc @@ -817,6 +825,11 @@ moc_irc.cpp: irc.h \ /usr/bin/moc /usr/bin/moc $(DEFINES) --include ./moc_predefs.h -I/usr/lib/qt/mkspecs/linux-g++ -I'/home/daniel_j/documents/school/2016 research project/RGBController/qt/RGBController' -I/usr/include/qt -I/usr/include/qt/QtWidgets -I/usr/include/qt/QtGui -I/usr/include/qt/QtSerialPort -I/usr/include/qt/QtNetwork -I/usr/include/qt/QtCore -I/usr/include/c++/6.3.1 -I/usr/include/c++/6.3.1/x86_64-pc-linux-gnu -I/usr/include/c++/6.3.1/backward -I/usr/lib/gcc/x86_64-pc-linux-gnu/6.3.1/include -I/usr/local/include -I/usr/lib/gcc/x86_64-pc-linux-gnu/6.3.1/include-fixed -I/usr/include irc.h -o moc_irc.cpp +moc_server.cpp: server.h \ + moc_predefs.h \ + /usr/bin/moc + /usr/bin/moc $(DEFINES) --include ./moc_predefs.h -I/usr/lib/qt/mkspecs/linux-g++ -I'/home/daniel_j/documents/school/2016 research project/RGBController/qt/RGBController' -I/usr/include/qt -I/usr/include/qt/QtWidgets -I/usr/include/qt/QtGui -I/usr/include/qt/QtSerialPort -I/usr/include/qt/QtNetwork -I/usr/include/qt/QtCore -I/usr/include/c++/6.3.1 -I/usr/include/c++/6.3.1/x86_64-pc-linux-gnu -I/usr/include/c++/6.3.1/backward -I/usr/lib/gcc/x86_64-pc-linux-gnu/6.3.1/include -I/usr/local/include -I/usr/lib/gcc/x86_64-pc-linux-gnu/6.3.1/include-fixed -I/usr/include server.h -o moc_server.cpp + compiler_moc_source_make_all: compiler_moc_source_clean: compiler_uic_make_all: ui_controllerwindow.h @@ -837,22 +850,32 @@ compiler_clean: compiler_moc_predefs_clean compiler_moc_header_clean compiler_ui ####### Compile main.o: main.cpp controllerwindow.h \ - ui_controllerwindow.h + ui_controllerwindow.h \ + irc.h \ + server.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp controllerwindow.o: controllerwindow.cpp controllerwindow.h \ - ui_controllerwindow.h + ui_controllerwindow.h \ + irc.h \ + server.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o controllerwindow.o controllerwindow.cpp irc.o: irc.cpp irc.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o irc.o irc.cpp +server.o: server.cpp server.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o server.o server.cpp + moc_controllerwindow.o: moc_controllerwindow.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_controllerwindow.o moc_controllerwindow.cpp moc_irc.o: moc_irc.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_irc.o moc_irc.cpp +moc_server.o: moc_server.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_server.o moc_server.cpp + ####### Install install: FORCE -- cgit v1.2.3