commit 0b8bf3cfe37a3d6e8ad01c0f6726430f53c0ad7e
Merge: 3cf74a97 a9e2d244
Author: Simon Howard <fraggle@gmail.com>
AuthorDate: Wed Jan 27 19:50:30 2010 +0000
Commit: Simon Howard <fraggle@gmail.com>
CommitDate: Wed Jan 27 19:50:30 2010 +0000
Merge from trunk.
Subversion-branch: /branches/opl-branch
Subversion-revision: 1829
.gitignore | 3 +
INSTALL | 2 +-
Makefile.am | 9 +-
NEWS | 95 +++++--
TODO | 21 +-
autogen.sh | 2 +-
configure.in | 33 ++-
data/README | 7 +
data/doom.ico | Bin 2238 -> 36726 bytes
data/doom8.ico | Bin 0 -> 2238 bytes
data/setup.ico | Bin 2238 -> 36726 bytes
data/setup8.ico | Bin 0 -> 2238 bytes
man/Makefile.am | 9 +-
pcsound/.gitignore | 2 +
pkg/.gitignore | 3 +
pkg/Makefile.am | 31 ++-
pkg/config.make.in | 28 ++
pkg/osx/.gitignore | 7 +
pkg/osx/AppController.h | 53 ++++
pkg/osx/AppController.m | 124 +++++++++
pkg/osx/Execute.h | 31 +++
pkg/osx/Execute.m | 197 ++++++++++++++
pkg/osx/GNUmakefile | 101 +++++++
pkg/osx/IWADController.h | 54 ++++
pkg/osx/IWADController.m | 347 ++++++++++++++++++++++++
pkg/osx/IWADLocation.h | 44 +++
pkg/osx/IWADLocation.m | 74 +++++
pkg/osx/Info-gnustep.plist.in | 36 +++
pkg/osx/Info.plist.in | 60 ++++
pkg/osx/LauncherManager.h | 51 ++++
pkg/osx/LauncherManager.m | 337 +++++++++++++++++++++++
pkg/osx/PkgInfo | 1 +
pkg/osx/Resources/128x128.png | Bin 0 -> 23029 bytes
pkg/osx/Resources/app.icns | Bin 0 -> 51625 bytes
pkg/osx/Resources/app.png | Bin 0 -> 4597 bytes
pkg/osx/Resources/launcher.nib/classes.nib | 46 ++++
pkg/osx/Resources/launcher.nib/info.nib | 23 ++
pkg/osx/Resources/launcher.nib/keyedobjects.nib | Bin 0 -> 19494 bytes
pkg/osx/Resources/wadfile.icns | Bin 0 -> 44092 bytes
pkg/osx/Resources/wadfile.png | Bin 0 -> 2249 bytes
pkg/osx/cp-with-libs | 100 +++++++
pkg/osx/main.m | 32 +++
pkg/win32/GNUmakefile | 32 +++
pkg/win32/README | 4 +
pkg/wince/GNUmakefile | 15 +
pkg/wince/GNUmakefile.am | 12 -
rpm.spec.in | 59 ++++
setup/.gitignore | 2 +
setup/Makefile.am | 2 +-
setup/execute.c | 35 ++-
setup/setup-manifest.xml | 25 +-
setup/setup-res.rc.in | 2 +-
src/.gitignore | 2 +
src/Makefile.am | 2 +-
src/d_iwad.c | 91 +++++--
src/g_game.c | 14 +-
src/hu_stuff.c | 30 +-
src/i_video.c | 1 +
src/p_map.c | 21 +-
src/p_setup.c | 27 +-
src/p_sight.c | 10 +-
src/st_stuff.c | 18 +-
textscreen/.gitignore | 2 +
textscreen/examples/.gitignore | 2 +
textscreen/txt_sdl.c | 8 +-
wince/.gitignore | 5 +
wince/Makefile.am | 1 +
67 files changed, 2248 insertions(+), 137 deletions(-)
diff --cc Makefile.am
index 5de8d88c,a980acde..13e8bddb
--- a/Makefile.am
+++ b/Makefile.am
@@@ -38,9 -42,9 +42,10 @@@ EXTRA_DIST
config.h \
CMDLINE \
HACKING \
+ README.OPL \
TODO \
- BUGS
+ BUGS \
+ rpm.spec
MAINTAINERCLEANFILES = $(AUX_DIST_GEN)
diff --cc configure.in
index 0327c0c3,05ea5d61..b097bb2f
--- a/configure.in
+++ b/configure.in
@@@ -120,19 -128,20 +134,22 @@@ AC_DEFUN([AC_DATAROOTDIR_CHECKED]
AC_OUTPUT([
Makefile
- wince/Makefile
- textscreen/Makefile
- textscreen/examples/Makefile
- setup/Makefile
+ rpm.spec
man/Makefile
+opl/Makefile
+opl/examples/Makefile
- src/Makefile
pcsound/Makefile
pkg/Makefile
- pkg/wince/GNUmakefile
- src/resource.rc
- src/doom-screensaver.desktop
+ pkg/config.make
+ pkg/osx/Info.plist
+ pkg/osx/Info-gnustep.plist
+ setup/Makefile
setup/setup-res.rc
+ src/Makefile
+ src/doom-screensaver.desktop
+ src/resource.rc
+ textscreen/Makefile
+ textscreen/examples/Makefile
+ wince/Makefile
])