isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2024-11-22 15:37:55 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleaned up mxomnicreateparambase

Browse source 
I remember there being a reason why I included MxOmniCreateParambase in ISLE, but testing now it doesn't seem to be what I thought (or maybe other factors are influencing it now). Indeed it seems this is unnecessary now.
This commit is contained in:
itsmattkc 2023-06-18 21:29:25 -07:00
parent a746a28702
commit bba513c525
5 changed files with 5 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
LEGO1/mxomnicreateparam.h
View file

@ -12,7 +12,6 @@ class MxOmniCreateParam : public MxOmniCreateParamBase
{ {
public: public:
__declspec(dllexport) MxOmniCreateParam(const char *mediaPath, struct HWND__ *windowHandle, MxVideoParam &vparam, MxOmniCreateFlags flags); __declspec(dllexport) MxOmniCreateParam(const char *mediaPath, struct HWND__ *windowHandle, MxVideoParam &vparam, MxOmniCreateFlags flags);
// virtual void vtable00(); seems to be a destructor
const MxOmniCreateFlags& CreateFlags() const { return this->m_createFlags; } const MxOmniCreateFlags& CreateFlags() const { return this->m_createFlags; }

5
LEGO1/mxomnicreateparambase.cpp
View file

@ -1,6 +1 @@
#include "mxomnicreateparam.h" #include "mxomnicreateparam.h"
MxOmniCreateParamBase::~MxOmniCreateParamBase()
{
}

3
LEGO1/mxomnicreateparambase.h
View file

@ -5,8 +5,7 @@
class MxOmniCreateParamBase class MxOmniCreateParamBase
{ {
public: public:
~MxOmniCreateParamBase(); virtual ~MxOmniCreateParamBase(){}
virtual void vtable00(){}
}; };

44
isle.mak
View file

@ -280,7 +280,6 @@ CLEAN :
-@erase "$(INTDIR)\isle.obj" -@erase "$(INTDIR)\isle.obj"
-@erase "$(INTDIR)\isle.res" -@erase "$(INTDIR)\isle.res"
-@erase "$(INTDIR)\main.obj" -@erase "$(INTDIR)\main.obj"
-@erase "$(INTDIR)\mxomnicreateparambase.obj"
-@erase "$(INTDIR)\vc40.pdb" -@erase "$(INTDIR)\vc40.pdb"
-@erase ".\Release\ISLE.EXE" -@erase ".\Release\ISLE.EXE"
-@erase ".\Release\ISLE.PDB" -@erase ".\Release\ISLE.PDB"
@ -342,7 +341,6 @@ LINK32_OBJS= \
"$(INTDIR)\isle.obj" \ "$(INTDIR)\isle.obj" \
"$(INTDIR)\isle.res" \ "$(INTDIR)\isle.res" \
"$(INTDIR)\main.obj" \ "$(INTDIR)\main.obj" \
"$(INTDIR)\mxomnicreateparambase.obj" \
".\Release\LEGO1.LIB" ".\Release\LEGO1.LIB"
".\Release\ISLE.EXE" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) ".\Release\ISLE.EXE" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
@ -372,7 +370,6 @@ CLEAN :
-@erase "$(INTDIR)\isle.obj" -@erase "$(INTDIR)\isle.obj"
-@erase "$(INTDIR)\isle.res" -@erase "$(INTDIR)\isle.res"
-@erase "$(INTDIR)\main.obj" -@erase "$(INTDIR)\main.obj"
-@erase "$(INTDIR)\mxomnicreateparambase.obj"
-@erase "$(INTDIR)\vc40.idb" -@erase "$(INTDIR)\vc40.idb"
-@erase "$(INTDIR)\vc40.pdb" -@erase "$(INTDIR)\vc40.pdb"
-@erase ".\Debug\ISLE.EXE" -@erase ".\Debug\ISLE.EXE"
@ -436,7 +433,6 @@ LINK32_OBJS= \
"$(INTDIR)\isle.obj" \ "$(INTDIR)\isle.obj" \
"$(INTDIR)\isle.res" \ "$(INTDIR)\isle.res" \
"$(INTDIR)\main.obj" \ "$(INTDIR)\main.obj" \
"$(INTDIR)\mxomnicreateparambase.obj" \
".\LEGO1\Debug\LEGO1.lib" ".\LEGO1\Debug\LEGO1.lib"
".\Debug\ISLE.EXE" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) ".\Debug\ISLE.EXE" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
@ -603,7 +599,11 @@ DEP_CPP_MXOMN=\
SOURCE=.\LEGO1\mxvideoparam.cpp SOURCE=.\LEGO1\mxvideoparam.cpp
DEP_CPP_MXVID=\ DEP_CPP_MXVID=\
".\LEGO1\mxpalette.h"\
".\LEGO1\mxrect32.h"\
".\LEGO1\mxvariabletable.h"\
".\LEGO1\mxvideoparam.h"\ ".\LEGO1\mxvideoparam.h"\
".\LEGO1\mxvideoparamflags.h"\
"$(INTDIR)\mxvideoparam.obj" : $(SOURCE) $(DEP_CPP_MXVID) "$(INTDIR)" "$(INTDIR)\mxvideoparam.obj" : $(SOURCE) $(DEP_CPP_MXVID) "$(INTDIR)"
@ -865,30 +865,6 @@ SOURCE=.\ISLE\res\isle.rc
!ENDIF !ENDIF
# End Source File
################################################################################
# Begin Source File
SOURCE=.\LEGO1\mxomnicreateparambase.cpp
DEP_CPP_MXOMNIC=\
".\LEGO1\mxbool.h"\
".\LEGO1\mxcore.h"\
".\LEGO1\mxomnicreateflags.h"\
".\LEGO1\mxomnicreateparam.h"\
".\LEGO1\mxomnicreateparambase.h"\
".\LEGO1\mxpalette.h"\
".\LEGO1\mxrect32.h"\
".\LEGO1\mxstring.h"\
".\LEGO1\mxvariabletable.h"\
".\LEGO1\mxvideoparam.h"\
".\LEGO1\mxvideoparamflags.h"\
"$(INTDIR)\mxomnicreateparambase.obj" : $(SOURCE) $(DEP_CPP_MXOMNIC)\
"$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
# End Source File # End Source File
################################################################################ ################################################################################
# Begin Source File # Begin Source File
@ -1145,18 +1121,6 @@ SOURCE=.\LEGO1\mxomnicreateparam.h
################################################################################ ################################################################################
# Begin Source File # Begin Source File
SOURCE=.\LEGO1\mxomnicreateparambase.h
!IF "$(CFG)" == "ISLE - Win32 Release"
!ELSEIF "$(CFG)" == "ISLE - Win32 Debug"
!ENDIF
# End Source File
################################################################################
# Begin Source File
SOURCE=.\LEGO1\mxpalette.h SOURCE=.\LEGO1\mxpalette.h
!IF "$(CFG)" == "ISLE - Win32 Release" !IF "$(CFG)" == "ISLE - Win32 Release"

BIN
isle.mdp
View file

Binary file not shown.