# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1350430623 -10800
# Node ID a41d0db5fa36094fe82bd36c2d0196226e2d5b6b
# Parent  40e33ad0d153d97bac3e27b60e50cd8e89fc3622
Improve building.

diff -r 40e33ad0d153 -r a41d0db5fa36 Makefile.gen
--- a/Makefile.gen	Wed Oct 17 02:27:55 2012 +0300
+++ b/Makefile.gen	Wed Oct 17 02:37:03 2012 +0300
@@ -371,14 +371,15 @@
 ###
 $(EDITOR_PRO): $(DMLIB)Makefile.gen config.mak $(addprefix $(DMLIB),$(EDITOR_SOURCES)) $(addprefix $(OBJPATH),$(DEMO_OBJS)) $(DMLIB_A)
 	@echo " CREATE $@"
-	@echo > $@
+	@echo "OBJECTS_DIR = $(OBJPATH)" > $@
+	@echo "MOC_DIR = $(OBJPATH)" >> $@
+	@echo "QMAKE_CXXFLAGS += $(DM_CFLAGS) $(SDL_CFLAGS)" >> $@
 	@echo "QMAKE_LIBS += $(filter-out %dmsimple.o,$(filter %.o %.a,$+))" >> $@
-	@echo "QMAKE_CXXFLAGS += $(DM_CFLAGS) $(SDL_CFLAGS)" >> $@
 	@echo "QMAKE_LIBS += $(DM_LDFLAGS) $(SDL_LDFLAGS)" >> $@
 	@echo "MAKEFILE = $(EDITOR_MAKEFILE)" >> $@
 	@echo "CONFIG += debug" >> $@
 	@echo "QT += core gui opengl" >> $@
-	@echo "TARGET = editor" >> $@
+	@echo "TARGET = $(BINPATH)ed_$(DEMO_BIN)$(EXEEXT)" >> $@
 	@echo "TEMPLATE = app" >> $@
 	@echo "SOURCES = $(addprefix $(DMLIB),$(EDITOR_SOURCES))" >> $@
 	@echo "HEADERS = $(addprefix $(DMLIB),$(EDITOR_HEADERS))" >> $@
@@ -396,5 +397,5 @@
 ### Special targets
 ###
 clean:
-	$(RM) $(TARGETS) $(OBJPATH)*.o $(EDITOR_MAKEFILE) $(EDITOR_PRO)
+	$(RM) $(TARGETS) $(OBJPATH)*.o $(OBJPATH)moc_* $(EDITOR_MAKEFILE) $(EDITOR_PRO)