From eb6f4d6d8cc6d895c7c6185b20eb93da1fdd8b3b Mon Sep 17 00:00:00 2001 From: XaviDCR92 Date: Wed, 27 Dec 2017 13:08:36 +0100 Subject: * Added "Save map" function to MapEditor. * Tiles can be now modified runtime. + tileset.ini now allows configuring tileset layout in an easy way. --- Source/MapEditor/Makefile | 72 +++++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 37 deletions(-) (limited to 'Source/MapEditor/Makefile') diff --git a/Source/MapEditor/Makefile b/Source/MapEditor/Makefile index 6a9b2b2..1368984 100644 --- a/Source/MapEditor/Makefile +++ b/Source/MapEditor/Makefile @@ -3,14 +3,14 @@ # Generated by qmake (3.0) (Qt 5.7.0) # Project: MapEditor.pro # Template: app -# Command: C:\Qt\5.7\mingw53_32\bin\qmake.exe -spec win32-g++ "CONFIG+=debug" "CONFIG+=qml_debug" -o Makefile MapEditor.pro +# Command: C:\Qt\5.7\mingw53_32\bin\qmake.exe -spec win32-g++ -o Makefile MapEditor.pro ############################################################################# MAKEFILE = Makefile -first: debug -install: debug-install -uninstall: debug-uninstall +first: release +install: release-install +uninstall: release-uninstall QMAKE = C:\Qt\5.7\mingw53_32\bin\qmake.exe DEL_FILE = del CHK_DIR_EXISTS= if not exist @@ -26,24 +26,10 @@ SYMLINK = $(QMAKE) -install ln -f -s DEL_DIR = rmdir MOVE = move SUBTARGETS = \ - debug \ - release + release \ + debug -debug: FORCE - $(MAKE) -f $(MAKEFILE).Debug -debug-make_first: FORCE - $(MAKE) -f $(MAKEFILE).Debug -debug-all: FORCE - $(MAKE) -f $(MAKEFILE).Debug all -debug-clean: FORCE - $(MAKE) -f $(MAKEFILE).Debug clean -debug-distclean: FORCE - $(MAKE) -f $(MAKEFILE).Debug distclean -debug-install: FORCE - $(MAKE) -f $(MAKEFILE).Debug install -debug-uninstall: FORCE - $(MAKE) -f $(MAKEFILE).Debug uninstall release: FORCE $(MAKE) -f $(MAKEFILE).Release release-make_first: FORCE @@ -58,6 +44,20 @@ release-install: FORCE $(MAKE) -f $(MAKEFILE).Release install release-uninstall: FORCE $(MAKE) -f $(MAKEFILE).Release uninstall +debug: FORCE + $(MAKE) -f $(MAKEFILE).Debug +debug-make_first: FORCE + $(MAKE) -f $(MAKEFILE).Debug +debug-all: FORCE + $(MAKE) -f $(MAKEFILE).Debug all +debug-clean: FORCE + $(MAKE) -f $(MAKEFILE).Debug clean +debug-distclean: FORCE + $(MAKE) -f $(MAKEFILE).Debug distclean +debug-install: FORCE + $(MAKE) -f $(MAKEFILE).Debug install +debug-uninstall: FORCE + $(MAKE) -f $(MAKEFILE).Debug uninstall Makefile: MapEditor.pro C:/Qt/5.7/mingw53_32/mkspecs/win32-g++/qmake.conf C:/Qt/5.7/mingw53_32/mkspecs/features/spec_pre.prf \ C:/Qt/5.7/mingw53_32/mkspecs/qdevice.pri \ @@ -183,7 +183,6 @@ Makefile: MapEditor.pro C:/Qt/5.7/mingw53_32/mkspecs/win32-g++/qmake.conf C:/Qt/ C:/Qt/5.7/mingw53_32/mkspecs/features/resolve_config.prf \ C:/Qt/5.7/mingw53_32/mkspecs/features/exclusive_builds_post.prf \ C:/Qt/5.7/mingw53_32/mkspecs/features/default_post.prf \ - C:/Qt/5.7/mingw53_32/mkspecs/features/qml_debug.prf \ C:/Qt/5.7/mingw53_32/mkspecs/features/win32/rtti.prf \ C:/Qt/5.7/mingw53_32/mkspecs/features/precompile_header.prf \ C:/Qt/5.7/mingw53_32/mkspecs/features/warn_on.prf \ @@ -199,11 +198,11 @@ Makefile: MapEditor.pro C:/Qt/5.7/mingw53_32/mkspecs/win32-g++/qmake.conf C:/Qt/ C:/Qt/5.7/mingw53_32/mkspecs/features/yacc.prf \ C:/Qt/5.7/mingw53_32/mkspecs/features/lex.prf \ MapEditor.pro \ - C:/Qt/5.7/mingw53_32/lib/qtmaind.prl \ + C:/Qt/5.7/mingw53_32/lib/qtmain.prl \ C:/Qt/5.7/mingw53_32/lib/Qt5Widgets.prl \ C:/Qt/5.7/mingw53_32/lib/Qt5Gui.prl \ C:/Qt/5.7/mingw53_32/lib/Qt5Core.prl - $(QMAKE) -spec win32-g++ "CONFIG+=debug" "CONFIG+=qml_debug" -o Makefile MapEditor.pro + $(QMAKE) -spec win32-g++ -o Makefile MapEditor.pro C:/Qt/5.7/mingw53_32/mkspecs/features/spec_pre.prf: C:/Qt/5.7/mingw53_32/mkspecs/qdevice.pri: C:/Qt/5.7/mingw53_32/mkspecs/features/device_config.prf: @@ -328,7 +327,6 @@ C:/Qt/5.7/mingw53_32/mkspecs/features/win32/default_pre.prf: C:/Qt/5.7/mingw53_32/mkspecs/features/resolve_config.prf: C:/Qt/5.7/mingw53_32/mkspecs/features/exclusive_builds_post.prf: C:/Qt/5.7/mingw53_32/mkspecs/features/default_post.prf: -C:/Qt/5.7/mingw53_32/mkspecs/features/qml_debug.prf: C:/Qt/5.7/mingw53_32/mkspecs/features/win32/rtti.prf: C:/Qt/5.7/mingw53_32/mkspecs/features/precompile_header.prf: C:/Qt/5.7/mingw53_32/mkspecs/features/warn_on.prf: @@ -344,38 +342,38 @@ C:/Qt/5.7/mingw53_32/mkspecs/features/exceptions.prf: C:/Qt/5.7/mingw53_32/mkspecs/features/yacc.prf: C:/Qt/5.7/mingw53_32/mkspecs/features/lex.prf: MapEditor.pro: -C:/Qt/5.7/mingw53_32/lib/qtmaind.prl: +C:/Qt/5.7/mingw53_32/lib/qtmain.prl: C:/Qt/5.7/mingw53_32/lib/Qt5Widgets.prl: C:/Qt/5.7/mingw53_32/lib/Qt5Gui.prl: C:/Qt/5.7/mingw53_32/lib/Qt5Core.prl: qmake: FORCE - @$(QMAKE) -spec win32-g++ "CONFIG+=debug" "CONFIG+=qml_debug" -o Makefile MapEditor.pro + @$(QMAKE) -spec win32-g++ -o Makefile MapEditor.pro qmake_all: FORCE -make_first: debug-make_first release-make_first FORCE -all: debug-all release-all FORCE -clean: debug-clean release-clean FORCE -distclean: debug-distclean release-distclean FORCE +make_first: release-make_first debug-make_first FORCE +all: release-all debug-all FORCE +clean: release-clean debug-clean FORCE +distclean: release-distclean debug-distclean FORCE -$(DEL_FILE) Makefile -$(DEL_FILE) .qmake.stash -debug-mocclean: - $(MAKE) -f $(MAKEFILE).Debug mocclean release-mocclean: $(MAKE) -f $(MAKEFILE).Release mocclean -mocclean: debug-mocclean release-mocclean +debug-mocclean: + $(MAKE) -f $(MAKEFILE).Debug mocclean +mocclean: release-mocclean debug-mocclean -debug-mocables: - $(MAKE) -f $(MAKEFILE).Debug mocables release-mocables: $(MAKE) -f $(MAKEFILE).Release mocables -mocables: debug-mocables release-mocables +debug-mocables: + $(MAKE) -f $(MAKEFILE).Debug mocables +mocables: release-mocables debug-mocables check: first benchmark: first FORCE: -$(MAKEFILE).Debug: Makefile $(MAKEFILE).Release: Makefile +$(MAKEFILE).Debug: Makefile -- cgit v1.2.3