Initial revision

svn-id: r4785
criezy · Aug 21, 2002 · ce46866 · ce46866
1 parent 662256f
commit ce46866
Show file tree

Hide file tree

Showing 160 changed files with 250 additions and 369 deletions.
diff --git a/.cvsignore b/.cvsignore
diff --git a/.indent.pro b/.indent.pro
diff --git a/copying.txt → COPYING b/copying.txt → COPYING
diff --git a/Makefile b/Makefile
@@ -1,15 +1,15 @@
 # $Header$
 
-CC       = g++
+CXX      = c++
 CFLAGS   = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar
 DEFINES  =
 LDFLAGS :=
-INCLUDES:= -I./ -I./sound
+INCLUDES:= -I. -Icommon -Iscumm -Isound
 LIBS	 = -lncurses
 
 # Uncomment this to activate the MAD lib for compressed sound files
-# DEFINES += -DCOMPRESSED_SOUND_FILE
-# LIBS    += -lmad
+DEFINES += -DCOMPRESSED_SOUND_FILE
+LIBS    += -lmad
 
 # Uncomment this to activate the ALSA lib for midi
 # DEFINES += -DUSE_ALSA
@@ -19,23 +19,23 @@ LIBS	 = -lncurses
 # Beware, only define one of them, otherwise the compilation will blow up.
 
 # Comment this if you want to disable SDL output
-OBJS	 = sdl.o
+OBJS	 = backends/sdl/sdl.o
 INCLUDES += `sdl-config --cflags`
 LIBS    += `sdl-config --libs`
 DEFINES += -DUNIX
 
 # Uncomment this (instead of the above) to activate the SDL with OpenGL output
-# OBJS	 = sdl_gl.o
+# OBJS	 = backends/sdl/sdl_gl.o
 # INCLUDES += `sdl-config --cflags`
 # LIBS    += `sdl-config --libs` -lGL
 # DEFINES += -DUNIX
 
 # Uncomment this in addition to the above if you compile on Mac OS X
-# LIBS	+= -framework QuickTime -framework AudioUnit
-# DEFINES += -DMACOSX
+LIBS	+= -framework QuickTime -framework AudioUnit
+DEFINES += -DMACOSX
 
 # Uncomment this if you rather want X11 output
-# OBJS     = x11.o
+# OBJS     = backends/x11/x11.o
 # DEFINES += -DUNIX -DX11_BACKEND
 # LDFLAGS := -L/usr/X11R6/lib -L/usr/local/lib
 # INCLUDES+= -I/usr/X11R6/include

diff --git a/Makefile.common b/Makefile.common
@@ -4,31 +4,44 @@
 
 ZIPFILE := scummvm-`date '+%Y-%m-%d'`.zip
 
