From 10ff9490f8d524fd8d0dcf86b4a60b7cbb5b3691 Mon Sep 17 00:00:00 2001 From: William McBrine Date: Mon, 8 Jan 2018 13:14:42 -0500 Subject: [PATCH] It's a long time since this demo was new. Let's call it something more apt. --- demos/{newdemo.c => ozdemo.c} | 4 ++-- doc/sdl.md | 2 +- dos/gccdos.mak | 2 +- dos/mscdos.mak | 2 +- libobjs.mif | 2 +- os2/gccos2.mak | 8 ++++---- os2/iccos2.mak | 6 +++--- sdl1/Makefile | 2 +- sdl1/Makefile.mng | 2 +- sdl2/Makefile | 2 +- watcom.mif | 4 ++-- win32/gccwin32.mak | 2 +- x11/Makefile.in | 12 ++++++------ 13 files changed, 25 insertions(+), 25 deletions(-) rename demos/{newdemo.c => ozdemo.c} (98%) diff --git a/demos/newdemo.c b/demos/ozdemo.c similarity index 98% rename from demos/newdemo.c rename to demos/ozdemo.c index f0ba904b..17e8a832 100644 --- a/demos/newdemo.c +++ b/demos/ozdemo.c @@ -1,6 +1,6 @@ /* - * newdemo.c - A demo program using PDCurses. The program - * illustrates the use of colors for text output. + * ozdemo.c - A demo program using PDCurses. The program + * (formerly newdemo) illustrates the use of colors for text output. * * Hacks by jbuhler@cs.washington.edu on 12/29/96 */ diff --git a/doc/sdl.md b/doc/sdl.md index 8bfe0015..7b8e8b3a 100644 --- a/doc/sdl.md +++ b/doc/sdl.md @@ -65,7 +65,7 @@ PDCurses for SDL supports an optional background image BMP. This is used whenever start_color() has not been called (see the ptest demo for an example), or when use_default_colors() has been called after start_color(), and the background color of a pair has been set to -1 -(see newdemo, worm, and rain for examples). The usage parallels that of +(see ozdemo, worm, and rain for examples). The usage parallels that of ncurses in an appropriate terminal (e.g., Gnome Terminal). The image is tiled to cover the PDCurses window, and can be any size or depth. diff --git a/dos/gccdos.mak b/dos/gccdos.mak index 86e4b255..84ec68b0 100644 --- a/dos/gccdos.mak +++ b/dos/gccdos.mak @@ -70,7 +70,7 @@ $(LIBOBJS) : %.o: $(srcdir)/%.c $(PDCOBJS) : %.o: $(osdir)/%.c $(CC) -c $(CFLAGS) $< -firework.exe newdemo.exe rain.exe testcurs.exe worm.exe xmas.exe \ +firework.exe ozdemo.exe rain.exe testcurs.exe worm.exe xmas.exe \ ptest.exe: %.exe: $(demodir)/%.c $(CC) $(CFLAGS) -o$@ $< $(LIBCURSES) diff --git a/dos/mscdos.mak b/dos/mscdos.mak index 063c929a..57dc6904 100644 --- a/dos/mscdos.mak +++ b/dos/mscdos.mak @@ -78,7 +78,7 @@ $(LIBCURSES) : $(LIBOBJS) $(PDCOBJS) firework.exe: firework.obj $(LINK) $(LDFLAGS) $*.obj,$*,,$(LIBCURSES); -newdemo.exe: newdemo.obj +ozdemo.exe: ozdemo.obj $(LINK) $(LDFLAGS) $*.obj,$*,,$(LIBCURSES); ptest.exe: ptest.obj diff --git a/libobjs.mif b/libobjs.mif index 5a6263c5..faf64fc2 100644 --- a/libobjs.mif +++ b/libobjs.mif @@ -22,5 +22,5 @@ debug.$(O) PDCOBJS = pdcclip.$(O) pdcdisp.$(O) pdcgetsc.$(O) pdckbd.$(O) pdcscrn.$(O) \ pdcsetsc.$(O) pdcutil.$(O) -DEMOS = testcurs$(E) newdemo$(E) xmas$(E) tuidemo$(E) firework$(E) \ +DEMOS = testcurs$(E) ozdemo$(E) xmas$(E) tuidemo$(E) firework$(E) \ ptest$(E) rain$(E) worm$(E) diff --git a/os2/gccos2.mak b/os2/gccos2.mak index 9e008c11..a5c41048 100644 --- a/os2/gccos2.mak +++ b/os2/gccos2.mak @@ -56,7 +56,7 @@ LIBDEPS = $(LIBOBJS) $(PDCOBJS) PDCLIBS = $(LIBCURSES) EXEPOST = $(EMXBIND) $* $(BINDFLAGS) TUIPOST = $(EMXBIND) tuidemo $(BINDFLAGS) -CLEAN = *.a testcurs newdemo xmas tuidemo firework ptest rain worm +CLEAN = *.a testcurs ozdemo xmas tuidemo firework ptest rain worm .PHONY: all libs clean demos dist @@ -71,7 +71,7 @@ clean: demos: $(DEMOS) -DEMOOBJS = testcurs.o newdemo.o xmas.o tui.o tuidemo.o firework.o \ +DEMOOBJS = testcurs.o ozdemo.o xmas.o tui.o tuidemo.o firework.o \ ptest.o rain.o worm.o $(LIBCURSES) : $(LIBDEPS) @@ -89,7 +89,7 @@ $(LIBOBJS) : %.o: $(srcdir)/%.c $(PDCOBJS) : %.o: $(osdir)/%.c $(CC) -c $(CFLAGS) -o$@ $< -firework.exe newdemo.exe rain.exe testcurs.exe worm.exe xmas.exe \ +firework.exe ozdemo.exe rain.exe testcurs.exe worm.exe xmas.exe \ ptest.exe: %.exe: %.o $(LINK) $(LDFLAGS) -o $* $< $(LIBCURSES) $(CCLIBS) $(EXEPOST) @@ -98,7 +98,7 @@ tuidemo.exe: tuidemo.o tui.o $(LINK) $(LDFLAGS) -o tuidemo tuidemo.o tui.o $(LIBCURSES) $(CCLIBS) $(TUIPOST) -firework.o newdemo.o ptest.o rain.o testcurs.o worm.o xmas.o: %.o: \ +firework.o ozdemo.o ptest.o rain.o testcurs.o worm.o xmas.o: %.o: \ $(demodir)/%.c $(CC) $(CFLAGS) -o$@ $< diff --git a/os2/iccos2.mak b/os2/iccos2.mak index bb4cb752..aa6ec5ce 100644 --- a/os2/iccos2.mak +++ b/os2/iccos2.mak @@ -202,7 +202,7 @@ pdcutil.obj: $(osdir)\pdcutil.c $(PDCURSES_HEADERS) $(PDCURSES_OS2_H) firework.exe: firework.obj $(LIBCURSES) $(LINK) $(LDFLAGS) $*.obj,$*,,$(LIBCURSES); -newdemo.exe: newdemo.obj $(LIBCURSES) +ozdemo.exe: ozdemo.obj $(LIBCURSES) $(LINK) $(LDFLAGS) $*.obj,$*,,$(LIBCURSES); ptest.exe: ptest.obj $(LIBCURSES) @@ -226,8 +226,8 @@ xmas.exe: xmas.obj $(LIBCURSES) firework.obj: $(demodir)\firework.c $(PDCURSES_CURSES_H) $(BUILD) $(demodir)\firework.c -newdemo.obj: $(demodir)\newdemo.c $(PDCURSES_CURSES_H) - $(BUILD) $(demodir)\newdemo.c +ozdemo.obj: $(demodir)\ozdemo.c $(PDCURSES_CURSES_H) + $(BUILD) $(demodir)\ozdemo.c ptest.obj: $(demodir)\ptest.c $(PANEL_HEADER) $(PDCURSES_CURSES_H) $(BUILD) $(demodir)\ptest.c diff --git a/sdl1/Makefile b/sdl1/Makefile index 081f5854..8d15e2a4 100644 --- a/sdl1/Makefile +++ b/sdl1/Makefile @@ -80,7 +80,7 @@ $(PDCOBJS) : %.o: $(osdir)/%.c firework: $(demodir)/firework.c $(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS) -newdemo: $(demodir)/newdemo.c +ozdemo: $(demodir)/ozdemo.c $(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS) ptest: $(demodir)/ptest.c diff --git a/sdl1/Makefile.mng b/sdl1/Makefile.mng index ec9d36e1..e5e2cdfb 100644 --- a/sdl1/Makefile.mng +++ b/sdl1/Makefile.mng @@ -81,7 +81,7 @@ $(LIBOBJS) : %.o: $(srcdir)/%.c $(PDCOBJS) : %.o: $(osdir)/%.c $(BUILD) -c $< -firework.exe newdemo.exe rain.exe testcurs.exe worm.exe xmas.exe \ +firework.exe ozdemo.exe rain.exe testcurs.exe worm.exe xmas.exe \ ptest.exe: %.exe: $(demodir)/%.c $(BUILD) -o $@ $< $(LDFLAGS) diff --git a/sdl2/Makefile b/sdl2/Makefile index eb96c600..8b125a05 100644 --- a/sdl2/Makefile +++ b/sdl2/Makefile @@ -76,7 +76,7 @@ $(PDCOBJS) : %.o: $(osdir)/%.c firework$(E): $(demodir)/firework.c $(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS) -newdemo$(E): $(demodir)/newdemo.c +ozdemo$(E): $(demodir)/ozdemo.c $(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS) ptest$(E): $(demodir)/ptest.c diff --git a/watcom.mif b/watcom.mif index bd66180c..36a2a8f7 100644 --- a/watcom.mif +++ b/watcom.mif @@ -14,7 +14,7 @@ touch.obj util.obj window.obj debug.obj PDCOBJS = pdcclip.obj pdcdisp.obj pdcgetsc.obj pdckbd.obj pdcscrn.obj & pdcsetsc.obj pdcutil.obj -DEMOS = testcurs.exe newdemo.exe xmas.exe tuidemo.exe firework.exe & +DEMOS = testcurs.exe ozdemo.exe xmas.exe tuidemo.exe firework.exe & ptest.exe rain.exe worm.exe LIBCURSES = pdcurses.lib @@ -46,7 +46,7 @@ demos: $(DEMOS) $(LINK) $(LDFLAGS) n $@ f $*.obj l $(LIBCURSES) testcurs.exe: testcurs.obj $(LIBCURSES) -newdemo.exe: newdemo.obj $(LIBCURSES) +ozdemo.exe: ozdemo.obj $(LIBCURSES) xmas.exe: xmas.obj $(LIBCURSES) firework.exe: firework.obj $(LIBCURSES) rain.exe: rain.obj $(LIBCURSES) diff --git a/win32/gccwin32.mak b/win32/gccwin32.mak index 4bef2322..47a1ab46 100644 --- a/win32/gccwin32.mak +++ b/win32/gccwin32.mak @@ -93,7 +93,7 @@ $(LIBOBJS) : %.o: $(srcdir)/%.c $(PDCOBJS) : %.o: $(osdir)/%.c $(CC) -c $(CFLAGS) $< -firework.exe newdemo.exe rain.exe testcurs.exe worm.exe xmas.exe \ +firework.exe ozdemo.exe rain.exe testcurs.exe worm.exe xmas.exe \ ptest.exe: %.exe: $(demodir)/%.c $(CC) $(CFLAGS) -o$@ $< $(LIBCURSES) diff --git a/x11/Makefile.in b/x11/Makefile.in index 58a3a096..14bfffba 100644 --- a/x11/Makefile.in +++ b/x11/Makefile.in @@ -43,8 +43,8 @@ LIB_DEPS = -L$(PDCURSES_SRCDIR)/x11 -lXCurses PDCLIBS = $(LIBCURSES) @SHL_TARGETS@ -DEMOS = firework newdemo ptest rain testcurs tuidemo worm xmas -DEMOOBJS = firework.o newdemo.o ptest.o rain.o testcurs.o tui.o \ +DEMOS = firework ozdemo ptest rain testcurs tuidemo worm xmas +DEMOOBJS = firework.o ozdemo.o ptest.o rain.o testcurs.o tui.o \ tuidemo.o worm.o xmas.o SHLFILE = XCurses @@ -484,8 +484,8 @@ x11.sho: $(osdir)/x11.c firework: firework.o $(LINK) firework.o -o $@ $(LDFLAGS) -newdemo: newdemo.o - $(LINK) newdemo.o -o $@ $(LDFLAGS) +ozdemo: ozdemo.o + $(LINK) ozdemo.o -o $@ $(LDFLAGS) ptest: ptest.o $(LINK) ptest.o -o $@ $(LDFLAGS) @@ -508,8 +508,8 @@ xmas: xmas.o firework.o: $(demodir)/firework.c $(BUILD) $(demodir)/firework.c -newdemo.o: $(demodir)/newdemo.c - $(BUILD) $(demodir)/newdemo.c +ozdemo.o: $(demodir)/ozdemo.c + $(BUILD) $(demodir)/ozdemo.c ptest.o: $(demodir)/ptest.c $(PDCURSES_SRCDIR)/panel.h $(BUILD) $(demodir)/ptest.c