* Tried to get some work done in MapEditor with no success so far.

* Timers with no repeat flag were being set to NULL, but this is not actually desired!
* Reenabled transparency for aircraft shadow.
* Deprecated NotificationRequest flags, and replaced by system timer handling.

1 files changed, 37 insertions, 35 deletions

diff --git a/Source/MapEditor/Makefile b/Source/MapEditor/Makefile
index fb5d1b1..6a9b2b2 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+=qml_debug" "CONFIG+=force_debug_info" "CONFIG+=separate_debug_info" -o Makefile MapEditor.pro

+# Command: C:\Qt\5.7\mingw53_32\bin\qmake.exe -spec win32-g++ "CONFIG+=debug" "CONFIG+=qml_debug" -o Makefile MapEditor.pro

 #############################################################################

 

 MAKEFILE      = Makefile

 

-first: release

-install: release-install

-uninstall: release-uninstall

+first: debug

+install: debug-install

+uninstall: debug-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    =  \

-		release \

-		debug

+		debug \

+		release

 

 

-release: FORCE

-	$(MAKE) -f $(MAKEFILE).Release

-release-make_first: FORCE

-	$(MAKE) -f $(MAKEFILE).Release 

-release-all: FORCE

-	$(MAKE) -f $(MAKEFILE).Release all

-release-clean: FORCE

-	$(MAKE) -f $(MAKEFILE).Release clean

-release-distclean: FORCE

-	$(MAKE) -f $(MAKEFILE).Release distclean

-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

@@ -58,6 +44,20 @@ 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

+	$(MAKE) -f $(MAKEFILE).Release 

+release-all: FORCE

+	$(MAKE) -f $(MAKEFILE).Release all

+release-clean: FORCE

+	$(MAKE) -f $(MAKEFILE).Release clean

+release-distclean: FORCE

+	$(MAKE) -f $(MAKEFILE).Release distclean

+release-install: FORCE

+	$(MAKE) -f $(MAKEFILE).Release install

+release-uninstall: FORCE

+	$(MAKE) -f $(MAKEFILE).Release 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 \

@@ -176,6 +176,7 @@ Makefile: MapEditor.pro C:/Qt/5.7/mingw53_32/mkspecs/win32-g++/qmake.conf C:/Qt/
 		C:/Qt/5.7/mingw53_32/mkspecs/features/win32/qt_config.prf \

 		C:/Qt/5.7/mingw53_32/mkspecs/win32-g++/qmake.conf \

 		C:/Qt/5.7/mingw53_32/mkspecs/features/spec_post.prf \

+		.qmake.stash \

 		C:/Qt/5.7/mingw53_32/mkspecs/features/exclusive_builds.prf \

 		C:/Qt/5.7/mingw53_32/mkspecs/features/default_pre.prf \

 		C:/Qt/5.7/mingw53_32/mkspecs/features/win32/default_pre.prf \

@@ -198,11 +199,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/qtmain.prl \

+		C:/Qt/5.7/mingw53_32/lib/qtmaind.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+=qml_debug" "CONFIG+=force_debug_info" "CONFIG+=separate_debug_info" -o Makefile MapEditor.pro

+	$(QMAKE) -spec win32-g++ "CONFIG+=debug" "CONFIG+=qml_debug" -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:

@@ -320,6 +321,7 @@ C:/Qt/5.7/mingw53_32/mkspecs/features/qt_config.prf:
 C:/Qt/5.7/mingw53_32/mkspecs/features/win32/qt_config.prf:

 C:/Qt/5.7/mingw53_32/mkspecs/win32-g++/qmake.conf:

 C:/Qt/5.7/mingw53_32/mkspecs/features/spec_post.prf:

+.qmake.stash:

 C:/Qt/5.7/mingw53_32/mkspecs/features/exclusive_builds.prf:

 C:/Qt/5.7/mingw53_32/mkspecs/features/default_pre.prf:

 C:/Qt/5.7/mingw53_32/mkspecs/features/win32/default_pre.prf:

@@ -342,38 +344,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/qtmain.prl:

+C:/Qt/5.7/mingw53_32/lib/qtmaind.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+=qml_debug" "CONFIG+=force_debug_info" "CONFIG+=separate_debug_info" -o Makefile MapEditor.pro

+	@$(QMAKE) -spec win32-g++ "CONFIG+=debug" "CONFIG+=qml_debug" -o Makefile MapEditor.pro

 

 qmake_all: 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

+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

 	-$(DEL_FILE) Makefile

 	-$(DEL_FILE) .qmake.stash

 

-release-mocclean:

-	$(MAKE) -f $(MAKEFILE).Release mocclean

 debug-mocclean:

 	$(MAKE) -f $(MAKEFILE).Debug mocclean

-mocclean: release-mocclean debug-mocclean

+release-mocclean:

+	$(MAKE) -f $(MAKEFILE).Release mocclean

+mocclean: debug-mocclean release-mocclean

 

-release-mocables:

-	$(MAKE) -f $(MAKEFILE).Release mocables

 debug-mocables:

 	$(MAKE) -f $(MAKEFILE).Debug mocables

-mocables: release-mocables debug-mocables

+release-mocables:

+	$(MAKE) -f $(MAKEFILE).Release mocables

+mocables: debug-mocables release-mocables

 

 check: first

 

 benchmark: first

 FORCE:

 

-$(MAKEFILE).Release: Makefile

 $(MAKEFILE).Debug: Makefile

+$(MAKEFILE).Release: Makefile