--- a/Makefile.gen	Mon Oct 15 21:27:24 2012 +0300
+++ b/Makefile.gen	Mon Oct 15 22:48:41 2012 +0300
@@ -11,6 +11,19 @@
 DM_CFLAGS += -I$(DMLIB)
 endif
 
+
+###
+### Editor
+###
+ifeq ($(DM_BUILD_EDITOR),yes)
+ifneq ($(DEMO_BIN),)
+BINARIES += ed_$(DEMO_BIN)
+endif
+endif
+
+EDITOR_OBJS = gtktimeline.o gtkwaveform.o dmeditor.o
+
+
 ###
 ### Form additional compilation defines based on settings
 ###
@@ -212,8 +225,7 @@
 DMLIB_A=$(OBJPATH)dmlib.a
 DMLIB_OBJS += dmfile.o dmlib.o dmlerp.o dmstring.o \
 	dmargs.o dmvecmat.o dmperlin.o dmimage.o \
-	dmwav.o	dmengine.o dmsimple.o \
-	dmtimeline.o dmtimelinew.o dmq3d.o
+	dmwav.o	dmengine.o dmtimeline.o dmtimelinew.o dmq3d.o
 
 ifeq ($(DM_BUILD_TESTS),yes)
 BINARIES += vecmattest fptest
@@ -226,6 +238,11 @@
 ###
 ### Generic rules
 ###
+$(OBJPATH)gtk%.o: $(DMLIB)gtk%.c $(DMLIB)gtk%.h
+	@echo " CC $+"
+	@$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS) $(GTK_CFLAGS)
+
+
 $(OBJPATH)%.d: $(DMLIB)%.c
 	@echo > $@
 	@grep '#\s*include\s*\"' $< | sed 's/#\s*include\s\s*"\(.*\)"/\1/' | while read i; do if test -e "$$i"; then echo "$$i" >> $@; fi; done
@@ -294,10 +311,6 @@
 ###
 ### Tests and binaries
 ###
-$(BINPATH)%$(EXEEXT): $(OBJPATH)%.o $(DMLIB_A)
-	@echo " LINK $+"
-	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS)
-
 $(BINPATH)vview$(EXEEXT): $(OBJPATH)vview.o $(DMLIB_A)
 	@echo " LINK $+"
 	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) -lSDL_ttf
@@ -350,6 +363,18 @@
 	@echo " LINK $+"
 	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS)
 
+###
+### Editor targets
+###
+$(OBJPATH)dmeditor.o: $(DMLIB)dmeditor.c
+	@echo " CC $+"
+	@$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS) $(GTK_CFLAGS)
+
+
+$(BINPATH)ed_$(DEMO_BIN)$(EXEEXT): $(OBJPATH)$(DEMO_BIN).o $(addprefix $(OBJPATH),$(EDITOR_OBJS)) $(addprefix $(OBJPATH),$(DEMO_OBJS)) $(DMLIB_A)
+	@echo " LINK $+"
+	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) $(GTK_LDFLAGS)
+
 
 ###
 ### Special targets