Move parseutil to core/, and fix include paths during build

This commit is contained in:
Marcus Huderle 2018-09-24 19:04:42 -05:00
parent 473cca4eee
commit 56499411b1
5 changed files with 271 additions and 268 deletions

0
parseutil.cpp → core/parseutil.cpp Executable file → Normal file
View file

0
parseutil.h → core/parseutil.h Executable file → Normal file
View file

View file

@ -2,7 +2,7 @@
#include "ui_mainwindow.h" #include "ui_mainwindow.h"
#include "project.h" #include "project.h"
#include "editor.h" #include "editor.h"
#include "eventpropertiesframe.h" #include "ui/eventpropertiesframe.h"
#include "ui_objectpropertiesframe.h" #include "ui_objectpropertiesframe.h"
#include <QDebug> #include <QDebug>

View file

@ -20,6 +20,7 @@ SOURCES += core/block.cpp \
core/historyitem.cpp \ core/historyitem.cpp \
core/maplayout.cpp \ core/maplayout.cpp \
core/metatile.cpp \ core/metatile.cpp \
core/parseutil.cpp \
core/tile.cpp \ core/tile.cpp \
core/tileset.cpp \ core/tileset.cpp \
ui/eventpropertiesframe.cpp \ ui/eventpropertiesframe.cpp \
@ -35,7 +36,6 @@ SOURCES += core/block.cpp \
main.cpp \ main.cpp \
mainwindow.cpp \ mainwindow.cpp \
map.cpp \ map.cpp \
parseutil.cpp \
project.cpp project.cpp
HEADERS += core/block.h \ HEADERS += core/block.h \
@ -46,6 +46,7 @@ HEADERS += core/block.h \
core/mapconnection.h \ core/mapconnection.h \
core/maplayout.h \ core/maplayout.h \
core/metatile.h \ core/metatile.h \
core/parseutil.h \
core/tile.h \ core/tile.h \
core/tileset.h \ core/tileset.h \
ui/eventpropertiesframe.h \ ui/eventpropertiesframe.h \
@ -60,7 +61,6 @@ HEADERS += core/block.h \
graphicsview.h \ graphicsview.h \
mainwindow.h \ mainwindow.h \
map.h \ map.h \
parseutil.h \
project.h project.h
FORMS += mainwindow.ui \ FORMS += mainwindow.ui \
@ -68,3 +68,6 @@ FORMS += mainwindow.ui \
RESOURCES += \ RESOURCES += \
resources/images.qrc resources/images.qrc
INCLUDEPATH += core
INCLUDEPATH += ui

View file

@ -1,7 +1,7 @@
#include "parseutil.h"
#include "project.h" #include "project.h"
#include "core/history.h" #include "core/history.h"
#include "core/historyitem.h" #include "core/historyitem.h"
#include "core/parseutil.h"
#include "core/tile.h" #include "core/tile.h"
#include "core/tileset.h" #include "core/tileset.h"
#include "event.h" #include "event.h"