-INCS	= scumm.h scummsys.h stdafx.h
-
-OBJS	+= util.o newgui.o gui/widget.o gui/dialog.o \
-	gui/ListWidget.o gui/ScrollBarWidget.o \
-	actor.o akos.o boxes.o bundle.o config-file.o costume.o debug.o \
-	debugrl.o engine.o gameDetector.o gfx.o gui.o insane.o main.o object.o \
-	resource.o saveload.o scaler.o script.o script_v1.o script_v2.o \
-	scummvm.o sound.o string.o sys.o timer.o vars.o verbs.o  \
-	sound/imuse.o sound/fmopl.o sound/mixer.o \
-	v3/resource_v3.o v4/resource_v4.o \
-	simon/midi.o simon/simon.o simon/simonsys.o simon/simonvga.o \
-	simon/simondebug.o simon/simonres.o simon/simonitems.o simon/simonverb.o \
-	sound/mididrv.o
-
-DISTFILES=$(OBJS:.o=.cpp) Makefile scummvm.dsp scummvm.dsw stdafx.cpp \
-	whatsnew.txt readme.txt copying.txt \
-	actor.h akos.h boxes.h bundle.h cmdline.h config-file.h costume.h debug.h \
-	debugrl.h engine.h fb2opengl.h gameDetector.h gapi_keys.h gfx.h gui.h guimaps.h \
-	newgui.h object.h resource.h saveload.h scaler.h scumm.h scummsys.h smush.h \
-	sound.h stdafx.h system.h timer.h util.h sound/fmopl.h
+INCS	= scumm/scumm.h common/scummsys.h common/stdafx.h
+
+COMMON_OBJS = common/config-file.o common/gameDetector.o common/main.o \
+	common/timer.o common/util.o
+
+GUI_OBJS = gui/gui.o gui/newgui.o gui/widget.o gui/dialog.o gui/ListWidget.o \
+	gui/ScrollBarWidget.o 
+
+SCUMM_OBJS = scumm/actor.o scumm/akos.o scumm/boxes.o scumm/bundle.o \
+	scumm/costume.o scumm/debug.o scumm/debugrl.o scumm/engine.o scumm/gfx.o \
+	scumm/imuse.o scumm/insane.o scumm/object.o scumm/resource.o \
+	scumm/resource_v3.o scumm/resource_v4.o scumm/saveload.o scumm/scaler.o \
+	scumm/script.o scumm/script_v1.o scumm/script_v2.o scumm/scummvm.o \
+	scumm/string.o scumm/sys.o scumm/vars.o scumm/verbs.o
+
+SIMON_OBJS = simon/debug.o simon/items.o simon/midi.o simon/res.o simon/simon.o \
+	simon/sys.o simon/verb.o simon/vga.o
+
+SOUND_OBJS = sound/fmopl.o sound/mididrv.o sound/mixer.o sound/sound.o
+
+OBJS	+= $(COMMON_OBJS) $(GUI_OBJS) scumm/libscumm.a simon/libsimon.a $(SOUND_OBJS)
+
+DISTFILES=$(OBJS:.o=.cpp) Makefile scumm.h scummsys.h stdafx.h stdafx.cpp \
+	debugrl.h whatsnew.txt readme.txt copying.txt \
+	scummvm.dsp scummvm.dsw sound/fmopl.h gui.h sound.h
 
 all: scummvm$(EXEEXT)
 
 scummvm$(EXEEXT): $(OBJS)
-	$(CC) $(LDFLAGS) -o $(@) $(OBJS) $(LIBS)
+	$(CXX) $(LDFLAGS) -o $(@) $(OBJS) $(LIBS)
+
+scumm/libscumm.a: $(SCUMM_OBJS)
+	ar cru $@ $+
+	ranlib $@ 
+
+simon/libsimon.a: $(SIMON_OBJS)
+	ar cru $@ $+
+	ranlib $@ 
 
 clean:
 	rm -f $(OBJS) scummvm$(EXEEXT)
@@ -37,18 +50,18 @@ clean:
 
 # Default (dumb) compile & dependcy rules
 .cpp.o:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
+	$(CXX) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
 $(OBJS): $(INCS)
 
 
 # If you use GCC, disable the above and enable this for intelligent
 # dependency tracking. 
 #DEPDIR := .deps
 #.cpp.o:
-#	mkdir -p $(DEPDIR)
-#	$(CC) -Wp,-MMD,"$(DEPDIR)/$(*F).d2" $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
-#	echo -n "$(*D)/" > $(DEPDIR)/$(*F).d
-#	cat "$(DEPDIR)/$(*F).d2" >> "$(DEPDIR)/$(*F).d"
-#	rm -f "$(DEPDIR)/$(*F).d2"
+#	mkdir -p $(*D)/$(DEPDIR)
+#	$(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d2" $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
+#	echo -n "$(*D)/" > $(*D)/$(DEPDIR)/$(*F).d
+#	cat "$(*D)/$(DEPDIR)/$(*F).d2" >> "$(*D)/$(DEPDIR)/$(*F).d"
+#	rm -f "$(*D)/$(DEPDIR)/$(*F).d2"
 #
 #-include $(DEPDIR)/*.d
