diff --git a/LEGO1/mxdirectdraw.cpp b/LEGO1/mxdirectdraw.cpp index 1f069b1f..c950dabe 100644 --- a/LEGO1/mxdirectdraw.cpp +++ b/LEGO1/mxdirectdraw.cpp @@ -1,6 +1,15 @@ #include "mxdirectdraw.h" +//TODO: make commonn place for defines like that +#ifndef _countof +#define _countof(arr) sizeof(arr) / sizeof(arr[0]) +#endif + +#ifndef DDSCAPS_3DDEVICE +#define DDSCAPS_3DDEVICE 0x00002000l +#endif + // OFFSET: LEGO1 10100C68 extern BOOL g_is_PALETTEINDEXED8 = 0; @@ -189,10 +198,11 @@ void MxDirectDraw::DestroyButNotDirectDraw() } } -// OFFSET: LEGO1 0x1009E880 +// OFFSET: LEGO1 0x1009E880 STUB const char* MxDirectDraw::ErrorToString(HRESULT error) { //TODO + return NULL; } @@ -938,7 +948,7 @@ void MxDirectDraw::unk1() // clear backBuffer line = (byte*)ddsd.lpSurface; - for (int j = 0; j < ddsd.dwHeight; i++) + for (unsigned int j = 0; j < ddsd.dwHeight; i++) { memset(line, 0, ddsd.dwWidth); line += ddsd.lPitch; diff --git a/LEGO1/mxdirectdraw.h b/LEGO1/mxdirectdraw.h index 91ebd805..0e19ec6b 100644 --- a/LEGO1/mxdirectdraw.h +++ b/LEGO1/mxdirectdraw.h @@ -34,7 +34,7 @@ class MxDirectDraw GUID* p_guid; Mode* m_mode_ARRAY; int count; - DDCAPS_DX5 m_ddcaps; + DDCAPS m_ddcaps; void* a_178; ~DeviceModesInfo() diff --git a/isle.mak b/isle.mak index 90a2cead..a54b619c 100644 --- a/isle.mak +++ b/isle.mak @@ -137,6 +137,8 @@ CLEAN : -@erase "$(INTDIR)\mxcontrolpresenter.obj" -@erase "$(INTDIR)\mxcore.obj" -@erase "$(INTDIR)\mxcriticalsection.obj" + -@erase "$(INTDIR)\mxdirect3d.obj" + -@erase "$(INTDIR)\mxdirectdraw.obj" -@erase "$(INTDIR)\mxdiskstreamcontroller.obj" -@erase "$(INTDIR)\mxdiskstreamprovider.obj" -@erase "$(INTDIR)\mxdsaction.obj" @@ -251,13 +253,13 @@ BSC32_SBRS= \ 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 /nologo /subsystem:windows /dll /machine:I386 -# ADD 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 winmm.lib /nologo /subsystem:windows /dll /pdb:"Release/LEGO1.PDB" /debug /machine:I386 /out:"Release/LEGO1.DLL" /implib:"Release/LEGO1.LIB" +# ADD 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 winmm.lib ddraw.lib /nologo /subsystem:windows /dll /pdb:"Release/LEGO1.PDB" /debug /machine:I386 /out:"Release/LEGO1.DLL" /implib:"Release/LEGO1.LIB" # SUBTRACT LINK32 /pdb:none /map LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\ advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\ - odbccp32.lib winmm.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"Release/LEGO1.PDB" /debug /machine:I386 /out:"Release/LEGO1.DLL"\ - /implib:"Release/LEGO1.LIB" + odbccp32.lib winmm.lib ddraw.lib /nologo /subsystem:windows /dll\ + /incremental:no /pdb:"Release/LEGO1.PDB" /debug /machine:I386\ + /out:"Release/LEGO1.DLL" /implib:"Release/LEGO1.LIB" LINK32_OBJS= \ "$(INTDIR)\act1state.obj" \ "$(INTDIR)\act2brick.obj" \ @@ -342,6 +344,8 @@ LINK32_OBJS= \ "$(INTDIR)\mxcontrolpresenter.obj" \ "$(INTDIR)\mxcore.obj" \ "$(INTDIR)\mxcriticalsection.obj" \ + "$(INTDIR)\mxdirect3d.obj" \ + "$(INTDIR)\mxdirectdraw.obj" \ "$(INTDIR)\mxdiskstreamcontroller.obj" \ "$(INTDIR)\mxdiskstreamprovider.obj" \ "$(INTDIR)\mxdsaction.obj" \ @@ -513,6 +517,8 @@ CLEAN : -@erase "$(INTDIR)\mxcontrolpresenter.obj" -@erase "$(INTDIR)\mxcore.obj" -@erase "$(INTDIR)\mxcriticalsection.obj" + -@erase "$(INTDIR)\mxdirect3d.obj" + -@erase "$(INTDIR)\mxdirectdraw.obj" -@erase "$(INTDIR)\mxdiskstreamcontroller.obj" -@erase "$(INTDIR)\mxdiskstreamprovider.obj" -@erase "$(INTDIR)\mxdsaction.obj" @@ -629,13 +635,13 @@ BSC32_SBRS= \ 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 /nologo /subsystem:windows /dll /debug /machine:I386 -# ADD 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 winmm.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"Debug/LEGO1.DLL" +# ADD 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 winmm.lib ddraw.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"Debug/LEGO1.DLL" # SUBTRACT LINK32 /pdb:none /map LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\ advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\ - odbccp32.lib winmm.lib /nologo /subsystem:windows /dll /incremental:yes\ - /pdb:"$(OUTDIR)/LEGO1.pdb" /debug /machine:I386 /out:"Debug/LEGO1.DLL"\ - /implib:"$(OUTDIR)/LEGO1.lib" + odbccp32.lib winmm.lib ddraw.lib /nologo /subsystem:windows /dll\ + /incremental:yes /pdb:"$(OUTDIR)/LEGO1.pdb" /debug /machine:I386\ + /out:"Debug/LEGO1.DLL" /implib:"$(OUTDIR)/LEGO1.lib" LINK32_OBJS= \ "$(INTDIR)\act1state.obj" \ "$(INTDIR)\act2brick.obj" \ @@ -720,6 +726,8 @@ LINK32_OBJS= \ "$(INTDIR)\mxcontrolpresenter.obj" \ "$(INTDIR)\mxcore.obj" \ "$(INTDIR)\mxcriticalsection.obj" \ + "$(INTDIR)\mxdirect3d.obj" \ + "$(INTDIR)\mxdirectdraw.obj" \ "$(INTDIR)\mxdiskstreamcontroller.obj" \ "$(INTDIR)\mxdiskstreamprovider.obj" \ "$(INTDIR)\mxdsaction.obj" \ @@ -2502,9 +2510,6 @@ DEP_CPP_LEGOT=\ # Begin Source File SOURCE=.\LEGO1\legoworld.cpp - -!IF "$(CFG)" == "LEGO1 - Win32 Release" - DEP_CPP_LEGOW=\ ".\LEGO1\legoentity.h"\ ".\LEGO1\legoworld.h"\ @@ -2517,22 +2522,6 @@ DEP_CPP_LEGOW=\ $(CPP) $(CPP_PROJ) $(SOURCE) -!ELSEIF "$(CFG)" == "LEGO1 - Win32 Debug" - -DEP_CPP_LEGOW=\ - ".\LEGO1\legoentity.h"\ - ".\LEGO1\legoworld.h"\ - ".\LEGO1\mxcore.h"\ - ".\LEGO1\mxentity.h"\ - ".\LEGO1\mxtypes.h"\ - - -"$(INTDIR)\legoworld.obj" : $(SOURCE) $(DEP_CPP_LEGOW) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - # End Source File ################################################################################ # Begin Source File @@ -2714,9 +2703,6 @@ DEP_CPP_MXFLC=\ # Begin Source File SOURCE=.\LEGO1\mxloopingsmkpresenter.cpp - -!IF "$(CFG)" == "LEGO1 - Win32 Release" - DEP_CPP_MXLOO=\ ".\LEGO1\mxcore.h"\ ".\LEGO1\mxcriticalsection.h"\ @@ -2732,25 +2718,6 @@ DEP_CPP_MXLOO=\ $(CPP) $(CPP_PROJ) $(SOURCE) -!ELSEIF "$(CFG)" == "LEGO1 - Win32 Debug" - -DEP_CPP_MXLOO=\ - ".\LEGO1\mxcore.h"\ - ".\LEGO1\mxcriticalsection.h"\ - ".\LEGO1\mxloopingsmkpresenter.h"\ - ".\LEGO1\mxmediapresenter.h"\ - ".\LEGO1\mxpresenter.h"\ - ".\LEGO1\mxsmkpresenter.h"\ - ".\LEGO1\mxtypes.h"\ - ".\LEGO1\mxvideopresenter.h"\ - - -"$(INTDIR)\mxloopingsmkpresenter.obj" : $(SOURCE) $(DEP_CPP_MXLOO) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - # End Source File ################################################################################ # Begin Source File @@ -3345,9 +3312,6 @@ DEP_CPP_MXDSS=\ # Begin Source File SOURCE=.\LEGO1\act3state.cpp - -!IF "$(CFG)" == "LEGO1 - Win32 Release" - DEP_CPP_ACT3ST=\ ".\LEGO1\act3state.h"\ ".\LEGO1\legostate.h"\ @@ -3359,29 +3323,11 @@ DEP_CPP_ACT3ST=\ $(CPP) $(CPP_PROJ) $(SOURCE) -!ELSEIF "$(CFG)" == "LEGO1 - Win32 Debug" - -DEP_CPP_ACT3ST=\ - ".\LEGO1\act3state.h"\ - ".\LEGO1\legostate.h"\ - ".\LEGO1\mxcore.h"\ - ".\LEGO1\mxtypes.h"\ - - -"$(INTDIR)\act3state.obj" : $(SOURCE) $(DEP_CPP_ACT3ST) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - # End Source File ################################################################################ # Begin Source File SOURCE=.\LEGO1\helicopterstate.cpp - -!IF "$(CFG)" == "LEGO1 - Win32 Release" - DEP_CPP_HELICO=\ ".\LEGO1\helicopterstate.h"\ ".\LEGO1\legostate.h"\ @@ -3393,29 +3339,11 @@ DEP_CPP_HELICO=\ $(CPP) $(CPP_PROJ) $(SOURCE) -!ELSEIF "$(CFG)" == "LEGO1 - Win32 Debug" - -DEP_CPP_HELICO=\ - ".\LEGO1\helicopterstate.h"\ - ".\LEGO1\legostate.h"\ - ".\LEGO1\mxcore.h"\ - ".\LEGO1\mxtypes.h"\ - - -"$(INTDIR)\helicopterstate.obj" : $(SOURCE) $(DEP_CPP_HELICO) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - # End Source File ################################################################################ # Begin Source File SOURCE=.\LEGO1\jukeboxstate.cpp - -!IF "$(CFG)" == "LEGO1 - Win32 Release" - DEP_CPP_JUKEBOX=\ ".\LEGO1\jukeboxstate.h"\ ".\LEGO1\legostate.h"\ @@ -3427,29 +3355,11 @@ DEP_CPP_JUKEBOX=\ $(CPP) $(CPP_PROJ) $(SOURCE) -!ELSEIF "$(CFG)" == "LEGO1 - Win32 Debug" - -DEP_CPP_JUKEBOX=\ - ".\LEGO1\jukeboxstate.h"\ - ".\LEGO1\legostate.h"\ - ".\LEGO1\mxcore.h"\ - ".\LEGO1\mxtypes.h"\ - - -"$(INTDIR)\jukeboxstate.obj" : $(SOURCE) $(DEP_CPP_JUKEBOX) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - # End Source File ################################################################################ # Begin Source File SOURCE=.\LEGO1\legoact2state.cpp - -!IF "$(CFG)" == "LEGO1 - Win32 Release" - DEP_CPP_LEGOAC=\ ".\LEGO1\legoact2state.h"\ ".\LEGO1\legostate.h"\ @@ -3461,29 +3371,11 @@ DEP_CPP_LEGOAC=\ $(CPP) $(CPP_PROJ) $(SOURCE) -!ELSEIF "$(CFG)" == "LEGO1 - Win32 Debug" - -DEP_CPP_LEGOAC=\ - ".\LEGO1\legoact2state.h"\ - ".\LEGO1\legostate.h"\ - ".\LEGO1\mxcore.h"\ - ".\LEGO1\mxtypes.h"\ - - -"$(INTDIR)\legoact2state.obj" : $(SOURCE) $(DEP_CPP_LEGOAC) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - # End Source File ################################################################################ # Begin Source File SOURCE=.\LEGO1\legopathcontroller.cpp - -!IF "$(CFG)" == "LEGO1 - Win32 Release" - DEP_CPP_LEGOPATH=\ ".\LEGO1\legopathcontroller.h"\ ".\LEGO1\mxcore.h"\ @@ -3494,28 +3386,11 @@ DEP_CPP_LEGOPATH=\ $(CPP) $(CPP_PROJ) $(SOURCE) -!ELSEIF "$(CFG)" == "LEGO1 - Win32 Debug" - -DEP_CPP_LEGOPATH=\ - ".\LEGO1\legopathcontroller.h"\ - ".\LEGO1\mxcore.h"\ - ".\LEGO1\mxtypes.h"\ - - -"$(INTDIR)\legopathcontroller.obj" : $(SOURCE) $(DEP_CPP_LEGOPATH) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - # End Source File ################################################################################ # Begin Source File SOURCE=.\LEGO1\legovideomanager.cpp - -!IF "$(CFG)" == "LEGO1 - Win32 Release" - DEP_CPP_LEGOV=\ ".\LEGO1\lego3dmanager.h"\ ".\LEGO1\lego3dview.h"\ @@ -3537,39 +3412,11 @@ DEP_CPP_LEGOV=\ $(CPP) $(CPP_PROJ) $(SOURCE) -!ELSEIF "$(CFG)" == "LEGO1 - Win32 Debug" - -DEP_CPP_LEGOV=\ - ".\LEGO1\lego3dmanager.h"\ - ".\LEGO1\lego3dview.h"\ - ".\LEGO1\legovideomanager.h"\ - ".\LEGO1\mxcore.h"\ - ".\LEGO1\mxcriticalsection.h"\ - ".\LEGO1\mxpalette.h"\ - ".\LEGO1\mxrect32.h"\ - ".\LEGO1\mxtypes.h"\ - ".\LEGO1\mxunknown100dc6b0.h"\ - ".\LEGO1\mxvariabletable.h"\ - ".\LEGO1\mxvideomanager.h"\ - ".\LEGO1\mxvideoparam.h"\ - ".\LEGO1\mxvideoparamflags.h"\ - ".\LEGO1\viewmanager.h"\ - - -"$(INTDIR)\legovideomanager.obj" : $(SOURCE) $(DEP_CPP_LEGOV) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - # End Source File ################################################################################ # Begin Source File SOURCE=.\LEGO1\mxbackgroundaudiomanager.cpp - -!IF "$(CFG)" == "LEGO1 - Win32 Release" - DEP_CPP_MXBAC=\ ".\LEGO1\mxbackgroundaudiomanager.h"\ ".\LEGO1\mxcore.h"\ @@ -3581,29 +3428,11 @@ DEP_CPP_MXBAC=\ $(CPP) $(CPP_PROJ) $(SOURCE) -!ELSEIF "$(CFG)" == "LEGO1 - Win32 Debug" - -DEP_CPP_MXBAC=\ - ".\LEGO1\mxbackgroundaudiomanager.h"\ - ".\LEGO1\mxcore.h"\ - ".\LEGO1\mxtypes.h"\ - - -"$(INTDIR)\mxbackgroundaudiomanager.obj" : $(SOURCE) $(DEP_CPP_MXBAC)\ - "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - # End Source File ################################################################################ # Begin Source File SOURCE=.\LEGO1\mxdiskstreamprovider.cpp - -!IF "$(CFG)" == "LEGO1 - Win32 Release" - DEP_CPP_MXDISK=\ ".\LEGO1\mxcore.h"\ ".\LEGO1\mxdiskstreamprovider.h"\ @@ -3615,29 +3444,11 @@ DEP_CPP_MXDISK=\ $(CPP) $(CPP_PROJ) $(SOURCE) -!ELSEIF "$(CFG)" == "LEGO1 - Win32 Debug" - -DEP_CPP_MXDISK=\ - ".\LEGO1\mxcore.h"\ - ".\LEGO1\mxdiskstreamprovider.h"\ - ".\LEGO1\mxstreamprovider.h"\ - ".\LEGO1\mxtypes.h"\ - - -"$(INTDIR)\mxdiskstreamprovider.obj" : $(SOURCE) $(DEP_CPP_MXDISK) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - # End Source File ################################################################################ # Begin Source File SOURCE=.\LEGO1\mxdsaction.cpp - -!IF "$(CFG)" == "LEGO1 - Win32 Release" - DEP_CPP_MXDSA=\ ".\LEGO1\mxatomid.h"\ ".\LEGO1\mxcore.h"\ @@ -3650,30 +3461,11 @@ DEP_CPP_MXDSA=\ $(CPP) $(CPP_PROJ) $(SOURCE) -!ELSEIF "$(CFG)" == "LEGO1 - Win32 Debug" - -DEP_CPP_MXDSA=\ - ".\LEGO1\mxatomid.h"\ - ".\LEGO1\mxcore.h"\ - ".\LEGO1\mxdsaction.h"\ - ".\LEGO1\mxdsobject.h"\ - ".\LEGO1\mxtypes.h"\ - - -"$(INTDIR)\mxdsaction.obj" : $(SOURCE) $(DEP_CPP_MXDSA) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - # End Source File ################################################################################ # Begin Source File SOURCE=.\LEGO1\mxdsanim.cpp - -!IF "$(CFG)" == "LEGO1 - Win32 Release" - DEP_CPP_MXDSAN=\ ".\LEGO1\mxatomid.h"\ ".\LEGO1\mxcore.h"\ @@ -3688,32 +3480,11 @@ DEP_CPP_MXDSAN=\ $(CPP) $(CPP_PROJ) $(SOURCE) -!ELSEIF "$(CFG)" == "LEGO1 - Win32 Debug" - -DEP_CPP_MXDSAN=\ - ".\LEGO1\mxatomid.h"\ - ".\LEGO1\mxcore.h"\ - ".\LEGO1\mxdsaction.h"\ - ".\LEGO1\mxdsanim.h"\ - ".\LEGO1\mxdsmediaaction.h"\ - ".\LEGO1\mxdsobject.h"\ - ".\LEGO1\mxtypes.h"\ - - -"$(INTDIR)\mxdsanim.obj" : $(SOURCE) $(DEP_CPP_MXDSAN) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - # End Source File ################################################################################ # Begin Source File SOURCE=.\LEGO1\mxdsevent.cpp - -!IF "$(CFG)" == "LEGO1 - Win32 Release" - DEP_CPP_MXDSE=\ ".\LEGO1\mxatomid.h"\ ".\LEGO1\mxcore.h"\ @@ -3728,32 +3499,11 @@ DEP_CPP_MXDSE=\ $(CPP) $(CPP_PROJ) $(SOURCE) -!ELSEIF "$(CFG)" == "LEGO1 - Win32 Debug" - -DEP_CPP_MXDSE=\ - ".\LEGO1\mxatomid.h"\ - ".\LEGO1\mxcore.h"\ - ".\LEGO1\mxdsaction.h"\ - ".\LEGO1\mxdsevent.h"\ - ".\LEGO1\mxdsmediaaction.h"\ - ".\LEGO1\mxdsobject.h"\ - ".\LEGO1\mxtypes.h"\ - - -"$(INTDIR)\mxdsevent.obj" : $(SOURCE) $(DEP_CPP_MXDSE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - # End Source File ################################################################################ # Begin Source File SOURCE=.\LEGO1\mxdsmediaaction.cpp - -!IF "$(CFG)" == "LEGO1 - Win32 Release" - DEP_CPP_MXDSM=\ ".\LEGO1\mxatomid.h"\ ".\LEGO1\mxcore.h"\ @@ -3767,31 +3517,11 @@ DEP_CPP_MXDSM=\ $(CPP) $(CPP_PROJ) $(SOURCE) -!ELSEIF "$(CFG)" == "LEGO1 - Win32 Debug" - -DEP_CPP_MXDSM=\ - ".\LEGO1\mxatomid.h"\ - ".\LEGO1\mxcore.h"\ - ".\LEGO1\mxdsaction.h"\ - ".\LEGO1\mxdsmediaaction.h"\ - ".\LEGO1\mxdsobject.h"\ - ".\LEGO1\mxtypes.h"\ - - -"$(INTDIR)\mxdsmediaaction.obj" : $(SOURCE) $(DEP_CPP_MXDSM) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - # End Source File ################################################################################ # Begin Source File SOURCE=.\LEGO1\mxdsmultiaction.cpp - -!IF "$(CFG)" == "LEGO1 - Win32 Release" - DEP_CPP_MXDSMU=\ ".\LEGO1\mxatomid.h"\ ".\LEGO1\mxcore.h"\ @@ -3805,31 +3535,11 @@ DEP_CPP_MXDSMU=\ $(CPP) $(CPP_PROJ) $(SOURCE) -!ELSEIF "$(CFG)" == "LEGO1 - Win32 Debug" - -DEP_CPP_MXDSMU=\ - ".\LEGO1\mxatomid.h"\ - ".\LEGO1\mxcore.h"\ - ".\LEGO1\mxdsaction.h"\ - ".\LEGO1\mxdsmultiaction.h"\ - ".\LEGO1\mxdsobject.h"\ - ".\LEGO1\mxtypes.h"\ - - -"$(INTDIR)\mxdsmultiaction.obj" : $(SOURCE) $(DEP_CPP_MXDSMU) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - # End Source File ################################################################################ # Begin Source File SOURCE=.\LEGO1\mxdsobjectaction.cpp - -!IF "$(CFG)" == "LEGO1 - Win32 Release" - DEP_CPP_MXDSOB=\ ".\LEGO1\mxatomid.h"\ ".\LEGO1\mxcore.h"\ @@ -3844,32 +3554,11 @@ DEP_CPP_MXDSOB=\ $(CPP) $(CPP_PROJ) $(SOURCE) -!ELSEIF "$(CFG)" == "LEGO1 - Win32 Debug" - -DEP_CPP_MXDSOB=\ - ".\LEGO1\mxatomid.h"\ - ".\LEGO1\mxcore.h"\ - ".\LEGO1\mxdsaction.h"\ - ".\LEGO1\mxdsmediaaction.h"\ - ".\LEGO1\mxdsobject.h"\ - ".\LEGO1\mxdsobjectaction.h"\ - ".\LEGO1\mxtypes.h"\ - - -"$(INTDIR)\mxdsobjectaction.obj" : $(SOURCE) $(DEP_CPP_MXDSOB) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - # End Source File ################################################################################ # Begin Source File SOURCE=.\LEGO1\mxdsparallelaction.cpp - -!IF "$(CFG)" == "LEGO1 - Win32 Release" - DEP_CPP_MXDSP=\ ".\LEGO1\mxatomid.h"\ ".\LEGO1\mxcore.h"\ @@ -3884,32 +3573,11 @@ DEP_CPP_MXDSP=\ $(CPP) $(CPP_PROJ) $(SOURCE) -!ELSEIF "$(CFG)" == "LEGO1 - Win32 Debug" - -DEP_CPP_MXDSP=\ - ".\LEGO1\mxatomid.h"\ - ".\LEGO1\mxcore.h"\ - ".\LEGO1\mxdsaction.h"\ - ".\LEGO1\mxdsmultiaction.h"\ - ".\LEGO1\mxdsobject.h"\ - ".\LEGO1\mxdsparallelaction.h"\ - ".\LEGO1\mxtypes.h"\ - - -"$(INTDIR)\mxdsparallelaction.obj" : $(SOURCE) $(DEP_CPP_MXDSP) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - # End Source File ################################################################################ # Begin Source File SOURCE=.\LEGO1\mxdsselectaction.cpp - -!IF "$(CFG)" == "LEGO1 - Win32 Release" - DEP_CPP_MXDSSE=\ ".\LEGO1\mxatomid.h"\ ".\LEGO1\mxcore.h"\ @@ -3925,33 +3593,11 @@ DEP_CPP_MXDSSE=\ $(CPP) $(CPP_PROJ) $(SOURCE) -!ELSEIF "$(CFG)" == "LEGO1 - Win32 Debug" - -DEP_CPP_MXDSSE=\ - ".\LEGO1\mxatomid.h"\ - ".\LEGO1\mxcore.h"\ - ".\LEGO1\mxdsaction.h"\ - ".\LEGO1\mxdsmultiaction.h"\ - ".\LEGO1\mxdsobject.h"\ - ".\LEGO1\mxdsparallelaction.h"\ - ".\LEGO1\mxdsselectaction.h"\ - ".\LEGO1\mxtypes.h"\ - - -"$(INTDIR)\mxdsselectaction.obj" : $(SOURCE) $(DEP_CPP_MXDSSE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - # End Source File ################################################################################ # Begin Source File SOURCE=.\LEGO1\mxdsserialaction.cpp - -!IF "$(CFG)" == "LEGO1 - Win32 Release" - DEP_CPP_MXDSSER=\ ".\LEGO1\mxatomid.h"\ ".\LEGO1\mxcore.h"\ @@ -3966,32 +3612,11 @@ DEP_CPP_MXDSSER=\ $(CPP) $(CPP_PROJ) $(SOURCE) -!ELSEIF "$(CFG)" == "LEGO1 - Win32 Debug" - -DEP_CPP_MXDSSER=\ - ".\LEGO1\mxatomid.h"\ - ".\LEGO1\mxcore.h"\ - ".\LEGO1\mxdsaction.h"\ - ".\LEGO1\mxdsmultiaction.h"\ - ".\LEGO1\mxdsobject.h"\ - ".\LEGO1\mxdsserialaction.h"\ - ".\LEGO1\mxtypes.h"\ - - -"$(INTDIR)\mxdsserialaction.obj" : $(SOURCE) $(DEP_CPP_MXDSSER) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - # End Source File ################################################################################ # Begin Source File SOURCE=.\LEGO1\mxdssound.cpp - -!IF "$(CFG)" == "LEGO1 - Win32 Release" - DEP_CPP_MXDSSO=\ ".\LEGO1\mxatomid.h"\ ".\LEGO1\mxcore.h"\ @@ -4006,32 +3631,11 @@ DEP_CPP_MXDSSO=\ $(CPP) $(CPP_PROJ) $(SOURCE) -!ELSEIF "$(CFG)" == "LEGO1 - Win32 Debug" - -DEP_CPP_MXDSSO=\ - ".\LEGO1\mxatomid.h"\ - ".\LEGO1\mxcore.h"\ - ".\LEGO1\mxdsaction.h"\ - ".\LEGO1\mxdsmediaaction.h"\ - ".\LEGO1\mxdsobject.h"\ - ".\LEGO1\mxdssound.h"\ - ".\LEGO1\mxtypes.h"\ - - -"$(INTDIR)\mxdssound.obj" : $(SOURCE) $(DEP_CPP_MXDSSO) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - # End Source File ################################################################################ # Begin Source File SOURCE=.\LEGO1\mxdsstill.cpp - -!IF "$(CFG)" == "LEGO1 - Win32 Release" - DEP_CPP_MXDSST=\ ".\LEGO1\mxatomid.h"\ ".\LEGO1\mxcore.h"\ @@ -4046,32 +3650,11 @@ DEP_CPP_MXDSST=\ $(CPP) $(CPP_PROJ) $(SOURCE) -!ELSEIF "$(CFG)" == "LEGO1 - Win32 Debug" - -DEP_CPP_MXDSST=\ - ".\LEGO1\mxatomid.h"\ - ".\LEGO1\mxcore.h"\ - ".\LEGO1\mxdsaction.h"\ - ".\LEGO1\mxdsmediaaction.h"\ - ".\LEGO1\mxdsobject.h"\ - ".\LEGO1\mxdsstill.h"\ - ".\LEGO1\mxtypes.h"\ - - -"$(INTDIR)\mxdsstill.obj" : $(SOURCE) $(DEP_CPP_MXDSST) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - # End Source File ################################################################################ # Begin Source File SOURCE=.\LEGO1\mxdssubscriber.cpp - -!IF "$(CFG)" == "LEGO1 - Win32 Release" - DEP_CPP_MXDSSU=\ ".\LEGO1\mxcore.h"\ ".\LEGO1\mxdssubscriber.h"\ @@ -4082,28 +3665,11 @@ DEP_CPP_MXDSSU=\ $(CPP) $(CPP_PROJ) $(SOURCE) -!ELSEIF "$(CFG)" == "LEGO1 - Win32 Debug" - -DEP_CPP_MXDSSU=\ - ".\LEGO1\mxcore.h"\ - ".\LEGO1\mxdssubscriber.h"\ - ".\LEGO1\mxtypes.h"\ - - -"$(INTDIR)\mxdssubscriber.obj" : $(SOURCE) $(DEP_CPP_MXDSSU) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - # End Source File ################################################################################ # Begin Source File SOURCE=.\LEGO1\mxloopingflcpresenter.cpp - -!IF "$(CFG)" == "LEGO1 - Win32 Release" - DEP_CPP_MXLOOP=\ ".\LEGO1\mxcore.h"\ ".\LEGO1\mxcriticalsection.h"\ @@ -4119,24 +3685,28 @@ DEP_CPP_MXLOOP=\ $(CPP) $(CPP_PROJ) $(SOURCE) -!ELSEIF "$(CFG)" == "LEGO1 - Win32 Debug" +# End Source File +################################################################################ +# Begin Source File -DEP_CPP_MXLOOP=\ - ".\LEGO1\mxcore.h"\ - ".\LEGO1\mxcriticalsection.h"\ - ".\LEGO1\mxflcpresenter.h"\ - ".\LEGO1\mxloopingflcpresenter.h"\ - ".\LEGO1\mxmediapresenter.h"\ - ".\LEGO1\mxpresenter.h"\ - ".\LEGO1\mxtypes.h"\ - ".\LEGO1\mxvideopresenter.h"\ - +SOURCE=.\LEGO1\mxdirect3d.cpp -"$(INTDIR)\mxloopingflcpresenter.obj" : $(SOURCE) $(DEP_CPP_MXLOOP) "$(INTDIR)" +"$(INTDIR)\mxdirect3d.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) -!ENDIF +# End Source File +################################################################################ +# Begin Source File + +SOURCE=.\LEGO1\mxdirectdraw.cpp +DEP_CPP_MXDIR=\ + ".\LEGO1\mxdirectdraw.h"\ + + +"$(INTDIR)\mxdirectdraw.obj" : $(SOURCE) $(DEP_CPP_MXDIR) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + # End Source File # End Target diff --git a/isle.mdp b/isle.mdp index a5fc4336..d53d2ec6 100644 Binary files a/isle.mdp and b/isle.mdp differ