From: Laszlo T. <ave...@us...> - 2010-06-01 16:20:42
|
win32: MSVC project files for building GemRB on MS Windows The branch master has been updated via 3807e13361dca7d03d7cf065d93a5d289c9a968d (commit) Summary of changes: MSVC6/GemRB/GemRB.dsp | 296 ++--- MSVC6/GemRB/GemRB.dsw | 1489 ++++++++++---------- MSVC6/GemRB/plugins/ACMImporter/ACMImporter.def | 7 - .../BIKPlayer.def => ACMReader/ACMReader.def} | 2 +- .../ACMImporter.dsp => ACMReader/ACMReader.dsp} | 97 +- .../BIKPlayer.def => OGGReader/OGGReader.def} | 2 +- .../ACMImporter.dsp => OGGReader/OGGReader.dsp} | 98 +- .../BIKPlayer.def => WAVReader/WAVReader.def} | 2 +- .../ACMImporter.dsp => WAVReader/WAVReader.dsp} | 98 +- 9 files changed, 989 insertions(+), 1102 deletions(-) delete mode 100644 MSVC6/GemRB/plugins/ACMImporter/ACMImporter.def copy MSVC6/GemRB/plugins/{BIKPlayer/BIKPlayer.def => ACMReader/ACMReader.def} (67%) copy MSVC6/GemRB/plugins/{ACMImporter/ACMImporter.dsp => ACMReader/ACMReader.dsp} (63%) copy MSVC6/GemRB/plugins/{BIKPlayer/BIKPlayer.def => OGGReader/OGGReader.def} (67%) copy MSVC6/GemRB/plugins/{ACMImporter/ACMImporter.dsp => OGGReader/OGGReader.dsp} (59%) copy MSVC6/GemRB/plugins/{BIKPlayer/BIKPlayer.def => WAVReader/WAVReader.def} (67%) rename MSVC6/GemRB/plugins/{ACMImporter/ACMImporter.dsp => WAVReader/WAVReader.dsp} (59%) from 338590ef89d32c0c533c03b0e2212b819a38addc (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/win32;a=commitdiff;h=3807e13361dca7d03d7cf065d93a5d289c9a968d commit 3807e13361dca7d03d7cf065d93a5d289c9a968d Author: Avenger <ave...@so...> Date: Tue Jun 1 18:19:51 2010 +0200 new msvc6 project files after explosion of ACMImporter diff --git a/MSVC6/GemRB/GemRB.dsp b/MSVC6/GemRB/GemRB.dsp index 5264dd9..a955336 100644 --- a/MSVC6/GemRB/GemRB.dsp +++ b/MSVC6/GemRB/GemRB.dsp @@ -1,171 +1,125 @@ -# Microsoft Developer Studio Project File - Name="GemRB" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=GemRB - Win32 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 "GemRB.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 "GemRB.mak" CFG="GemRB - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "GemRB - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE "GemRB - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "GemRB - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -MTL=midl.exe -# ADD BASE MTL /nologo /win32 -# ADD MTL /nologo /win32 -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "includes" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /GZ PRECOMP_VC7_TOBEREMOVED /c -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "includes" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FR /GZ /c -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 core.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"plugins\Core" -# SUBTRACT BASE LINK32 /pdb:none -# ADD LINK32 core.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"plugins\Core" -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "GemRB - 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 "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -MTL=midl.exe -# ADD BASE MTL /nologo /win32 -# ADD MTL /nologo /win32 -# ADD BASE CPP /nologo /W3 /GX /Zi /O2 /I "includes" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /GF PRECOMP_VC7_TOBEREMOVED /c -# ADD CPP /nologo /W3 /GX /Zi /O2 /I "includes" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Fr /GF /c -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 core.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"plugins\Core" /opt:ref /opt:icf -# ADD LINK32 Core.lib /nologo /subsystem:console /machine:IX86 /libpath:"plugins\Core" /opt:ref /opt:icf -# SUBTRACT LINK32 /debug - -!ENDIF - -# Begin Target - -# Name "GemRB - Win32 Debug" -# Name "GemRB - Win32 Release" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;def;odl;idl;hpj;bat;asm" -# Begin Source File - -SOURCE=..\..\..\gemrb\gemrb\GemRB.cpp -DEP_CPP_GEMRB=\ - ".\includes\globals.h"\ - ".\includes\ie_types.h"\ - ".\includes\RGBAColor.h"\ - ".\includes\SClassID.h"\ - ".\includes\win32def.h"\ - ".\plugins\Core\ActorBlock.h"\ - ".\plugins\Core\Animation.h"\ - ".\plugins\Core\AnimationFactory.h"\ - ".\plugins\Core\AnimStructures.h"\ - ".\plugins\Core\Cache.h"\ - ".\plugins\Core\CharAnimations.h"\ - ".\plugins\Core\Class_ID.h"\ - ".\plugins\Core\ClassDesc.h"\ - ".\plugins\Core\DataFileMgr.h"\ - ".\plugins\Core\DataStream.h"\ - ".\plugins\Core\Dialog.h"\ - ".\plugins\Core\DialogMgr.h"\ - ".\plugins\Core\EffectQueue.h"\ - ".\plugins\Core\EventMgr.h"\ - ".\plugins\Core\FactoryObject.h"\ - ".\plugins\Core\Font.h"\ - ".\plugins\Core\GameData.h"\ - ".\plugins\Core\GlobalTimer.h"\ - ".\plugins\Core\ImageMgr.h"\ - ".\plugins\Core\IniSpawn.h"\ - ".\plugins\Core\Interface.h"\ - ".\plugins\Core\InterfaceDesc.h"\ - ".\plugins\Core\Inventory.h"\ - ".\plugins\Core\Item.h"\ - ".\plugins\Core\Map.h"\ - ".\plugins\Core\MapMgr.h"\ - ".\plugins\Core\Palette.h"\ - ".\plugins\Core\PathFinder.h"\ - ".\plugins\Core\Plugin.h"\ - ".\plugins\Core\PluginMgr.h"\ - ".\plugins\Core\Polygon.h"\ - ".\plugins\Core\Region.h"\ - ".\plugins\Core\ResourceMgr.h"\ - ".\plugins\Core\ScriptedAnimation.h"\ - ".\plugins\Core\ScrollBar.h"\ - ".\plugins\Core\snprintf.h"\ - ".\plugins\Core\Sprite2D.h"\ - ".\plugins\Core\SpriteCover.h"\ - ".\plugins\Core\Store.h"\ - ".\plugins\Core\TableMgr.h"\ - ".\plugins\Core\TextArea.h"\ - ".\plugins\Core\Tile.h"\ - ".\plugins\Core\TileOverlay.h"\ - ".\plugins\Core\Variables.h"\ - ".\plugins\Core\VFS.h"\ - ".\plugins\Core\Video.h"\ - ".\plugins\Core\VideoMode.h"\ - ".\plugins\Core\VideoModes.h"\ - ".\plugins\Core\Window.h"\ - ".\plugins\Core\WindowMgr.h"\ - -NODEP_CPP_GEMRB=\ - ".\SDL.h"\ - -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl;inc" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="GemRB" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=GemRB - Win32 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 "GemRB.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 "GemRB.mak" CFG="GemRB - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "GemRB - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE "GemRB - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "GemRB - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +MTL=midl.exe +# ADD BASE MTL /nologo /win32 +# ADD MTL /nologo /win32 +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "includes" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /GZ PRECOMP_VC7_TOBEREMOVED /c +# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "Core" /I "includes" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FR /GZ /c +# ADD BASE RSC /l 0x409 +# ADD RSC /l 0x409 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# 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 core.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"plugins\Core" +# SUBTRACT BASE LINK32 /pdb:none +# ADD LINK32 core.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"Core" +# SUBTRACT LINK32 /pdb:none + +!ELSEIF "$(CFG)" == "GemRB - 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 "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +MTL=midl.exe +# ADD BASE MTL /nologo /win32 +# ADD MTL /nologo /win32 +# ADD BASE CPP /nologo /W3 /GX /Zi /O2 /I "includes" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /GF PRECOMP_VC7_TOBEREMOVED /c +# ADD CPP /nologo /W3 /GX /Zi /O2 /I "Core" /I "includes" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Fr /GF /c +# ADD BASE RSC /l 0x409 +# ADD RSC /l 0x409 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# 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 core.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"plugins\Core" /opt:ref /opt:icf +# ADD LINK32 Core.lib /nologo /subsystem:console /machine:IX86 /libpath:"Core" /opt:ref /opt:icf +# SUBTRACT LINK32 /debug + +!ENDIF + +# Begin Target + +# Name "GemRB - Win32 Debug" +# Name "GemRB - Win32 Release" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;def;odl;idl;hpj;bat;asm" +# Begin Source File + +SOURCE=..\..\..\gemrb\gemrb\GemRB.cpp +DEP_CPP_GEMRB=\ + ".\includes\win32def.h"\ + +NODEP_CPP_GEMRB=\ + ".\DialogMgr.h"\ + ".\ImageMgr.h"\ + ".\includes\snprintf.h"\ + ".\includes\VFS.h"\ + ".\Interface.h"\ + ".\MapMgr.h"\ + ".\SDL.h"\ + ".\Video.h"\ + ".\WindowMgr.h"\ + +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl;inc" +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project diff --git a/MSVC6/GemRB/GemRB.dsw b/MSVC6/GemRB/GemRB.dsw index 7e1a172..d8c56b2 100644 --- a/MSVC6/GemRB/GemRB.dsw +++ b/MSVC6/GemRB/GemRB.dsw @@ -1,722 +1,767 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "2DAImporter"=.\plugins\2DAImporter\2DAImporter.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core - End Project Dependency -}}} - -############################################################################### - -Project: "ACMImporter"=.\plugins\ACMImporter\ACMImporter.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core - End Project Dependency -}}} - -############################################################################### - -Project: "AREImporter"=.\plugins\AREImporter\AREImporter.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core - End Project Dependency -}}} - -############################################################################### - -Project: "BAMImporter"=.\plugins\BAMImporter\BAMImporter.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core - End Project Dependency -}}} - -############################################################################### - -Project: "BIFImporter"=.\plugins\BIFImporter\BIFImporter.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core - End Project Dependency -}}} - -############################################################################### - -Project: "BIKPlayer"=.\plugins\BIKPlayer\BIKPlayer.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core - End Project Dependency -}}} - -############################################################################### - -Project: "BMPImporter"=.\plugins\BMPImporter\BMPImporter.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core - End Project Dependency -}}} - -############################################################################### - -Project: "CHUImporter"=.\plugins\CHUImporter\CHUImporter.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core - End Project Dependency -}}} - -############################################################################### - -Project: "CREImporter"=.\plugins\CREImporter\CREImporter.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core - End Project Dependency -}}} - -############################################################################### - -Project: "Config"=.\Config\Config.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name GemRB - End Project Dependency -}}} - -############################################################################### - -Project: "Core"=.\plugins\Core\Core.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "DLGImporter"=.\plugins\DLGImporter\DLGImporter.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core - End Project Dependency -}}} - -############################################################################### - -Project: "EFFImporter"=.\plugins\EFFImporter\EFFImporter.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core - End Project Dependency -}}} - -############################################################################### - -Project: "FXOpcodes"=.\plugins\FXOpcodes\FXOpcodes.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core - End Project Dependency -}}} - -############################################################################### - -Project: "GAMImporter"=.\plugins\GAMImporter\GAMImporter.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core - End Project Dependency -}}} - -############################################################################### - -Project: "GUIScript"=.\plugins\GUIScript\GUIScript.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core - End Project Dependency -}}} - -############################################################################### - -Project: "GemRB"=.\GemRB.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name 2DAImporter - End Project Dependency - Begin Project Dependency - Project_Dep_Name ACMImporter - End Project Dependency - Begin Project Dependency - Project_Dep_Name AREImporter - End Project Dependency - Begin Project Dependency - Project_Dep_Name BAMImporter - End Project Dependency - Begin Project Dependency - Project_Dep_Name BIFImporter - End Project Dependency - Begin Project Dependency - Project_Dep_Name BMPImporter - End Project Dependency - Begin Project Dependency - Project_Dep_Name CHUImporter - End Project Dependency - Begin Project Dependency - Project_Dep_Name Core - End Project Dependency - Begin Project Dependency - Project_Dep_Name CREImporter - End Project Dependency - Begin Project Dependency - Project_Dep_Name DLGImporter - End Project Dependency - Begin Project Dependency - Project_Dep_Name GAMImporter - End Project Dependency - Begin Project Dependency - Project_Dep_Name GUIScript - End Project Dependency - Begin Project Dependency - Project_Dep_Name IDSImporter - End Project Dependency - Begin Project Dependency - Project_Dep_Name INIImporter - End Project Dependency - Begin Project Dependency - Project_Dep_Name ITMImporter - End Project Dependency - Begin Project Dependency - Project_Dep_Name KEYImporter - End Project Dependency - Begin Project Dependency - Project_Dep_Name MUSImporter - End Project Dependency - Begin Project Dependency - Project_Dep_Name MVEPlayer - End Project Dependency - Begin Project Dependency - Project_Dep_Name NULLSound - End Project Dependency - Begin Project Dependency - Project_Dep_Name PLTImporter - End Project Dependency - Begin Project Dependency - Project_Dep_Name SDLVideo - End Project Dependency - Begin Project Dependency - Project_Dep_Name SPLImporter - End Project Dependency - Begin Project Dependency - Project_Dep_Name STOImporter - End Project Dependency - Begin Project Dependency - Project_Dep_Name TISImporter - End Project Dependency - Begin Project Dependency - Project_Dep_Name TLKImporter - End Project Dependency - Begin Project Dependency - Project_Dep_Name WEDImporter - End Project Dependency - Begin Project Dependency - Project_Dep_Name WMPImporter - End Project Dependency - Begin Project Dependency - Project_Dep_Name ZLibMgr - End Project Dependency - Begin Project Dependency - Project_Dep_Name MOSImporter - End Project Dependency - Begin Project Dependency - Project_Dep_Name EFFImporter - End Project Dependency - Begin Project Dependency - Project_Dep_Name FXOpcodes - End Project Dependency - Begin Project Dependency - Project_Dep_Name IWDOpcodes - End Project Dependency - Begin Project Dependency - Project_Dep_Name PSTOpcodes - End Project Dependency - Begin Project Dependency - Project_Dep_Name PNGImporter - End Project Dependency - Begin Project Dependency - Project_Dep_Name PROImporter - End Project Dependency - Begin Project Dependency - Project_Dep_Name OpenALAudio - End Project Dependency - Begin Project Dependency - Project_Dep_Name BIKPlayer - End Project Dependency -}}} - -############################################################################### - -Project: "IDSImporter"=.\plugins\IDSImporter\IDSImporter.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core - End Project Dependency -}}} - -############################################################################### - -Project: "INIImporter"=.\plugins\INIImporter\INIImporter.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core - End Project Dependency -}}} - -############################################################################### - -Project: "ITMImporter"=.\plugins\ITMImporter\ITMImporter.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core - End Project Dependency -}}} - -############################################################################### - -Project: "IWDOpcodes"=.\plugins\IWDOpcodes\IWDOpcodes.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core - End Project Dependency -}}} - -############################################################################### - -Project: "KEYImporter"=.\plugins\KEYImporter\KEYImporter.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core - End Project Dependency -}}} - -############################################################################### - -Project: "MOSImporter"=.\plugins\MOSImporter\MOSImporter.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core - End Project Dependency -}}} - -############################################################################### - -Project: "MUSImporter"=.\plugins\MUSImporter\MUSImporter.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core - End Project Dependency -}}} - -############################################################################### - -Project: "MVEPlayer"=.\plugins\MVEPlayer\MVEPlayer.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core - End Project Dependency -}}} - -############################################################################### - -Project: "NULLSound"=.\plugins\NULLSound\NULLSound.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core - End Project Dependency -}}} - -############################################################################### - -Project: "OpenALAudio"=.\plugins\OpenALAudio\OpenALAudio.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core - End Project Dependency -}}} - -############################################################################### - -Project: "PLTImporter"=.\plugins\PLTImporter\PLTImporter.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core - End Project Dependency -}}} - -############################################################################### - -Project: "PNGImporter"=.\plugins\PNGImporter\PNGImporter.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core - End Project Dependency - Begin Project Dependency - Project_Dep_Name libpng - End Project Dependency -}}} - -############################################################################### - -Project: "PROImporter"=.\plugins\PROImporter\PROImporter.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core - End Project Dependency -}}} - -############################################################################### - -Project: "PSTOpcodes"=.\plugins\PSTOpcodes\PSTOpcodes.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core - End Project Dependency -}}} - -############################################################################### - -Project: "SDLVideo"=.\plugins\SDLVideo\SDLVideo.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core - End Project Dependency -}}} - -############################################################################### - -Project: "SPLImporter"=.\plugins\SPLImporter\SPLImporter.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core - End Project Dependency -}}} - -############################################################################### - -Project: "STOImporter"=.\plugins\STOImporter\STOImporter.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core - End Project Dependency -}}} - -############################################################################### - -Project: "TISImporter"=.\plugins\TISImporter\TISImporter.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core - End Project Dependency -}}} - -############################################################################### - -Project: "TLKImporter"=.\plugins\TLKImporter\TLKImporter.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core - End Project Dependency -}}} - -############################################################################### - -Project: "WEDImporter"=.\plugins\WEDImporter\WEDImporter.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core - End Project Dependency -}}} - -############################################################################### - -Project: "WMPImporter"=.\plugins\WMPImporter\WMPImporter.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core - End Project Dependency -}}} - -############################################################################### - -Project: "ZLibMgr"=.\plugins\ZLibMgr\ZLibMgr.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Core - End Project Dependency -}}} - -############################################################################### - -Project: "libpng"=.\lpng\projects\visualc6\libpng_gemrb.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - +Microsoft Developer Studio Workspace File, Format Version 6.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### + +Project: "2DAImporter"=.\plugins\2DAImporter\2DAImporter.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name Core + End Project Dependency +}}} + +############################################################################### + +Project: "ACMReader"=.\plugins\ACMReader\ACMReader.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "AREImporter"=.\plugins\AREImporter\AREImporter.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name Core + End Project Dependency +}}} + +############################################################################### + +Project: "BAMImporter"=.\plugins\BAMImporter\BAMImporter.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name Core + End Project Dependency +}}} + +############################################################################### + +Project: "BIFImporter"=.\plugins\BIFImporter\BIFImporter.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name Core + End Project Dependency +}}} + +############################################################################### + +Project: "BIKPlayer"=.\plugins\BIKPlayer\BIKPlayer.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name Core + End Project Dependency +}}} + +############################################################################### + +Project: "BMPImporter"=.\plugins\BMPImporter\BMPImporter.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name Core + End Project Dependency +}}} + +############################################################################### + +Project: "CHUImporter"=.\plugins\CHUImporter\CHUImporter.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name Core + End Project Dependency +}}} + +############################################################################### + +Project: "CREImporter"=.\plugins\CREImporter\CREImporter.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name Core + End Project Dependency +}}} + +############################################################################### + +Project: "Config"=.\Config\Config.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name GemRB + End Project Dependency +}}} + +############################################################################### + +Project: "Core"=.\core\Core.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "DLGImporter"=.\plugins\DLGImporter\DLGImporter.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name Core + End Project Dependency +}}} + +############################################################################### + +Project: "DirectoryImporter"=.\plugins\DirectoryImporter\DirectoryImporter.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name Core + End Project Dependency +}}} + +############################################################################### + +Project: "EFFImporter"=.\plugins\EFFImporter\EFFImporter.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name Core + End Project Dependency +}}} + +############################################################################### + +Project: "FXOpcodes"=.\plugins\FXOpcodes\FXOpcodes.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name Core + End Project Dependency +}}} + +############################################################################### + +Project: "GAMImporter"=.\plugins\GAMImporter\GAMImporter.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name Core + End Project Dependency +}}} + +############################################################################### + +Project: "GUIScript"=.\plugins\GUIScript\GUIScript.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name Core + End Project Dependency +}}} + +############################################################################### + +Project: "GemRB"=.\GemRB.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name 2DAImporter + End Project Dependency + Begin Project Dependency + Project_Dep_Name ACMImporter + End Project Dependency + Begin Project Dependency + Project_Dep_Name AREImporter + End Project Dependency + Begin Project Dependency + Project_Dep_Name BAMImporter + End Project Dependency + Begin Project Dependency + Project_Dep_Name BIFImporter + End Project Dependency + Begin Project Dependency + Project_Dep_Name BMPImporter + End Project Dependency + Begin Project Dependency + Project_Dep_Name CHUImporter + End Project Dependency + Begin Project Dependency + Project_Dep_Name Core + End Project Dependency + Begin Project Dependency + Project_Dep_Name CREImporter + End Project Dependency + Begin Project Dependency + Project_Dep_Name DLGImporter + End Project Dependency + Begin Project Dependency + Project_Dep_Name GAMImporter + End Project Dependency + Begin Project Dependency + Project_Dep_Name GUIScript + End Project Dependency + Begin Project Dependency + Project_Dep_Name IDSImporter + End Project Dependency + Begin Project Dependency + Project_Dep_Name INIImporter + End Project Dependency + Begin Project Dependency + Project_Dep_Name ITMImporter + End Project Dependency + Begin Project Dependency + Project_Dep_Name KEYImporter + End Project Dependency + Begin Project Dependency + Project_Dep_Name MUSImporter + End Project Dependency + Begin Project Dependency + Project_Dep_Name MVEPlayer + End Project Dependency + Begin Project Dependency + Project_Dep_Name NULLSound + End Project Dependency + Begin Project Dependency + Project_Dep_Name PLTImporter + End Project Dependency + Begin Project Dependency + Project_Dep_Name SDLVideo + End Project Dependency + Begin Project Dependency + Project_Dep_Name SPLImporter + End Project Dependency + Begin Project Dependency + Project_Dep_Name STOImporter + End Project Dependency + Begin Project Dependency + Project_Dep_Name TISImporter + End Project Dependency + Begin Project Dependency + Project_Dep_Name TLKImporter + End Project Dependency + Begin Project Dependency + Project_Dep_Name WEDImporter + End Project Dependency + Begin Project Dependency + Project_Dep_Name WMPImporter + End Project Dependency + Begin Project Dependency + Project_Dep_Name ZLibManager + End Project Dependency + Begin Project Dependency + Project_Dep_Name MOSImporter + End Project Dependency + Begin Project Dependency + Project_Dep_Name EFFImporter + End Project Dependency + Begin Project Dependency + Project_Dep_Name FXOpcodes + End Project Dependency + Begin Project Dependency + Project_Dep_Name IWDOpcodes + End Project Dependency + Begin Project Dependency + Project_Dep_Name PSTOpcodes + End Project Dependency + Begin Project Dependency + Project_Dep_Name PNGImporter + End Project Dependency + Begin Project Dependency + Project_Dep_Name PROImporter + End Project Dependency + Begin Project Dependency + Project_Dep_Name OpenALAudio + End Project Dependency + Begin Project Dependency + Project_Dep_Name BIKPlayer + End Project Dependency + Begin Project Dependency + Project_Dep_Name DirectoryImporter + End Project Dependency + Begin Project Dependency + Project_Dep_Name ACMReader + End Project Dependency + Begin Project Dependency + Project_Dep_Name WAVReader + End Project Dependency +}}} + +############################################################################### + +Project: "IDSImporter"=.\plugins\IDSImporter\IDSImporter.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name Core + End Project Dependency +}}} + +############################################################################### + +Project: "INIImporter"=.\plugins\INIImporter\INIImporter.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name Core + End Project Dependency +}}} + +############################################################################### + +Project: "ITMImporter"=.\plugins\ITMImporter\ITMImporter.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name Core + End Project Dependency +}}} + +############################################################################### + +Project: "IWDOpcodes"=.\plugins\IWDOpcodes\IWDOpcodes.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name Core + End Project Dependency +}}} + +############################################################################### + +Project: "KEYImporter"=.\plugins\KEYImporter\KEYImporter.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name Core + End Project Dependency +}}} + +############################################################################### + +Project: "MOSImporter"=.\plugins\MOSImporter\MOSImporter.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name Core + End Project Dependency +}}} + +############################################################################### + +Project: "MUSImporter"=.\plugins\MUSImporter\MUSImporter.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name Core + End Project Dependency +}}} + +############################################################################### + +Project: "MVEPlayer"=.\plugins\MVEPlayer\MVEPlayer.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name Core + End Project Dependency +}}} + +############################################################################### + +Project: "NULLSound"=.\plugins\NULLSound\NULLSound.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name Core + End Project Dependency +}}} + +############################################################################### + +Project: "OGGReader"=.\plugins\OGGReader\OGGReader.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "OpenALAudio"=.\plugins\OpenALAudio\OpenALAudio.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name Core + End Project Dependency +}}} + +############################################################################### + +Project: "PLTImporter"=.\plugins\PLTImporter\PLTImporter.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name Core + End Project Dependency +}}} + +############################################################################### + +Project: "PNGImporter"=.\plugins\PNGImporter\PNGImporter.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name Core + End Project Dependency + Begin Project Dependency + Project_Dep_Name libpng + End Project Dependency +}}} + +############################################################################### + +Project: "PROImporter"=.\plugins\PROImporter\PROImporter.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name Core + End Project Dependency +}}} + +############################################################################### + +Project: "PSTOpcodes"=.\plugins\PSTOpcodes\PSTOpcodes.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name Core + End Project Dependency +}}} + +############################################################################### + +Project: "SDLVideo"=.\plugins\SDLVideo\SDLVideo.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name Core + End Project Dependency +}}} + +############################################################################### + +Project: "SPLImporter"=.\plugins\SPLImporter\SPLImporter.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name Core + End Project Dependency +}}} + +############################################################################### + +Project: "STOImporter"=.\plugins\STOImporter\STOImporter.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name Core + End Project Dependency +}}} + +############################################################################### + +Project: "TISImporter"=.\plugins\TISImporter\TISImporter.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name Core + End Project Dependency +}}} + +############################################################################### + +Project: "TLKImporter"=.\plugins\TLKImporter\TLKImporter.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name Core + End Project Dependency +}}} + +############################################################################### + +Project: "WAVReader"=.\plugins\WAVReader\WAVReader.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "WEDImporter"=.\plugins\WEDImporter\WEDImporter.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name Core + End Project Dependency +}}} + +############################################################################### + +Project: "WMPImporter"=.\plugins\WMPImporter\WMPImporter.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name Core + End Project Dependency +}}} + +############################################################################### + +Project: "ZLibManager"=.\plugins\ZLibManager\ZLibManager.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name Core + End Project Dependency +}}} + +############################################################################### + +Project: "libpng"=.\lpng\projects\visualc6\libpng_gemrb.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### + diff --git a/MSVC6/GemRB/plugins/ACMImporter/ACMImporter.def b/MSVC6/GemRB/plugins/ACMReader/ACMReader.def similarity index 66% copy from MSVC6/GemRB/plugins/ACMImporter/ACMImporter.def copy to MSVC6/GemRB/plugins/ACMReader/ACMReader.def index 41929f5..53f6d36 100644 --- a/MSVC6/GemRB/plugins/ACMImporter/ACMImporter.def +++ b/MSVC6/GemRB/plugins/ACMReader/ACMReader.def @@ -1,4 +1,4 @@ -LIBRARY ACMImporter +LIBRARY ACMReader ;EXPORTS ; LibDescription @1 ; LibClassDesc @2 diff --git a/MSVC6/GemRB/plugins/ACMImporter/ACMImporter.dsp b/MSVC6/GemRB/plugins/ACMReader/ACMReader.dsp similarity index 63% copy from MSVC6/GemRB/plugins/ACMImporter/ACMImporter.dsp copy to MSVC6/GemRB/plugins/ACMReader/ACMReader.dsp index 332f650..f6eab43 100644 --- a/MSVC6/GemRB/plugins/ACMImporter/ACMImporter.dsp +++ b/MSVC6/GemRB/plugins/ACMReader/ACMReader.dsp @@ -1,24 +1,24 @@ -# Microsoft Developer Studio Project File - Name="ACMImporter" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="ACMReader" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 -CFG=ACMImporter - Win32 Debug +CFG=ACMReader - Win32 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 "ACMImporter.mak". +!MESSAGE NMAKE /f "ACMReader.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 "ACMImporter.mak" CFG="ACMImporter - Win32 Debug" +!MESSAGE NMAKE /f "ACMReader.mak" CFG="ACMReader - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "ACMImporter - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "ACMImporter - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "ACMReader - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "ACMReader - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE # Begin Project @@ -29,7 +29,7 @@ CPP=cl.exe MTL=midl.exe RSC=rc.exe -!IF "$(CFG)" == "ACMImporter - Win32 Debug" +!IF "$(CFG)" == "ACMReader - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -52,12 +52,12 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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 core.lib OpenAL32.lib sdl.lib /nologo /subsystem:windows /dll /debug /machine:IX86 /def:"ACMImporter.def" /out:"$(SolutionDir)plugins\ACMImporter.dll" /implib:"$(OutDir)/ACMImporter.lib" /pdbtype:sept /libpath:"..\SDLVideo" /libpath:"C:\Programmi\OpenAL 1.0 Software Development Kit\libs" /libpath:"..\.." /libpath:"..\Core" +# 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 core.lib OpenAL32.lib sdl.lib /nologo /subsystem:windows /dll /debug /machine:IX86 /def:"ACMReader.def" /out:"$(SolutionDir)plugins\ACMReader.dll" /implib:"$(OutDir)/ACMReader.lib" /pdbtype:sept /libpath:"..\SDLVideo" /libpath:"C:\Programmi\OpenAL 1.0 Software Development Kit\libs" /libpath:"..\.." /libpath:"..\Core" # SUBTRACT BASE LINK32 /pdb:none -# ADD LINK32 Core.lib OpenAL32.lib sdl.lib /nologo /subsystem:windows /dll /debug /machine:IX86 /def:"ACMImporter.def" /out:"../../plugins\ACMImporter.dll" /implib:"ACMImporter.lib" /pdbtype:sept /libpath:"..\..\Core" /libpath:"..\..\SDL\lib" /libpath:"..\..\openal\libs" +# ADD LINK32 Core.lib OpenAL32.lib sdl.lib /nologo /subsystem:windows /dll /debug /machine:IX86 /def:"ACMReader.def" /out:"../../plugins\ACMReader.dll" /implib:"ACMReader.lib" /pdbtype:sept /libpath:"..\..\Core" /libpath:"..\..\SDL\lib" /libpath:"..\..\openal\libs" # SUBTRACT LINK32 /pdb:none -!ELSEIF "$(CFG)" == "ACMImporter - Win32 Release" +!ELSEIF "$(CFG)" == "ACMReader - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -81,93 +81,88 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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 core.lib OpenAL32.lib sdl.lib /nologo /subsystem:windows /dll /debug /machine:IX86 /def:"ACMImporter.def" /out:"$(SolutionDir)plugins\ACMImporter.dll" /implib:"$(OutDir)/ACMImporter.lib" /pdbtype:sept /libpath:"..\SDLVideo" /libpath:"C:\Programmi\OpenAL 1.0 Software Development Kit\libs" /libpath:"..\.." /libpath:"..\Core" /opt:ref /opt:icf -# ADD LINK32 Core.lib OpenAL32.lib sdl.lib /nologo /subsystem:windows /dll /machine:IX86 /def:"ACMImporter.def" /out:"../../plugins\ACMImporter.dll" /implib:"ACMImporter.lib" /libpath:"..\..\Core" /libpath:"..\..\SDL\lib" /libpath:"..\..\openal\libs" /opt:ref /opt:icf +# 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 core.lib OpenAL32.lib sdl.lib /nologo /subsystem:windows /dll /debug /machine:IX86 /def:"ACMReader.def" /out:"$(SolutionDir)plugins\ACMReader.dll" /implib:"$(OutDir)/ACMReader.lib" /pdbtype:sept /libpath:"..\SDLVideo" /libpath:"C:\Programmi\OpenAL 1.0 Software Development Kit\libs" /libpath:"..\.." /libpath:"..\Core" /opt:ref /opt:icf +# ADD LINK32 Core.lib OpenAL32.lib sdl.lib /nologo /subsystem:windows /dll /machine:IX86 /def:"ACMReader.def" /out:"../../plugins\ACMReader.dll" /implib:"ACMReader.lib" /libpath:"..\..\Core" /libpath:"..\..\SDL\lib" /libpath:"..\..\openal\libs" /opt:ref /opt:icf # SUBTRACT LINK32 /pdb:none /debug !ENDIF # Begin Target -# Name "ACMImporter - Win32 Debug" -# Name "ACMImporter - Win32 Release" +# Name "ACMReader - Win32 Debug" +# Name "ACMReader - Win32 Release" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;def;odl;idl;hpj;bat;asm" # Begin Source File -SOURCE=..\..\..\..\..\gemrb\gemrb\plugins\ACMImporter\ACMImporter.cpp -DEP_CPP_ACMIM=\ +SOURCE=..\..\..\..\..\gemrb\gemrb\plugins\ACMReader\ACMReader.cpp +DEP_CPP_ACMRE=\ "..\..\core\AnimStructures.h"\ "..\..\core\DataStream.h"\ + "..\..\core\Holder.h"\ "..\..\core\Palette.h"\ "..\..\core\Plugin.h"\ "..\..\core\PluginMgr.h"\ "..\..\core\Region.h"\ + "..\..\core\Resource.h"\ "..\..\core\ResourceDesc.h"\ "..\..\core\snprintf.h"\ "..\..\core\SoundMgr.h"\ "..\..\core\Sprite2D.h"\ + "..\..\core\TypeID.h"\ "..\..\core\VFS.h"\ "..\..\core\VideoMode.h"\ "..\..\core\VideoModes.h"\ "..\..\includes\exports.h"\ "..\..\includes\globals.h"\ "..\..\includes\ie_types.h"\ + "..\..\includes\iless.h"\ + "..\..\includes\logging.h"\ "..\..\includes\plugindef.h"\ "..\..\includes\RGBAColor.h"\ "..\..\includes\SClassID.h"\ "..\..\includes\win32def.h"\ - ".\ACMImporter.h"\ + ".\ACMReader.h"\ ".\decoder.h"\ ".\general.h"\ - ".\readers.h"\ ".\unpacker.h"\ # End Source File # Begin Source File -SOURCE=ACMImporter.def - -!IF "$(CFG)" == "ACMImporter - Win32 Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "ACMImporter - Win32 Release" - -!ENDIF - +SOURCE=.\ACMReader.def # End Source File # Begin Source File -SOURCE=..\..\..\..\..\gemrb\gemrb\plugins\ACMImporter\decoder.cpp +SOURCE=..\..\..\..\..\gemrb\gemrb\plugins\ACMReader\decoder.cpp DEP_CPP_DECOD=\ ".\decoder.h"\ # End Source File # Begin Source File -SOURCE=..\..\..\..\..\gemrb\gemrb\plugins\ACMImporter\readers.cpp -DEP_CPP_READE=\ - ".\decoder.h"\ - ".\general.h"\ - ".\readers.h"\ - ".\unpacker.h"\ - -NODEP_CPP_READE=\ - ".\DataStream.h"\ - ".\Interface.h"\ - -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\..\gemrb\gemrb\plugins\ACMImporter\unpacker.cpp +SOURCE=..\..\..\..\..\gemrb\gemrb\plugins\ACMReader\unpacker.cpp DEP_CPP_UNPAC=\ + "..\..\core\AnimStructures.h"\ + "..\..\core\DataStream.h"\ + "..\..\core\Palette.h"\ + "..\..\core\Region.h"\ + "..\..\core\snprintf.h"\ + "..\..\core\Sprite2D.h"\ + "..\..\core\TypeID.h"\ + "..\..\core\VFS.h"\ + "..\..\core\VideoMode.h"\ + "..\..\core\VideoModes.h"\ + "..\..\includes\exports.h"\ + "..\..\includes\globals.h"\ + "..\..\includes\ie_types.h"\ + "..\..\includes\logging.h"\ + "..\..\includes\RGBAColor.h"\ + "..\..\includes\SClassID.h"\ + "..\..\includes\win32def.h"\ ".\unpacker.h"\ -NODEP_CPP_UNPAC=\ - ".\DataStream.h"\ - # End Source File # End Group # Begin Group "Header Files" @@ -175,10 +170,6 @@ NODEP_CPP_UNPAC=\ # PROP Default_Filter "h;hpp;hxx;hm;inl;inc" # Begin Source File -SOURCE=..\..\..\..\..\gemrb\gemrb\plugins\ACMImporter\ACMImp.h -# End Source File -# Begin Source File - SOURCE=.\decoder.h # End Source File # Begin Source File @@ -187,10 +178,6 @@ SOURCE=.\general.h # End Source File # Begin Source File -SOURCE=.\readers.h -# End Source File -# Begin Source File - SOURCE=.\unpacker.h # End Source File # End Group diff --git a/MSVC6/GemRB/plugins/ACMImporter/ACMImporter.def b/MSVC6/GemRB/plugins/OGGReader/OGGReader.def similarity index 66% copy from MSVC6/GemRB/plugins/ACMImporter/ACMImporter.def copy to MSVC6/GemRB/plugins/OGGReader/OGGReader.def index 41929f5..157796e 100644 --- a/MSVC6/GemRB/plugins/ACMImporter/ACMImporter.def +++ b/MSVC6/GemRB/plugins/OGGReader/OGGReader.def @@ -1,4 +1,4 @@ -LIBRARY ACMImporter +LIBRARY OGGReader ;EXPORTS ; LibDescription @1 ; LibClassDesc @2 diff --git a/MSVC6/GemRB/plugins/ACMImporter/ACMImporter.dsp b/MSVC6/GemRB/plugins/OGGReader/OGGReader.dsp similarity index 59% copy from MSVC6/GemRB/plugins/ACMImporter/ACMImporter.dsp copy to MSVC6/GemRB/plugins/OGGReader/OGGReader.dsp index 332f650..85b00c5 100644 --- a/MSVC6/GemRB/plugins/ACMImporter/ACMImporter.dsp +++ b/MSVC6/GemRB/plugins/OGGReader/OGGReader.dsp @@ -1,24 +1,24 @@ -# Microsoft Developer Studio Project File - Name="ACMImporter" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="OGGReader" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 -CFG=ACMImporter - Win32 Debug +CFG=OGGReader - Win32 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 "ACMImporter.mak". +!MESSAGE NMAKE /f "OGGReader.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 "ACMImporter.mak" CFG="ACMImporter - Win32 Debug" +!MESSAGE NMAKE /f "OGGReader.mak" CFG="OGGReader - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "ACMImporter - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "ACMImporter - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "OGGReader - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "OGGReader - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE # Begin Project @@ -29,7 +29,7 @@ CPP=cl.exe MTL=midl.exe RSC=rc.exe -!IF "$(CFG)" == "ACMImporter - Win32 Debug" +!IF "$(CFG)" == "OGGReader - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -52,12 +52,12 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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 core.lib OpenAL32.lib sdl.lib /nologo /subsystem:windows /dll /debug /machine:IX86 /def:"ACMImporter.def" /out:"$(SolutionDir)plugins\ACMImporter.dll" /implib:"$(OutDir)/ACMImporter.lib" /pdbtype:sept /libpath:"..\SDLVideo" /libpath:"C:\Programmi\OpenAL 1.0 Software Development Kit\libs" /libpath:"..\.." /libpath:"..\Core" +# 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 core.lib OpenAL32.lib sdl.lib /nologo /subsystem:windows /dll /debug /machine:IX86 /def:"OGGReader.def" /out:"$(SolutionDir)plugins\OGGReader.dll" /implib:"$(OutDir)/OGGReader.lib" /pdbtype:sept /libpath:"..\SDLVideo" /libpath:"C:\Programmi\OpenAL 1.0 Software Development Kit\libs" /libpath:"..\.." /libpath:"..\Core" # SUBTRACT BASE LINK32 /pdb:none -# ADD LINK32 Core.lib OpenAL32.lib sdl.lib /nologo /subsystem:windows /dll /debug /machine:IX86 /def:"ACMImporter.def" /out:"../../plugins\ACMImporter.dll" /implib:"ACMImporter.lib" /pdbtype:sept /libpath:"..\..\Core" /libpath:"..\..\SDL\lib" /libpath:"..\..\openal\libs" +# ADD LINK32 Core.lib OpenAL32.lib sdl.lib /nologo /subsystem:windows /dll /debug /machine:IX86 /def:"OGGReader.def" /out:"../../plugins\OGGReader.dll" /implib:"OGGReader.lib" /pdbtype:sept /libpath:"..\..\Core" /libpath:"..\..\SDL\lib" /libpath:"..\..\openal\libs" # SUBTRACT LINK32 /pdb:none -!ELSEIF "$(CFG)" == "ACMImporter - Win32 Release" +!ELSEIF "$(CFG)" == "OGGReader - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -81,117 +81,71 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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 core.lib OpenAL32.lib sdl.lib /nologo /subsystem:windows /dll /debug /machine:IX86 /def:"ACMImporter.def" /out:"$(SolutionDir)plugins\ACMImporter.dll" /implib:"$(OutDir)/ACMImporter.lib" /pdbtype:sept /libpath:"..\SDLVideo" /libpath:"C:\Programmi\OpenAL 1.0 Software Development Kit\libs" /libpath:"..\.." /libpath:"..\Core" /opt:ref /opt:icf -# ADD LINK32 Core.lib OpenAL32.lib sdl.lib /nologo /subsystem:windows /dll /machine:IX86 /def:"ACMImporter.def" /out:"../../plugins\ACMImporter.dll" /implib:"ACMImporter.lib" /libpath:"..\..\Core" /libpath:"..\..\SDL\lib" /libpath:"..\..\openal\libs" /opt:ref /opt:icf +# 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 core.lib OpenAL32.lib sdl.lib /nologo /subsystem:windows /dll /debug /machine:IX86 /def:"OGGReader.def" /out:"$(SolutionDir)plugins\OGGReader.dll" /implib:"$(OutDir)/OGGReader.lib" /pdbtype:sept /libpath:"..\SDLVideo" /libpath:"C:\Programmi\OpenAL 1.0 Software Development Kit\libs" /libpath:"..\.." /libpath:"..\Core" /opt:ref /opt:icf +# ADD LINK32 Core.lib OpenAL32.lib sdl.lib /nologo /subsystem:windows /dll /machine:IX86 /def:"OGGReader.def" /out:"../../plugins\OGGReader.dll" /implib:"OGGReader.lib" /libpath:"..\..\Core" /libpath:"..\..\SDL\lib" /libpath:"..\..\openal\libs" /opt:ref /opt:icf # SUBTRACT LINK32 /pdb:none /debug !ENDIF # Begin Target -# Name "ACMImporter - Win32 Debug" -# Name "ACMImporter - Win32 Release" +# Name "OGGReader - Win32 Debug" +# Name "OGGReader - Win32 Release" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;def;odl;idl;hpj;bat;asm" # Beg... [truncated message content] |