Mercurial > hg > dmlib
diff Makefile.gen @ 376:40e33ad0d153
Work towards a working editor .. some day.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Wed, 17 Oct 2012 02:27:55 +0300 |
| parents | 097b537fa957 |
| children | a41d0db5fa36 |
line wrap: on
line diff
--- a/Makefile.gen Wed Oct 17 01:47:49 2012 +0300 +++ b/Makefile.gen Wed Oct 17 02:27:55 2012 +0300 @@ -362,7 +362,7 @@ @echo " LINK $+" @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) -$(BINPATH)$(DEMO_BIN)$(EXEEXT): $(OBJPATH)$(DEMO_BIN).o $(addprefix $(OBJPATH),$(DEMO_OBJS)) $(DMLIB_A) +$(BINPATH)$(DEMO_BIN)$(EXEEXT): $(addprefix $(OBJPATH),$(DEMO_OBJS)) $(DMLIB_A) @echo " LINK $+" @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) @@ -372,7 +372,7 @@ $(EDITOR_PRO): $(DMLIB)Makefile.gen config.mak $(addprefix $(DMLIB),$(EDITOR_SOURCES)) $(addprefix $(OBJPATH),$(DEMO_OBJS)) $(DMLIB_A) @echo " CREATE $@" @echo > $@ - @echo "POST_TARGETDEPS = $(filter %.o %.a,$+)" >> $@ + @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)" >> $@