diff --git a/Makefile.irix b/Makefile.irix
diff --git a/Makefile.mingw b/Makefile.mingw
diff --git a/Makefile.qtopia b/Makefile.qtopia
diff --git a/whatsnew.txt → NEWS b/whatsnew.txt → NEWS
diff --git a/readme.txt → README b/readme.txt → README
diff --git a/dc/.cvsignore → backends/dc/.cvsignore b/dc/.cvsignore → backends/dc/.cvsignore
diff --git a/dc/Makefile → backends/dc/Makefile b/dc/Makefile → backends/dc/Makefile
diff --git a/dc/README → backends/dc/README b/dc/README → backends/dc/README
diff --git a/dc/audio.cpp → backends/dc/audio.cpp b/dc/audio.cpp → backends/dc/audio.cpp
diff --git a/dc/dc.h → backends/dc/dc.h b/dc/dc.h → backends/dc/dc.h
diff --git a/dc/dcmain.cpp → backends/dc/dcmain.cpp b/dc/dcmain.cpp → backends/dc/dcmain.cpp
diff --git a/dc/display.cpp → backends/dc/display.cpp b/dc/display.cpp → backends/dc/display.cpp
diff --git a/dc/icon.cpp → backends/dc/icon.cpp b/dc/icon.cpp → backends/dc/icon.cpp
diff --git a/dc/icon.h → backends/dc/icon.h b/dc/icon.h → backends/dc/icon.h
diff --git a/dc/input.cpp → backends/dc/input.cpp b/dc/input.cpp → backends/dc/input.cpp
diff --git a/dc/label.cpp → backends/dc/label.cpp b/dc/label.cpp → backends/dc/label.cpp
diff --git a/dc/label.h → backends/dc/label.h b/dc/label.h → backends/dc/label.h
diff --git a/dc/portdefs.h → backends/dc/portdefs.h b/dc/portdefs.h → backends/dc/portdefs.h
diff --git a/dc/selector.cpp → backends/dc/selector.cpp b/dc/selector.cpp → backends/dc/selector.cpp
diff --git a/dc/vmsave.cpp → backends/dc/vmsave.cpp b/dc/vmsave.cpp → backends/dc/vmsave.cpp
diff --git a/mac/Carbon.r → backends/mac/Carbon.r b/mac/Carbon.r → backends/mac/Carbon.r
diff --git a/mac/CarbonPort-ReadMe.txt → backends/mac/CarbonPort-ReadMe.txt b/mac/CarbonPort-ReadMe.txt → backends/mac/CarbonPort-ReadMe.txt
diff --git a/mac/mac.cpp → backends/mac/mac.cpp b/mac/mac.cpp → backends/mac/mac.cpp
diff --git a/mac/macos.h → backends/mac/macos.h b/mac/macos.h → backends/mac/macos.h
diff --git a/backends/mac/scummvm.icns b/backends/mac/scummvm.icns
diff --git a/mac/scummvm.mcp → backends/mac/scummvm.mcp b/mac/scummvm.mcp → backends/mac/scummvm.mcp
diff --git a/morphos/Makefile → backends/morphos/Makefile b/morphos/Makefile → backends/morphos/Makefile
@@ -14,15 +14,14 @@ INCS	= scumm.h scummsys.h stdafx.h
 
 GUIOBJS = widget.o dialog.o newgui.o ListWidget.o ScrollBarWidget.o
 
-SCUMMOBJS = actor.o akos.o boxes.o bundle.o costume.o debug.o debugrl.o gfx.o \
-	object.o saveload.o script.o scummvm.o sound.o string.o sys.o vars.o verbs.o \
-	script_v1.o script_v2.o gui.o imuse.o insane.o resource.o resource_v3.o resource_v4.o
-
 SIMONOBJS =	midi.o simon.o simondebug.o simonitems.o simonres.o simonsys.o simonverb.o simonvga.o
 
-OBJS	= config-file.o engine.o gameDetector.o fmopl.o mixer.o mididrv.o util.o main.o \
+OBJS	= actor.o akos.o boxes.o config-file.o costume.o gfx.o object.o resource.o \
+	saveload.o script.o scummvm.o sound.o string.o sys.o verbs.o \
 	morphos.o morphos_scaler.o morphos_sound.o morphos_start.o morphos_timer.o \
-	$(GUIOBJS) $(SCUMMOBJS) $(SIMONOBJS)
+	script_v1.o script_v2.o debug.o gui.o imuse.o fmopl.o mixer.o mididrv.o \
+	debugrl.o vars.o insane.o gameDetector.o resource_v3.o resource_v4.o \
+	util.o main.o bundle.o $(GUIOBJS) $(SIMONOBJS)
 
 DISTFILES=$(OBJS:.o=.cpp) Makefile scumm.h scummsys.h stdafx.h stdafx.cpp \
 	windows.cpp debugrl.h whatsnew.txt readme.txt copying.txt \

