Skip to content

* Compile clean in ubuntu 16.04 #119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mjscosta wants to merge 1 commit into
base: Letartare
Choose a base branch
from
Open

* Compile clean in ubuntu 16.04 #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
329 changes: 165 additions & 164 deletions GCV-3.6.1-T4.qt52/src/GCV.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,164 +1,165 @@
#-------------------------------------------------
#
# Project created by QtCreator 2012-02-13 T17:48:40
#
# Rename by LETARTARE July 28, 2014
# GCV.pro
#
#-------------------------------------------------

TEMPLATE = app
TARGET = GrblController

DEFINES = QT_NO_DEBUG

QT += core gui

unix {
QT += widgets
}

# LETARTARE June 12, 2014
contains(QT_VERSION, "^5.*") {
QT *= widgets printsupport
}

# LETARTARE July 28, 2014
# DESTDIR = bin

CONFIG(debug, debug|release) {
# TARGET =
DESTDIR = bin/debug
OBJECTS_DIR = build/debug/obj
MOC_DIR = build/debug/moc
RCC_DIR = build/debug/rcc
UI_DIR = build/debug/ui
}
else {
# TARGET =
DESTDIR = bin
OBJECTS_DIR = build/release/obj
MOC_DIR = build/release/moc
RCC_DIR = build/release/rcc
UI_DIR = build/release/ui
}

# QGlViewer
QT += xml opengl
INCLUDEPATH += QGLViewer QGLWidget
# srichy November 17, 2014
unix {
!macx {
LIBS += -lGLU
LIBS += -lQGLViewer
}
else
{
LIBS *= -framework QGLViewer
}
}
else {
LIBS += -lQGlViewer2
}


HEADER += visu3D/Point3D.h visu3D/Line3D.h visu3D/Arc3D.h visu3D/Tools3D.h visu3D/Box3D.h
SOURCES += visu3D/Point3D.cpp visu3D/Line3D.cpp visu3D/Arc3D.cpp visu3D/Tools3D.cpp visu3D/Box3D.cpp


# Translations
TRANSLATIONS += trlocale/GrblController_xx.ts
TRANSLATIONS += trlocale/GrblController_fr.ts

include(QextSerialPort/qextserialport.pri)
include(log4qt/log4qt.pri)

SOURCES += main.cpp\
mainwindow.cpp \
rs232.cpp \
options.cpp \
grbldialog.cpp \
about.cpp \
gcode.cpp \
timer.cpp \
atomicintbool.cpp \
coord3d.cpp \
renderarea.cpp \
positem.cpp \
renderitemlist.cpp \
lineitem.cpp \
itemtobase.cpp \
arcitem.cpp \
pointitem.cpp \
controlparams.cpp \
visu3D/viewer3D.cpp

HEADERS += mainwindow.h \
rs232.h \
options.h \
grbldialog.h \
definitions.h \
about.h \
images.rcc \
gcode.h \
timer.h \
atomicintbool.h \
coord3d.h \
log4qtdef.h \
renderarea.h \
positem.h \
renderitemlist.h \
lineitem.h \
itemtobase.h \
arcitem.h \
pointitem.h \
termiosext.h \
controlparams.h \
version.h \
visu3D/viewer3D.h

FORMS += forms/mainwindow.ui \
forms/options.ui \
forms/grbldialog.ui \
forms/about.ui

RESOURCES += GrblController.qrc

RC_FILE = grbl.rc

OTHER_FILES += \
android/AndroidManifest.xml \
android/res/drawable/icon.png \
android/res/drawable/logo.png \
android/res/drawable-hdpi/icon.png \
android/res/drawable-ldpi/icon.png \
android/res/drawable-mdpi/icon.png \
android/res/layout/splash.xml \
android/res/values/libs.xml \
android/res/values/strings.xml \
android/res/values-de/strings.xml \
android/res/values-el/strings.xml \
android/res/values-es/strings.xml \
android/res/values-et/strings.xml \
android/res/values-fa/strings.xml \
android/res/values-fr/strings.xml \
android/res/values-id/strings.xml \
android/res/values-it/strings.xml \
android/res/values-ja/strings.xml \
android/res/values-ms/strings.xml \
android/res/values-nb/strings.xml \
android/res/values-nl/strings.xml \
android/res/values-pl/strings.xml \
android/res/values-pt-rBR/strings.xml \
android/res/values-ro/strings.xml \
android/res/values-rs/strings.xml \
android/res/values-ru/strings.xml \
android/res/values-zh-rCN/strings.xml \
android/res/values-zh-rTW/strings.xml \
android/src/org/kde/necessitas/ministro/IMinistro.aidl \
android/src/org/kde/necessitas/ministro/IMinistroCallback.aidl \
android/src/org/kde/necessitas/origo/QtActivity.java \
android/src/org/kde/necessitas/origo/QtApplication.java \
android/version.xml


#-------------------------------------------------
#
# Project created by QtCreator 2012-02-13 T17:48:40
#
# Rename by LETARTARE July 28, 2014
# GCV.pro
#
#-------------------------------------------------

TEMPLATE = app
TARGET = GrblController

DEFINES = QT_NO_DEBUG

QT += core gui

unix {
QT += widgets
}

# LETARTARE June 12, 2014
contains(QT_VERSION, "^5.*") {
QT *= widgets printsupport
}

# LETARTARE July 28, 2014
# DESTDIR = bin

