diff --git a/Makefile b/Makefile index 84a5925..a3d6d56 100644 --- a/Makefile +++ b/Makefile @@ -62,6 +62,7 @@ SOURCES = main.cpp \ player.cpp \ yamlparser.cpp \ unitconfig.cpp \ + buildingconfig.cpp \ pathfinder.cpp \ unit.cpp \ city.cpp \ @@ -69,7 +70,9 @@ SOURCES = main.cpp \ gamemanager.cpp \ unitrenderer.cpp \ localization.cpp \ - terrainmovementmanager.cpp qrc_shaders.cpp \ + terrainmovementmanager.cpp \ + roadconfig.cpp \ + actionneededmanager.cpp qrc_shaders.cpp \ moc_mainwindow.cpp OBJECTS = main.o \ mainwindow.o \ @@ -81,6 +84,7 @@ OBJECTS = main.o \ player.o \ yamlparser.o \ unitconfig.o \ + buildingconfig.o \ pathfinder.o \ unit.o \ city.o \ @@ -89,6 +93,8 @@ OBJECTS = main.o \ unitrenderer.o \ localization.o \ terrainmovementmanager.o \ + roadconfig.o \ + actionneededmanager.o \ qrc_shaders.o \ moc_mainwindow.o DIST = shaders/simple.vert \ @@ -193,6 +199,7 @@ DIST = shaders/simple.vert \ player.h \ yamlparser.h \ unitconfig.h \ + buildingconfig.h \ pathfinder.h \ unit.h \ city.h \ @@ -200,7 +207,9 @@ DIST = shaders/simple.vert \ gamemanager.h \ unitrenderer.h \ localization.h \ - terrainmovementmanager.h main.cpp \ + terrainmovementmanager.h \ + roadconfig.h \ + actionneededmanager.h main.cpp \ mainwindow.cpp \ qscenerenderer.cpp \ vertex.cpp \ @@ -210,6 +219,7 @@ DIST = shaders/simple.vert \ player.cpp \ yamlparser.cpp \ unitconfig.cpp \ + buildingconfig.cpp \ pathfinder.cpp \ unit.cpp \ city.cpp \ @@ -217,7 +227,9 @@ DIST = shaders/simple.vert \ gamemanager.cpp \ unitrenderer.cpp \ localization.cpp \ - terrainmovementmanager.cpp + terrainmovementmanager.cpp \ + roadconfig.cpp \ + actionneededmanager.cpp QMAKE_TARGET = tiletest DESTDIR = TARGET = tiletest @@ -424,8 +436,8 @@ distdir: FORCE $(COPY_FILE) --parents $(DIST) $(DISTDIR)/ $(COPY_FILE) --parents shaders.qrc $(DISTDIR)/ $(COPY_FILE) --parents /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/data/dummy.cpp $(DISTDIR)/ - $(COPY_FILE) --parents mainwindow.h qscenerenderer.h vertex.h tile.h terrain.h tilevertexinfo.h matrix2d.h face.h player.h yamlparser.h unitconfig.h pathfinder.h unit.h city.h terrainyieldmanager.h gamemanager.h unitrenderer.h localization.h terrainmovementmanager.h $(DISTDIR)/ - $(COPY_FILE) --parents main.cpp mainwindow.cpp qscenerenderer.cpp vertex.cpp tile.cpp tilevertexinfo.cpp face.cpp player.cpp yamlparser.cpp unitconfig.cpp pathfinder.cpp unit.cpp city.cpp terrainyieldmanager.cpp gamemanager.cpp unitrenderer.cpp localization.cpp terrainmovementmanager.cpp $(DISTDIR)/ + $(COPY_FILE) --parents mainwindow.h qscenerenderer.h vertex.h tile.h terrain.h tilevertexinfo.h matrix2d.h face.h player.h yamlparser.h unitconfig.h buildingconfig.h pathfinder.h unit.h city.h terrainyieldmanager.h gamemanager.h unitrenderer.h localization.h terrainmovementmanager.h roadconfig.h actionneededmanager.h $(DISTDIR)/ + $(COPY_FILE) --parents main.cpp mainwindow.cpp qscenerenderer.cpp vertex.cpp tile.cpp tilevertexinfo.cpp face.cpp player.cpp yamlparser.cpp unitconfig.cpp buildingconfig.cpp pathfinder.cpp unit.cpp city.cpp terrainyieldmanager.cpp gamemanager.cpp unitrenderer.cpp localization.cpp terrainmovementmanager.cpp roadconfig.cpp actionneededmanager.cpp $(DISTDIR)/ $(COPY_FILE) --parents mainwindow.ui $(DISTDIR)/ @@ -495,8 +507,11 @@ ui_mainwindow.h: mainwindow.ui \ terrainmovementmanager.h \ player.h \ city.h \ + roadconfig.h \ gamemanager.h \ - terrainyieldmanager.h + buildingconfig.h \ + terrainyieldmanager.h \ + actionneededmanager.h /usr/lib/qt5/bin/uic mainwindow.ui -o ui_mainwindow.h compiler_yacc_decl_make_all: @@ -513,7 +528,25 @@ main.o: main.cpp mainwindow.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp mainwindow.o: mainwindow.cpp mainwindow.h \ - ui_mainwindow.h + ui_mainwindow.h \ + qscenerenderer.h \ + terrain.h \ + tile.h \ + vertex.h \ + face.h \ + tilevertexinfo.h \ + matrix2d.h \ + unitrenderer.h \ + unit.h \ + unitconfig.h \ + terrainmovementmanager.h \ + player.h \ + city.h \ + roadconfig.h \ + gamemanager.h \ + buildingconfig.h \ + terrainyieldmanager.h \ + actionneededmanager.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o mainwindow.o mainwindow.cpp qscenerenderer.o: qscenerenderer.cpp qscenerenderer.h \ @@ -529,10 +562,14 @@ qscenerenderer.o: qscenerenderer.cpp qscenerenderer.h \ terrainmovementmanager.h \ player.h \ city.h \ + roadconfig.h \ gamemanager.h \ + buildingconfig.h \ terrainyieldmanager.h \ + actionneededmanager.h \ pathfinder.h \ - yamlparser.h + yamlparser.h \ + localization.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o qscenerenderer.o qscenerenderer.cpp vertex.o: vertex.cpp vertex.h \ @@ -553,8 +590,11 @@ tile.o: tile.cpp tile.h \ terrainmovementmanager.h \ player.h \ city.h \ + roadconfig.h \ gamemanager.h \ - terrainyieldmanager.h + buildingconfig.h \ + terrainyieldmanager.h \ + actionneededmanager.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o tile.o tile.cpp tilevertexinfo.o: tilevertexinfo.cpp tilevertexinfo.h \ @@ -580,6 +620,10 @@ unitconfig.o: unitconfig.cpp unitconfig.h \ yamlparser.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o unitconfig.o unitconfig.cpp +buildingconfig.o: buildingconfig.cpp buildingconfig.h \ + yamlparser.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o buildingconfig.o buildingconfig.cpp + pathfinder.o: pathfinder.cpp pathfinder.h \ terrain.h \ matrix2d.h \ @@ -613,9 +657,12 @@ gamemanager.o: gamemanager.cpp gamemanager.h \ terrainmovementmanager.h \ terrain.h \ matrix2d.h \ + buildingconfig.h \ + roadconfig.h \ unit.h \ city.h \ terrainyieldmanager.h \ + actionneededmanager.h \ pathfinder.h \ yamlparser.h \ localization.h @@ -629,6 +676,7 @@ unitrenderer.o: unitrenderer.cpp unitrenderer.h \ matrix2d.h \ player.h \ city.h \ + roadconfig.h \ pathfinder.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o unitrenderer.o unitrenderer.cpp @@ -641,9 +689,31 @@ terrainmovementmanager.o: terrainmovementmanager.cpp terrainmovementmanager.h \ matrix2d.h \ unitconfig.h \ pathfinder.h \ - yamlparser.h + yamlparser.h \ + gamemanager.h \ + player.h \ + buildingconfig.h \ + roadconfig.h \ + unit.h \ + city.h \ + terrainyieldmanager.h \ + actionneededmanager.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o terrainmovementmanager.o terrainmovementmanager.cpp +roadconfig.o: roadconfig.cpp roadconfig.h \ + yamlparser.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o roadconfig.o roadconfig.cpp + +actionneededmanager.o: actionneededmanager.cpp actionneededmanager.h \ + yamlparser.h \ + unit.h \ + unitconfig.h \ + terrainmovementmanager.h \ + terrain.h \ + matrix2d.h \ + city.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o actionneededmanager.o actionneededmanager.cpp + qrc_shaders.o: qrc_shaders.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o qrc_shaders.o qrc_shaders.cpp diff --git a/tiletest b/tiletest index fb06f56..191cf8f 100755 Binary files a/tiletest and b/tiletest differ