diff --git a/morphos/MorphOS.readme → backends/morphos/MorphOS.readme b/morphos/MorphOS.readme → backends/morphos/MorphOS.readme
diff --git a/morphos/morphos.cpp → backends/morphos/morphos.cpp b/morphos/morphos.cpp → backends/morphos/morphos.cpp
diff --git a/morphos/morphos.h → backends/morphos/morphos.h b/morphos/morphos.h → backends/morphos/morphos.h
diff --git a/morphos/morphos_scaler.cpp → backends/morphos/morphos_scaler.cpp b/morphos/morphos_scaler.cpp → backends/morphos/morphos_scaler.cpp
diff --git a/morphos/morphos_scaler.h → backends/morphos/morphos_scaler.h b/morphos/morphos_scaler.h → backends/morphos/morphos_scaler.h
diff --git a/morphos/morphos_sound.cpp → backends/morphos/morphos_sound.cpp b/morphos/morphos_sound.cpp → backends/morphos/morphos_sound.cpp
diff --git a/morphos/morphos_start.cpp → backends/morphos/morphos_start.cpp b/morphos/morphos_start.cpp → backends/morphos/morphos_start.cpp
diff --git a/morphos/morphos_timer.cpp → backends/morphos/morphos_timer.cpp b/morphos/morphos_timer.cpp → backends/morphos/morphos_timer.cpp
diff --git a/morphos/morphos_timer.h → backends/morphos/morphos_timer.h b/morphos/morphos_timer.h → backends/morphos/morphos_timer.h
diff --git a/fb2opengl.h → backends/sdl/fb2opengl.h b/fb2opengl.h → backends/sdl/fb2opengl.h
diff --git a/sdl.cpp → backends/sdl/sdl.cpp b/sdl.cpp → backends/sdl/sdl.cpp
diff --git a/sdl_gl.cpp → backends/sdl/sdl_gl.cpp b/sdl_gl.cpp → backends/sdl/sdl_gl.cpp
diff --git a/wince/MenuTitle.bmp → backends/wince/MenuTitle.bmp b/wince/MenuTitle.bmp → backends/wince/MenuTitle.bmp
diff --git a/wince/PocketSCUMM.rc → backends/wince/PocketSCUMM.rc b/wince/PocketSCUMM.rc → backends/wince/PocketSCUMM.rc
diff --git a/wince/PocketSCUMM.vcc → backends/wince/PocketSCUMM.vcc b/wince/PocketSCUMM.vcc → backends/wince/PocketSCUMM.vcc
diff --git a/wince/PocketSCUMM.vcp → backends/wince/PocketSCUMM.vcp b/wince/PocketSCUMM.vcp → backends/wince/PocketSCUMM.vcp
diff --git a/wince/PocketSCUMM.vcw → backends/wince/PocketSCUMM.vcw b/wince/PocketSCUMM.vcw → backends/wince/PocketSCUMM.vcw
diff --git a/wince/bitmaps.cpp → backends/wince/bitmaps.cpp b/wince/bitmaps.cpp → backends/wince/bitmaps.cpp
diff --git a/wince/findgame.cpp → backends/wince/findgame.cpp b/wince/findgame.cpp → backends/wince/findgame.cpp
diff --git a/wince/gapi_keys.cpp → backends/wince/gapi_keys.cpp b/wince/gapi_keys.cpp → backends/wince/gapi_keys.cpp
diff --git a/gapi_keys.h → backends/wince/gapi_keys.h b/gapi_keys.h → backends/wince/gapi_keys.h
diff --git a/wince/missing/assert.h → backends/wince/missing/assert.h b/wince/missing/assert.h → backends/wince/missing/assert.h
diff --git a/wince/missing/conio.h → backends/wince/missing/conio.h b/wince/missing/conio.h → backends/wince/missing/conio.h
diff --git a/wince/missing/dir.h → backends/wince/missing/dir.h b/wince/missing/dir.h → backends/wince/missing/dir.h
diff --git a/wince/missing/direct.h → backends/wince/missing/direct.h b/wince/missing/direct.h → backends/wince/missing/direct.h
diff --git a/wince/missing/dirent.h → backends/wince/missing/dirent.h b/wince/missing/dirent.h → backends/wince/missing/dirent.h
diff --git a/wince/missing/errno.h → backends/wince/missing/errno.h b/wince/missing/errno.h → backends/wince/missing/errno.h
diff --git a/wince/missing/fcntl.h → backends/wince/missing/fcntl.h b/wince/missing/fcntl.h → backends/wince/missing/fcntl.h
diff --git a/wince/missing/io.h → backends/wince/missing/io.h b/wince/missing/io.h → backends/wince/missing/io.h
diff --git a/wince/missing/missing.cpp → backends/wince/missing/missing.cpp b/wince/missing/missing.cpp → backends/wince/missing/missing.cpp
diff --git a/wince/missing/signal.h → backends/wince/missing/signal.h b/wince/missing/signal.h → backends/wince/missing/signal.h
diff --git a/wince/missing/sys/stat.h → backends/wince/missing/sys/stat.h b/wince/missing/sys/stat.h → backends/wince/missing/sys/stat.h
diff --git a/wince/missing/sys/time.h → backends/wince/missing/sys/time.h b/wince/missing/sys/time.h → backends/wince/missing/sys/time.h
diff --git a/wince/missing/sys/types.h → backends/wince/missing/sys/types.h b/wince/missing/sys/types.h → backends/wince/missing/sys/types.h
diff --git a/wince/missing/time.h → backends/wince/missing/time.h b/wince/missing/time.h → backends/wince/missing/time.h
diff --git a/wince/missing/unistd.h → backends/wince/missing/unistd.h b/wince/missing/unistd.h → backends/wince/missing/unistd.h
diff --git a/wince/newres.h → backends/wince/newres.h b/wince/newres.h → backends/wince/newres.h
diff --git a/wince/pocketpc.cpp → backends/wince/pocketpc.cpp b/wince/pocketpc.cpp → backends/wince/pocketpc.cpp
diff --git a/wince/pocketscumm.ico → backends/wince/pocketscumm.ico b/wince/pocketscumm.ico → backends/wince/pocketscumm.ico
diff --git a/wince/resource.h → backends/wince/resource.h b/wince/resource.h → backends/wince/resource.h
diff --git a/wince/screen.cpp → backends/wince/screen.cpp b/wince/screen.cpp → backends/wince/screen.cpp
diff --git a/wince/screen.h → backends/wince/screen.h b/wince/screen.h → backends/wince/screen.h
diff --git a/x11.cpp → backends/x11/x11.cpp b/x11.cpp → backends/x11/x11.cpp
diff --git a/config-file.cpp → common/config-file.cpp b/config-file.cpp → common/config-file.cpp
diff --git a/config-file.h → common/config-file.h b/config-file.h → common/config-file.h
diff --git a/gameDetector.cpp → common/gameDetector.cpp b/gameDetector.cpp → common/gameDetector.cpp
@@ -22,11 +22,11 @@
 
 
 #include "stdafx.h"
