From bba513c5255c0c087d45114a582f3f2a879e3596 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Sun, 18 Jun 2023 21:29:25 -0700 Subject: [PATCH] cleaned up mxomnicreateparambase 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. --- LEGO1/mxomnicreateparam.h | 1 - LEGO1/mxomnicreateparambase.cpp | 5 ---- LEGO1/mxomnicreateparambase.h | 3 +-- isle.mak | 44 +++----------------------------- isle.mdp | Bin 47616 -> 47104 bytes 5 files changed, 5 insertions(+), 48 deletions(-) diff --git a/LEGO1/mxomnicreateparam.h b/LEGO1/mxomnicreateparam.h index 3729e969..d0439e26 100644 --- a/LEGO1/mxomnicreateparam.h +++ b/LEGO1/mxomnicreateparam.h @@ -12,7 +12,6 @@ class MxOmniCreateParam : public MxOmniCreateParamBase { public: __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; } diff --git a/LEGO1/mxomnicreateparambase.cpp b/LEGO1/mxomnicreateparambase.cpp index fe7c5836..0091785d 100644 --- a/LEGO1/mxomnicreateparambase.cpp +++ b/LEGO1/mxomnicreateparambase.cpp @@ -1,6 +1 @@ #include "mxomnicreateparam.h" - -MxOmniCreateParamBase::~MxOmniCreateParamBase() -{ - -} diff --git a/LEGO1/mxomnicreateparambase.h b/LEGO1/mxomnicreateparambase.h index fee0a488..605f4d30 100644 --- a/LEGO1/mxomnicreateparambase.h +++ b/LEGO1/mxomnicreateparambase.h @@ -5,8 +5,7 @@ class MxOmniCreateParamBase { public: - ~MxOmniCreateParamBase(); - virtual void vtable00(){} + virtual ~MxOmniCreateParamBase(){} }; diff --git a/isle.mak b/isle.mak index b1b8bfad..1672552e 100644 --- a/isle.mak +++ b/isle.mak @@ -280,7 +280,6 @@ CLEAN : -@erase "$(INTDIR)\isle.obj" -@erase "$(INTDIR)\isle.res" -@erase "$(INTDIR)\main.obj" - -@erase "$(INTDIR)\mxomnicreateparambase.obj" -@erase "$(INTDIR)\vc40.pdb" -@erase ".\Release\ISLE.EXE" -@erase ".\Release\ISLE.PDB" @@ -342,7 +341,6 @@ LINK32_OBJS= \ "$(INTDIR)\isle.obj" \ "$(INTDIR)\isle.res" \ "$(INTDIR)\main.obj" \ - "$(INTDIR)\mxomnicreateparambase.obj" \ ".\Release\LEGO1.LIB" ".\Release\ISLE.EXE" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) @@ -372,7 +370,6 @@ CLEAN : -@erase "$(INTDIR)\isle.obj" -@erase "$(INTDIR)\isle.res" -@erase "$(INTDIR)\main.obj" - -@erase "$(INTDIR)\mxomnicreateparambase.obj" -@erase "$(INTDIR)\vc40.idb" -@erase "$(INTDIR)\vc40.pdb" -@erase ".\Debug\ISLE.EXE" @@ -436,7 +433,6 @@ LINK32_OBJS= \ "$(INTDIR)\isle.obj" \ "$(INTDIR)\isle.res" \ "$(INTDIR)\main.obj" \ - "$(INTDIR)\mxomnicreateparambase.obj" \ ".\LEGO1\Debug\LEGO1.lib" ".\Debug\ISLE.EXE" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) @@ -603,7 +599,11 @@ DEP_CPP_MXOMN=\ SOURCE=.\LEGO1\mxvideoparam.cpp DEP_CPP_MXVID=\ + ".\LEGO1\mxpalette.h"\ + ".\LEGO1\mxrect32.h"\ + ".\LEGO1\mxvariabletable.h"\ ".\LEGO1\mxvideoparam.h"\ + ".\LEGO1\mxvideoparamflags.h"\ "$(INTDIR)\mxvideoparam.obj" : $(SOURCE) $(DEP_CPP_MXVID) "$(INTDIR)" @@ -865,30 +865,6 @@ SOURCE=.\ISLE\res\isle.rc !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 ################################################################################ # Begin Source File @@ -1145,18 +1121,6 @@ SOURCE=.\LEGO1\mxomnicreateparam.h ################################################################################ # 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 !IF "$(CFG)" == "ISLE - Win32 Release" diff --git a/isle.mdp b/isle.mdp index bb991128114c77383e61cfa28bf0c6f7030adc83..9bec89b4d8d07f8581aff2cc9426a1e03d0cae5c 100644 GIT binary patch delta 422 zcmZqp!qo7AiN`D0-GG^ag&~H4foZcN_ZP-ROe_L{3_1+a3`z_V4F7?Ek6|+-(+9>$ z9Ndf_fUGZ!lel;{dvkB)+o)j2$X_yS*G-W-&{&b0YjLNPOpyGU%aRy|PScN44l zMg=EEey2_hH?mJ!;;~U^8zZX<11kf=Waee*lI#o&3}QeGqk&8?P@k-rA~sopn`833 zIL^tNmdU9w0>wcggA71AL70)5fngU=!RF;DkK!7J%`dV(FbW1S1T%y% VgffINgfm1iL^4Ee7L<9<2mrPZf3yGq delta 1144 zcmZqpz|`=CiN`D0-GG^ag&~%KfoZcK*B8b`Oe_LH3_1)k3`z_V4F7?Ek6|+-(+9>$ z9Ndf#fUGZ!lel>6!;Ka6-6ItAqcRor{f!j#Jr$IET;2T*l@#<{6qLd}{fvzuOg|S_ zr%-nYJ02+R;vXIiVr6X1<4sesYsx)ZuzLvARQ@4LR>&C zK(S;6E~Uwi$ zMkESOCPt&lf+-4{|0UNjGaAEWSdxHAb8})`4J#?CIhi&$X3iFwY@BblS*C6-Gn2gD zCrUq#yh