The MinGW.OSDN Installation Manager Tool
| Revision | 8874d77303037ab288860b161fa8f04ec6603929 (tree) |
|---|---|
| Zeit | 2012-09-21 06:27:28 |
| Autor | Keith Marshall <keithmarshall@user...> |
| Commiter | Keith Marshall |
Adjust incorrectly resolved 2012-09-14 merge from master.
ChangeLog (diff) Makefile.in (diff)| @@ -1,3 +1,9 @@ | ||
| 1 | +2012-09-20 Keith Marshall <keithmarshall@users.sourceforge.net> | |
| 2 | + | |
| 3 | + Adjust incorrectly resolved 2012-09-14 merge from master. | |
| 4 | + | |
| 5 | + * src/Makefile.in: Restore lost reference to guistub.cpp | |
| 6 | + | |
| 1 | 7 | 2012-09-14 Keith Marshall <keithmarshall@users.sourceforge.net> |
| 2 | 8 | |
| 3 | 9 | Implement GUI hooks in "rites of passage" internal API. |
| @@ -97,7 +97,7 @@ GUI_LDFLAGS = -mwindows $(LDFLAGS) | ||
| 97 | 97 | %.$(OBJEXT): %.ico |
| 98 | 98 | echo $* ICON $*.ico | $(WINDRES) -I ${srcdir}/icons -o $@ |
| 99 | 99 | # |
| 100 | -gui$(EXEEXT): guimain.$(OBJEXT) pkgicon.$(OBJEXT) | |
| 100 | +gui$(EXEEXT): guistub.$(OBJEXT) pkgicon.$(OBJEXT) | |
| 101 | 101 | $(CXX) -o $@ $(CXXFLAGS) $(GUI_LDFLAGS) $+ |
| 102 | 102 | |
| 103 | 103 | lastrites$(EXEEXT): rites.$(OBJEXT) |
Fork