CONFIG(debug, debug|release) {
# TARGET =
DESTDIR = bin/debug
OBJECTS_DIR = build/debug/obj
MOC_DIR = build/debug/moc
RCC_DIR = build/debug/rcc
UI_DIR = build/debug/ui
}
else {
# TARGET =
DESTDIR = bin
OBJECTS_DIR = build/release/obj
MOC_DIR = build/release/moc
RCC_DIR = build/release/rcc
UI_DIR = build/release/ui
}

# QGlViewer
QT += xml opengl
#INCLUDEPATH += QGLViewer QGLWidget
# srichy November 17, 2014
unix {
!macx {
LIBS += -lGLU
LIBS += -lQGLViewer
}

linux-g++ {
LIBS += -lqglviewer2
message(Linux)
}
}
else {
LIBS += -lQGlViewer2
}


HEADER += visu3D/Point3D.h visu3D/Line3D.h visu3D/Arc3D.h visu3D/Tools3D.h visu3D/Box3D.h
SOURCES += visu3D/Point3D.cpp visu3D/Line3D.cpp visu3D/Arc3D.cpp visu3D/Tools3D.cpp visu3D/Box3D.cpp


# Translations
TRANSLATIONS += trlocale/GrblController_xx.ts
TRANSLATIONS += trlocale/GrblController_fr.ts

include(QextSerialPort/qextserialport.pri)
include(log4qt/log4qt.pri)

SOURCES += main.cpp\
mainwindow.cpp \
rs232.cpp \
options.cpp \
grbldialog.cpp \
about.cpp \
gcode.cpp \
timer.cpp \
atomicintbool.cpp \
coord3d.cpp \
renderarea.cpp \
positem.cpp \
renderitemlist.cpp \
lineitem.cpp \
itemtobase.cpp \
arcitem.cpp \
pointitem.cpp \
controlparams.cpp \
visu3D/viewer3D.cpp

HEADERS += mainwindow.h \
rs232.h \
options.h \
grbldialog.h \
definitions.h \
about.h \
images.rcc \
gcode.h \
timer.h \
atomicintbool.h \
coord3d.h \
log4qtdef.h \
renderarea.h \
positem.h \
renderitemlist.h \
lineitem.h \
itemtobase.h \
arcitem.h \
pointitem.h \
termiosext.h \
controlparams.h \
version.h \
visu3D/viewer3D.h

FORMS += forms/mainwindow.ui \
forms/options.ui \
forms/grbldialog.ui \
forms/about.ui

RESOURCES += GrblController.qrc

RC_FILE = grbl.rc

OTHER_FILES += \
android/AndroidManifest.xml \
android/res/drawable/icon.png \
android/res/drawable/logo.png \
android/res/drawable-hdpi/icon.png \
android/res/drawable-ldpi/icon.png \
android/res/drawable-mdpi/icon.png \
android/res/layout/splash.xml \
android/res/values/libs.xml \
android/res/values/strings.xml \
android/res/values-de/strings.xml \
android/res/values-el/strings.xml \
android/res/values-es/strings.xml \
android/res/values-et/strings.xml \
android/res/values-fa/strings.xml \
android/res/values-fr/strings.xml \
android/res/values-id/strings.xml \
android/res/values-it/strings.xml \
android/res/values-ja/strings.xml \
android/res/values-ms/strings.xml \
android/res/values-nb/strings.xml \
android/res/values-nl/strings.xml \
android/res/values-pl/strings.xml \
android/res/values-pt-rBR/strings.xml \
android/res/values-ro/strings.xml \
android/res/values-rs/strings.xml \
android/res/values-ru/strings.xml \
android/res/values-zh-rCN/strings.xml \
android/res/values-zh-rTW/strings.xml \
android/src/org/kde/necessitas/ministro/IMinistro.aidl \
android/src/org/kde/necessitas/ministro/IMinistroCallback.aidl \
android/src/org/kde/necessitas/origo/QtActivity.java \
android/src/org/kde/necessitas/origo/QtApplication.java \
android/version.xml


2 changes: 1 addition & 1 deletion GCV-3.6.1-T4.qt52/src/forms/mainwindow.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1246,7 +1246,7 @@
<property name="smallDecimalPoint">
<bool>false</bool>
</property>
<property name="numDigits">
<property name="digitCount">
<number>3</number>
</property>
<property name="segmentStyle">
Expand Down
2 changes: 1 addition & 1 deletion GCV-3.6.1-T4.qt52/src/log4qt/helpers/factory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
/******************************************************************************
* Dependencies
******************************************************************************/

#include <QObject>
#include <QtCore/QHash>
#include <QtCore/QMutex>
#include <QtCore/QStringList>
Expand Down
2 changes: 1 addition & 1 deletion GCV-3.6.1-T4.qt52/src/visu3D/box3D.cpp → GCV-3.6.1-T4.qt52/src/visu3D/Box3D.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* License: GPL
**************************************************************/

#include "box3D.h"
#include "Box3D.h"
#include <QtOpenGL>

Box3D::Box3D(const QVector3D p1, const QVector3D p2, bool mm1, QColor c)
Expand Down
0 GCV-3.6.1-T4.qt52/src/visu3D/box3D.h → GCV-3.6.1-T4.qt52/src/visu3D/Box3D.h
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions GCV-3.6.1-T4.qt52/src/visu3D/viewer3D.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@

#include "viewer3D.h"
#include <math.h>
#include "point3D.h"
#include "line3D.h"
#include "arc3d.h"
#include "box3D.h"
#include "Point3D.h"
#include "Line3D.h"
#include "Arc3D.h"
#include "Box3D.h"
#include "version.h"

// Constructor must call the base class constructor.
Expand Down