From f81bae8235029e991cadab608f493649074f21c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Ko=C5=82odziejski?= Date: Sat, 24 Aug 2002 22:03:05 +0000 Subject: [PATCH] support for VC6, not finished - not correct linking (duplicate default libs) svn-id: r4834 --- scumm.dsp | 434 ++++++++++++++++++++++++++++++++++++++++ scummvm.dsp | 566 +++++++++++++--------------------------------------- scummvm.dsw | 32 ++- simon.dsp | 186 +++++++++++++++++ 4 files changed, 787 insertions(+), 431 deletions(-) create mode 100644 scumm.dsp create mode 100644 simon.dsp diff --git a/scumm.dsp b/scumm.dsp new file mode 100644 index 00000000000..4aff1837f37 --- /dev/null +++ b/scumm.dsp @@ -0,0 +1,434 @@ +# Microsoft Developer Studio Project File - Name="scumm" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=scumm - Win32 MP3 Enabled Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "scumm.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "scumm.mak" CFG="scumm - Win32 MP3 Enabled Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "scumm - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "scumm - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE "scumm - Win32 MP3 Enabled Debug" (based on "Win32 (x86) Static Library") +!MESSAGE "scumm - Win32 MP3 Enabled Release" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "scumm - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "scumm___Release" +# PROP Intermediate_Dir "scumm___Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "." /I "common" /I "scumm" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "DUMP_SCRIPTS" /YX /FD /c +# ADD BASE RSC /l 0x415 /d "NDEBUG" +# ADD RSC /l 0x415 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ELSEIF "$(CFG)" == "scumm - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "scumm___Win32_Debug" +# PROP BASE Intermediate_Dir "scumm___Win32_Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "scumm___Win32_Debug" +# PROP Intermediate_Dir "scumm___Win32_Debug" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "." /I "common" /I "scumm" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /D "DUMP_SCRIPTS" /YX /FD /GZ /c +# ADD BASE RSC /l 0x415 /d "_DEBUG" +# ADD RSC /l 0x415 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ELSEIF "$(CFG)" == "scumm - Win32 MP3 Enabled Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "scumm___Win32_MP3_Enabled_Debug" +# PROP BASE Intermediate_Dir "scumm___Win32_MP3_Enabled_Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "scumm___Win32_MP3_Enabled_Debug" +# PROP Intermediate_Dir "scumm___Win32_MP3_Enabled_Debug" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "." /I "common" /I "scumm" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /D "DUMP_SCRIPTS" /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "." /I "common" /I "scumm" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /D "DUMP_SCRIPTS" /D "COMPRESSED_SOUND_FILE" /YX /FD /GZ /c +# ADD BASE RSC /l 0x415 /d "_DEBUG" +# ADD RSC /l 0x415 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ELSEIF "$(CFG)" == "scumm - Win32 MP3 Enabled Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "scumm___Win32_MP3_Enabled_Release" +# PROP BASE Intermediate_Dir "scumm___Win32_MP3_Enabled_Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "scumm___Win32_MP3_Enabled_Release" +# PROP Intermediate_Dir "scumm___Win32_MP3_Enabled_Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /I "." /I "common" /I "scumm" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "DUMP_SCRIPTS" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "." /I "common" /I "scumm" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "DUMP_SCRIPTS" /D "COMPRESSED_SOUND_FILE" /YX /FD /c +# ADD BASE RSC /l 0x415 /d "NDEBUG" +# ADD RSC /l 0x415 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ENDIF + +# Begin Target + +# Name "scumm - Win32 Release" +# Name "scumm - Win32 Debug" +# Name "scumm - Win32 MP3 Enabled Debug" +# Name "scumm - Win32 MP3 Enabled Release" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Group "smush" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=.\scumm\smush\blitter.cpp +# End Source File +# Begin Source File + +SOURCE=.\scumm\smush\blitter.h +# End Source File +# Begin Source File + +SOURCE=.\scumm\smush\brenderer.cpp +# End Source File +# Begin Source File + +SOURCE=.\scumm\smush\brenderer.h +# End Source File +# Begin Source File + +SOURCE=.\scumm\smush\channel.h +# End Source File +# Begin Source File + +SOURCE=.\scumm\smush\chunk.cpp +# End Source File +# Begin Source File + +SOURCE=.\scumm\smush\chunk.h +# End Source File +# Begin Source File + +SOURCE=.\scumm\smush\chunk_type.h +# End Source File +# Begin Source File + +SOURCE=.\scumm\smush\codec1.cpp +# End Source File +# Begin Source File + +SOURCE=.\scumm\smush\codec1.h +# End Source File +# Begin Source File + +SOURCE=.\scumm\smush\codec37.cpp +# End Source File +# Begin Source File + +SOURCE=.\scumm\smush\codec37.h +# End Source File +# Begin Source File + +SOURCE=.\scumm\smush\codec44.cpp +# End Source File +# Begin Source File + +SOURCE=.\scumm\smush\codec44.h +# End Source File +# Begin Source File + +SOURCE=.\scumm\smush\codec47.cpp +# End Source File +# Begin Source File + +SOURCE=.\scumm\smush\codec47.h +# End Source File +# Begin Source File + +SOURCE=.\scumm\smush\color.cpp +# End Source File +# Begin Source File + +SOURCE=.\scumm\smush\color.h +# End Source File +# Begin Source File + +SOURCE=.\scumm\smush\config.h +# End Source File +# Begin Source File + +SOURCE=.\scumm\smush\decoder.h +# End Source File +# Begin Source File + +SOURCE=.\scumm\smush\frenderer.cpp +# End Source File +# Begin Source File + +SOURCE=.\scumm\smush\frenderer.h +# End Source File +# Begin Source File + +SOURCE=.\scumm\smush\imuse_channel.cpp +# End Source File +# Begin Source File + +SOURCE=.\scumm\smush\mixer.h +# End Source File +# Begin Source File + +SOURCE=.\scumm\smush\palette.cpp +# End Source File +# Begin Source File + +SOURCE=.\scumm\smush\palette.h +# End Source File +# Begin Source File + +SOURCE=.\scumm\smush\player.cpp +# End Source File +# Begin Source File + +SOURCE=.\scumm\smush\player.h +# End Source File +# Begin Source File + +SOURCE=.\scumm\smush\rect.cpp +# End Source File +# Begin Source File + +SOURCE=.\scumm\smush\rect.h +# End Source File +# Begin Source File + +SOURCE=.\scumm\smush\renderer.h +# End Source File +# Begin Source File + +SOURCE=.\scumm\smush\saud_channel.cpp +# End Source File +# Begin Source File + +SOURCE=.\scumm\smush\scumm_renderer.cpp +# End Source File +# Begin Source File + +SOURCE=.\scumm\smush\scumm_renderer.h +# End Source File +# End Group +# Begin Source File + +SOURCE=.\scumm\actor.cpp +# End Source File +# Begin Source File + +SOURCE=.\scumm\actor.h +# End Source File +# Begin Source File + +SOURCE=.\scumm\akos.cpp +# End Source File +# Begin Source File + +SOURCE=.\scumm\akos.h +# End Source File +# Begin Source File + +SOURCE=.\scumm\boxes.cpp +# End Source File +# Begin Source File + +SOURCE=.\scumm\boxes.h +# End Source File +# Begin Source File + +SOURCE=.\scumm\bundle.cpp +# End Source File +# Begin Source File + +SOURCE=.\scumm\bundle.h +# End Source File +# Begin Source File + +SOURCE=.\scumm\costume.cpp +# End Source File +# Begin Source File + +SOURCE=.\scumm\costume.h +# End Source File +# Begin Source File + +SOURCE=.\scumm\debug.cpp +# End Source File +# Begin Source File + +SOURCE=.\scumm\debug.h +# End Source File +# Begin Source File + +SOURCE=.\scumm\debugrl.cpp +# End Source File +# Begin Source File + +SOURCE=.\scumm\debugrl.h +# End Source File +# Begin Source File + +SOURCE=.\scumm\gfx.cpp +# End Source File +# Begin Source File + +SOURCE=.\scumm\gfx.h +# End Source File +# Begin Source File + +SOURCE=.\scumm\imuse.cpp +# End Source File +# Begin Source File + +SOURCE=.\scumm\imuse.h +# End Source File +# Begin Source File + +SOURCE=.\scumm\insane.cpp +# End Source File +# Begin Source File + +SOURCE=.\scumm\object.cpp +# End Source File +# Begin Source File + +SOURCE=.\scumm\object.h +# End Source File +# Begin Source File + +SOURCE=.\scumm\resource.cpp +# End Source File +# Begin Source File + +SOURCE=.\scumm\resource.h +# End Source File +# Begin Source File + +SOURCE=.\scumm\resource_v3.cpp +# End Source File +# Begin Source File + +SOURCE=.\scumm\resource_v4.cpp +# End Source File +# Begin Source File + +SOURCE=.\scumm\saveload.cpp +# End Source File +# Begin Source File + +SOURCE=.\scumm\saveload.h +# End Source File +# Begin Source File + +SOURCE=.\scumm\script.cpp +# End Source File +# Begin Source File + +SOURCE=.\scumm\script_v1.cpp +# End Source File +# Begin Source File + +SOURCE=.\scumm\script_v2.cpp +# End Source File +# Begin Source File + +SOURCE=.\scumm\scumm.h +# End Source File +# Begin Source File + +SOURCE=.\scumm\scummvm.cpp +# End Source File +# Begin Source File + +SOURCE=.\scumm\smush.h +# End Source File +# Begin Source File + +SOURCE=.\scumm\sound.h +# End Source File +# Begin Source File + +SOURCE=.\scumm\string.cpp +# End Source File +# Begin Source File + +SOURCE=.\scumm\sys.cpp +# End Source File +# Begin Source File + +SOURCE=.\scumm\vars.cpp +# End Source File +# Begin Source File + +SOURCE=.\scumm\verbs.cpp +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# End Group +# End Target +# End Project diff --git a/scummvm.dsp b/scummvm.dsp index a5fe09cf7c6..1d66d6bc88f 100644 --- a/scummvm.dsp +++ b/scummvm.dsp @@ -20,6 +20,7 @@ CFG=scummvm - Win32 MP3 Enabled Debug !MESSAGE "scummvm - Win32 Release" (based on "Win32 (x86) Console Application") !MESSAGE "scummvm - Win32 Debug" (based on "Win32 (x86) Console Application") !MESSAGE "scummvm - Win32 MP3 Enabled Debug" (based on "Win32 (x86) Console Application") +!MESSAGE "scummvm - Win32 MP3 Enabled Release" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project @@ -38,12 +39,12 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" +# PROP Output_Dir "scummvm___Release" +# PROP Intermediate_Dir "scummvm___Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /G6 /MD /W3 /O2 /Ob2 /I "." /I "sound" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "USE_ADLIB" /D "COMPRESSED_SOUND_FILE" /FD /c +# ADD CPP /nologo /G6 /MD /W3 /O2 /Ob2 /I "." /I "sound" /I "common" /I "scumm" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "USE_ADLIB" /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE RSC /l 0x41d /d "NDEBUG" # ADD RSC /l 0x41d /d "NDEBUG" @@ -52,8 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib wsock32.lib libmad.lib /nologo /subsystem:console /machine:I386 -# SUBTRACT LINK32 /nodefaultlib +# ADD LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib wsock32.lib libmad.lib simon___Release\simon.lib scumm___Release\scumm.lib sdl.lib /nologo /subsystem:console /machine:I386 /nodefaultlib !ELSEIF "$(CFG)" == "scummvm - Win32 Debug" @@ -64,8 +64,8 @@ LINK32=link.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" +# PROP Output_Dir "scummvm___Debug" +# PROP Intermediate_Dir "scummvm___Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c @@ -78,7 +78,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib wsock32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib wsock32.lib simon___Debug\simon.lib scumm___Debug\scumm.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept !ELSEIF "$(CFG)" == "scummvm - Win32 MP3 Enabled Debug" @@ -96,7 +96,7 @@ LINK32=link.exe # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /I "./sound" /I "./" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "ALLOW_GDI" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /D "DUMP_SCRIPTS" /D "COMPRESSED_SOUND_FILE" /Yu"stdafx.h" /FD /GZ /c # SUBTRACT BASE CPP /Fr -# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "./sound" /I "./" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "ALLOW_GDI" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /D "DUMP_SCRIPTS" /D "COMPRESSED_SOUND_FILE" /Yu"stdafx.h" /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "." /I "common" /I "scumm" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "ALLOW_GDI" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /D "DUMP_SCRIPTS" /D "COMPRESSED_SOUND_FILE" /Yu"stdafx.h" /FD /GZ /c # SUBTRACT CPP /Fr # ADD BASE RSC /l 0x41d /d "_DEBUG" # ADD RSC /l 0x41d /d "_DEBUG" @@ -107,6 +107,33 @@ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib libmad.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept # ADD LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib libmad.lib wsock32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +!ELSEIF "$(CFG)" == "scummvm - Win32 MP3 Enabled Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "scummvm___Win32_MP3_Enabled_Release" +# PROP BASE Intermediate_Dir "scummvm___Win32_MP3_Enabled_Release" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "scummvm___Win32_MP3_Enabled_Release" +# PROP Intermediate_Dir "scummvm___Win32_MP3_Enabled_Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /G6 /MD /W3 /O2 /Ob2 /I "." /I "sound" /I "common" /I "scumm" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "USE_ADLIB" /D "COMPRESSED_SOUND_FILE" /FD /c +# SUBTRACT BASE CPP /YX /Yc /Yu +# ADD CPP /nologo /G6 /MD /W3 /O2 /Ob2 /I "." /I "sound" /I "common" /I "scumm" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "USE_ADLIB" /D "COMPRESSED_SOUND_FILE" /FD /c +# SUBTRACT CPP /YX /Yc /Yu +# ADD BASE RSC /l 0x41d /d "NDEBUG" +# ADD RSC /l 0x41d /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib wsock32.lib libmad.lib simon___Release\simon.lib scumm___Release\scumm.lib sdl.lib /nologo /subsystem:console /machine:I386 /nodefaultlib +# ADD LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib wsock32.lib libmad.lib simon___Release\simon.lib scumm___Release\scumm.lib sdl.lib /nologo /subsystem:console /machine:I386 /nodefaultlib + !ENDIF # Begin Target @@ -114,9 +141,82 @@ LINK32=link.exe # Name "scummvm - Win32 Release" # Name "scummvm - Win32 Debug" # Name "scummvm - Win32 MP3 Enabled Debug" +# Name "scummvm - Win32 MP3 Enabled Release" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Group "common" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=".\common\config-file.cpp" +# End Source File +# Begin Source File + +SOURCE=".\common\config-file.h" +# End Source File +# Begin Source File + +SOURCE=.\common\engine.cpp +# End Source File +# Begin Source File + +SOURCE=.\common\engine.h +# End Source File +# Begin Source File + +SOURCE=.\common\gameDetector.cpp +# End Source File +# Begin Source File + +SOURCE=.\common\gameDetector.h +# End Source File +# Begin Source File + +SOURCE=.\common\main.cpp +# End Source File +# Begin Source File + +SOURCE=.\common\scaler.cpp +# End Source File +# Begin Source File + +SOURCE=.\common\scaler.h +# End Source File +# Begin Source File + +SOURCE=.\common\scummsys.h +# End Source File +# Begin Source File + +SOURCE=.\common\stdafx.cpp +# End Source File +# Begin Source File + +SOURCE=.\common\stdafx.h +# End Source File +# Begin Source File + +SOURCE=.\common\system.h +# End Source File +# Begin Source File + +SOURCE=.\common\timer.cpp +# End Source File +# Begin Source File + +SOURCE=.\common\timer.h +# End Source File +# Begin Source File + +SOURCE=.\common\util.cpp +# End Source File +# Begin Source File + +SOURCE=.\common\util.h +# End Source File +# End Group # Begin Group "sound" # PROP Default_Filter "" @@ -126,11 +226,7 @@ SOURCE=.\sound\fmopl.cpp # End Source File # Begin Source File -SOURCE=.\sound\imuse.cpp -# End Source File -# Begin Source File - -SOURCE=.\sound\imuse.h +SOURCE=.\sound\fmopl.h # End Source File # Begin Source File @@ -148,61 +244,13 @@ SOURCE=.\sound\mixer.cpp SOURCE=.\sound\mixer.h # End Source File -# End Group -# Begin Group "v3" - -# PROP Default_Filter "" # Begin Source File -SOURCE=.\v3\resource_v3.cpp -# End Source File -# End Group -# Begin Group "v4" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\v4\resource_v4.cpp -# End Source File -# End Group -# Begin Group "simon" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\simon\midi.cpp +SOURCE=.\sound\sound.cpp # End Source File # Begin Source File -SOURCE=.\simon\simon.cpp -# End Source File -# Begin Source File - -SOURCE=.\simon\simon.h -# End Source File -# Begin Source File - -SOURCE=.\simon\simondebug.cpp -# End Source File -# Begin Source File - -SOURCE=.\simon\simonitems.cpp -# End Source File -# Begin Source File - -SOURCE=.\simon\simonres.cpp -# End Source File -# Begin Source File - -SOURCE=.\simon\simonsys.cpp -# End Source File -# Begin Source File - -SOURCE=.\simon\simonverb.cpp -# End Source File -# Begin Source File - -SOURCE=.\simon\simonvga.cpp +SOURCE=.\sound\sound.h # End Source File # End Group # Begin Group "gui" @@ -218,6 +266,18 @@ SOURCE=.\gui\dialog.h # End Source File # Begin Source File +SOURCE=.\gui\gui.cpp +# End Source File +# Begin Source File + +SOURCE=.\gui\gui.h +# End Source File +# Begin Source File + +SOURCE=.\gui\guimaps.h +# End Source File +# Begin Source File + SOURCE=.\gui\ListWidget.cpp # End Source File # Begin Source File @@ -226,11 +286,11 @@ SOURCE=.\gui\ListWidget.h # End Source File # Begin Source File -SOURCE=.\newgui.cpp +SOURCE=.\gui\newgui.cpp # End Source File # Begin Source File -SOURCE=.\newgui.h +SOURCE=.\gui\newgui.h # End Source File # Begin Source File @@ -242,14 +302,6 @@ SOURCE=.\gui\ScrollBarWidget.h # End Source File # Begin Source File -SOURCE=.\util.cpp -# End Source File -# Begin Source File - -SOURCE=.\util.h -# End Source File -# Begin Source File - SOURCE=.\gui\widget.cpp # End Source File # Begin Source File @@ -257,372 +309,26 @@ SOURCE=.\gui\widget.cpp SOURCE=.\gui\widget.h # End Source File # End Group +# Begin Group "backends" + +# PROP Default_Filter "" +# Begin Group "sdl" + +# PROP Default_Filter "" # Begin Source File -SOURCE=.\actor.cpp - -!IF "$(CFG)" == "scummvm - Win32 Release" - -# ADD CPP /Gd - -!ELSEIF "$(CFG)" == "scummvm - Win32 Debug" - -!ELSEIF "$(CFG)" == "scummvm - Win32 MP3 Enabled Debug" - -!ENDIF - +SOURCE=".\backends\sdl\sdl-common.cpp" # End Source File # Begin Source File -SOURCE=.\akos.cpp -# End Source File -# Begin Source File - -SOURCE=.\boxes.cpp - -!IF "$(CFG)" == "scummvm - Win32 Release" - -# ADD CPP /Gd - -!ELSEIF "$(CFG)" == "scummvm - Win32 Debug" - -!ELSEIF "$(CFG)" == "scummvm - Win32 MP3 Enabled Debug" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\bundle.cpp -# End Source File -# Begin Source File - -SOURCE=".\config-file.cpp" -# End Source File -# Begin Source File - -SOURCE=.\costume.cpp -# End Source File -# Begin Source File - -SOURCE=.\debug.cpp - -!IF "$(CFG)" == "scummvm - Win32 Release" - -# ADD CPP /Gd - -!ELSEIF "$(CFG)" == "scummvm - Win32 Debug" - -!ELSEIF "$(CFG)" == "scummvm - Win32 MP3 Enabled Debug" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=".\engine.cpp" -# End Source File -# Begin Source File - -SOURCE=.\gameDetector.cpp -# End Source File -# Begin Source File - -SOURCE=.\gfx.cpp - -!IF "$(CFG)" == "scummvm - Win32 Release" - -# ADD CPP /Gd - -!ELSEIF "$(CFG)" == "scummvm - Win32 Debug" - -!ELSEIF "$(CFG)" == "scummvm - Win32 MP3 Enabled Debug" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\gui.cpp -# End Source File -# Begin Source File - -SOURCE=.\insane.cpp -# End Source File -# Begin Source File - -SOURCE=.\main.cpp -# End Source File -# Begin Source File - -SOURCE=.\object.cpp - -!IF "$(CFG)" == "scummvm - Win32 Release" - -# ADD CPP /Gd - -!ELSEIF "$(CFG)" == "scummvm - Win32 Debug" - -!ELSEIF "$(CFG)" == "scummvm - Win32 MP3 Enabled Debug" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\resource.cpp - -!IF "$(CFG)" == "scummvm - Win32 Release" - -# ADD CPP /Gd - -!ELSEIF "$(CFG)" == "scummvm - Win32 Debug" - -!ELSEIF "$(CFG)" == "scummvm - Win32 MP3 Enabled Debug" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\saveload.cpp - -!IF "$(CFG)" == "scummvm - Win32 Release" - -# ADD CPP /Gd - -!ELSEIF "$(CFG)" == "scummvm - Win32 Debug" - -!ELSEIF "$(CFG)" == "scummvm - Win32 MP3 Enabled Debug" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\scaler.cpp -# End Source File -# Begin Source File - -SOURCE=.\script.cpp - -!IF "$(CFG)" == "scummvm - Win32 Release" - -# ADD CPP /Gd - -!ELSEIF "$(CFG)" == "scummvm - Win32 Debug" - -!ELSEIF "$(CFG)" == "scummvm - Win32 MP3 Enabled Debug" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\script_v1.cpp - -!IF "$(CFG)" == "scummvm - Win32 Release" - -# ADD CPP /Gd - -!ELSEIF "$(CFG)" == "scummvm - Win32 Debug" - -!ELSEIF "$(CFG)" == "scummvm - Win32 MP3 Enabled Debug" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\script_v2.cpp - -!IF "$(CFG)" == "scummvm - Win32 Release" - -# ADD CPP /Gd - -!ELSEIF "$(CFG)" == "scummvm - Win32 Debug" - -!ELSEIF "$(CFG)" == "scummvm - Win32 MP3 Enabled Debug" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\scummvm.cpp -# End Source File -# Begin Source File - -SOURCE=.\scummvm.rc -# End Source File -# Begin Source File - -SOURCE=.\sdl.cpp -# End Source File -# Begin Source File - -SOURCE=.\sound.cpp - -!IF "$(CFG)" == "scummvm - Win32 Release" - -# ADD CPP /Gd - -!ELSEIF "$(CFG)" == "scummvm - Win32 Debug" - -!ELSEIF "$(CFG)" == "scummvm - Win32 MP3 Enabled Debug" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\StdAfx.cpp - -!IF "$(CFG)" == "scummvm - Win32 Release" - -# ADD CPP /Gd /Yc"stdafx.h" - -!ELSEIF "$(CFG)" == "scummvm - Win32 Debug" - -# ADD CPP /Yc"stdafx.h" - -!ELSEIF "$(CFG)" == "scummvm - Win32 MP3 Enabled Debug" - -# ADD BASE CPP /Yc"stdafx.h" -# ADD CPP /Yc"stdafx.h" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\string.cpp - -!IF "$(CFG)" == "scummvm - Win32 Release" - -# ADD CPP /Gd - -!ELSEIF "$(CFG)" == "scummvm - Win32 Debug" - -!ELSEIF "$(CFG)" == "scummvm - Win32 MP3 Enabled Debug" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\sys.cpp - -!IF "$(CFG)" == "scummvm - Win32 Release" - -# ADD CPP /Gd - -!ELSEIF "$(CFG)" == "scummvm - Win32 Debug" - -!ELSEIF "$(CFG)" == "scummvm - Win32 MP3 Enabled Debug" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\timer.cpp -# End Source File -# Begin Source File - -SOURCE=.\vars.cpp -# End Source File -# Begin Source File - -SOURCE=.\verbs.cpp - -!IF "$(CFG)" == "scummvm - Win32 Release" - -# ADD CPP /Gd - -!ELSEIF "$(CFG)" == "scummvm - Win32 Debug" - -!ELSEIF "$(CFG)" == "scummvm - Win32 MP3 Enabled Debug" - -!ENDIF - +SOURCE=".\backends\sdl\sdl-common.h" # End Source File # End Group +# End Group +# End Group # Begin Group "Header Files" # PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\actor.h -# End Source File -# Begin Source File - -SOURCE=.\akos.h -# End Source File -# Begin Source File - -SOURCE=.\boxes.h -# End Source File -# Begin Source File - -SOURCE=.\bundle.h -# End Source File -# Begin Source File - -SOURCE=.\cdmusic.h -# End Source File -# Begin Source File - -SOURCE=".\config-file.h" -# End Source File -# Begin Source File - -SOURCE=.\sound\fmopl.h -# End Source File -# Begin Source File - -SOURCE=.\gameDetector.h -# End Source File -# Begin Source File - -SOURCE=.\gfx.h -# End Source File -# Begin Source File - -SOURCE=.\gui.h -# End Source File -# Begin Source File - -SOURCE=.\guimaps.h -# End Source File -# Begin Source File - -SOURCE=.\scumm.h -# End Source File -# Begin Source File - -SOURCE=.\scummsys.h -# End Source File -# Begin Source File - -SOURCE=.\smush.h -# End Source File -# Begin Source File - -SOURCE=.\sound.h -# End Source File -# Begin Source File - -SOURCE=.\StdAfx.h -# End Source File -# Begin Source File - -SOURCE=.\system.h -# End Source File -# Begin Source File - -SOURCE=.\timer.h -# End Source File # End Group # Begin Source File diff --git a/scummvm.dsw b/scummvm.dsw index e4c72042dc4..b4bbec9050e 100644 --- a/scummvm.dsw +++ b/scummvm.dsw @@ -3,7 +3,37 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 ############################################################################### -Project: "scummvm"=.\scummvm.dsp - Package Owner=<4> +Project: "scumm"=".\scumm.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "scummvm"=".\scummvm.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name scumm + End Project Dependency + Begin Project Dependency + Project_Dep_Name simon + End Project Dependency +}}} + +############################################################################### + +Project: "simon"=".\simon.dsp" - Package Owner=<4> Package=<5> {{{ diff --git a/simon.dsp b/simon.dsp new file mode 100644 index 00000000000..d7e8e243af1 --- /dev/null +++ b/simon.dsp @@ -0,0 +1,186 @@ +# Microsoft Developer Studio Project File - Name="simon" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=simon - Win32 MP3 Enabled Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "simon.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "simon.mak" CFG="simon - Win32 MP3 Enabled Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "simon - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "simon - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE "simon - Win32 MP3 Enabled Debug" (based on "Win32 (x86) Static Library") +!MESSAGE "simon - Win32 MP3 Enabled Release" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "simon - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "simon___Release" +# PROP Intermediate_Dir "simon___Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "." /I "common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /YX /FD /c +# ADD BASE RSC /l 0x415 /d "NDEBUG" +# ADD RSC /l 0x415 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ELSEIF "$(CFG)" == "simon - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "simon___Win32_Debug" +# PROP BASE Intermediate_Dir "simon___Win32_Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "simon___Win32_Debug" +# PROP Intermediate_Dir "simon___Win32_Debug" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /D "DUMP_SCRIPTS" /YX /FD /GZ /c +# ADD BASE RSC /l 0x415 /d "_DEBUG" +# ADD RSC /l 0x415 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ELSEIF "$(CFG)" == "simon - Win32 MP3 Enabled Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "simon___Win32_MP3_Enabled_Debug" +# PROP BASE Intermediate_Dir "simon___Win32_MP3_Enabled_Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "simon___Win32_MP3_Enabled_Debug" +# PROP Intermediate_Dir "simon___Win32_MP3_Enabled_Debug" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /D "DUMP_SCRIPTS" /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /D "DUMP_SCRIPTS" /D "COMPRESSED_SOUND_FILE" /YX /FD /GZ /c +# ADD BASE RSC /l 0x415 /d "_DEBUG" +# ADD RSC /l 0x415 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ELSEIF "$(CFG)" == "simon - Win32 MP3 Enabled Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "simon___Win32_MP3_Enabled_Release" +# PROP BASE Intermediate_Dir "simon___Win32_MP3_Enabled_Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "simon___Win32_MP3_Enabled_Release" +# PROP Intermediate_Dir "simon___Win32_MP3_Enabled_Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /I "." /I "common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "." /I "common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "COMPRESSED_SOUND_FILE" /YX /FD /c +# ADD BASE RSC /l 0x415 /d "NDEBUG" +# ADD RSC /l 0x415 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ENDIF + +# Begin Target + +# Name "simon - Win32 Release" +# Name "simon - Win32 Debug" +# Name "simon - Win32 MP3 Enabled Debug" +# Name "simon - Win32 MP3 Enabled Release" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\simon\debug.cpp +# End Source File +# Begin Source File + +SOURCE=.\simon\intern.h +# End Source File +# Begin Source File + +SOURCE=.\simon\items.cpp +# End Source File +# Begin Source File + +SOURCE=.\simon\midi.cpp +# End Source File +# Begin Source File + +SOURCE=.\simon\midi.h +# End Source File +# Begin Source File + +SOURCE=.\simon\res.cpp +# End Source File +# Begin Source File + +SOURCE=.\simon\simon.cpp +# End Source File +# Begin Source File + +SOURCE=.\simon\simon.h +# End Source File +# Begin Source File + +SOURCE=.\simon\sys.cpp +# End Source File +# Begin Source File + +SOURCE=.\simon\verb.cpp +# End Source File +# Begin Source File + +SOURCE=.\simon\vga.cpp +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# End Group +# End Target +# End Project