-#include "scumm.h"
+#include "scumm/scumm.h"
 #include "sound/mididrv.h"
-#include "sound/imuse.h"
-#include "gameDetector.h"
-#include "config-file.h"
+#include "scumm/imuse.h"
+#include "common/gameDetector.h"
+#include "common/config-file.h"
 
 
 #define CHECK_OPTION() if ((current_option != NULL) || (*s != '\0')) goto ShowHelpAndExit

diff --git a/gameDetector.h → common/gameDetector.h b/gameDetector.h → common/gameDetector.h
diff --git a/main.cpp → common/main.cpp b/main.cpp → common/main.cpp
diff --git a/scummsys.h → common/scummsys.h b/scummsys.h → common/scummsys.h
diff --git a/stdafx.cpp → common/stdafx.cpp b/stdafx.cpp → common/stdafx.cpp
diff --git a/stdafx.h → common/stdafx.h b/stdafx.h → common/stdafx.h
@@ -2,6 +2,9 @@
  * $Id$
  *
  * $Log$
+ * Revision 1.1  2002/08/21 16:07:23  fingolfin
+ * Initial revision
+ *
  * Revision 1.18  2002/07/08 13:33:10  fingolfin
  * two more small QNX fixes
  *

diff --git a/system.h → common/system.h b/system.h → common/system.h
diff --git a/timer.cpp → common/timer.cpp b/timer.cpp → common/timer.cpp
diff --git a/timer.h → common/timer.h b/timer.h → common/timer.h
diff --git a/util.cpp → common/util.cpp b/util.cpp → common/util.cpp
diff --git a/util.h → common/util.h b/util.h → common/util.h
diff --git a/debian/.cvsignore b/debian/.cvsignore
diff --git a/debian/README.Debian b/debian/README.Debian
diff --git a/debian/changelog.cvs b/debian/changelog.cvs
diff --git a/debian/changelog.debian b/debian/changelog.debian
diff --git a/debian/changelog.debian_official b/debian/changelog.debian_official
diff --git a/debian/control b/debian/control