[Scummvm-cvs-logs] SF.net SVN: scummvm:[38192] scummvm/trunk
jvprat at users.sourceforge.net
jvprat at users.sourceforge.net
Sun Feb 15 07:10:59 CET 2009
Revision: 38192
http://scummvm.svn.sourceforge.net/scummvm/?rev=38192&view=rev
Author: jvprat
Date: 2009-02-15 06:10:59 +0000 (Sun, 15 Feb 2009)
Log Message:
-----------
Import the SCI engine sources from the FreeSCI Glutton branch (it doesn't compile yet)
Modified Paths:
--------------
scummvm/trunk/base/plugins.cpp
scummvm/trunk/configure
scummvm/trunk/engines/engines.mk
Added Paths:
-----------
scummvm/trunk/engines/sci/
scummvm/trunk/engines/sci/module.mk
Modified: scummvm/trunk/base/plugins.cpp
===================================================================
--- scummvm/trunk/base/plugins.cpp 2009-02-15 03:46:05 UTC (rev 38191)
+++ scummvm/trunk/base/plugins.cpp 2009-02-15 06:10:59 UTC (rev 38192)
@@ -136,6 +136,9 @@
#if PLUGIN_ENABLED_STATIC(SAGA)
LINK_PLUGIN(SAGA)
#endif
+ #if PLUGIN_ENABLED_STATIC(SCI)
+ LINK_PLUGIN(SCI)
+ #endif
#if PLUGIN_ENABLED_STATIC(SKY)
LINK_PLUGIN(SKY)
#endif
Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure 2009-02-15 03:46:05 UTC (rev 38191)
+++ scummvm/trunk/configure 2009-02-15 06:10:59 UTC (rev 38192)
@@ -103,6 +103,7 @@
add_engine saga "SAGA" yes "ihnm saga2"
add_engine ihnm "IHNM" yes
add_engine saga2 "SAGA 2 games" no
+add_engine sci "SCI" no
add_engine sky "Beneath a Steel Sky" yes
add_engine sword1 "Broken Sword 1" yes
add_engine sword2 "Broken Sword 2" yes
Modified: scummvm/trunk/engines/engines.mk
===================================================================
--- scummvm/trunk/engines/engines.mk 2009-02-15 03:46:05 UTC (rev 38191)
+++ scummvm/trunk/engines/engines.mk 2009-02-15 06:10:59 UTC (rev 38192)
@@ -96,6 +96,11 @@
endif
+ifdef ENABLE_SCI
+DEFINES += -DENABLE_SCI=$(ENABLE_SCI)
+MODULES += engines/sci
+endif
+
ifdef ENABLE_SKY
DEFINES += -DENABLE_SKY=$(ENABLE_SKY)
MODULES += engines/sky
Property changes on: scummvm/trunk/engines/sci
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: scummvm/trunk/engines/sci/module.mk (from rev 38191, vendor/freesci/glutton/module.mk)
===================================================================
--- scummvm/trunk/engines/sci/module.mk (rev 0)
+++ scummvm/trunk/engines/sci/module.mk 2009-02-15 06:10:59 UTC (rev 38192)
@@ -0,0 +1,111 @@
+MODULE := engines/sci
+
+MODULE_OBJS = \
+ engine/game.o \
+ engine/gc.o \
+ engine/grammar.o \
+ engine/kernel.o \
+ engine/kevent.o \
+ engine/kfile.o \
+ engine/kgraphics.o \
+ engine/klists.o \
+ engine/kmath.o \
+ engine/kmenu.o \
+ engine/kmovement.o \
+ engine/kpathing.o \
+ engine/kscripts.o \
+ engine/ksound.o \
+ engine/kstring.o \
+ engine/said.o \
+ engine/savegame.o \
+ engine/scriptconsole.o \
+ engine/scriptdebug.o \
+ engine/seg_manager.o \
+ engine/sys_strings.o \
+ engine/vm.o \
+ gfx/antialias.o \
+ gfx/font.o \
+ gfx/font-5x8.o \
+ gfx/font-6x10.o \
+ gfx/gfx_res_options.o \
+ gfx/gfx_resource.o \
+ gfx/gfx_support.o \
+ gfx/gfx_tools.o \
+ gfx/menubar.o \
+ gfx/operations.o \
+ gfx/resmgr.o \
+ gfx/sbtree.o \
+ gfx/sci_widgets.o \
+ gfx/widgets.o \
+ gfx/drivers/scummvm_driver.o \
+ gfx/resource/sci_cursor_0.o \
+ gfx/resource/sci_font.o \
+ gfx/resource/sci_pal_1.o \
+ gfx/resource/sci_pic_0.o \
+ gfx/resource/sci_resmgr.o \
+ gfx/resource/sci_view_0.o \
+ gfx/resource/sci_view_1.o \
+ scicore/aatree.o \
+ scicore/console.o \
+ scicore/decompress0.o \
+ scicore/decompress01.o \
+ scicore/decompress1.o \
+ scicore/decompress11.o \
+ scicore/exe.o \
+ scicore/exe_lzexe.o \
+ scicore/exe_raw.o \
+ scicore/int_hashmap.o \
+ scicore/reg_t_hashmap.o \
+ scicore/resource.o \
+ scicore/resource_map.o \
+ scicore/resource_patch.o \
+ scicore/sci_memory.o \
+ scicore/script.o \
+ scicore/tools.o \
+ scicore/versions.o \
+ scicore/vocab.o \
+ scicore/vocab_debug.o \
+ scummvm/detection.o \
+ scummvm/scummvm_engine.o \
+ sfx/adlib.o \
+ sfx/core.o \
+ sfx/iterator.o \
+ sfx/pcm-iterator.o \
+ sfx/songlib.o \
+ sfx/time.o \
+ sfx/device/devices.o \
+ sfx/mixer/mixers.o \
+ sfx/mixer/soft.o \
+ sfx/pcm_device/pcm_devices.o \
+ sfx/pcm_device/scummvm.o \
+ sfx/player/players.o \
+ sfx/player/polled.o \
+ sfx/player/realtime.o \
+ sfx/seq/sequencers.o \
+ sfx/softseq/amiga.o \
+ sfx/softseq/fmopl.o \
+ sfx/softseq/opl2.o \
+ sfx/softseq/pcspeaker.o \
+ sfx/softseq/SN76496.o \
+ sfx/softseq/softsequencers.o \
+ sfx/timer/scummvm.o \
+ sfx/timer/timers.o
+
+CPPFLAGS+=-DSCUMMVM -I$(srcdir)/engines/sci/src/include
+
+# Build .c files as C++
+%.o: %.c
+ $(MKDIR) $(*D)/$(DEPDIR)
+ $(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
+
+# Generate savegame.cpp
+$(srcdir)/engines/sci/src/engine/savegame.cpp: $(srcdir)/engines/sci/src/engine/savegame.cfsml
+ cat $< | perl $(srcdir)/engines/sci/engine/cfsml.pl -f savegame.cfsml > $@
+
+# This module can be built as a plugin
+ifeq ($(ENABLE_SCI), DYNAMIC_PLUGIN)
+PLUGIN := 1
+endif
+
+# Include common rules
+include $(srcdir)/rules.mk
Property changes on: scummvm/trunk/engines/sci/module.mk
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:mergeinfo
+
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list