diff options
| author | Simon Howard | 2006-05-24 21:35:45 +0000 |
|---|---|---|
| committer | Simon Howard | 2006-05-24 21:35:45 +0000 |
| commit | 1f101a63a60428230549243931356a4c0ee5ca7d (patch) | |
| tree | ad9a73a9a94f927c64ca90f194ed01357c63ecee | |
| parent | b03198720a635d32908c98dc0e11bb9d87ee32f2 (diff) | |
| download | chocolate-doom-1f101a63a60428230549243931356a4c0ee5ca7d.tar.gz chocolate-doom-1f101a63a60428230549243931356a4c0ee5ca7d.tar.bz2 chocolate-doom-1f101a63a60428230549243931356a4c0ee5ca7d.zip | |
Move textscreen GUI demos into an examples/ subdir.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 524
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | textscreen/Makefile.am | 9 | ||||
| -rw-r--r-- | textscreen/examples/Makefile.am | 11 | ||||
| -rw-r--r-- | textscreen/examples/calculator.c (renamed from textscreen/calculator.c) | 0 | ||||
| -rw-r--r-- | textscreen/examples/guitest.c (renamed from textscreen/guitest.c) | 0 |
5 files changed, 14 insertions, 7 deletions
diff --git a/configure.in b/configure.in index 1d19deae..aeba3710 100644 --- a/configure.in +++ b/configure.in @@ -52,6 +52,7 @@ AC_C_BIGENDIAN AC_OUTPUT([ Makefile textscreen/Makefile +textscreen/examples/Makefile src/Makefile src/chocolate-doom-res.rc ]) diff --git a/textscreen/Makefile.am b/textscreen/Makefile.am index 442839fc..d8bee615 100644 --- a/textscreen/Makefile.am +++ b/textscreen/Makefile.am @@ -1,9 +1,10 @@ AM_CFLAGS = @SDL_CFLAGS@ -I../src +SUBDIRS=examples noinst_LIBRARIES=libtextscreen.a -bin_PROGRAMS=guitest calculator +libtextscreen_a_LIBADD = @SDL_LIBS@ libtextscreen_a_SOURCES = \ txt_checkbox.c txt_checkbox.h \ txt_desktop.c txt_desktop.h \ @@ -21,9 +22,3 @@ libtextscreen_a_SOURCES = \ txt_window_action.c txt_window_action.h \ txt_font.h -guitest_LDADD = @SDL_LIBS@ libtextscreen.a -guitest_SOURCES = guitest.c - -calculator_LDADD = @SDL_LIBS@ libtextscreen.a -calculator_SOURCES = calculator.c - diff --git a/textscreen/examples/Makefile.am b/textscreen/examples/Makefile.am new file mode 100644 index 00000000..001416c5 --- /dev/null +++ b/textscreen/examples/Makefile.am @@ -0,0 +1,11 @@ + +AM_CFLAGS = @SDL_CFLAGS@ -I.. -I../../src + +noinst_PROGRAMS=guitest calculator + +guitest_LDADD = @LDFLAGS@ @SDL_LIBS@ ../libtextscreen.a +guitest_SOURCES = guitest.c + +calculator_LDADD = @LDFLAGS@ @SDL_LIBS@ ../libtextscreen.a +calculator_SOURCES = calculator.c + diff --git a/textscreen/calculator.c b/textscreen/examples/calculator.c index d51d4f9c..d51d4f9c 100644 --- a/textscreen/calculator.c +++ b/textscreen/examples/calculator.c diff --git a/textscreen/guitest.c b/textscreen/examples/guitest.c index 23df5282..23df5282 100644 --- a/textscreen/guitest.c +++ b/textscreen/examples/guitest.c |