converted to proper directory structure
This commit is contained in:
parent
2b491ac83e
commit
22d1b57a48
8 changed files with 12 additions and 10 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -5,3 +5,5 @@ ui_mainwindow.h
|
||||||
untitled.mtl
|
untitled.mtl
|
||||||
untitled.obj
|
untitled.obj
|
||||||
moc*
|
moc*
|
||||||
|
build/
|
||||||
|
bin/
|
||||||
|
|
|
@ -4,10 +4,6 @@
|
||||||
|
|
||||||
TEMPLATE = app
|
TEMPLATE = app
|
||||||
TARGET = 3dobj-renderer
|
TARGET = 3dobj-renderer
|
||||||
INCLUDEPATH += . \
|
|
||||||
/usr/include/GL
|
|
||||||
DEPENDPATH += . \
|
|
||||||
/usr/include/GL
|
|
||||||
|
|
||||||
# You can make your code fail to compile if you use deprecated APIs.
|
# You can make your code fail to compile if you use deprecated APIs.
|
||||||
# In order to do so, uncomment the following line.
|
# In order to do so, uncomment the following line.
|
||||||
|
@ -17,7 +13,11 @@ DEPENDPATH += . \
|
||||||
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
|
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
|
||||||
|
|
||||||
# Input
|
# Input
|
||||||
SOURCES += main.cpp opglwidget.cpp obj.cpp
|
SOURCES += src/main.cpp src/opglwidget.cpp src/obj.cpp
|
||||||
HEADERS += ui_mainwindow.h opglwidget.h obj.h
|
HEADERS += include/opglwidget.h include/obj.h
|
||||||
FORMS += mainwindow.ui
|
FORMS += forms/mainwindow.ui
|
||||||
|
MOC_DIR += build/moc
|
||||||
|
UI_DIR += include/
|
||||||
|
OBJECTS_DIR += build/objects
|
||||||
QT += core gui widgets
|
QT += core gui widgets
|
||||||
|
DESTDIR = $$PWD/bin
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#include <QtWidgets/QApplication>
|
#include <QtWidgets/QApplication>
|
||||||
#include <QMainWindow>
|
#include <QMainWindow>
|
||||||
#include <QTimer>
|
#include <QTimer>
|
||||||
#include "ui_mainwindow.h"
|
#include "include/ui_mainwindow.h"
|
||||||
|
|
||||||
int main(int argc, char **argv) {
|
int main(int argc, char **argv) {
|
||||||
QApplication app(argc, argv);
|
QApplication app(argc, argv);
|
|
@ -1,4 +1,4 @@
|
||||||
#include "obj.h"
|
#include "include/obj.h"
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <string>
|
#include <string>
|
|
@ -1,4 +1,4 @@
|
||||||
#include "opglwidget.h"
|
#include "include/opglwidget.h"
|
||||||
#include <GL/gl.h>
|
#include <GL/gl.h>
|
||||||
#include <GL/glu.h>
|
#include <GL/glu.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
Loading…
Reference in a new issue