diff options
| -rw-r--r-- | backends/platform/sdl/sdl.cpp | 14 | ||||
| -rw-r--r-- | base/main.cpp | 36 | ||||
| -rw-r--r-- | dists/msvc9/kyra.vcproj | 699 | ||||
| -rw-r--r-- | dists/msvc9/scumm.vcproj | 968 | ||||
| -rw-r--r-- | dists/msvc9/scummvm-tfmx.sln | 48 | ||||
| -rw-r--r-- | dists/msvc9/scummvm-tfmx.vcproj | 2070 | ||||
| -rw-r--r-- | dists/msvc9/scummvm.vcproj | 16 | ||||
| -rw-r--r-- | tfmx/module.mk | 9 | ||||
| -rw-r--r-- | tfmx/mxtxplayer.cpp | 149 | ||||
| -rw-r--r-- | tfmx/tfmxdebug.cpp | 200 | ||||
| -rw-r--r-- | tfmx/tfmxdebug.h | 14 | ||||
| -rw-r--r-- | tfmx/tfmxplayer.cpp | 172 |
12 files changed, 314 insertions, 4081 deletions
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp index e40966f6b0..8972234f9e 100644 --- a/backends/platform/sdl/sdl.cpp +++ b/backends/platform/sdl/sdl.cpp @@ -89,12 +89,7 @@ void OSystem_SDL::initBackend() { assert(!_inited); int joystick_num = ConfMan.getInt("joystick_num"); - joystick_num = 0; -#if !defined(TFMX_CMDLINE_TOOL) && !defined(MXTX_CMDLINE_TOOL) - uint32 sdlFlags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_TIMER; -#else - uint32 sdlFlags = /*SDL_INIT_VIDEO |*/ SDL_INIT_AUDIO | SDL_INIT_TIMER; -#endif + uint32 sdlFlags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_TIMER; if (ConfMan.hasKey("disable_sdl_parachute")) sdlFlags |= SDL_INIT_NOPARACHUTE; @@ -113,11 +108,10 @@ void OSystem_SDL::initBackend() { error("Could not initialize SDL: %s", SDL_GetError()); } - _graphicsMutex = createMutex(); -#if !defined(TFMX_CMDLINE_TOOL) && !defined(MXTX_CMDLINE_TOOL) + SDL_ShowCursor(SDL_DISABLE); - + // Enable unicode support if possible SDL_EnableUNICODE(1); @@ -169,7 +163,7 @@ void OSystem_SDL::initBackend() { _savefile = new DefaultSaveFileManager(); #endif } -#endif + // Create and hook up the mixer, if none exists yet (we check for this to // allow subclasses to provide their own). if (_mixer == 0) { diff --git a/base/main.cpp b/base/main.cpp index 39647f1534..d108512416 100644 --- a/base/main.cpp +++ b/base/main.cpp @@ -296,40 +296,6 @@ static void setupKeymapper(OSystem &system) { } -#if defined(TFMX_CMDLINE_TOOL) || defined(MXTX_CMDLINE_TOOL) -void modcmdmain(int argc, const char * const argv[]); - -extern "C" int scummvm_main(int argc, const char * const argv[]) { - Common::String specialDebug; - Common::String command; - - // Verify that the backend has been initialized (i.e. g_system has been set). - assert(g_system); - OSystem &system = *g_system; - - // Register config manager defaults - Base::registerDefaults(); - - // Load the plugins. - PluginManager::instance().loadPlugins(); - - // Init the backend. Must take place after all config data (including - // the command line params) was read. - system.initBackend(); - - // pass control to my own main-function, including arguments - modcmdmain(argc,argv); - - PluginManager::instance().unloadPlugins(); - PluginManager::destroy(); - Common::ConfigManager::destroy(); - Common::SearchManager::destroy(); - GUI::GuiManager::destroy(); - - return 0; -} -#else - extern "C" int scummvm_main(int argc, const char * const argv[]) { Common::String specialDebug; Common::String command; @@ -462,5 +428,3 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) { return 0; } - -#endif diff --git a/dists/msvc9/kyra.vcproj b/dists/msvc9/kyra.vcproj index 97befa059d..053007fae4 100644 --- a/dists/msvc9/kyra.vcproj +++ b/dists/msvc9/kyra.vcproj @@ -9,588 +9,129 @@ TargetFrameworkVersion="131072" > <Platforms> - <Platform - Name="Win32" - /> + <Platform Name="Win32" /> </Platforms> - <ToolFiles> - </ToolFiles> <Configurations> - <Configuration - Name="Debug|Win32" - ConfigurationType="4" - InheritedPropertySheets=".\ScummVM_Debug.vsprops" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|Win32" - ConfigurationType="4" - InheritedPropertySheets=".\ScummVM_Release.vsprops" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> + <Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" /> + <Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" /> </Configurations> - <References> - </References> <Files> - <File - RelativePath="..\..\engines\kyra\animator_hof.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\animator_lok.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\animator_lok.h" - > - </File> - <File - RelativePath="..\..\engines\kyra\animator_mr.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\animator_v2.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\debugger.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\debugger.h" - > - </File> - <File - RelativePath="..\..\engines\kyra\detection.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\gui.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\gui.h" - > - </File> - <File - RelativePath="..\..\engines\kyra\gui_hof.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\gui_hof.h" - > - </File> - <File - RelativePath="..\..\engines\kyra\gui_lok.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\gui_lok.h" - > - </File> - <File - RelativePath="..\..\engines\kyra\gui_lol.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\gui_lol.h" - > - </File> - <File - RelativePath="..\..\engines\kyra\gui_mr.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\gui_mr.h" - > - </File> - <File - RelativePath="..\..\engines\kyra\gui_v2.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\gui_v2.h" - > - </File> - <File - RelativePath="..\..\engines\kyra\items_hof.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\items_lok.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\items_lol.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\items_mr.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\items_v2.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\kyra_hof.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\kyra_hof.h" - > - </File> - <File - RelativePath="..\..\engines\kyra\kyra_lok.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\kyra_lok.h" - > - </File> - <File - RelativePath="..\..\engines\kyra\kyra_mr.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\kyra_mr.h" - > - </File> - <File - RelativePath="..\..\engines\kyra\kyra_v1.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\kyra_v1.h" - > - </File> - <File - RelativePath="..\..\engines\kyra\kyra_v2.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\kyra_v2.h" - > - </File> - <File - RelativePath="..\..\engines\kyra\lol.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\lol.h" - > - </File> - <File - RelativePath="..\..\engines\kyra\resource.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\resource.h" - > - </File> - <File - RelativePath="..\..\engines\kyra\resource_intern.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\resource_intern.h" - > - </File> - <File - RelativePath="..\..\engines\kyra\saveload.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\saveload_hof.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\saveload_lok.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\saveload_lol.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\saveload_mr.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\scene_hof.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\scene_lok.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\scene_lol.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\scene_mr.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\scene_v1.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\scene_v2.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\screen.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\screen.h" - > - </File> - <File - RelativePath="..\..\engines\kyra\screen_hof.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\screen_hof.h" - > - </File> - <File - RelativePath="..\..\engines\kyra\screen_lok.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\screen_lok.h" - > - </File> - <File - RelativePath="..\..\engines\kyra\screen_lol.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\screen_lol.h" - > - </File> - <File - RelativePath="..\..\engines\kyra\screen_mr.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\screen_mr.h" - > - </File> - <File - RelativePath="..\..\engines\kyra\screen_v2.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\screen_v2.h" - > - </File> - <File - RelativePath="..\..\engines\kyra\script.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\script.h" - > - </File> - <File - RelativePath="..\..\engines\kyra\script_hof.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\script_lok.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\script_lol.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\script_mr.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\script_tim.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\script_tim.h" - > - </File> - <File - RelativePath="..\..\engines\kyra\script_v1.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\script_v2.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\seqplayer.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\seqplayer.h" - > - </File> - <File - RelativePath="..\..\engines\kyra\sequences_hof.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\sequences_lok.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\sequences_lol.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\sequences_mr.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\sequences_v2.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\sound.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\sound.h" - > - </File> - <File - RelativePath="..\..\engines\kyra\sound_adlib.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\sound_amiga.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\sound_digital.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\sound_intern.h" - > - </File> - <File - RelativePath="..\..\engines\kyra\sound_lok.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\sound_lol.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\sound_midi.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\sound_pcspk.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\sound_towns.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\sprites.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\sprites.h" - > - </File> - <File - RelativePath="..\..\engines\kyra\sprites_lol.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\staticres.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\text.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\text.h" - > - </File> - <File - RelativePath="..\..\engines\kyra\text_hof.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\text_hof.h" - > - </File> - <File - RelativePath="..\..\engines\kyra\text_lok.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\text_lol.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\text_lol.h" - > - </File> - <File - RelativePath="..\..\engines\kyra\text_mr.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\text_mr.h" - > - </File> - <File - RelativePath="..\..\engines\kyra\timer.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\timer.h" - > - </File> - <File - RelativePath="..\..\engines\kyra\timer_hof.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\timer_lok.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\timer_lol.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\timer_mr.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\util.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\util.h" - > - </File> - <File - RelativePath="..\..\engines\kyra\vqa.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\vqa.h" - > - </File> - <File - RelativePath="..\..\engines\kyra\wsamovie.cpp" - > - </File> - <File - RelativePath="..\..\engines\kyra\wsamovie.h" - > - </File> + <File RelativePath="..\..\engines\kyra\animator_hof.cpp" /> + <File RelativePath="..\..\engines\kyra\animator_lok.cpp" /> + <File RelativePath="..\..\engines\kyra\animator_lok.h" /> + <File RelativePath="..\..\engines\kyra\animator_mr.cpp" /> + <File RelativePath="..\..\engines\kyra\animator_v2.cpp" /> + <File RelativePath="..\..\engines\kyra\debugger.cpp" /> + <File RelativePath="..\..\engines\kyra\debugger.h" /> + <File RelativePath="..\..\engines\kyra\detection.cpp" /> + <File RelativePath="..\..\engines\kyra\gui.cpp" /> + <File RelativePath="..\..\engines\kyra\gui.h" /> + <File RelativePath="..\..\engines\kyra\gui_hof.cpp" /> + <File RelativePath="..\..\engines\kyra\gui_hof.h" /> + <File RelativePath="..\..\engines\kyra\gui_lok.cpp" /> + <File RelativePath="..\..\engines\kyra\gui_lok.h" /> + <File RelativePath="..\..\engines\kyra\gui_lol.cpp" /> + <File RelativePath="..\..\engines\kyra\gui_lol.h" /> + <File RelativePath="..\..\engines\kyra\gui_mr.cpp" /> + <File RelativePath="..\..\engines\kyra\gui_mr.h" /> + <File RelativePath="..\..\engines\kyra\gui_v2.cpp" /> + <File RelativePath="..\..\engines\kyra\gui_v2.h" /> + <File RelativePath="..\..\engines\kyra\items_hof.cpp" /> + <File RelativePath="..\..\engines\kyra\items_lok.cpp" /> + <File RelativePath="..\..\engines\kyra\items_lol.cpp" /> + <File RelativePath="..\..\engines\kyra\items_mr.cpp" /> + <File RelativePath="..\..\engines\kyra\items_v2.cpp" /> + <File RelativePath="..\..\engines\kyra\kyra_hof.cpp" /> + <File RelativePath="..\..\engines\kyra\kyra_hof.h" /> + <File RelativePath="..\..\engines\kyra\kyra_lok.cpp" /> + <File RelativePath="..\..\engines\kyra\kyra_lok.h" /> + <File RelativePath="..\..\engines\kyra\kyra_mr.cpp" /> + <File RelativePath="..\..\engines\kyra\kyra_mr.h" /> + <File RelativePath="..\..\engines\kyra\kyra_v1.cpp" /> + <File RelativePath="..\..\engines\kyra\kyra_v1.h" /> + <File RelativePath="..\..\engines\kyra\kyra_v2.cpp" /> + <File RelativePath="..\..\engines\kyra\kyra_v2.h" /> + <File RelativePath="..\..\engines\kyra\lol.cpp" /> + <File RelativePath="..\..\engines\kyra\lol.h" /> + <File RelativePath="..\..\engines\kyra\resource.cpp" /> + <File RelativePath="..\..\engines\kyra\resource.h" /> + <File RelativePath="..\..\engines\kyra\resource_intern.cpp" /> + <File RelativePath="..\..\engines\kyra\resource_intern.h" /> + <File RelativePath="..\..\engines\kyra\saveload.cpp" /> + <File RelativePath="..\..\engines\kyra\saveload_hof.cpp" /> + <File RelativePath="..\..\engines\kyra\saveload_lok.cpp" /> + <File RelativePath="..\..\engines\kyra\saveload_lol.cpp" /> + <File RelativePath="..\..\engines\kyra\saveload_mr.cpp" /> + <File RelativePath="..\..\engines\kyra\scene_hof.cpp" /> + <File RelativePath="..\..\engines\kyra\scene_lok.cpp" /> + <File RelativePath="..\..\engines\kyra\scene_lol.cpp" /> + <File RelativePath="..\..\engines\kyra\scene_mr.cpp" /> + <File RelativePath="..\..\engines\kyra\scene_v1.cpp" /> + <File RelativePath="..\..\engines\kyra\scene_v2.cpp" /> + <File RelativePath="..\..\engines\kyra\screen.cpp" /> + <File RelativePath="..\..\engines\kyra\screen.h" /> + <File RelativePath="..\..\engines\kyra\screen_hof.cpp" /> + <File RelativePath="..\..\engines\kyra\screen_hof.h" /> + <File RelativePath="..\..\engines\kyra\screen_lok.cpp" /> + <File RelativePath="..\..\engines\kyra\screen_lok.h" /> + <File RelativePath="..\..\engines\kyra\screen_lol.cpp" /> + <File RelativePath="..\..\engines\kyra\screen_lol.h" /> + <File RelativePath="..\..\engines\kyra\screen_mr.cpp" /> + <File RelativePath="..\..\engines\kyra\screen_mr.h" /> + <File RelativePath="..\..\engines\kyra\screen_v2.cpp" /> + <File RelativePath="..\..\engines\kyra\screen_v2.h" /> + <File RelativePath="..\..\engines\kyra\script.cpp" /> + <File RelativePath="..\..\engines\kyra\script.h" /> + <File RelativePath="..\..\engines\kyra\script_hof.cpp" /> + <File RelativePath="..\..\engines\kyra\script_lok.cpp" /> + <File RelativePath="..\..\engines\kyra\script_lol.cpp" /> + <File RelativePath="..\..\engines\kyra\script_mr.cpp" /> + <File RelativePath="..\..\engines\kyra\script_tim.cpp" /> + <File RelativePath="..\..\engines\kyra\script_tim.h" /> + <File RelativePath="..\..\engines\kyra\script_v1.cpp" /> + <File RelativePath="..\..\engines\kyra\script_v2.cpp" /> + <File RelativePath="..\..\engines\kyra\seqplayer.cpp" /> + <File RelativePath="..\..\engines\kyra\seqplayer.h" /> + <File RelativePath="..\..\engines\kyra\sequences_hof.cpp" /> + <File RelativePath="..\..\engines\kyra\sequences_lok.cpp" /> + <File RelativePath="..\..\engines\kyra\sequences_lol.cpp" /> + <File RelativePath="..\..\engines\kyra\sequences_mr.cpp" /> + <File RelativePath="..\..\engines\kyra\sequences_v2.cpp" /> + <File RelativePath="..\..\engines\kyra\sound.cpp" /> + <File RelativePath="..\..\engines\kyra\sound.h" /> + <File RelativePath="..\..\engines\kyra\sound_adlib.cpp" /> + <File RelativePath="..\..\engines\kyra\sound_amiga.cpp" /> + <File RelativePath="..\..\engines\kyra\sound_digital.cpp" /> + <File RelativePath="..\..\engines\kyra\sound_intern.h" /> + <File RelativePath="..\..\engines\kyra\sound_lok.cpp" /> + <File RelativePath="..\..\engines\kyra\sound_lol.cpp" /> + <File RelativePath="..\..\engines\kyra\sound_midi.cpp" /> + <File RelativePath="..\..\engines\kyra\sound_pcspk.cpp" /> + <File RelativePath="..\..\engines\kyra\sound_towns.cpp" /> + <File RelativePath="..\..\engines\kyra\sprites.cpp" /> + <File RelativePath="..\..\engines\kyra\sprites.h" /> + <File RelativePath="..\..\engines\kyra\sprites_lol.cpp" /> + <File RelativePath="..\..\engines\kyra\staticres.cpp" /> + <File RelativePath="..\..\engines\kyra\text.cpp" /> + <File RelativePath="..\..\engines\kyra\text.h" /> + <File RelativePath="..\..\engines\kyra\text_hof.cpp" /> + <File RelativePath="..\..\engines\kyra\text_hof.h" /> + <File RelativePath="..\..\engines\kyra\text_lok.cpp" /> + <File RelativePath="..\..\engines\kyra\text_lol.cpp" /> + <File RelativePath="..\..\engines\kyra\text_lol.h" /> + <File RelativePath="..\..\engines\kyra\text_mr.cpp" /> + <File RelativePath="..\..\engines\kyra\text_mr.h" /> + <File RelativePath="..\..\engines\kyra\timer.cpp" /> + <File RelativePath="..\..\engines\kyra\timer.h" /> + <File RelativePath="..\..\engines\kyra\timer_hof.cpp" /> + <File RelativePath="..\..\engines\kyra\timer_lok.cpp" /> + <File RelativePath="..\..\engines\kyra\timer_lol.cpp" /> + <File RelativePath="..\..\engines\kyra\timer_mr.cpp" /> + <File RelativePath="..\..\engines\kyra\util.cpp" /> + <File RelativePath="..\..\engines\kyra\util.h" /> + <File RelativePath="..\..\engines\kyra\vqa.cpp" /> + <File RelativePath="..\..\engines\kyra\vqa.h" /> + <File RelativePath="..\..\engines\kyra\wsamovie.cpp" /> + <File RelativePath="..\..\engines\kyra\wsamovie.h" /> </Files> - <Globals> - </Globals> </VisualStudioProject> diff --git a/dists/msvc9/scumm.vcproj b/dists/msvc9/scumm.vcproj index 3633e53b78..e77ab97292 100644 --- a/dists/msvc9/scumm.vcproj +++ b/dists/msvc9/scumm.vcproj @@ -9,808 +9,188 @@ TargetFrameworkVersion="131072" > <Platforms> - <Platform - Name="Win32" - /> + <Platform Name="Win32" /> </Platforms> - <ToolFiles> - </ToolFiles> <Configurations> - <Configuration - Name="Debug|Win32" - ConfigurationType="4" - InheritedPropertySheets=".\ScummVM_Debug.vsprops" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|Win32" - ConfigurationType="4" - InheritedPropertySheets=".\ScummVM_Release.vsprops" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> + <Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" /> + <Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" /> + </Configurations> - <References> - </References> <Files> - <Filter - Name="smush" - > - <File - RelativePath="..\..\engines\scumm\smush\channel.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\smush\channel.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\smush\chunk_type.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\smush\codec1.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\smush\codec37.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\smush\codec37.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\smush\codec47.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\smush\codec47.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\smush\imuse_channel.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\smush\saud_channel.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\smush\smush_font.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\smush\smush_font.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\smush\smush_mixer.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\smush\smush_mixer.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\smush\smush_player.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\smush\smush_player.h" - > - </File> + <Filter Name="smush"> + <File RelativePath="..\..\engines\scumm\smush\channel.cpp" /> + <File RelativePath="..\..\engines\scumm\smush\channel.h" /> + <File RelativePath="..\..\engines\scumm\smush\chunk_type.h" /> + <File RelativePath="..\..\engines\scumm\smush\codec1.cpp" /> + <File RelativePath="..\..\engines\scumm\smush\codec37.cpp" /> + <File RelativePath="..\..\engines\scumm\smush\codec37.h" /> + <File RelativePath="..\..\engines\scumm\smush\codec47.cpp" /> + <File RelativePath="..\..\engines\scumm\smush\codec47.h" /> + <File RelativePath="..\..\engines\scumm\smush\imuse_channel.cpp" /> + <File RelativePath="..\..\engines\scumm\smush\saud_channel.cpp" /> + <File RelativePath="..\..\engines\scumm\smush\smush_font.cpp" /> + <File RelativePath="..\..\engines\scumm\smush\smush_font.h" /> + <File RelativePath="..\..\engines\scumm\smush\smush_mixer.cpp" /> + <File RelativePath="..\..\engines\scumm\smush\smush_mixer.h" /> + <File RelativePath="..\..\engines\scumm\smush\smush_player.cpp" /> + <File RelativePath="..\..\engines\scumm\smush\smush_player.h" /> </Filter> - <Filter - Name="imuse_digi" - > - <File - RelativePath="..\..\engines\scumm\imuse_digi\dimuse.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\imuse_digi\dimuse.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\imuse_digi\dimuse_bndmgr.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\imuse_digi\dimuse_bndmgr.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\imuse_digi\dimuse_codecs.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\imuse_digi\dimuse_music.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\imuse_digi\dimuse_script.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\imuse_digi\dimuse_sndmgr.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\imuse_digi\dimuse_sndmgr.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\imuse_digi\dimuse_tables.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\imuse_digi\dimuse_tables.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\imuse_digi\dimuse_track.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\imuse_digi\dimuse_track.h" - > - </File> + <Filter Name="imuse_digi"> + <File RelativePath="..\..\engines\scumm\imuse_digi\dimuse.cpp" /> + <File RelativePath="..\..\engines\scumm\imuse_digi\dimuse.h" /> + <File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_bndmgr.cpp" /> + <File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_bndmgr.h" /> + <File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_codecs.cpp" /> + <File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_music.cpp" /> + <File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_script.cpp" /> + <File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_sndmgr.cpp" /> + <File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_sndmgr.h" /> + <File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_tables.cpp" /> + <File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_tables.h" /> + <File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_track.cpp" /> + <File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_track.h" /> </Filter> - <Filter - Name="insane" - > - <File - RelativePath="..\..\engines\scumm\insane\insane.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\insane\insane.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\insane\insane_ben.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\insane\insane_enemy.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\insane\insane_iact.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\insane\insane_scenes.cpp" - > - </File> + <Filter Name="insane"> + <File RelativePath="..\..\engines\scumm\insane\insane.cpp" /> + <File RelativePath="..\..\engines\scumm\insane\insane.h" /> + <File RelativePath="..\..\engines\scumm\insane\insane_ben.cpp" /> + <File RelativePath="..\..\engines\scumm\insane\insane_enemy.cpp" /> + <File RelativePath="..\..\engines\scumm\insane\insane_iact.cpp" /> + <File RelativePath="..\..\engines\scumm\insane\insane_scenes.cpp" /> </Filter> - <Filter - Name="he" - > - <File - RelativePath="..\..\engines\scumm\he\animation_he.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\he\animation_he.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\he\cup_player_he.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\he\cup_player_he.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\he\floodfill_he.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\he\floodfill_he.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\he\intern_he.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\he\logic_he.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\he\logic_he.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\he\palette_he.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\he\resource_he.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\he\resource_he.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\he\script_v100he.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\he\script_v60he.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\he\script_v70he.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\he\script_v71he.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\he\script_v72he.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\he\script_v80he.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\he\script_v90he.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\he\sound_he.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\he\sound_he.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\he\sprite_he.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\he\sprite_he.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\he\wiz_he.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\he\wiz_he.h" - > - </File> + <Filter Name="he"> + <File RelativePath="..\..\engines\scumm\he\animation_he.cpp" /> + <File RelativePath="..\..\engines\scumm\he\animation_he.h" /> + <File RelativePath="..\..\engines\scumm\he\cup_player_he.cpp" /> + <File RelativePath="..\..\engines\scumm\he\cup_player_he.h" /> + <File RelativePath="..\..\engines\scumm\he\floodfill_he.cpp" /> + <File RelativePath="..\..\engines\scumm\he\floodfill_he.h" /> + <File RelativePath="..\..\engines\scumm\he\intern_he.h" /> + <File RelativePath="..\..\engines\scumm\he\logic_he.cpp" /> + <File RelativePath="..\..\engines\scumm\he\logic_he.h" /> + <File RelativePath="..\..\engines\scumm\he\palette_he.cpp" /> + <File RelativePath="..\..\engines\scumm\he\resource_he.cpp" /> + <File RelativePath="..\..\engines\scumm\he\resource_he.h" /> + <File RelativePath="..\..\engines\scumm\he\script_v100he.cpp" /> + <File RelativePath="..\..\engines\scumm\he\script_v60he.cpp" /> + <File RelativePath="..\..\engines\scumm\he\script_v70he.cpp" /> + <File RelativePath="..\..\engines\scumm\he\script_v71he.cpp" /> + <File RelativePath="..\..\engines\scumm\he\script_v72he.cpp" /> + <File RelativePath="..\..\engines\scumm\he\script_v80he.cpp" /> + <File RelativePath="..\..\engines\scumm\he\script_v90he.cpp" /> + <File RelativePath="..\..\engines\scumm\he\sound_he.cpp" /> + <File RelativePath="..\..\engines\scumm\he\sound_he.h" /> + <File RelativePath="..\..\engines\scumm\he\sprite_he.cpp" /> + <File RelativePath="..\..\engines\scumm\he\sprite_he.h" /> + <File RelativePath="..\..\engines\scumm\he\wiz_he.cpp" /> + <File RelativePath="..\..\engines\scumm\he\wiz_he.h" /> </Filter> - <Filter - Name="imuse" - > - <File - RelativePath="..\..\engines\scumm\imuse\imuse.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\imuse\imuse.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\imuse\imuse_internal.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\imuse\imuse_part.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\imuse\imuse_player.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\imuse\instrument.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\imuse\instrument.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\imuse\sysex.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\imuse\sysex_samnmax.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\imuse\sysex_scumm.cpp" - > - </File> + <Filter Name="imuse"> + <File RelativePath="..\..\engines\scumm\imuse\imuse.cpp" /> + <File RelativePath="..\..\engines\scumm\imuse\imuse.h" /> + <File RelativePath="..\..\engines\scumm\imuse\imuse_internal.h" /> + <File RelativePath="..\..\engines\scumm\imuse\imuse_part.cpp" /> + <File RelativePath="..\..\engines\scumm\imuse\imuse_player.cpp" /> + <File RelativePath="..\..\engines\scumm\imuse\instrument.cpp" /> + <File RelativePath="..\..\engines\scumm\imuse\instrument.h" /> + <File RelativePath="..\..\engines\scumm\imuse\sysex.h" /> + <File RelativePath="..\..\engines\scumm\imuse\sysex_samnmax.cpp" /> + <File RelativePath="..\..\engines\scumm\imuse\sysex_scumm.cpp" /> </Filter> - <File - RelativePath="..\..\engines\scumm\actor.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\actor.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\akos.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\akos.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\base-costume.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\base-costume.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\bomp.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\bomp.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\boxes.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\boxes.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\camera.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\charset-fontdata.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\charset.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\charset.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\costume.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\costume.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\cursor.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\debugger.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\debugger.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\detection.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\detection.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\detection_tables.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\dialogs.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\dialogs.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\file.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\file.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\file_nes.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\file_nes.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\gfx.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\gfx.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\help.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\help.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\input.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\intern.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\midiparser_eup.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\midiparser_ro.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\music.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\nut_renderer.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\nut_renderer.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\object.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\object.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\palette.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\player_mod.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\player_mod.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\player_nes.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\player_nes.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\player_v1.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\player_v1.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\player_v2.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\player_v2.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\player_v2a.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\player_v2a.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\player_v2cms.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\player_v3a.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\player_v3a.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\player_v4a.cpp" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - DisableSpecificWarnings="$(NOINHERIT)" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\engines\scumm\player_v4a.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\resource.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\resource.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\resource_v2.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\resource_v3.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\resource_v4.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\room.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\saveload.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\saveload.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\script.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\script.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\script_v0.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\script_v2.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\script_v3.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\script_v4.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\script_v5.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\script_v6.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\script_v8.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\scumm-md5.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\scumm.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\scumm.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\scumm_v0.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\scumm_v2.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\scumm_v3.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\scumm_v4.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\scumm_v5.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\scumm_v6.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\scumm_v7.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\scumm_v8.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\sound.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\sound.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\string.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\usage_bits.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\usage_bits.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\util.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\util.h" - > - </File> - <File - RelativePath="..\..\engines\scumm\vars.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\verbs.cpp" - > - </File> - <File - RelativePath="..\..\engines\scumm\verbs.h" - > - </File> + <File RelativePath="..\..\engines\scumm\actor.cpp" /> + <File RelativePath="..\..\engines\scumm\actor.h" /> + <File RelativePath="..\..\engines\scumm\akos.cpp" /> + <File RelativePath="..\..\engines\scumm\akos.h" /> + <File RelativePath="..\..\engines\scumm\base-costume.cpp" /> + <File RelativePath="..\..\engines\scumm\base-costume.h" /> + <File RelativePath="..\..\engines\scumm\bomp.cpp" /> + <File RelativePath="..\..\engines\scumm\bomp.h" /> + <File RelativePath="..\..\engines\scumm\boxes.cpp" /> + <File RelativePath="..\..\engines\scumm\boxes.h" /> + <File RelativePath="..\..\engines\scumm\camera.cpp" /> + <File RelativePath="..\..\engines\scumm\charset-fontdata.cpp" /> + <File RelativePath="..\..\engines\scumm\charset.cpp" /> + <File RelativePath="..\..\engines\scumm\charset.h" /> + <File RelativePath="..\..\engines\scumm\costume.cpp" /> + <File RelativePath="..\..\engines\scumm\costume.h" /> + <File RelativePath="..\..\engines\scumm\cursor.cpp" /> + <File RelativePath="..\..\engines\scumm\debugger.cpp" /> + <File RelativePath="..\..\engines\scumm\debugger.h" /> + <File RelativePath="..\..\engines\scumm\detection.cpp" /> + <File RelativePath="..\..\engines\scumm\detection.h" /> + <File RelativePath="..\..\engines\scumm\detection_tables.h" /> + <File RelativePath="..\..\engines\scumm\dialogs.cpp" /> + <File RelativePath="..\..\engines\scumm\dialogs.h" /> + <File RelativePath="..\..\engines\scumm\file.cpp" /> + <File RelativePath="..\..\engines\scumm\file.h" /> + <File RelativePath="..\..\engines\scumm\file_nes.cpp" /> + <File RelativePath="..\..\engines\scumm\file_nes.h" /> + <File RelativePath="..\..\engines\scumm\gfx.cpp" /> + <File RelativePath="..\..\engines\scumm\gfx.h" /> + <File RelativePath="..\..\engines\scumm\help.cpp" /> + <File RelativePath="..\..\engines\scumm\help.h" /> + <File RelativePath="..\..\engines\scumm\input.cpp" /> + <File RelativePath="..\..\engines\scumm\intern.h" /> + <File RelativePath="..\..\engines\scumm\midiparser_eup.cpp" /> + <File RelativePath="..\..\engines\scumm\midiparser_ro.cpp" /> + <File RelativePath="..\..\engines\scumm\music.h" /> + <File RelativePath="..\..\engines\scumm\nut_renderer.cpp" /> + <File RelativePath="..\..\engines\scumm\nut_renderer.h" /> + <File RelativePath="..\..\engines\scumm\object.cpp" /> + <File RelativePath="..\..\engines\scumm\object.h" /> + <File RelativePath="..\..\engines\scumm\palette.cpp" /> + <File RelativePath="..\..\engines\scumm\player_mod.cpp" /> + <File RelativePath="..\..\engines\scumm\player_mod.h" /> + <File RelativePath="..\..\engines\scumm\player_nes.cpp" /> + <File RelativePath="..\..\engines\scumm\player_nes.h" /> + <File RelativePath="..\..\engines\scumm\player_v1.cpp" /> + <File RelativePath="..\..\engines\scumm\player_v1.h" /> + <File RelativePath="..\..\engines\scumm\player_v2.cpp" /> + <File RelativePath="..\..\engines\scumm\player_v2.h" /> + <File RelativePath="..\..\engines\scumm\player_v2a.cpp" /> + <File RelativePath="..\..\engines\scumm\player_v2a.h" /> + <File RelativePath="..\..\engines\scumm\player_v2cms.cpp" /> + <File RelativePath="..\..\engines\scumm\player_v3a.cpp" /> + <File RelativePath="..\..\engines\scumm\player_v3a.h" /> + <File RelativePath="..\..\engines\scumm\player_v4a.cpp" /> + <File RelativePath="..\..\engines\scumm\player_v4a.h" /> + <File RelativePath="..\..\engines\scumm\resource.cpp" /> + <File RelativePath="..\..\engines\scumm\resource.h" /> + <File RelativePath="..\..\engines\scumm\resource_v2.cpp" /> + <File RelativePath="..\..\engines\scumm\resource_v3.cpp" /> + <File RelativePath="..\..\engines\scumm\resource_v4.cpp" /> + <File RelativePath="..\..\engines\scumm\room.cpp" /> + <File RelativePath="..\..\engines\scumm\saveload.cpp" /> + <File RelativePath="..\..\engines\scumm\saveload.h" /> + <File RelativePath="..\..\engines\scumm\script.cpp" /> + <File RelativePath="..\..\engines\scumm\script.h" /> + <File RelativePath="..\..\engines\scumm\script_v0.cpp" /> + <File RelativePath="..\..\engines\scumm\script_v2.cpp" /> + <File RelativePath="..\..\engines\scumm\script_v3.cpp" /> + <File RelativePath="..\..\engines\scumm\script_v4.cpp" /> + <File RelativePath="..\..\engines\scumm\script_v5.cpp" /> + <File RelativePath="..\..\engines\scumm\script_v6.cpp" /> + <File RelativePath="..\..\engines\scumm\script_v8.cpp" /> + <File RelativePath="..\..\engines\scumm\scumm-md5.h" /> + <File RelativePath="..\..\engines\scumm\scumm.cpp" /> + <File RelativePath="..\..\engines\scumm\scumm.h" /> + <File RelativePath="..\..\engines\scumm\scumm_v0.h" /> + <File RelativePath="..\..\engines\scumm\scumm_v2.h" /> + <File RelativePath="..\..\engines\scumm\scumm_v3.h" /> + <File RelativePath="..\..\engines\scumm\scumm_v4.h" /> + <File RelativePath="..\..\engines\scumm\scumm_v5.h" /> + <File RelativePath="..\..\engines\scumm\scumm_v6.h" /> + <File RelativePath="..\..\engines\scumm\scumm_v7.h" /> + <File RelativePath="..\..\engines\scumm\scumm_v8.h" /> + <File RelativePath="..\..\engines\scumm\sound.cpp" /> + <File RelativePath="..\..\engines\scumm\sound.h" /> + <File RelativePath="..\..\engines\scumm\string.cpp" /> + <File RelativePath="..\..\engines\scumm\usage_bits.cpp" /> + <File RelativePath="..\..\engines\scumm\usage_bits.h" /> + <File RelativePath="..\..\engines\scumm\util.cpp" /> + <File RelativePath="..\..\engines\scumm\util.h" /> + <File RelativePath="..\..\engines\scumm\vars.cpp" /> + <File RelativePath="..\..\engines\scumm\verbs.cpp" /> + <File RelativePath="..\..\engines\scumm\verbs.h" /> </Files> - <Globals> - </Globals> </VisualStudioProject> diff --git a/dists/msvc9/scummvm-tfmx.sln b/dists/msvc9/scummvm-tfmx.sln deleted file mode 100644 index 208703fc17..0000000000 --- a/dists/msvc9/scummvm-tfmx.sln +++ /dev/null @@ -1,48 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scummvm", "scummvm-tfmx.vcproj", "{8434CB15-D08F-427D-9E6D-581AE5B28440}" - ProjectSection(ProjectDependencies) = postProject - {B6AFD548-63D2-40CD-A652-E87095AFCBAF} = {B6AFD548-63D2-40CD-A652-E87095AFCBAF} - {9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC} = {9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scumm", "scumm.vcproj", "{B6AFD548-63D2-40CD-A652-E87095AFCBAF}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kyra", "kyra.vcproj", "{9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug_Command|Win32 = Debug_Command|Win32 - Debug|Win32 = Debug|Win32 - Release_Command|Win32 = Release_Command|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {8434CB15-D08F-427D-9E6D-581AE5B28440}.Debug_Command|Win32.ActiveCfg = Debug_Command|Win32 - {8434CB15-D08F-427D-9E6D-581AE5B28440}.Debug_Command|Win32.Build.0 = Debug_Command|Win32 - {8434CB15-D08F-427D-9E6D-581AE5B28440}.Debug|Win32.ActiveCfg = Debug|Win32 - {8434CB15-D08F-427D-9E6D-581AE5B28440}.Debug|Win32.Build.0 = Debug|Win32 - {8434CB15-D08F-427D-9E6D-581AE5B28440}.Release_Command|Win32.ActiveCfg = Release_Command|Win32 - {8434CB15-D08F-427D-9E6D-581AE5B28440}.Release_Command|Win32.Build.0 = Release_Command|Win32 - {8434CB15-D08F-427D-9E6D-581AE5B28440}.Release|Win32.ActiveCfg = Release|Win32 - {8434CB15-D08F-427D-9E6D-581AE5B28440}.Release|Win32.Build.0 = Release|Win32 - {B6AFD548-63D2-40CD-A652-E87095AFCBAF}.Debug_Command|Win32.ActiveCfg = Debug|Win32 - {B6AFD548-63D2-40CD-A652-E87095AFCBAF}.Debug|Win32.ActiveCfg = Debug|Win32 - {B6AFD548-63D2-40CD-A652-E87095AFCBAF}.Debug|Win32.Build.0 = Debug|Win32 - {B6AFD548-63D2-40CD-A652-E87095AFCBAF}.Release_Command|Win32.ActiveCfg = Release|Win32 - {B6AFD548-63D2-40CD-A652-E87095AFCBAF}.Release|Win32.ActiveCfg = Release|Win32 - {B6AFD548-63D2-40CD-A652-E87095AFCBAF}.Release|Win32.Build.0 = Release|Win32 - {9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}.Debug_Command|Win32.ActiveCfg = Debug|Win32 - {9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}.Debug_Command|Win32.Build.0 = Debug|Win32 - {9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}.Debug|Win32.ActiveCfg = Debug|Win32 - {9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}.Debug|Win32.Build.0 = Debug|Win32 - {9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}.Release_Command|Win32.ActiveCfg = Release|Win32 - {9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}.Release_Command|Win32.Build.0 = Release|Win32 - {9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}.Release|Win32.ActiveCfg = Release|Win32 - {9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/dists/msvc9/scummvm-tfmx.vcproj b/dists/msvc9/scummvm-tfmx.vcproj deleted file mode 100644 index ba2c231886..0000000000 --- a/dists/msvc9/scummvm-tfmx.vcproj +++ /dev/null @@ -1,2070 +0,0 @@ -<?xml version="1.0" encoding="windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9,00" - Name="scummvm" - ProjectGUID="{8434CB15-D08F-427D-9E6D-581AE5B28440}" - RootNamespace="scummvm" - Keyword="Win32Proj" - TargetFrameworkVersion="131072" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - ConfigurationType="1" - InheritedPropertySheets=".\ScummVM_Debug.vsprops" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - InlineFunctionExpansion="0" - UsePrecompiledHeader="0" - SuppressStartupBanner="false" - Detect64BitPortabilityProblems="false" - DisableSpecificWarnings="4512" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="winmm.lib sdl.lib zlib.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib" - OutputFile="$(OutDir)\$(ProjectName)-tfmx.exe" - ProgramDatabaseFile="$(OutDir)/scummvm.pdb" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|Win32" - ConfigurationType="1" - InheritedPropertySheets=".\ScummVM_Release.vsprops" - CharacterSet="2" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996" - OmitFramePointers="true" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;ENABLE_SCUMM;ENABLE_LOL;USE_ZLIB" - UsePrecompiledHeader="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="winmm.lib sdl.lib zlib.lib" - OutputFile="$(OutDir)\$(ProjectName)-tfmx.exe" - SuppressStartupBanner="true" - GenerateDebugInformation="false" - OptimizeReferences="2" - EnableCOMDATFolding="2" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Debug_Command|Win32" - ConfigurationType="1" - InheritedPropertySheets=".\ScummVM_Debug.vsprops" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - InlineFunctionExpansion="0" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;TFMX_CMDLINE_TOOL;NMXTX_CMDLINE_TOOL" - UsePrecompiledHeader="0" - SuppressStartupBanner="false" - Detect64BitPortabilityProblems="false" - DisableSpecificWarnings="4512" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - LinkLibraryDependencies="true" - AdditionalDependencies="winmm.lib sdl.lib zlib.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib" - OutputFile="$(OutDir)\$(ProjectName)-tfmx.exe" - ProgramDatabaseFile="$(OutDir)/scummvm.pdb" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release_Command|Win32" - ConfigurationType="1" - InheritedPropertySheets=".\ScummVM_Release.vsprops" - CharacterSet="2" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996" - OmitFramePointers="true" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;TFMX_CMDLINE_TOOL" - UsePrecompiledHeader="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - LinkLibraryDependencies="false" - AdditionalDependencies="winmm.lib sdl.lib" - OutputFile="$(OutDir)\$(ProjectName)-tfmx.exe" - SuppressStartupBanner="true" - GenerateDebugInformation="false" - OptimizeReferences="2" - EnableCOMDATFolding="2" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="base" - > - <File - RelativePath="..\..\base\commandLine.cpp" - > - </File> - <File - RelativePath="..\..\base\commandLine.h" - > - </File> - <File - RelativePath="..\..\base\internal_version.h" - > - </File> - <File - RelativePath="..\..\base\main.cpp" - > - </File> - <File - RelativePath="..\..\base\main.h" - > - </File> - <File - RelativePath="..\..\base\plugins.cpp" - > - </File> - <File - RelativePath="..\..\base\plugins.h" - > - </File> - <File - RelativePath="..\..\base\version.cpp" - > - </File> - <File - RelativePath="..\..\base\version.h" - > - </File> - </Filter> - <Filter - Name="common" - > - <File - RelativePath="..\..\common\algorithm.h" - > - </File> - <File - RelativePath="..\..\common\archive.cpp" - > - </File> - <File - RelativePath="..\..\common\archive.h" - > - </File> - <File - RelativePath="..\..\common\array.h" - > - </File> - <File - RelativePath="..\..\backends\base-backend.h" - > - </File> - <File - RelativePath="..\..\common\config-file.cpp" - > - </File> - <File - RelativePath="..\..\common\config-file.h" - > - </File> - <File - RelativePath="..\..\common\config-manager.cpp" - > - </File> - <File - RelativePath="..\..\common\config-manager.h" - > - </File> - <File - RelativePath="..\..\common\debug.cpp" - > - </File> - <File - RelativePath="..\..\common\debug.h" - > - </File> - <File - RelativePath="..\..\common\endian.h" - > - </File> - <File - RelativePath="..\..\common\error.h" - > - </File> - <File - RelativePath="..\..\common\EventDispatcher.cpp" - > - </File> - <File - RelativePath="..\..\common\EventRecorder.cpp" - > - </File> - <File - RelativePath="..\..\common\EventRecorder.h" - > - </File> - <File - RelativePath="..\..\common\events.h" - > - </File> - <File - RelativePath="..\..\common\file.cpp" - > - </File> - <File - RelativePath="..\..\common\file.h" - > - </File> - <File - RelativePath="..\..\common\frac.h" - > - </File> - <File - RelativePath="..\..\common\fs.cpp" - > - </File> - <File - RelativePath="..\..\common\fs.h" - > - </File> - <File - RelativePath="..\..\common\func.h" - > - </File> - <File - RelativePath="..\..\common\hash-str.h" - > - </File> - <File - RelativePath="..\..\common\hashmap.cpp" - > - </File> - <File - RelativePath="..\..\common\hashmap.h" - > - </File> - <File - RelativePath="..\..\common\iff_container.h" - > - </File> - <File - RelativePath="..\..\common\keyboard.h" - > - </File> - <File - RelativePath="..\..\common\list.h" - > - </File> - <File - RelativePath="..\..\common\list_intern.h" - > - </File> - <File - RelativePath="..\..\common\md5.cpp" - > - </File> - <File - RelativePath="..\..\common\md5.h" - > - </File> - <File - RelativePath="..\..\common\memorypool.cpp" - > - </File> - <File - RelativePath="..\..\common\memorypool.h" - > - </File> - <File - RelativePath="..\..\common\mutex.cpp" - > - </File> - <File - RelativePath="..\..\common\mutex.h" - > - </File> - <File - RelativePath="..\..\common\noncopyable.h" - > - </File> - <File - RelativePath="..\..\common\pack-end.h" - > - </File> - <File - RelativePath="..\..\common\pack-start.h" - > - </File> - <File - RelativePath="..\..\common\ptr.h" - > - </File> - <File - RelativePath="..\..\common\queue.h" - > - </File> - <File - RelativePath="..\..\common\rect.h" - > - </File> - <File - RelativePath="..\..\common\savefile.h" - > - </File> - <File - RelativePath="..\..\common\scummsys.h" - > - </File> - <File - RelativePath="..\..\common\serializer.h" - > - </File> - <File - RelativePath="..\..\common\singleton.h" - > - </File> - <File - RelativePath="..\..\common\stack.h" - > - </File> - <File - RelativePath="..\..\common\str.cpp" - > - </File> - <File - RelativePath="..\..\common\str.h" - > - </File> - <File - RelativePath="..\..\common\stream.cpp" - > - </File> - <File - RelativePath="..\..\common\stream.h" - > - </File> - <File - RelativePath="..\..\common\system.cpp" - > - </File> - <File - RelativePath="..\..\common\system.h" - > - </File> - <File - RelativePath="..\..\common\timer.h" - > - </File> - <File - RelativePath="..\..\common\unarj.cpp" - > - </File> - <File - RelativePath="..\..\common\unarj.h" - > - </File> - <File - RelativePath="..\..\common\unzip.cpp" - > - </File> - <File - RelativePath="..\..\common\unzip.h" - > - </File> - <File - RelativePath="..\..\common\util.cpp" - > - </File> - <File - RelativePath="..\..\common\util.h" - > - </File> - <File - RelativePath="..\..\common\xmlparser.cpp" - > - </File> - <File - RelativePath="..\..\common\xmlparser.h" - > - </File> - <File - RelativePath="..\..\common\zlib.cpp" - > - </File> - <File - RelativePath="..\..\common\zlib.h" - > - </File> - </Filter> - <Filter - Name="sound" - > - <File - RelativePath="..\..\sound\adpcm.cpp" - > - </File> - <File - RelativePath="..\..\sound\adpcm.h" - > - </File> - <File - RelativePath="..\..\sound\aiff.cpp" - > - </File> - <File - RelativePath="..\..\sound\aiff.h" - > - </File> - <File - RelativePath="..\..\sound\audiocd.cpp" - > - </File> - <File - RelativePath="..\..\sound\audiocd.h" - > - </File> - <File - RelativePath="..\..\sound\audiostream.cpp" - > - </File> - <File - RelativePath="..\..\sound\audiostream.h" - > - </File> - <File - RelativePath="..\..\sound\flac.cpp" - > - </File> - <File - RelativePath="..\..\sound\flac.h" - > - </File> - <File - RelativePath="..\..\sound\fmopl.cpp" - > - </File> - <File - RelativePath="..\..\sound\fmopl.h" - > - </File> - <File - RelativePath="..\..\sound\iff_sound.cpp" - > - </File> - <File - RelativePath="..\..\sound\iff_sound.h" - > - </File> - <File - RelativePath="..\..\sound\mididrv.cpp" - > - </File> - <File - RelativePath="..\..\sound\mididrv.h" - > - </File> - <File - RelativePath="..\..\sound\midiparser.cpp" - > - </File> - <File - RelativePath="..\..\sound\midiparser.h" - > - </File> - <File - RelativePath="..\..\sound\midiparser_smf.cpp" - > - </File> - <File - RelativePath="..\..\sound\midiparser_xmidi.cpp" - > - </File> - <File - RelativePath="..\..\sound\mixer.cpp" - > - </File> - <File - RelativePath="..\..\sound\mixer.h" - > - </File> - <File - RelativePath="..\..\sound\mixer_intern.h" - > - </File> - <File - RelativePath="..\..\sound\mp3.cpp" - > - </File> - <File - RelativePath="..\..\sound\mp3.h" - > - </File> - <File - RelativePath="..\..\sound\mpu401.cpp" - > - </File> - <File - RelativePath="..\..\sound\mpu401.h" - > - </File> - <File - RelativePath="..\..\sound\musicplugin.cpp" - > - </File> - <File - RelativePath="..\..\sound\musicplugin.h" - > - </File> - <File - RelativePath="..\..\sound\null.cpp" - > - </File> - <File - RelativePath="..\..\sound\rate.cpp" - > - </File> - <File - RelativePath="..\..\sound\rate.h" - > - </File> - <File - RelativePath="..\..\sound\shorten.cpp" - > - </File> - <File - RelativePath="..\..\sound\shorten.h" - > - </File> - <File - RelativePath="..\..\sound\timestamp.cpp" - > - </File> - <File - RelativePath="..\..\sound\timestamp.h" - > - </File> - <File - RelativePath="..\..\sound\vag.cpp" - > - </File> - <File - RelativePath="..\..\sound\vag.h" - > - </File> - <File - RelativePath="..\..\sound\voc.cpp" - > - </File> - <File - RelativePath="..\..\sound\voc.h" - > - </File> - <File - RelativePath="..\..\sound\vorbis.cpp" - > - </File> - <File - RelativePath="..\..\sound\vorbis.h" - > - </File> - <File - RelativePath="..\..\sound\wave.cpp" - > - </File> - <File - RelativePath="..\..\sound\wave.h" - > - </File> - <Filter - Name="softhsynth" - > - <File - RelativePath="..\..\sound\softsynth\adlib.cpp" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj" - XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj" - XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug_Command|Win32" - > - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj" - XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc" - /> - </FileConfiguration> - <FileConfiguration - Name="Release_Command|Win32" - > - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj" - XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\sound\softsynth\emumidi.h" - > - </File> - <File - RelativePath="..\..\sound\softsynth\fluidsynth.cpp" - > - </File> - <File - RelativePath="..\..\sound\softsynth\mt32.cpp" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj" - XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj" - XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug_Command|Win32" - > - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj" - XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc" - /> - </FileConfiguration> - <FileConfiguration - Name="Release_Command|Win32" - > - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj" - XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\sound\softsynth\pcspk.cpp" - > - </File> - <File - RelativePath="..\..\sound\softsynth\pcspk.h" - > - </File> - <File - RelativePath="..\..\sound\softsynth\ym2612.cpp" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj" - XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj" - XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug_Command|Win32" - > - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj" - XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc" - /> - </FileConfiguration> - <FileConfiguration - Name="Release_Command|Win32" - > - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj" - XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\sound\softsynth\ym2612.h" - > - </File> - <Filter - Name="mt32" - > - <File - RelativePath="..\..\sound\softsynth\mt32\freeverb.cpp" - > - </File> - <File - RelativePath="..\..\sound\softsynth\mt32\freeverb.h" - > - </File> - <File - RelativePath="..\..\sound\softsynth\mt32\i386.cpp" - > - </File> - <File - RelativePath="..\..\sound\softsynth\mt32\i386.h" - > - </File> - <File - RelativePath="..\..\sound\softsynth\mt32\mt32_file.cpp" - > - </File> - <File - RelativePath="..\..\sound\softsynth\mt32\mt32_file.h" - > - </File> - <File - RelativePath="..\..\sound\softsynth\mt32\mt32emu.h" - > - </File> - <File - RelativePath="..\..\sound\softsynth\mt32\part.cpp" - > - </File> - <File - RelativePath="..\..\sound\softsynth\mt32\part.h" - > - </File> - <File - RelativePath="..\..\sound\softsynth\mt32\partial.cpp" - > - </File> - <File - RelativePath="..\..\sound\softsynth\mt32\partial.h" - > - </File> - <File - RelativePath="..\..\sound\softsynth\mt32\partialManager.cpp" - > - </File> - <File - RelativePath="..\..\sound\softsynth\mt32\partialManager.h" - > - </File> - <File - RelativePath="..\..\sound\softsynth\mt32\structures.h" - > - </File> - <File - RelativePath="..\..\sound\softsynth\mt32\synth.cpp" - > - </File> - <File - RelativePath="..\..\sound\softsynth\mt32\synth.h" - > - </File> - <File - RelativePath="..\..\sound\softsynth\mt32\tables.cpp" - > - </File> - <File - RelativePath="..\..\sound\softsynth\mt32\tables.h" - > - </File> - </Filter> - <Filter - Name="opl" - > - <File - RelativePath="..\..\sound\softsynth\opl\dosbox.cpp" - > - </File> - <File - RelativePath="..\..\sound\softsynth\opl\dosbox.h" - > - </File> - <File - RelativePath="..\..\sound\softsynth\opl\mame.cpp" - > - </File> - <File - RelativePath="..\..\sound\softsynth\opl\mame.h" - > - </File> - <File - RelativePath="..\..\sound\softsynth\opl\opl_impl.h" - > - </File> - <File - RelativePath="..\..\sound\softsynth\opl\opl_inc.h" - > - </File> - </Filter> - </Filter> - <Filter - Name="mods" - > - <File - RelativePath="..\..\sound\mods\infogrames.cpp" - > - </File> - <File - RelativePath="..\..\sound\mods\infogrames.h" - > - </File> - <File - RelativePath="..\..\sound\mods\maxtrax.cpp" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - DisableSpecificWarnings="$(NOINHERIT)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug_Command|Win32" - > - <Tool - Name="VCCLCompilerTool" - AssemblerOutput="2" - /> - </FileConfiguration> - <FileConfiguration - Name="Release_Command|Win32" - > - <Tool - Name="VCCLCompilerTool" - AssemblerOutput="2" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\sound\mods\maxtrax.h" - > - </File> - <File - RelativePath="..\..\sound\mods\module.cpp" - > - </File> - <File - RelativePath="..\..\sound\mods\module.h" - > - </File> - <File - RelativePath="..\..\sound\mods\paula.cpp" - > - </File> - <File - RelativePath="..\..\sound\mods\paula.h" - > - </File> - <File - RelativePath="..\..\sound\mods\protracker.cpp" - > - </File> - <File - RelativePath="..\..\sound\mods\protracker.h" - > - </File> - <File - RelativePath="..\..\sound\mods\rjp1.cpp" - > - </File> - <File - RelativePath="..\..\sound\mods\rjp1.h" - > - </File> - <File - RelativePath="..\..\sound\mods\soundfx.cpp" - > - </File> - <File - RelativePath="..\..\sound\mods\soundfx.h" - > - </File> - <File - RelativePath="..\..\sound\mods\tfmx.cpp" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - DisableSpecificWarnings="$(NOINHERIT)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AssemblerOutput="2" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\sound\mods\tfmx.h" - > - </File> - </Filter> - </Filter> - <Filter - Name="txt" - > - <File - RelativePath="..\..\COPYING" - > - </File> - <File - RelativePath="..\..\NEWS" - > - </File> - <File - RelativePath="..\..\README" - > - </File> - <File - RelativePath="..\..\TODO" - > - </File> - </Filter> - <Filter - Name="rsc" - Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" - > - <File - RelativePath="..\..\icons\scummvm.ico" - > - </File> - <File - RelativePath="..\..\dists\scummvm.rc" - > - </File> - </Filter> - <Filter - Name="backends" - > - <File - RelativePath="..\..\backends\base-backend.cpp" - > - </File> - <Filter - Name="sdl" - > - <File - RelativePath="..\..\backends\platform\sdl\events.cpp" - > - </File> - <File - RelativePath="..\..\backends\platform\sdl\graphics.cpp" - > - </File> - <File - RelativePath="..\..\backends\platform\sdl\hardwarekeys.cpp" - > - </File> - <File - RelativePath="..\..\backends\platform\sdl\main.cpp" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)\$(InputName)1.obj" - XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)\$(InputName)1.obj" - XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug_Command|Win32" - > - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)\$(InputName)1.obj" - XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc" - /> - </FileConfiguration> - <FileConfiguration - Name="Release_Command|Win32" - > - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)\$(InputName)1.obj" - XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\backends\platform\sdl\sdl.cpp" - > - </File> - <File - RelativePath="..\..\backends\platform\sdl\sdl.h" - > - </File> - </Filter> - <Filter - Name="fs" - > - <File - RelativePath="..\..\backends\fs\abstract-fs.cpp" - > - </File> - <File - RelativePath="..\..\backends\fs\abstract-fs.h" - > - </File> - <File - RelativePath="..\..\backends\fs\fs-factory.h" - > - </File> - <File - RelativePath="..\..\backends\fs\stdiostream.cpp" - > - </File> - <File - RelativePath="..\..\backends\fs\stdiostream.h" - > - </File> - <Filter - Name="windows" - > - <File - RelativePath="..\..\backends\fs\windows\windows-fs-factory.cpp" - > - </File> - <File - RelativePath="..\..\backends\fs\windows\windows-fs-factory.h" - > - </File> - </Filter> - </Filter> - <Filter - Name="midi" - > - <File - RelativePath="..\..\backends\midi\windows.cpp" - > - </File> - </Filter> - <Filter - Name="timer" - > - <File - RelativePath="..\..\backends\timer\default\default-timer.cpp" - > - </File> - <File - RelativePath="..\..\backends\timer\default\default-timer.h" - > - </File> - </Filter> - <Filter - Name="saves" - > - <File - RelativePath="..\..\backends\saves\default\default-saves.cpp" - > - </File> - <File - RelativePath="..\..\backends\saves\default\default-saves.h" - > - </File> - <File - RelativePath="..\..\backends\saves\savefile.cpp" - > - </File> - </Filter> - <Filter - Name="events" - > - <Filter - Name="default" - > - <File - RelativePath="..\..\backends\events\default\default-events.cpp" - > - </File> - <File - RelativePath="..\..\backends\events\default\default-events.h" - > - </File> - </Filter> - </Filter> - <Filter - Name="keymapper" - > - <File - RelativePath="..\..\backends\keymapper\action.cpp" - > - </File> - <File - RelativePath="..\..\backends\keymapper\action.h" - > - </File> - <File - RelativePath="..\..\backends\keymapper\hardware-key.h" - > - </File> - <File - RelativePath="..\..\backends\keymapper\keymap.cpp" - > - </File> - <File - RelativePath="..\..\backends\keymapper\keymap.h" - > - </File> - <File - RelativePath="..\..\backends\keymapper\keymapper.cpp" - > - </File> - <File - RelativePath="..\..\backends\keymapper\keymapper.h" - > - </File> - <File - RelativePath="..\..\backends\keymapper\remap-dialog.cpp" - > - </File> - <File - RelativePath="..\..\backends\keymapper\remap-dialog.h" - > - </File> - <File - RelativePath="..\..\backends\keymapper\types.h" - > - </File> - </Filter> - <Filter - Name="vkeybd" - > - <File - RelativePath="..\..\backends\vkeybd\image-map.cpp" - > - </File> - <File - RelativePath="..\..\backends\vkeybd\image-map.h" - > - </File> - <File - RelativePath="..\..\backends\vkeybd\keycode-descriptions.h" - > - </File> - <File - RelativePath="..\..\backends\vkeybd\polygon.cpp" - > - </File> - <File - RelativePath="..\..\backends\vkeybd\polygon.h" - > - </File> - <File - RelativePath="..\..\backends\vkeybd\virtual-keyboard-gui.cpp" - > - </File> - <File - RelativePath="..\..\backends\vkeybd\virtual-keyboard-gui.h" - > - </File> - <File - RelativePath="..\..\backends\vkeybd\virtual-keyboard-parser.cpp" - > - </File> - <File - RelativePath="..\..\backends\vkeybd\virtual-keyboard-parser.h" - > - </File> - <File - RelativePath="..\..\backends\vkeybd\virtual-keyboard.cpp" - > - </File> - <File - RelativePath="..\..\backends\vkeybd\virtual-keyboard.h" - > - </File> - </Filter> - </Filter> - <Filter - Name="gui" - > - <File - RelativePath="..\..\gui\about.cpp" - > - </File> - <File - RelativePath="..\..\gui\about.h" - > - </File> - <File - RelativePath="..\..\gui\browser.cpp" - > - </File> - <File - RelativePath="..\..\gui\browser.h" - > - </File> - <File - RelativePath="..\..\gui\chooser.cpp" - > - </File> - <File - RelativePath="..\..\gui\chooser.h" - > - </File> - <File - RelativePath="..\..\gui\console.cpp" - > - </File> - <File - RelativePath="..\..\gui\console.h" - > - </File> - <File - RelativePath="..\..\gui\credits.h" - > - </File> - <File - RelativePath="..\..\gui\debugger.cpp" - > - </File> - <File - RelativePath="..\..\gui\debugger.h" - > - </File> - <File - RelativePath="..\..\gui\dialog.cpp" - > - </File> - <File - RelativePath="..\..\gui\dialog.h" - > - </File> - <File - RelativePath="..\..\gui\editable.cpp" - > - </File> - <File - RelativePath="..\..\gui\editable.h" - > - </File> - <File - RelativePath="..\..\gui\EditTextWidget.cpp" - > - </File> - <File - RelativePath="..\..\gui\EditTextWidget.h" - > - </File> - <File - RelativePath="..\..\gui\GuiManager.cpp" - > - </File> - <File - RelativePath="..\..\gui\GuiManager.h" - > - </File> - <File - RelativePath="..\..\gui\Key.cpp" - > - </File> - <File - RelativePath="..\..\gui\Key.h" - > - </File> - <File - RelativePath="..\..\gui\launcher.cpp" - > - </File> - <File - RelativePath="..\..\gui\launcher.h" - > - </File> - <File - RelativePath="..\..\gui\ListWidget.cpp" - > - </File> - <File - RelativePath="..\..\gui\ListWidget.h" - > - </File> - <File - RelativePath="..\..\gui\massadd.cpp" - > - </File> - <File - RelativePath="..\..\gui\massadd.h" - > - </File> - <File - RelativePath="..\..\gui\message.cpp" - > - </File> - <File - RelativePath="..\..\gui\message.h" - > - </File> - <File - RelativePath="..\..\gui\object.cpp" - > - </File> - <File - RelativePath="..\..\gui\object.h" - > - </File> - <File - RelativePath="..\..\gui\options.cpp" - > - </File> - <File - RelativePath="..\..\gui\options.h" - > - </File> - <File - RelativePath="..\..\gui\PopUpWidget.cpp" - > - </File> - <File - RelativePath="..\..\gui\PopUpWidget.h" - > - </File> - <File - RelativePath="..\..\gui\saveload.cpp" - > - </File> - <File - RelativePath="..\..\gui\saveload.h" - > - </File> - <File - RelativePath="..\..\gui\ScrollBarWidget.cpp" - > - </File> - <File - RelativePath="..\..\gui\ScrollBarWidget.h" - > - </File> - <File - RelativePath="..\..\gui\TabWidget.cpp" - > - </File> - <File - RelativePath="..\..\gui\TabWidget.h" - > - </File> - <File - RelativePath="..\..\gui\themebrowser.cpp" - > - </File> - <File - RelativePath="..\..\gui\themebrowser.h" - > - </File> - <File - RelativePath="..\..\gui\ThemeEngine.cpp" - > - </File> - <File - RelativePath="..\..\gui\ThemeEngine.h" - > - </File> - <File - RelativePath="..\..\gui\ThemeEval.cpp" - > - </File> - <File - RelativePath="..\..\gui\ThemeLayout.cpp" - > - </File> - <File - RelativePath="..\..\gui\ThemeLayout.h" - > - </File> - <File - RelativePath="..\..\gui\ThemeParser.cpp" - > - </File> - <File - RelativePath="..\..\gui\ThemeParser.h" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug_Command|Win32" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\gui\widget.cpp" - > - </File> - <File - RelativePath="..\..\gui\widget.h" - > - </File> - </Filter> - <Filter - Name="graphics" - > - <File - RelativePath="..\..\graphics\colormasks.h" - > - </File> - <File - RelativePath="..\..\graphics\cursorman.cpp" - > - </File> - <File - RelativePath="..\..\graphics\cursorman.h" - > - </File> - <File - RelativePath="..\..\graphics\dither.cpp" - > - </File> - <File - RelativePath="..\..\graphics\dither.h" - > - </File> - <File - RelativePath="..\..\graphics\font.cpp" - > - </File> - <File - RelativePath="..\..\graphics\font.h" - > - </File> - <File - RelativePath="..\..\graphics\fontman.cpp" - > - </File> - <File - RelativePath="..\..\graphics\fontman.h" - > - </File> - <File - RelativePath="..\..\graphics\iff.cpp" - > - </File> - <File - RelativePath="..\..\graphics\iff.h" - > - </File> - <File - RelativePath="..\..\graphics\imagedec.cpp" - > - </File> - <File - RelativePath="..\..\graphics\imagedec.h" - > - </File> - <File - RelativePath="..\..\graphics\primitives.cpp" - > - </File> - <File - RelativePath="..\..\graphics\primitives.h" - > - </File> - <File - RelativePath="..\..\graphics\scaler.cpp" - > - </File> - <File - RelativePath="..\..\graphics\scaler.h" - > - </File> - <File - RelativePath="..\..\graphics\sjis.cpp" - > - </File> - <File - RelativePath="..\..\graphics\sjis.h" - > - </File> - <File - RelativePath="..\..\graphics\surface.cpp" - > - </File> - <File - RelativePath="..\..\graphics\surface.h" - > - </File> - <File - RelativePath="..\..\graphics\thumbnail.cpp" - > - </File> - <File - RelativePath="..\..\graphics\thumbnail.h" - > - </File> - <File - RelativePath="..\..\graphics\VectorRenderer.cpp" - > - </File> - <File - RelativePath="..\..\graphics\VectorRenderer.h" - > - </File> - <File - RelativePath="..\..\graphics\VectorRendererSpec.cpp" - > - </File> - <File - RelativePath="..\..\graphics\VectorRendererSpec.h" - > - </File> - <Filter - Name="scaler" - > - <File - RelativePath="..\..\graphics\scaler\2xsai.cpp" - > - </File> - <File - RelativePath="..\..\graphics\scaler\aspect.cpp" - > - </File> - <File - RelativePath="..\..\graphics\scaler\hq2x.cpp" - > - </File> - <File - RelativePath="..\..\graphics\scaler\hq2x.h" - > - </File> - <File - RelativePath="..\..\graphics\scaler\hq2x_i386.asm" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCustomBuildTool" - CommandLine="nasm.exe -f win32 -g -o "$(OutDir)\$(InputName).obj" "$(InputPath)"
" - Outputs="$(OutDir)\$(InputName).obj" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCustomBuildTool" - CommandLine="nasm.exe -f win32 -o "$(OutDir)\$(InputName).obj" "$(InputPath)"
" - Outputs="$(OutDir)\$(InputName).obj" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug_Command|Win32" - > - <Tool - Name="VCCustomBuildTool" - CommandLine="nasm.exe -f win32 -g -o "$(OutDir)\$(InputName).obj" "$(InputPath)"
" - Outputs="$(OutDir)\$(InputName).obj" - /> - </FileConfiguration> - <FileConfiguration - Name="Release_Command|Win32" - > - <Tool - Name="VCCustomBuildTool" - CommandLine="nasm.exe -f win32 -o "$(OutDir)\$(InputName).obj" "$(InputPath)"
" - Outputs="$(OutDir)\$(InputName).obj" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\graphics\scaler\hq3x.cpp" - > - </File> - <File - RelativePath="..\..\graphics\scaler\hq3x.h" - > - </File> - <File - RelativePath="..\..\graphics\scaler\hq3x_i386.asm" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCustomBuildTool" - CommandLine="nasm.exe -f win32 -g -o "$(OutDir)\$(InputName).obj" "$(InputPath)"
" - Outputs="$(OutDir)\$(InputName).obj" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCustomBuildTool" - CommandLine="nasm.exe -f win32 -o "$(OutDir)\$(InputName).obj" "$(InputPath)"
" - Outputs="$(OutDir)\$(InputName).obj" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug_Command|Win32" - > - <Tool - Name="VCCustomBuildTool" - CommandLine="nasm.exe -f win32 -g -o "$(OutDir)\$(InputName).obj" "$(InputPath)"
" - Outputs="$(OutDir)\$(InputName).obj" - /> - </FileConfiguration> - <FileConfiguration - Name="Release_Command|Win32" - > - <Tool - Name="VCCustomBuildTool" - CommandLine="nasm.exe -f win32 -o "$(OutDir)\$(InputName).obj" "$(InputPath)"
" - Outputs="$(OutDir)\$(InputName).obj" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\graphics\scaler\intern.h" - > - </File> - <File - RelativePath="..\..\graphics\scaler\scale2x.cpp" - > - </File> - <File - RelativePath="..\..\graphics\scaler\scale2x.h" - > - </File> - <File - RelativePath="..\..\graphics\scaler\scale3x.cpp" - > - </File> - <File - RelativePath="..\..\graphics\scaler\scale3x.h" - > - </File> - <File - RelativePath="..\..\graphics\scaler\scalebit.cpp" - > - </File> - <File - RelativePath="..\..\graphics\scaler\scalebit.h" - > - </File> - <File - RelativePath="..\..\graphics\scaler\thumbnail_intern.cpp" - > - </File> - </Filter> - <Filter - Name="fonts" - > - <File - RelativePath="..\..\graphics\fonts\consolefont.cpp" - > - </File> - <File - RelativePath="..\..\graphics\fonts\newfont.cpp" - > - </File> - <File - RelativePath="..\..\graphics\fonts\newfont_big.cpp" - > - </File> - <File - RelativePath="..\..\graphics\fonts\scummfont.cpp" - > - </File> - </Filter> - <Filter - Name="video" - > - <File - RelativePath="..\..\graphics\video\dxa_decoder.cpp" - > - </File> - <File - RelativePath="..\..\graphics\video\dxa_decoder.h" - > - </File> - <File - RelativePath="..\..\graphics\video\flic_decoder.cpp" - > - </File> - <File - RelativePath="..\..\graphics\video\flic_decoder.h" - > - </File> - <File - RelativePath="..\..\graphics\video\mpeg_player.cpp" - > - </File> - <File - RelativePath="..\..\graphics\video\mpeg_player.h" - > - </File> - <File - RelativePath="..\..\graphics\video\smk_decoder.cpp" - > - </File> - <File - RelativePath="..\..\graphics\video\smk_decoder.h" - > - </File> - <File - RelativePath="..\..\graphics\video\video_player.cpp" - > - </File> - <File - RelativePath="..\..\graphics\video\video_player.h" - > - </File> - <Filter - Name="coktelvideo" - > - <File - RelativePath="..\..\graphics\video\coktelvideo\coktelvideo.cpp" - > - </File> - <File - RelativePath="..\..\graphics\video\coktelvideo\coktelvideo.h" - > - </File> - <File - RelativePath="..\..\graphics\video\coktelvideo\indeo3.cpp" - > - </File> - <File - RelativePath="..\..\graphics\video\coktelvideo\indeo3.h" - > - </File> - </Filter> - </Filter> - </Filter> - <Filter - Name="engines" - > - <File - RelativePath="..\..\engines\advancedDetector.cpp" - > - </File> - <File - RelativePath="..\..\engines\advancedDetector.h" - > - </File> - <File - RelativePath="..\..\engines\dialogs.cpp" - > - </File> - <File - RelativePath="..\..\engines\dialogs.h" - > - </File> - <File - RelativePath="..\..\engines\engine.cpp" - > - </File> - <File - RelativePath="..\..\engines\engine.h" - > - </File> - <File - RelativePath="..\..\engines\game.cpp" - > - </File> - <File - RelativePath="..\..\engines\game.h" - > - </File> - <File - RelativePath="..\..\engines\metaengine.h" - > - </File> - </Filter> - <Filter - Name="TFMX" - > - <File - RelativePath="..\..\tfmx\mxtxplayer.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\TFMX\README.txt" - > - </File> - <File - RelativePath="..\..\tfmx\tfmxdebug.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug_Command|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\tfmx\tfmxdebug.h" - > - </File> - <File - RelativePath="..\..\TFMX\tfmxplayer.cpp" - > - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/dists/msvc9/scummvm.vcproj b/dists/msvc9/scummvm.vcproj index 51c532a195..93e4d851dd 100644 --- a/dists/msvc9/scummvm.vcproj +++ b/dists/msvc9/scummvm.vcproj @@ -765,6 +765,14 @@ > </File> <File + RelativePath="..\..\sound\mods\maxtrax.cpp" + > + </File> + <File + RelativePath="..\..\sound\mods\maxtrax.h" + > + </File> + <File RelativePath="..\..\sound\mods\module.cpp" > </File> @@ -804,6 +812,14 @@ RelativePath="..\..\sound\mods\soundfx.h" > </File> + <File + RelativePath="..\..\sound\mods\tfmx.cpp" + > + </File> + <File + RelativePath="..\..\sound\mods\tfmx.h" + > + </File> </Filter> </Filter> <Filter diff --git a/tfmx/module.mk b/tfmx/module.mk deleted file mode 100644 index 5227ae7e7e..0000000000 --- a/tfmx/module.mk +++ /dev/null @@ -1,9 +0,0 @@ -MODULE := tfmx - -MODULE_OBJS := \ - mxtxplayer.o \ - tfmxplayer.o \ - tfmxdebug.o - -# Include common rules -include $(srcdir)/rules.mk diff --git a/tfmx/mxtxplayer.cpp b/tfmx/mxtxplayer.cpp deleted file mode 100644 index 524626a972..0000000000 --- a/tfmx/mxtxplayer.cpp +++ /dev/null @@ -1,149 +0,0 @@ -#include "common/scummsys.h" -#include "common/system.h" -#include "common/stream.h" -#include "common/file.h" -#include "common/fs.h" -#include "common/endian.h" -#include "common/debug.h" - -#include "sound/mixer.h" -#include "sound/mods/maxtrax.h" - -#if defined(MXTX_CMDLINE_TOOL) - -#define FILEDIR "" - -using namespace Common; - -#define MUSICFILE "introscr.mx" -#define SAMPLEFILE "introinst.mx" - -Audio::MaxTrax *loadMtmxfile(const char *mdatName, const char *smplName) { - FSNode fileDir(FILEDIR); - FSNode musicNode = fileDir.getChild(mdatName); - FSNode sampleNode = fileDir.getChild(smplName); - SeekableReadStream *musicIn = musicNode.createReadStream(); - if (0 == musicIn) { - debug("Couldnt load file %s", mdatName); - return 0; - } - - Audio::MaxTrax *mxtxPlay = new Audio::MaxTrax(44100, true); - - if (strcmp(mdatName, smplName)) { - SeekableReadStream *sampleIn = sampleNode.createReadStream(); - if (0 == sampleIn) { - debug("Couldnt load file %s", smplName); - delete musicIn; - return 0; - } - mxtxPlay->load(*musicIn, true, false); - mxtxPlay->load(*sampleIn, false, true); - delete sampleIn; - } else { - mxtxPlay->load(*musicIn, true, true); - } - - delete musicIn; - - return mxtxPlay; -} - -void runFlac(int chan, int bits, int sr, const char *fileName); - -void modcmdmain(const int argc, const char *const argv[]) { - debug("Started Scumm&VM"); - debug("Sound celebrating utility for malcoms menace & Various Malfunctions"); - debug(""); - - Audio::MaxTrax *player = loadMtmxfile(MUSICFILE, SAMPLEFILE); - if (!player) { - debug("couldnt create MXTX-Player"); - return; - } - - int i = 1; - int playflag = 1; - bool hasCmd = false; - - - while (i < argc && argv[i][0] == '-') { - int param; - if (!strcmp("-s", argv[i])) { - if (i + 1 < argc) { - param = atoi(argv[++i]); - debug( "play Song %02X", param); - - player->playSong(param); - - //player->noteOn(player->_channelCtx[0], 43, 64, 0); - - - hasCmd = true; - } - } else if (!strcmp("-flac", argv[i])) { - playflag = 2; - } - ++i; - } - - if (!hasCmd) { - player->playSong(0); - //player->playNote(0x18, 0x03, 0x0F52, 120, 1); - } - - int maxsecs = 10 * 60; - if (playflag == 1) { - // get Mixer, assume this never fails - Audio::Mixer *mixer = g_system->getMixer(); - - Audio::SoundHandle soundH; - - mixer->playInputStream(Audio::Mixer::kMusicSoundType, &soundH, player); - while (mixer->isSoundHandleActive(soundH) && --maxsecs) - g_system->delayMillis(1000); -// player->AllOff(); - -// while (mixer->isSoundHandleActive(soundH)); - - mixer->stopHandle(soundH); - player = 0; - } - - if (playflag == 2) { - Common::FSNode file("out.raw"); - WriteStream *wav = file.createWriteStream(); - int16 buf[2 * 1024]; - int32 maxsamples = (maxsecs <= 0) ? 0 : maxsecs * 44100; - while (!player->endOfData() && maxsamples > 0) { - int read = player->readBuffer(buf, ARRAYSIZE(buf)); - wav->write(buf, read * 2); - maxsamples -= read/2; - } - delete wav; - - runFlac(2, 16, 44100, "out.raw"); - } - delete player; - -#ifdef _MSC_VER - printf("\npress a key"); - getc(stdin); -#endif -} - -void runFlac( int chan, int bits, int sr, const char *fileName) { - const char *format = "flac --endian=" -#ifdef SCUMM_BIG_ENDIAN - "big" -#else - "little" -#endif - " --channels=%d -f --bps=%d --sample-rate=%d --sign=signed --force-raw-format %s"; - char cmd[1024]; - sprintf(cmd, format, chan, bits, sr, fileName); - debug(cmd); - system(cmd); -} - -#endif // #if defined(MXTX_CMDLINE_TOOL)
\ No newline at end of file diff --git a/tfmx/tfmxdebug.cpp b/tfmx/tfmxdebug.cpp deleted file mode 100644 index 95bad15a96..0000000000 --- a/tfmx/tfmxdebug.cpp +++ /dev/null @@ -1,200 +0,0 @@ -#include "common/scummsys.h" -#include "common/endian.h" -#include "common/debug.h" -#include "common/stream.h" -#include "common/util.h" - -#include "sound/mods/tfmx.h" - -#include "tfmx/tfmxdebug.h" - - -const char *pattcmds[]={ - "End --Next track step--", - "Loop[count / step.w]", - "Cont[patternno./ step.w]", - "Wait[count 00-FF--------", - "Stop--Stop this pattern-", - "Kup^-Set key up/channel]", - "Vibr[speed / rate.b]", - "Enve[speed /endvolume.b]", - "GsPt[patternno./ step.w]", - "RoPt-Return old pattern-", - "Fade[speed /endvolume.b]", - "PPat[patt./track+transp]", - "Lock---------ch./time.b]", - "Cue [number.b/ value.w]", - "Stop-Stop custompattern-", - "NOP!-no operation-------" -}; - -const char *macrocmds[]={ - "DMAoff+Resetxx/xx/xx flag/addset/vol ", - "DMAon (start sample at selected begin) ", - "SetBegin xxxxxx sample-startadress", - "SetLen ..xxxx sample-length ", - "Wait ..xxxx count (VBI''s) ", - "Loop xx/xxxx count/step ", - "Cont xx/xxxx macro-number/step ", - "-------------STOP----------------------", - "AddNote xx/xxxx note/detune ", - "SetNote xx/xxxx note/detune ", - "Reset Vibrato-Portamento-Envelope ", - "Portamento xx/../xx count/speed ", - "Vibrato xx/../xx speed/intensity ", - "AddVolume ....xx volume 00-3F ", - "SetVolume ....xx volume 00-3F ", - "Envelope xx/xx/xx speed/count/endvol", - "Loop key up xx/xxxx count/step ", - "AddBegin xx/xxxx count/add to start", - "AddLen ..xxxx add to sample-len ", - "DMAoff stop sample but no clear ", - "Wait key up ....xx count (VBI''s) ", - "Go submacro xx/xxxx macro-number/step ", - "--------Return to old macro------------", - "Setperiod ..xxxx DMA period ", - "Sampleloop ..xxxx relative adress ", - "-------Set one shot sample-------------", - "Wait on DMA ..xxxx count (Wavecycles)", - "Random play xx/xx/xx macro/speed/mode ", - "Splitkey xx/xxxx key/macrostep ", - "Splitvolume xx/xxxx volume/macrostep ", - "Addvol+note xx/fe/xx note/CONST./volume", - "SetPrevNote xx/xxxx note/detune ", - "Signal xx/xxxx signalnumber/value", - "Play macro xx/.x/xx macro/chan/detune ", - "SID setbeg xxxxxx sample-startadress", - "SID setlen xx/xxxx buflen/sourcelen ", - "SID op3 ofs xxxxxx offset ", - "SID op3 frq xx/xxxx speed/amplitude ", - "SID op2 ofs xxxxxx offset ", - "SID op2 frq xx/xxxx speed/amplitude ", - "SID op1 xx/xx/xx speed/amplitude/TC", - "SID stop xx.... flag (1=clear all)" -}; - -const char *const trackstepFmt[] = { - "---Stop Player----", - "Loop step/count ", - "Tempo tempo/ciaDiv", - "Timeshare ?/? ", - "Fade start/end " -}; - -void displayPatternstep(const void *const vptr) { - const byte *const patData = (const byte *const)vptr; - - const byte command = patData[0]; - - if (command < 0xF0) { // Playnote - const byte flags = command >> 6; // 0-1 means note+detune, 2 means wait, 3 means portamento? - char *flagsSt[] = {"Note ", "Note ", "Wait ", "Porta"}; - debug("%s %02X%02X%02X%02X", flagsSt[flags], patData[0], patData[1], patData[2], patData[3]); - } else { - debug("%s %02X%02X%02X",pattcmds[command&0xF], patData[1], patData[2], patData[3]); - } - -} - -void displayTrackstep(const void *const vptr) { - const uint16 *const trackData = (const uint16 *const)vptr; - - if (trackData[0] == FROM_BE_16(0xEFFE)) { - // 16 byte Trackstep Command - const uint16 command = READ_BE_UINT16(&trackData[1]); - const uint16 param1 = READ_BE_UINT16(&trackData[2]); - const uint16 param2 = READ_BE_UINT16(&trackData[3]); - - - if (command >= ARRAYSIZE(trackstepFmt)) - debug("Unknown (%04X) : %04X %04X", command, param1, param2); - else - debug("%s: %04X %04X", trackstepFmt[command], param1, param2); - } else { - const byte *const ptr = (const byte *const)vptr; - // 8 commands for Patterns - debug("%02X%02X-%02X%02X-%02X%02X-%02X%02X-%02X%02X-%02X%02X-%02X%02X-%02X%02X", - ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5], ptr[6], ptr[7], - ptr[8], ptr[9], ptr[10], ptr[11], ptr[12], ptr[13], ptr[14], ptr[15]); - } -} - -void displayMacroStep(const void *const vptr, int chan, int index) { - const byte *const macroData = (const byte *const)vptr; - - if (macroData[0] < ARRAYSIZE(macrocmds)) - debug("%02X %02X %s %02X%02X%02X", chan, index, macrocmds[macroData[0]], macroData[1], macroData[2], macroData[3]); - else - debug("%02X %02X Unkown Macro #%02X %02X%02X%02X", chan, index, macroData[0], macroData[1], macroData[2], macroData[3]); -} - -void displayMacroStep(const void *const vptr) { - const byte *const macroData = (const byte *const)vptr; - - if (macroData[0] < ARRAYSIZE(macrocmds)) - debug("%s %02X%02X%02X", macrocmds[macroData[0]], macroData[1], macroData[2], macroData[3]); - else - debug("Unkown Macro #%02X %02X%02X%02X", macroData[0], macroData[1], macroData[2], macroData[3]); -} - -void dumpTracksteps(Audio::Tfmx &player, uint16 first, uint16 last) { - for ( ; first <= last; ++first) { - displayTrackstep(player._resource.getTrackPtr(first)); - } -} - -void dumpTrackstepsBySong(Audio::Tfmx &player, int song) { - debug("Song %02X: Pos %02X - %02X. Tempo: %02X", song, player._subsong[song].songstart, player._subsong[song].songend, player._subsong[song].tempo); - dumpTracksteps(player, player._subsong[song].songstart, player._subsong[song].songend); - debug(""); -} - -void dumpMacro(Audio::Tfmx &player, uint16 macroIndex, uint16 len, uint16 start) { - const uint32 * macroPtr = player._resource.getMacroPtr(player._macroOffset[macroIndex]); - bool untilMacroStop = (len == 0); - while (len--) { - displayMacroStep(macroPtr++); - } - while (untilMacroStop) { - untilMacroStop = *(const byte *)macroPtr != 7; - displayMacroStep(macroPtr++); - } -} - -void dumpPattern(Audio::Tfmx &player, uint16 pattIndex, uint16 len, uint16 start) { - const uint32 * pattPtr = player._resource.getPatternPtr(player._patternOffset[pattIndex]); - if (len == 0) - len = (player._patternOffset[pattIndex+1] - player._patternOffset[pattIndex])/4; - bool untilMacroStop = (len == 0); - while (len--) { - displayPatternstep(pattPtr++); - } - while (untilMacroStop) { - byte cmd = *(const byte *)pattPtr; - untilMacroStop = cmd != 0 && cmd != 4; - displayPatternstep(pattPtr++); - } -} - -void countAllMacros1(Audio::Tfmx &player, uint16 macroIndex, int *list) { - const uint32 * macroPtr = player._resource.getMacroPtr(player._macroOffset[macroIndex]); - bool untilMacroStop = true; - while (untilMacroStop) { - const int type = *(const byte *)macroPtr++; - untilMacroStop = type != 7; - list[type]++; - } -} - -void countAllMacros(Audio::Tfmx &player) { - int list[256] = {0}; - for (int i = 0; i < 128; ++i) - countAllMacros1(player, i, list); - byte fakeMacro[4] = {0}; - for (int i = 0; i < 256; ++i) { - fakeMacro[0] = (byte)i; - if (list[i] > 0) - displayMacroStep(fakeMacro); - } - -} diff --git a/tfmx/tfmxdebug.h b/tfmx/tfmxdebug.h deleted file mode 100644 index e849e561a9..0000000000 --- a/tfmx/tfmxdebug.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef TFMXDEBUG_H -#define TFMXDEBUG_H - -void displayTrackstep(const void *const vptr); -void displayPatternstep(const void *const vptr); -void displayMacroStep(const void *const vptr); -void displayMacroStep(const void *const vptr, int chan, int index); -void dumpTracksteps(Audio::Tfmx &player, uint16 first, uint16 last); -void dumpTrackstepsBySong(Audio::Tfmx &player, int song); -void dumpMacro(Audio::Tfmx &player, uint16 macroIndex, uint16 len = 0, uint16 start = 0); -void dumpPattern(Audio::Tfmx &player, uint16 pattIndex, uint16 len = 0, uint16 start = 0); -void countAllMacros(Audio::Tfmx &player); - -#endif // TFMXDEBUG_H
\ No newline at end of file diff --git a/tfmx/tfmxplayer.cpp b/tfmx/tfmxplayer.cpp deleted file mode 100644 index adf4b9866c..0000000000 --- a/tfmx/tfmxplayer.cpp +++ /dev/null @@ -1,172 +0,0 @@ -#include "common/scummsys.h" -#include "common/system.h" -#include "common/stream.h" -#include "common/file.h" -#include "common/fs.h" -#include "common/endian.h" -#include "common/debug.h" - -#include "sound/mixer.h" -#include "sound/mods/tfmx.h" - -#if defined(TFMX_CMDLINE_TOOL) - -#include "tfmx/tfmxdebug.h" - -#define FILEDIR "" - -using namespace Common; - -#define MUSICFILE "mdat.monkey" -#define SAMPLEFILE "smpl.monkey" -const int samplerate = 48000; - -Audio::Tfmx *loadTfmxfile(const char *mdatName, const char *sampleName) { - FSNode fileDir(FILEDIR); - FSNode musicNode = fileDir.getChild(mdatName); - FSNode sampleNode = fileDir.getChild(sampleName); - SeekableReadStream *musicIn = musicNode.createReadStream(); - if (0 == musicIn) { - debug("Couldnt load file %s", mdatName); - return 0; - } - - SeekableReadStream *sampleIn = sampleNode.createReadStream(); - if (0 == sampleIn) { - debug("Couldnt load file %s", sampleName); - delete musicIn; - return 0; - } - - Audio::Tfmx *player = new Audio::Tfmx(samplerate, true); - player->load(*musicIn, *sampleIn); - delete musicIn; - delete sampleIn; - - return player; -} - -void runFlac(int chan, int bits, int sr, const char *fileName); - -void modcmdmain(const int argc, const char *const argv[]) { - debug("Started Scumm&VM"); - debug("Sound celebrating utility for monkey melodies & Various Malfunctions"); - debug(""); - - //simplePlaybacktest(argc, argv); - - Audio::Tfmx *player = loadTfmxfile(MUSICFILE, SAMPLEFILE); - if (!player) { - debug("couldnt create TFMX-Player"); - return; - } - - int i = 1; - int playflag = 1; - bool hasCmd = false; - - - while (i < argc && argv[i][0] == '-') { - int param; - if (!strcmp("-m", argv[i])) { - if (i + 1 < argc) { - param = atoi(argv[++i]); - debug( "play Macro %02X", param); - //dumpMacro(*player, param); - player->doMacro(0x1B, param); - hasCmd = true; - } - } else if (!strcmp("-s", argv[i])) { - if (i + 1 < argc) { - param = atoi(argv[++i]); - debug( "play Song %02X", param); - //dumpTrackstepsBySong(*player, param); - player->doSong(param); - hasCmd = true; - } - } else if (!strcmp("-c", argv[i])) { - if (i + 1 < argc) { - param = atoi(argv[++i]); - debug( "play custom %02X", param); - if (player->getSongIndex() < 0) - player->doSong(0x18); - player->doSfx(param); - hasCmd = true; - } - } else if (!strcmp("-flac", argv[i])) { - playflag = 2; - } else if (!strcmp("-hack-patternstop", argv[i])) - // player->_playerCtx.stopWithLastPattern = true; - ++i; - } - - if (!hasCmd) { - player->doSong(4); - //dumpTrackstepsBySong(*player, 4); - } - - - - -#if 0 - int16 buf[2 * 1024]; - - while( true) - player->readBuffer(buf, ARRAYSIZE(buf)); -#endif - int maxsecs = 10 * 60; - if (playflag == 1) { - // get Mixer, assume this never fails - Audio::Mixer *mixer = g_system->getMixer(); - - Audio::SoundHandle soundH; - - mixer->playInputStream(Audio::Mixer::kMusicSoundType, &soundH, player); - while (mixer->isSoundHandleActive(soundH) && --maxsecs) - g_system->delayMillis(1000); -// player->AllOff(); - -// while (mixer->isSoundHandleActive(soundH)); - - mixer->stopHandle(soundH); - player = 0; - } - - if (playflag == 2) { - Common::FSNode file("out.raw"); - WriteStream *wav = file.createWriteStream(); - int16 buf[2 * 1024]; - int32 maxsamples = (maxsecs <= 0) ? 0 : maxsecs * samplerate; - while (!player->endOfData() && maxsamples > 0) { - int read = player->readBuffer(buf, ARRAYSIZE(buf)); - wav->write(buf, read * 2); - maxsamples -= read/2; - } - delete wav; - - runFlac(2, 16, samplerate, "out.raw"); - } - -#ifdef _MSC_VER - printf("\npress a key"); - getc(stdin); -#endif - - delete player; -} - -void runFlac( int chan, int bits, int sr, const char *fileName) { - const char *format = "flac --endian=" -#ifdef SCUMM_BIG_ENDIAN - "big" -#else - "little" -#endif - " --channels=%d -f --bps=%d --sample-rate=%d --sign=signed --force-raw-format %s"; - char cmd[1024]; - sprintf(cmd, format, chan, bits, sr, fileName); - debug(cmd); - system(cmd); -} - -#endif // #if defined(TFMX_CMDLINE_TOOL) |