commit 480a31094b7621dd7d65ec05a6e36964dca99b66
Merge: 37db69b8 e66653a8
Author: Simon Howard <fraggle@gmail.com>
AuthorDate: Mon Jul 13 00:52:26 2009 +0000
Commit: Simon Howard <fraggle@gmail.com>
CommitDate: Mon Jul 13 00:52:26 2009 +0000
Merge from trunk.
Subversion-branch: /branches/opl-branch
Subversion-revision: 1624
.lvimrc | 25 +
Makefile.am | 2 +-
NEWS | 46 +
codeblocks/textscreen.cbp | 5 +
configure.in | 16 +
man/manpage.template | 4 +-
pcsound/pcsound.c | 4 +
pcsound/pcsound_sdl.c | 34 +-
pcsound/pcsound_win32.c | 1 +
pkg/wince/.gitignore | 3 +
pkg/wince/Makefile.am | 10 +
pkg/wince/wince-cab.cfg | 25 +
pkg/wince/wince-cabgen | 672 +++++++++
setup/Makefile.am | 5 +-
setup/configfile.c | 138 +-
setup/configfile.h | 2 +
setup/display.c | 22 +-
setup/execute.c | 154 +-
setup/keyboard.c | 245 +++-
setup/keyboard.h | 57 +
setup/mainmenu.c | 17 +
setup/multiplayer.c | 42 +-
setup/txt_keyinput.c | 12 +
src/Makefile.am | 3 +-
src/am_map.c | 210 +--
src/d_iwad.c | 11 +-
src/d_main.c | 4 +-
src/d_net.c | 2 +
src/doomtype.h | 7 +
src/g_game.c | 45 +-
src/hu_stuff.c | 3 +-
src/hu_stuff.h | 1 -
src/i_main.c | 42 +-
src/i_sdlsound.c | 407 +++---
src/i_system.c | 142 +-
src/i_video.c | 237 ++--
src/m_config.c | 411 +++++-
src/m_config.h | 1 +
src/m_menu.c | 234 ++--
src/p_enemy.c | 122 +-
src/w_file_win32.c | 24 +-
src/z_native.c | 5 +
src/z_zone.c | 5 +
src/z_zone.h | 2 +-
textscreen/Doxyfile | 1366 ++++++++++++++++++
textscreen/Makefile.am | 8 +-
textscreen/examples/calculator.c | 25 +
textscreen/examples/guitest.c | 29 +
textscreen/txt_button.h | 41 +-
textscreen/txt_checkbox.h | 41 +
textscreen/txt_desktop.c | 11 +-
textscreen/txt_desktop.h | 37 +-
textscreen/txt_dropdown.h | 30 +
textscreen/txt_font.h | 9 +-
textscreen/txt_inputbox.c | 2 +
textscreen/txt_inputbox.h | 38 +
textscreen/txt_label.h | 43 +
textscreen/txt_radiobutton.h | 43 +
textscreen/txt_scrollpane.c | 8 +-
textscreen/txt_scrollpane.h | 24 +
textscreen/txt_sdl.c | 98 +-
textscreen/txt_separator.h | 23 +
textscreen/txt_smallfont.h | 2884 ++++++++++++++++++++++++++++++++++++++
textscreen/txt_spinctrl.h | 36 +
textscreen/txt_strut.h | 26 +-
textscreen/txt_table.h | 124 +-
textscreen/txt_widget.h | 55 +-
textscreen/txt_window.h | 101 +-
textscreen/txt_window_action.h | 50 +-
wince/Makefile.am | 16 +
wince/README | 8 +
wince/env.c | 92 ++
wince/env.h | 24 +
wince/errno.c | 20 +
wince/errno.h | 17 +
wince/fileops.c | 49 +
wince/fileops.h | 14 +
wince/libc_wince.h | 4 +
78 files changed, 8196 insertions(+), 659 deletions(-)
diff --cc Makefile.am
index 4f678149,e4b7c825..991bf198
--- a/Makefile.am
+++ b/Makefile.am
@@@ -44,7 -44,7 +44,7 @@@ EXTRA_DIST
MAINTAINERCLEANFILES = $(AUX_DIST_GEN)
docdir=$(prefix)/share/doc/@PACKAGE@
- SUBDIRS=textscreen opl pcsound src man setup
-SUBDIRS=wince textscreen pcsound src man setup
++SUBDIRS=wince textscreen opl pcsound src man setup
if HAVE_PYTHON
diff --cc configure.in
index 3ee2e59e,4b29cee5..7c31ced4
--- a/configure.in
+++ b/configure.in
@@@ -53,8 -53,21 +53,21 @@@ AC_CHECK_LIB(SDL_net,SDLNet_UDP_Send,
exit -1
])
+ # Windows CE build?
+
+ WINDOWS_CE=false
+
+ case "$host" in
+ *mingw32ce*|*cegcc*|*wince*)
+ CFLAGS="-I../wince $CFLAGS"
+ WINDOWS_CE=true
+ ;;
+ *)
+ ;;
+ esac
+
AC_CHECK_HEADERS([linux/kd.h dev/isa/spkrio.h dev/speaker/speaker.h])
-AC_CHECK_FUNCS(mmap sched_setaffinity)
+AC_CHECK_FUNCS(mmap sched_setaffinity ioperm)
# DWF 2008-02-10: FIXME
AC_CHECK_LIB(samplerate, src_new)
@@@ -90,10 -105,9 +105,11 @@@ textscreen/Makefil
textscreen/examples/Makefile
setup/Makefile
man/Makefile
+opl/Makefile
+opl/examples/Makefile
src/Makefile
pcsound/Makefile
+ pkg/wince/Makefile
src/resource.rc
src/doom-screensaver.desktop
setup/setup-res.rc
diff --cc src/Makefile.am
index 3874c35f,208039a5..7deed766
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -172,9 -170,9 +172,10 @@@ chocolate_doom_SOURCES=$(SOURCE_FILES
endif
chocolate_doom_LDADD = \
+ ../wince/libc_wince.a \
../textscreen/libtextscreen.a \
../pcsound/libpcsound.a \
+ ../opl/libopl.a \
@LDFLAGS@ \
@SDLMIXER_LIBS@ \
@SDLNET_LIBS@