From 0f27f4b0a989f4f4d9b3aab0f7eff212c50f59dd Mon Sep 17 00:00:00 2001 From: konfiot Date: Sun, 29 Jun 2014 23:59:51 +0200 Subject: [PATCH] =?UTF-8?q?M=C3=A9rification=20de=20la=20compilation=20sou?= =?UTF-8?q?s=20win?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 +- Logger21.pro | 15 +- Makefile | 788 --------------------------------------------------- build.sh | 11 +- 4 files changed, 10 insertions(+), 807 deletions(-) delete mode 100644 Makefile diff --git a/.gitignore b/.gitignore index 8b95ceb..7756ffa 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -*.user \ No newline at end of file +*.user +Makefile diff --git a/Logger21.pro b/Logger21.pro index b22c278..5d2692a 100644 --- a/Logger21.pro +++ b/Logger21.pro @@ -14,6 +14,7 @@ TEMPLATE = app QMAKE_CXXFLAGS += -std=c++0x +ICON = icone.ico SOURCES += \ FenPrincipale.cpp \ @@ -83,15 +84,7 @@ CONFIG += serialport QMAKE_CXXFLAGS_DEBUG += -O2 #Sinon ça faire l'erreur "too many sections" -unix { - message(*nix detected) - LIBS += -lqwt - LIBS += -lqjson -} +message(*nix detected) +LIBS += -lqwt +LIBS += -lqjson -win32 { - message(win32 detected) - LIBS += C:\Qwt-6.0.1\lib\libqwtd.a - LIBS += C:\qjson\lib\libqjson.dll.a - INCLUDEPATH += C:\Qwt-6.0.1\include C:\qjson\include -} diff --git a/Makefile b/Makefile deleted file mode 100644 index 60314cc..0000000 --- a/Makefile +++ /dev/null @@ -1,788 +0,0 @@ -############################################################################# -# Makefile for building: Logger21 -# Generated by qmake (2.01a) (Qt 4.8.5) on: mar. avr. 1 21:24:55 2014 -# Project: Logger21.pro -# Template: app -# Command: /usr/bin/qmake-qt4 -o Makefile Logger21.pro -############################################################################# - -####### Compiler, tools and options - -CC = gcc -CXX = g++ -DEFINES = -DQWT_DLL -DQT_NO_DEBUG -DQT_WEBKIT_LIB -DQT_SQL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED -CFLAGS = -pipe -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches -m64 -mtune=generic -O2 -Wall -W -D_REENTRANT $(DEFINES) -CXXFLAGS = -pipe -std=c++0x -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches -m64 -mtune=generic -O2 -Wall -W -D_REENTRANT $(DEFINES) -INCPATH = -I/usr/lib64/qt4/mkspecs/linux-g++ -I. -I/usr/include/QtCore -I/usr/include/QtNetwork -I/usr/include/QtGui -I/usr/include/QtSql -I/usr/include/QtWebKit -I/usr/include -I. -I. -LINK = g++ -LFLAGS = -Wl,-O1 -Wl,-z,relro -LIBS = $(SUBLIBS) -L/usr/lib64 /usr/lib/libqwt.so -lqjson -lQtWebKit -lQtSql -lQtGui -lQtNetwork -lQtCore -lpthread -AR = ar cqs -RANLIB = -QMAKE = /usr/bin/qmake-qt4 -TAR = tar -cf -COMPRESS = gzip -9f -COPY = cp -f -SED = sed -COPY_FILE = $(COPY) -COPY_DIR = $(COPY) -r -STRIP = -INSTALL_FILE = install -m 644 -p -INSTALL_DIR = $(COPY_DIR) -INSTALL_PROGRAM = install -m 755 -p -DEL_FILE = rm -f -SYMLINK = ln -f -s -DEL_DIR = rmdir -MOVE = mv -f -CHK_DIR_EXISTS= test -d -MKDIR = mkdir -p - -####### Output directory - -OBJECTS_DIR = ./ - -####### Files - -SOURCES = FenPrincipale.cpp \ - dialog.cpp \ - tablemgr.cpp \ - main.cpp \ - UI/mapsview.cpp \ - UI/boardingtable.cpp \ - InPut/serial.cpp \ - InPut/sensormanager.cpp \ - InPut/fileimportdialog.cpp \ - ChronoReader/chronoreaderwidget.cpp \ - ChronoReader/TimeCalc/timecalcs.cpp \ - ChronoReader/eventbox.cpp \ - UI/graphicview.cpp \ - InPut/cookiedecoder.cpp \ - InPut/yolodecoder.cpp \ - InPut/databasecontroller.cpp \ - InPut/sensor.cpp \ - InPut/sensorvalue.cpp \ - balaifrequenciel.cpp \ - UI/histogram.cpp moc_FenPrincipale.cpp \ - moc_dialog.cpp \ - moc_mapsview.cpp \ - moc_serial.cpp \ - moc_sensormanager.cpp \ - moc_fileimportdialog.cpp \ - moc_graphicview.cpp \ - moc_cookiedecoder.cpp \ - moc_yolodecoder.cpp \ - moc_databasecontroller.cpp \ - moc_balaifrequenciel.cpp \ - qrc_res.cpp -OBJECTS = FenPrincipale.o \ - dialog.o \ - tablemgr.o \ - main.o \ - mapsview.o \ - boardingtable.o \ - serial.o \ - sensormanager.o \ - fileimportdialog.o \ - chronoreaderwidget.o \ - timecalcs.o \ - eventbox.o \ - graphicview.o \ - cookiedecoder.o \ - yolodecoder.o \ - databasecontroller.o \ - sensor.o \ - sensorvalue.o \ - balaifrequenciel.o \ - histogram.o \ - moc_FenPrincipale.o \ - moc_dialog.o \ - moc_mapsview.o \ - moc_serial.o \ - moc_sensormanager.o \ - moc_fileimportdialog.o \ - moc_graphicview.o \ - moc_cookiedecoder.o \ - moc_yolodecoder.o \ - moc_databasecontroller.o \ - moc_balaifrequenciel.o \ - qrc_res.o -DIST = /usr/lib64/qt4/mkspecs/common/unix.conf \ - /usr/lib64/qt4/mkspecs/common/linux.conf \ - /usr/lib64/qt4/mkspecs/common/gcc-base.conf \ - /usr/lib64/qt4/mkspecs/common/gcc-base-unix.conf \ - /usr/lib64/qt4/mkspecs/common/g++-base.conf \ - /usr/lib64/qt4/mkspecs/common/g++-unix.conf \ - /usr/lib64/qt4/mkspecs/qconfig.pri \ - /usr/lib64/qt4/mkspecs/modules/qt_webkit.pri \ - /usr/lib64/qt4/mkspecs/features/qt_functions.prf \ - /usr/lib64/qt4/mkspecs/features/qt_config.prf \ - /usr/lib64/qt4/mkspecs/features/exclusive_builds.prf \ - /usr/lib64/qt4/mkspecs/features/default_pre.prf \ - /usr/lib64/qt4/mkspecs/features/release.prf \ - /usr/lib64/qt4/mkspecs/features/default_post.prf \ - /usr/lib64/qt4/mkspecs/features/shared.prf \ - /usr/lib64/qt4/mkspecs/features/unix/gdb_dwarf_index.prf \ - /usr/lib64/qt4/mkspecs/features/warn_on.prf \ - /usr/lib64/qt4/mkspecs/features/qt.prf \ - /usr/lib64/qt4/mkspecs/features/unix/thread.prf \ - /usr/lib64/qt4/mkspecs/features/moc.prf \ - /usr/lib64/qt4/mkspecs/features/resources.prf \ - /usr/lib64/qt4/mkspecs/features/uic.prf \ - /usr/lib64/qt4/mkspecs/features/yacc.prf \ - /usr/lib64/qt4/mkspecs/features/lex.prf \ - /usr/lib64/qt4/mkspecs/features/include_source_dir.prf \ - Logger21.pro -QMAKE_TARGET = Logger21 -DESTDIR = -TARGET = Logger21 - -first: all -####### Implicit rules - -.SUFFIXES: .o .c .cpp .cc .cxx .C - -.cpp.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.cc.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.cxx.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.C.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.c.o: - $(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<" - -####### Build rules - -all: Makefile $(TARGET) - -$(TARGET): ui_FenPrincipale.h ui_dialog.h ui_fileimportdialog.h ui_chronoreaderwidget.h ui_eventbox.h ui_balaifrequenciel.h $(OBJECTS) - $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) - -Makefile: Logger21.pro /usr/lib64/qt4/mkspecs/linux-g++/qmake.conf /usr/lib64/qt4/mkspecs/common/unix.conf \ - /usr/lib64/qt4/mkspecs/common/linux.conf \ - /usr/lib64/qt4/mkspecs/common/gcc-base.conf \ - /usr/lib64/qt4/mkspecs/common/gcc-base-unix.conf \ - /usr/lib64/qt4/mkspecs/common/g++-base.conf \ - /usr/lib64/qt4/mkspecs/common/g++-unix.conf \ - /usr/lib64/qt4/mkspecs/qconfig.pri \ - /usr/lib64/qt4/mkspecs/modules/qt_webkit.pri \ - /usr/lib64/qt4/mkspecs/features/qt_functions.prf \ - /usr/lib64/qt4/mkspecs/features/qt_config.prf \ - /usr/lib64/qt4/mkspecs/features/exclusive_builds.prf \ - /usr/lib64/qt4/mkspecs/features/default_pre.prf \ - /usr/lib64/qt4/mkspecs/features/release.prf \ - /usr/lib64/qt4/mkspecs/features/default_post.prf \ - /usr/lib64/qt4/mkspecs/features/shared.prf \ - /usr/lib64/qt4/mkspecs/features/unix/gdb_dwarf_index.prf \ - /usr/lib64/qt4/mkspecs/features/warn_on.prf \ - /usr/lib64/qt4/mkspecs/features/qt.prf \ - /usr/lib64/qt4/mkspecs/features/unix/thread.prf \ - /usr/lib64/qt4/mkspecs/features/moc.prf \ - /usr/lib64/qt4/mkspecs/features/resources.prf \ - /usr/lib64/qt4/mkspecs/features/uic.prf \ - /usr/lib64/qt4/mkspecs/features/yacc.prf \ - /usr/lib64/qt4/mkspecs/features/lex.prf \ - /usr/lib64/qt4/mkspecs/features/include_source_dir.prf \ - /usr/lib64/libQtWebKit.prl \ - /usr/lib64/libQtSql.prl \ - /usr/lib64/libQtCore.prl \ - /usr/lib64/libQtGui.prl \ - /usr/lib64/libQtNetwork.prl - $(QMAKE) -o Makefile Logger21.pro -/usr/lib64/qt4/mkspecs/common/unix.conf: -/usr/lib64/qt4/mkspecs/common/linux.conf: -/usr/lib64/qt4/mkspecs/common/gcc-base.conf: -/usr/lib64/qt4/mkspecs/common/gcc-base-unix.conf: -/usr/lib64/qt4/mkspecs/common/g++-base.conf: -/usr/lib64/qt4/mkspecs/common/g++-unix.conf: -/usr/lib64/qt4/mkspecs/qconfig.pri: -/usr/lib64/qt4/mkspecs/modules/qt_webkit.pri: -/usr/lib64/qt4/mkspecs/features/qt_functions.prf: -/usr/lib64/qt4/mkspecs/features/qt_config.prf: -/usr/lib64/qt4/mkspecs/features/exclusive_builds.prf: -/usr/lib64/qt4/mkspecs/features/default_pre.prf: -/usr/lib64/qt4/mkspecs/features/release.prf: -/usr/lib64/qt4/mkspecs/features/default_post.prf: -/usr/lib64/qt4/mkspecs/features/shared.prf: -/usr/lib64/qt4/mkspecs/features/unix/gdb_dwarf_index.prf: -/usr/lib64/qt4/mkspecs/features/warn_on.prf: -/usr/lib64/qt4/mkspecs/features/qt.prf: -/usr/lib64/qt4/mkspecs/features/unix/thread.prf: -/usr/lib64/qt4/mkspecs/features/moc.prf: -/usr/lib64/qt4/mkspecs/features/resources.prf: -/usr/lib64/qt4/mkspecs/features/uic.prf: -/usr/lib64/qt4/mkspecs/features/yacc.prf: -/usr/lib64/qt4/mkspecs/features/lex.prf: -/usr/lib64/qt4/mkspecs/features/include_source_dir.prf: -/usr/lib64/libQtWebKit.prl: -/usr/lib64/libQtSql.prl: -/usr/lib64/libQtCore.prl: -/usr/lib64/libQtGui.prl: -/usr/lib64/libQtNetwork.prl: -qmake: FORCE - @$(QMAKE) -o Makefile Logger21.pro - -dist: - @$(CHK_DIR_EXISTS) .tmp/Logger211.0.0 || $(MKDIR) .tmp/Logger211.0.0 - $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/Logger211.0.0/ && $(COPY_FILE) --parents tablemgr.h FenPrincipale.h dialog.h defines.h UI/mapsview.h UI/boardingtable.h InPut/serial.h InPut/sensorvalue.h InPut/sensormanager.h InPut/sensor.h InPut/fileimportdialog.h ChronoReader/chronoreaderwidget.h ChronoReader/TimeCalc/timecalcs.h ChronoReader/eventbox.h UI/graphicview.h InPut/cookiedecoder.h InPut/yolodecoder.h InPut/databasecontroller.h balaifrequenciel.h UI/histogram.h .tmp/Logger211.0.0/ && $(COPY_FILE) --parents res.qrc .tmp/Logger211.0.0/ && $(COPY_FILE) --parents FenPrincipale.cpp dialog.cpp tablemgr.cpp main.cpp UI/mapsview.cpp UI/boardingtable.cpp InPut/serial.cpp InPut/sensormanager.cpp InPut/fileimportdialog.cpp ChronoReader/chronoreaderwidget.cpp ChronoReader/TimeCalc/timecalcs.cpp ChronoReader/eventbox.cpp UI/graphicview.cpp InPut/cookiedecoder.cpp InPut/yolodecoder.cpp InPut/databasecontroller.cpp InPut/sensor.cpp InPut/sensorvalue.cpp balaifrequenciel.cpp UI/histogram.cpp .tmp/Logger211.0.0/ && $(COPY_FILE) --parents FenPrincipale.ui dialog.ui InPut/fileimportdialog.ui ChronoReader/chronoreaderwidget.ui ChronoReader/eventbox.ui balaifrequenciel.ui .tmp/Logger211.0.0/ && (cd `dirname .tmp/Logger211.0.0` && $(TAR) Logger211.0.0.tar Logger211.0.0 && $(COMPRESS) Logger211.0.0.tar) && $(MOVE) `dirname .tmp/Logger211.0.0`/Logger211.0.0.tar.gz . && $(DEL_FILE) -r .tmp/Logger211.0.0 - - -clean:compiler_clean - -$(DEL_FILE) $(OBJECTS) - -$(DEL_FILE) *~ core *.core - - -####### Sub-libraries - -distclean: clean - -$(DEL_FILE) $(TARGET) - -$(DEL_FILE) Makefile - - -check: first - -mocclean: compiler_moc_header_clean compiler_moc_source_clean - -mocables: compiler_moc_header_make_all compiler_moc_source_make_all - -compiler_moc_header_make_all: moc_FenPrincipale.cpp moc_dialog.cpp moc_mapsview.cpp moc_serial.cpp moc_sensormanager.cpp moc_fileimportdialog.cpp moc_graphicview.cpp moc_cookiedecoder.cpp moc_yolodecoder.cpp moc_databasecontroller.cpp moc_balaifrequenciel.cpp -compiler_moc_header_clean: - -$(DEL_FILE) moc_FenPrincipale.cpp moc_dialog.cpp moc_mapsview.cpp moc_serial.cpp moc_sensormanager.cpp moc_fileimportdialog.cpp moc_graphicview.cpp moc_cookiedecoder.cpp moc_yolodecoder.cpp moc_databasecontroller.cpp moc_balaifrequenciel.cpp -moc_FenPrincipale.cpp: ui_FenPrincipale.h \ - InPut/sensormanager.h \ - InPut/sensor.h \ - InPut/sensorvalue.h \ - defines.h \ - exprtk.hpp \ - FenPrincipale.h \ - InPut/cookiedecoder.h \ - InPut/serial.h \ - UI/boardingtable.h \ - UI/graphicview.h \ - UI/mapsview.h \ - balaifrequenciel.h \ - UI/histogram.h \ - tablemgr.h \ - InPut/serialdecoder.h \ - InPut/databasecontroller.h \ - FenPrincipale.h - /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) FenPrincipale.h -o moc_FenPrincipale.cpp - -moc_dialog.cpp: ui_dialog.h \ - InPut/serial.h \ - defines.h \ - FenPrincipale.h \ - ui_FenPrincipale.h \ - InPut/sensormanager.h \ - InPut/sensor.h \ - InPut/sensorvalue.h \ - exprtk.hpp \ - tablemgr.h \ - InPut/serialdecoder.h \ - InPut/databasecontroller.h \ - InPut/cookiedecoder.h \ - UI/boardingtable.h \ - UI/graphicview.h \ - UI/mapsview.h \ - balaifrequenciel.h \ - UI/histogram.h \ - dialog.h - /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) dialog.h -o moc_dialog.cpp - -moc_mapsview.cpp: FenPrincipale.h \ - ui_FenPrincipale.h \ - InPut/sensormanager.h \ - InPut/sensor.h \ - InPut/sensorvalue.h \ - defines.h \ - exprtk.hpp \ - tablemgr.h \ - InPut/serialdecoder.h \ - InPut/databasecontroller.h \ - InPut/cookiedecoder.h \ - InPut/serial.h \ - UI/boardingtable.h \ - UI/graphicview.h \ - UI/mapsview.h \ - balaifrequenciel.h \ - UI/histogram.h \ - UI/mapsview.h - /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) UI/mapsview.h -o moc_mapsview.cpp - -moc_serial.cpp: defines.h \ - InPut/serial.h - /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) InPut/serial.h -o moc_serial.cpp - -moc_sensormanager.cpp: InPut/sensor.h \ - InPut/sensorvalue.h \ - defines.h \ - exprtk.hpp \ - InPut/sensormanager.h \ - FenPrincipale.h \ - ui_FenPrincipale.h \ - InPut/cookiedecoder.h \ - InPut/serial.h \ - UI/boardingtable.h \ - UI/graphicview.h \ - UI/mapsview.h \ - balaifrequenciel.h \ - UI/histogram.h \ - tablemgr.h \ - InPut/serialdecoder.h \ - InPut/databasecontroller.h \ - InPut/sensormanager.h - /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) InPut/sensormanager.h -o moc_sensormanager.cpp - -moc_fileimportdialog.cpp: FenPrincipale.h \ - ui_FenPrincipale.h \ - InPut/sensormanager.h \ - InPut/sensor.h \ - InPut/sensorvalue.h \ - defines.h \ - exprtk.hpp \ - tablemgr.h \ - InPut/serialdecoder.h \ - InPut/databasecontroller.h \ - InPut/cookiedecoder.h \ - InPut/serial.h \ - UI/boardingtable.h \ - UI/graphicview.h \ - UI/mapsview.h \ - balaifrequenciel.h \ - UI/histogram.h \ - ui_fileimportdialog.h \ - InPut/fileimportdialog.h - /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) InPut/fileimportdialog.h -o moc_fileimportdialog.cpp - -moc_graphicview.cpp: FenPrincipale.h \ - ui_FenPrincipale.h \ - InPut/sensormanager.h \ - InPut/sensor.h \ - InPut/sensorvalue.h \ - defines.h \ - exprtk.hpp \ - tablemgr.h \ - InPut/serialdecoder.h \ - InPut/databasecontroller.h \ - InPut/cookiedecoder.h \ - InPut/serial.h \ - UI/boardingtable.h \ - UI/graphicview.h \ - UI/mapsview.h \ - balaifrequenciel.h \ - UI/histogram.h \ - UI/graphicview.h - /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) UI/graphicview.h -o moc_graphicview.cpp - -moc_cookiedecoder.cpp: defines.h \ - InPut/cookiedecoder.h - /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) InPut/cookiedecoder.h -o moc_cookiedecoder.cpp - -moc_yolodecoder.cpp: InPut/yolodecoder.h - /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) InPut/yolodecoder.h -o moc_yolodecoder.cpp - -moc_databasecontroller.cpp: InPut/sensormanager.h \ - InPut/sensor.h \ - InPut/sensorvalue.h \ - defines.h \ - exprtk.hpp \ - FenPrincipale.h \ - ui_FenPrincipale.h \ - InPut/cookiedecoder.h \ - InPut/serial.h \ - UI/boardingtable.h \ - UI/graphicview.h \ - UI/mapsview.h \ - balaifrequenciel.h \ - UI/histogram.h \ - tablemgr.h \ - InPut/serialdecoder.h \ - InPut/databasecontroller.h \ - InPut/databasecontroller.h - /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) InPut/databasecontroller.h -o moc_databasecontroller.cpp - -moc_balaifrequenciel.cpp: InPut/serial.h \ - defines.h \ - UI/histogram.h \ - balaifrequenciel.h - /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) balaifrequenciel.h -o moc_balaifrequenciel.cpp - -compiler_rcc_make_all: qrc_res.cpp -compiler_rcc_clean: - -$(DEL_FILE) qrc_res.cpp -qrc_res.cpp: res.qrc \ - html/maps.html \ - html/chart.html \ - js/highstock.js \ - js/exporting.js \ - js/jquery.js - /usr/lib64/qt4/bin/rcc -name res res.qrc -o qrc_res.cpp - -compiler_image_collection_make_all: qmake_image_collection.cpp -compiler_image_collection_clean: - -$(DEL_FILE) qmake_image_collection.cpp -compiler_moc_source_make_all: -compiler_moc_source_clean: -compiler_uic_make_all: ui_FenPrincipale.h ui_dialog.h ui_fileimportdialog.h ui_chronoreaderwidget.h ui_eventbox.h ui_balaifrequenciel.h -compiler_uic_clean: - -$(DEL_FILE) ui_FenPrincipale.h ui_dialog.h ui_fileimportdialog.h ui_chronoreaderwidget.h ui_eventbox.h ui_balaifrequenciel.h -ui_FenPrincipale.h: FenPrincipale.ui - /usr/lib64/qt4/bin/uic FenPrincipale.ui -o ui_FenPrincipale.h - -ui_dialog.h: dialog.ui - /usr/lib64/qt4/bin/uic dialog.ui -o ui_dialog.h - -ui_fileimportdialog.h: InPut/fileimportdialog.ui - /usr/lib64/qt4/bin/uic InPut/fileimportdialog.ui -o ui_fileimportdialog.h - -ui_chronoreaderwidget.h: ChronoReader/chronoreaderwidget.ui - /usr/lib64/qt4/bin/uic ChronoReader/chronoreaderwidget.ui -o ui_chronoreaderwidget.h - -ui_eventbox.h: ChronoReader/eventbox.ui - /usr/lib64/qt4/bin/uic ChronoReader/eventbox.ui -o ui_eventbox.h - -ui_balaifrequenciel.h: balaifrequenciel.ui - /usr/lib64/qt4/bin/uic balaifrequenciel.ui -o ui_balaifrequenciel.h - -compiler_yacc_decl_make_all: -compiler_yacc_decl_clean: -compiler_yacc_impl_make_all: -compiler_yacc_impl_clean: -compiler_lex_make_all: -compiler_lex_clean: -compiler_clean: compiler_moc_header_clean compiler_rcc_clean compiler_uic_clean - -####### Compile - -FenPrincipale.o: FenPrincipale.cpp FenPrincipale.h \ - ui_FenPrincipale.h \ - InPut/sensormanager.h \ - InPut/sensor.h \ - InPut/sensorvalue.h \ - defines.h \ - exprtk.hpp \ - tablemgr.h \ - InPut/serialdecoder.h \ - InPut/databasecontroller.h \ - InPut/cookiedecoder.h \ - InPut/serial.h \ - UI/boardingtable.h \ - UI/graphicview.h \ - UI/mapsview.h \ - balaifrequenciel.h \ - UI/histogram.h \ - InPut/fileimportdialog.h \ - ui_fileimportdialog.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o FenPrincipale.o FenPrincipale.cpp - -dialog.o: dialog.cpp dialog.h \ - ui_dialog.h \ - InPut/serial.h \ - defines.h \ - FenPrincipale.h \ - ui_FenPrincipale.h \ - InPut/sensormanager.h \ - InPut/sensor.h \ - InPut/sensorvalue.h \ - exprtk.hpp \ - tablemgr.h \ - InPut/serialdecoder.h \ - InPut/databasecontroller.h \ - InPut/cookiedecoder.h \ - UI/boardingtable.h \ - UI/graphicview.h \ - UI/mapsview.h \ - balaifrequenciel.h \ - UI/histogram.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o dialog.o dialog.cpp - -tablemgr.o: tablemgr.cpp tablemgr.h \ - InPut/sensorvalue.h \ - defines.h \ - exprtk.hpp \ - InPut/sensor.h \ - InPut/sensormanager.h \ - FenPrincipale.h \ - ui_FenPrincipale.h \ - InPut/cookiedecoder.h \ - InPut/serial.h \ - UI/boardingtable.h \ - UI/graphicview.h \ - UI/mapsview.h \ - balaifrequenciel.h \ - UI/histogram.h \ - InPut/serialdecoder.h \ - InPut/databasecontroller.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o tablemgr.o tablemgr.cpp - -main.o: main.cpp defines.h \ - FenPrincipale.h \ - ui_FenPrincipale.h \ - InPut/sensormanager.h \ - InPut/sensor.h \ - InPut/sensorvalue.h \ - exprtk.hpp \ - tablemgr.h \ - InPut/serialdecoder.h \ - InPut/databasecontroller.h \ - InPut/cookiedecoder.h \ - InPut/serial.h \ - UI/boardingtable.h \ - UI/graphicview.h \ - UI/mapsview.h \ - balaifrequenciel.h \ - UI/histogram.h \ - dialog.h \ - ui_dialog.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp - -mapsview.o: UI/mapsview.cpp UI/mapsview.h \ - FenPrincipale.h \ - ui_FenPrincipale.h \ - InPut/sensormanager.h \ - InPut/sensor.h \ - InPut/sensorvalue.h \ - defines.h \ - exprtk.hpp \ - tablemgr.h \ - InPut/serialdecoder.h \ - InPut/databasecontroller.h \ - InPut/cookiedecoder.h \ - InPut/serial.h \ - UI/boardingtable.h \ - UI/graphicview.h \ - balaifrequenciel.h \ - UI/histogram.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o mapsview.o UI/mapsview.cpp - -boardingtable.o: UI/boardingtable.cpp UI/boardingtable.h \ - InPut/sensormanager.h \ - InPut/sensor.h \ - InPut/sensorvalue.h \ - defines.h \ - exprtk.hpp \ - FenPrincipale.h \ - ui_FenPrincipale.h \ - InPut/cookiedecoder.h \ - InPut/serial.h \ - UI/graphicview.h \ - UI/mapsview.h \ - balaifrequenciel.h \ - UI/histogram.h \ - tablemgr.h \ - InPut/serialdecoder.h \ - InPut/databasecontroller.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o boardingtable.o UI/boardingtable.cpp - -serial.o: InPut/serial.cpp InPut/serialdecoder.h \ - InPut/sensormanager.h \ - InPut/sensor.h \ - InPut/sensorvalue.h \ - defines.h \ - exprtk.hpp \ - FenPrincipale.h \ - ui_FenPrincipale.h \ - InPut/cookiedecoder.h \ - InPut/serial.h \ - UI/boardingtable.h \ - UI/graphicview.h \ - UI/mapsview.h \ - balaifrequenciel.h \ - UI/histogram.h \ - tablemgr.h \ - InPut/databasecontroller.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o serial.o InPut/serial.cpp - -sensormanager.o: InPut/sensormanager.cpp InPut/sensormanager.h \ - InPut/sensor.h \ - InPut/sensorvalue.h \ - defines.h \ - exprtk.hpp \ - FenPrincipale.h \ - ui_FenPrincipale.h \ - InPut/cookiedecoder.h \ - InPut/serial.h \ - UI/boardingtable.h \ - UI/graphicview.h \ - UI/mapsview.h \ - balaifrequenciel.h \ - UI/histogram.h \ - tablemgr.h \ - InPut/serialdecoder.h \ - InPut/databasecontroller.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o sensormanager.o InPut/sensormanager.cpp - -fileimportdialog.o: InPut/fileimportdialog.cpp InPut/fileimportdialog.h \ - FenPrincipale.h \ - ui_FenPrincipale.h \ - InPut/sensormanager.h \ - InPut/sensor.h \ - InPut/sensorvalue.h \ - defines.h \ - exprtk.hpp \ - tablemgr.h \ - InPut/serialdecoder.h \ - InPut/databasecontroller.h \ - InPut/cookiedecoder.h \ - InPut/serial.h \ - UI/boardingtable.h \ - UI/graphicview.h \ - UI/mapsview.h \ - balaifrequenciel.h \ - UI/histogram.h \ - ui_fileimportdialog.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o fileimportdialog.o InPut/fileimportdialog.cpp - -chronoreaderwidget.o: ChronoReader/chronoreaderwidget.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o chronoreaderwidget.o ChronoReader/chronoreaderwidget.cpp - -timecalcs.o: ChronoReader/TimeCalc/timecalcs.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o timecalcs.o ChronoReader/TimeCalc/timecalcs.cpp - -eventbox.o: ChronoReader/eventbox.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o eventbox.o ChronoReader/eventbox.cpp - -graphicview.o: UI/graphicview.cpp UI/graphicview.h \ - FenPrincipale.h \ - ui_FenPrincipale.h \ - InPut/sensormanager.h \ - InPut/sensor.h \ - InPut/sensorvalue.h \ - defines.h \ - exprtk.hpp \ - tablemgr.h \ - InPut/serialdecoder.h \ - InPut/databasecontroller.h \ - InPut/cookiedecoder.h \ - InPut/serial.h \ - UI/boardingtable.h \ - UI/mapsview.h \ - balaifrequenciel.h \ - UI/histogram.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o graphicview.o UI/graphicview.cpp - -cookiedecoder.o: InPut/cookiedecoder.cpp InPut/cookiedecoder.h \ - defines.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o cookiedecoder.o InPut/cookiedecoder.cpp - -yolodecoder.o: InPut/yolodecoder.cpp InPut/serial.h \ - defines.h \ - InPut/yolodecoder.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o yolodecoder.o InPut/yolodecoder.cpp - -databasecontroller.o: InPut/databasecontroller.cpp InPut/databasecontroller.h \ - InPut/sensormanager.h \ - InPut/sensor.h \ - InPut/sensorvalue.h \ - defines.h \ - exprtk.hpp \ - FenPrincipale.h \ - ui_FenPrincipale.h \ - InPut/cookiedecoder.h \ - InPut/serial.h \ - UI/boardingtable.h \ - UI/graphicview.h \ - UI/mapsview.h \ - balaifrequenciel.h \ - UI/histogram.h \ - tablemgr.h \ - InPut/serialdecoder.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o databasecontroller.o InPut/databasecontroller.cpp - -sensor.o: InPut/sensor.cpp InPut/sensor.h \ - InPut/sensorvalue.h \ - defines.h \ - exprtk.hpp \ - InPut/sensormanager.h \ - FenPrincipale.h \ - ui_FenPrincipale.h \ - InPut/cookiedecoder.h \ - InPut/serial.h \ - UI/boardingtable.h \ - UI/graphicview.h \ - UI/mapsview.h \ - balaifrequenciel.h \ - UI/histogram.h \ - tablemgr.h \ - InPut/serialdecoder.h \ - InPut/databasecontroller.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o sensor.o InPut/sensor.cpp - -sensorvalue.o: InPut/sensorvalue.cpp InPut/sensorvalue.h \ - defines.h \ - exprtk.hpp \ - InPut/sensor.h \ - InPut/sensormanager.h \ - FenPrincipale.h \ - ui_FenPrincipale.h \ - InPut/cookiedecoder.h \ - InPut/serial.h \ - UI/boardingtable.h \ - UI/graphicview.h \ - UI/mapsview.h \ - balaifrequenciel.h \ - UI/histogram.h \ - tablemgr.h \ - InPut/serialdecoder.h \ - InPut/databasecontroller.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o sensorvalue.o InPut/sensorvalue.cpp - -balaifrequenciel.o: balaifrequenciel.cpp balaifrequenciel.h \ - InPut/serial.h \ - defines.h \ - UI/histogram.h \ - ui_balaifrequenciel.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o balaifrequenciel.o balaifrequenciel.cpp - -histogram.o: UI/histogram.cpp UI/histogram.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o histogram.o UI/histogram.cpp - -moc_FenPrincipale.o: moc_FenPrincipale.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_FenPrincipale.o moc_FenPrincipale.cpp - -moc_dialog.o: moc_dialog.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_dialog.o moc_dialog.cpp - -moc_mapsview.o: moc_mapsview.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_mapsview.o moc_mapsview.cpp - -moc_serial.o: moc_serial.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_serial.o moc_serial.cpp - -moc_sensormanager.o: moc_sensormanager.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_sensormanager.o moc_sensormanager.cpp - -moc_fileimportdialog.o: moc_fileimportdialog.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_fileimportdialog.o moc_fileimportdialog.cpp - -moc_graphicview.o: moc_graphicview.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_graphicview.o moc_graphicview.cpp - -moc_cookiedecoder.o: moc_cookiedecoder.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_cookiedecoder.o moc_cookiedecoder.cpp - -moc_yolodecoder.o: moc_yolodecoder.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_yolodecoder.o moc_yolodecoder.cpp - -moc_databasecontroller.o: moc_databasecontroller.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_databasecontroller.o moc_databasecontroller.cpp - -moc_balaifrequenciel.o: moc_balaifrequenciel.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_balaifrequenciel.o moc_balaifrequenciel.cpp - -qrc_res.o: qrc_res.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o qrc_res.o qrc_res.cpp - -####### Install - -install: FORCE - -uninstall: FORCE - -FORCE: - diff --git a/build.sh b/build.sh index f1a4459..a6cee3e 100755 --- a/build.sh +++ b/build.sh @@ -19,13 +19,10 @@ then make elif [ $OS == "WIN" ]; then - sudo apt-get install autopoint intltool gperf && - git clone https://github.com/mxe/mxe.git && - cd mxe && - curl http://arthurtoussaint.free.fr/qtserialport.patch | patch -p1 - curl http://arthurtoussaint.free.fr/qwt.patch | patch -p1 - make qt qwt_qt4 qjson qtserialport && - cd .. && + sudo apt-get install autopoint intltool gperf cmake scons && + wget https://dl.dropboxusercontent.com/content_link/mz7Ei4ao7lqEJg8pUrGyinv7GQuZvWE5EYWLYMFu7p9aFmkOL6JKwH0ErToR8rUj?dl=1 -O mxe.tar.xz + pxz mxe.tar.xz + tar zf mxe.tar export PATH=$TRAVIS_BUILD_DIR/mxe/usr/bin:$PATH && mxe/usr/i686-w64-mingw32.shared/qt/bin/qmake Logger21.pro && make