From 288f8614281788fd3a19f07a7732b06337253e34 Mon Sep 17 00:00:00 2001 From: Misha Date: Sun, 25 Jun 2023 07:57:14 +0300 Subject: [PATCH] fix makefile --- isle.mak | 138 ++++++++++++++++++++++++++++++++++++++++++++++--------- isle.mdp | Bin 50176 -> 52736 bytes 2 files changed, 117 insertions(+), 21 deletions(-) diff --git a/isle.mak b/isle.mak index 8f956bd8..af54a53c 100644 --- a/isle.mak +++ b/isle.mak @@ -55,10 +55,14 @@ ALL : ".\Release\LEGO1.DLL" CLEAN : -@erase "$(INTDIR)\dllmain.obj" + -@erase "$(INTDIR)\legobackgroundcolor.obj" -@erase "$(INTDIR)\legonavcontroller.obj" -@erase "$(INTDIR)\legoomni.obj" + -@erase "$(INTDIR)\legoutil.obj" + -@erase "$(INTDIR)\legovideomanager.obj" -@erase "$(INTDIR)\mxatomid.obj" -@erase "$(INTDIR)\mxautolocker.obj" + -@erase "$(INTDIR)\mxbackgroundcolor.obj" -@erase "$(INTDIR)\mxcore.obj" -@erase "$(INTDIR)\mxcriticalsection.obj" -@erase "$(INTDIR)\mxdsobject.obj" @@ -132,10 +136,14 @@ LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\ /implib:"Release/LEGO1.LIB" LINK32_OBJS= \ "$(INTDIR)\dllmain.obj" \ + "$(INTDIR)\legobackgroundcolor.obj" \ "$(INTDIR)\legonavcontroller.obj" \ "$(INTDIR)\legoomni.obj" \ + "$(INTDIR)\legoutil.obj" \ + "$(INTDIR)\legovideomanager.obj" \ "$(INTDIR)\mxatomid.obj" \ "$(INTDIR)\mxautolocker.obj" \ + "$(INTDIR)\mxbackgroundcolor.obj" \ "$(INTDIR)\mxcore.obj" \ "$(INTDIR)\mxcriticalsection.obj" \ "$(INTDIR)\mxdsobject.obj" \ @@ -149,11 +157,7 @@ LINK32_OBJS= \ "$(INTDIR)\mxunknown100dc6b0.obj" \ "$(INTDIR)\mxvideomanager.obj" \ "$(INTDIR)\mxvideoparam.obj" \ - "$(INTDIR)\mxvideoparamflags.obj" \ - "$(INTDIR)\mxbackgroundcolor.obj" \ - "$(INTDIR)\legobackgroundcolor.obj" \ - "$(INTDIR)\legoutil.obj" \ - "$(INTDIR)\legovideomanager.obj" + "$(INTDIR)\mxvideoparamflags.obj" ".\Release\LEGO1.DLL" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< @@ -179,10 +183,14 @@ ALL : ".\Debug\LEGO1.DLL" CLEAN : -@erase "$(INTDIR)\dllmain.obj" + -@erase "$(INTDIR)\legobackgroundcolor.obj" -@erase "$(INTDIR)\legonavcontroller.obj" -@erase "$(INTDIR)\legoomni.obj" + -@erase "$(INTDIR)\legoutil.obj" + -@erase "$(INTDIR)\legovideomanager.obj" -@erase "$(INTDIR)\mxatomid.obj" -@erase "$(INTDIR)\mxautolocker.obj" + -@erase "$(INTDIR)\mxbackgroundcolor.obj" -@erase "$(INTDIR)\mxcore.obj" -@erase "$(INTDIR)\mxcriticalsection.obj" -@erase "$(INTDIR)\mxdsobject.obj" @@ -258,10 +266,14 @@ LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\ /implib:"$(OUTDIR)/LEGO1.lib" LINK32_OBJS= \ "$(INTDIR)\dllmain.obj" \ + "$(INTDIR)\legobackgroundcolor.obj" \ "$(INTDIR)\legonavcontroller.obj" \ "$(INTDIR)\legoomni.obj" \ + "$(INTDIR)\legoutil.obj" \ + "$(INTDIR)\legovideomanager.obj" \ "$(INTDIR)\mxatomid.obj" \ "$(INTDIR)\mxautolocker.obj" \ + "$(INTDIR)\mxbackgroundcolor.obj" \ "$(INTDIR)\mxcore.obj" \ "$(INTDIR)\mxcriticalsection.obj" \ "$(INTDIR)\mxdsobject.obj" \ @@ -275,11 +287,7 @@ LINK32_OBJS= \ "$(INTDIR)\mxunknown100dc6b0.obj" \ "$(INTDIR)\mxvideomanager.obj" \ "$(INTDIR)\mxvideoparam.obj" \ - "$(INTDIR)\mxvideoparamflags.obj" \ - "$(INTDIR)\mxbackgroundcolor.obj" \ - "$(INTDIR)\legobackgroundcolor.obj" \ - "$(INTDIR)\legoutil.obj" \ - "$(INTDIR)\legovideomanager.obj" + "$(INTDIR)\mxvideoparamflags.obj" ".\Debug\LEGO1.DLL" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< @@ -598,8 +606,6 @@ DEP_CPP_MXAUT=\ SOURCE=.\LEGO1\mxtimer.cpp DEP_CPP_MXTIM=\ ".\LEGO1\legoinc.h"\ - ".\LEGO1\mxbool.h"\ - ".\LEGO1\mxcore.h"\ ".\LEGO1\mxtimer.h"\ @@ -653,8 +659,11 @@ DEP_CPP_MXOMN=\ SOURCE=.\LEGO1\mxvideoparam.cpp DEP_CPP_MXVID=\ ".\LEGO1\legoinc.h"\ + ".\LEGO1\mxbool.h"\ + ".\LEGO1\mxcore.h"\ ".\LEGO1\mxpalette.h"\ ".\LEGO1\mxrect32.h"\ + ".\LEGO1\mxresult.h"\ ".\LEGO1\mxvariabletable.h"\ ".\LEGO1\mxvideoparam.h"\ ".\LEGO1\mxvideoparamflags.h"\ @@ -692,6 +701,7 @@ DEP_CPP_MXOMNI=\ ".\LEGO1\mxomnicreateparambase.h"\ ".\LEGO1\mxpalette.h"\ ".\LEGO1\mxrect32.h"\ + ".\LEGO1\mxresult.h"\ ".\LEGO1\mxstring.h"\ ".\LEGO1\mxvariabletable.h"\ ".\LEGO1\mxvideoparam.h"\ @@ -716,6 +726,7 @@ DEP_CPP_MXOMNIC=\ ".\LEGO1\mxomnicreateparambase.h"\ ".\LEGO1\mxpalette.h"\ ".\LEGO1\mxrect32.h"\ + ".\LEGO1\mxresult.h"\ ".\LEGO1\mxstring.h"\ ".\LEGO1\mxvariabletable.h"\ ".\LEGO1\mxvideoparam.h"\ @@ -748,7 +759,6 @@ DEP_CPP_MXSTR=\ SOURCE=.\LEGO1\mxomnicreateflags.cpp DEP_CPP_MXOMNICR=\ - ".\LEGO1\mxbool.h"\ ".\LEGO1\mxomnicreateflags.h"\ @@ -845,23 +855,28 @@ DEP_CPP_MXATO=\ # Begin Source File SOURCE=.\LEGO1\mxbackgroundcolor.cpp -DEP_CPP_MXATO=\ +DEP_CPP_MXBAC=\ ".\LEGO1\mxbackgroundcolor.h"\ + ".\LEGO1\mxbool.h"\ + ".\LEGO1\mxcore.h"\ + ".\LEGO1\mxstring.h"\ -"$(INTDIR)\mxbackgroundcolor.obj" : $(SOURCE) $(DEP_CPP_MXATO) "$(INTDIR)" +"$(INTDIR)\mxbackgroundcolor.obj" : $(SOURCE) $(DEP_CPP_MXBAC) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) # End Source File ################################################################################ # Begin Source File + SOURCE=.\LEGO1\mxunknown100dc6b0.cpp DEP_CPP_MXUNK=\ ".\LEGO1\legoinc.h"\ ".\LEGO1\mxbool.h"\ ".\LEGO1\mxcore.h"\ ".\LEGO1\mxcriticalsection.h"\ + ".\LEGO1\mxresult.h"\ ".\LEGO1\mxunknown100dc6b0.h"\ @@ -874,14 +889,62 @@ DEP_CPP_MXUNK=\ # Begin Source File SOURCE=.\LEGO1\legobackgroundcolor.cpp -DEP_CPP_MXATO=\ +DEP_CPP_LEGOB=\ + ".\LEGO1\lego3dmanager.h"\ + ".\LEGO1\lego3dview.h"\ ".\LEGO1\legobackgroundcolor.h"\ + ".\LEGO1\legoentity.h"\ + ".\LEGO1\legogamestate.h"\ + ".\LEGO1\legoinc.h"\ + ".\LEGO1\legoinputmanager.h"\ + ".\LEGO1\legonavcontroller.h"\ + ".\LEGO1\legoomni.h"\ + ".\LEGO1\legoroi.h"\ + ".\LEGO1\legoutil.h"\ + ".\LEGO1\legovideomanager.h"\ + ".\LEGO1\mxatomid.h"\ + ".\LEGO1\mxbackgroundaudiomanager.h"\ + ".\LEGO1\mxbackgroundcolor.h"\ + ".\LEGO1\mxbool.h"\ + ".\LEGO1\mxcore.h"\ + ".\LEGO1\mxcriticalsection.h"\ + ".\LEGO1\mxdsaction.h"\ + ".\LEGO1\mxdsfile.h"\ + ".\LEGO1\mxdsobject.h"\ + ".\LEGO1\mxeventmanager.h"\ + ".\LEGO1\mxmusicmanager.h"\ + ".\LEGO1\mxnotificationmanager.h"\ + ".\LEGO1\mxobjectfactory.h"\ + ".\LEGO1\mxomni.h"\ + ".\LEGO1\mxomnicreateflags.h"\ + ".\LEGO1\mxomnicreateparam.h"\ + ".\LEGO1\mxomnicreateparambase.h"\ + ".\LEGO1\mxpalette.h"\ + ".\LEGO1\mxrect32.h"\ + ".\LEGO1\mxresult.h"\ + ".\LEGO1\mxsoundmanager.h"\ + ".\LEGO1\mxstreamcontroller.h"\ + ".\LEGO1\mxstreamer.h"\ + ".\LEGO1\mxstring.h"\ + ".\LEGO1\mxticklemanager.h"\ + ".\LEGO1\mxtimer.h"\ + ".\LEGO1\mxtransitionmanager.h"\ + ".\LEGO1\mxunknown100dc6b0.h"\ + ".\LEGO1\mxvariabletable.h"\ + ".\LEGO1\mxvideomanager.h"\ + ".\LEGO1\mxvideoparam.h"\ + ".\LEGO1\mxvideoparamflags.h"\ + ".\LEGO1\viewmanager.h"\ -"$(INTDIR)\legobackgroundcolor.obj" : $(SOURCE) $(DEP_CPP_MXATO) "$(INTDIR)" +"$(INTDIR)\legobackgroundcolor.obj" : $(SOURCE) $(DEP_CPP_LEGOB) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + # End Source File ################################################################################ # Begin Source File + SOURCE=.\LEGO1\mxvideomanager.cpp DEP_CPP_MXVIDEO=\ ".\LEGO1\legoinc.h"\ @@ -890,6 +953,7 @@ DEP_CPP_MXVIDEO=\ ".\LEGO1\mxcriticalsection.h"\ ".\LEGO1\mxpalette.h"\ ".\LEGO1\mxrect32.h"\ + ".\LEGO1\mxresult.h"\ ".\LEGO1\mxunknown100dc6b0.h"\ ".\LEGO1\mxvariabletable.h"\ ".\LEGO1\mxvideomanager.h"\ @@ -906,27 +970,52 @@ DEP_CPP_MXVIDEO=\ # Begin Source File SOURCE=.\LEGO1\legoutil.cpp -DEP_CPP_MXATO=\ +DEP_CPP_LEGOU=\ ".\LEGO1\legoutil.h"\ -"$(INTDIR)\legoutil.obj" : $(SOURCE) $(DEP_CPP_MXATO) "$(INTDIR)" +"$(INTDIR)\legoutil.obj" : $(SOURCE) $(DEP_CPP_LEGOU) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + # End Source File ################################################################################ # Begin Source File SOURCE=.\LEGO1\legovideomanager.cpp -DEP_CPP_MXATO=\ +DEP_CPP_LEGOV=\ + ".\LEGO1\lego3dmanager.h"\ + ".\LEGO1\lego3dview.h"\ + ".\LEGO1\legoinc.h"\ ".\LEGO1\legovideomanager.h"\ + ".\LEGO1\mxbool.h"\ + ".\LEGO1\mxcore.h"\ + ".\LEGO1\mxcriticalsection.h"\ + ".\LEGO1\mxpalette.h"\ + ".\LEGO1\mxrect32.h"\ + ".\LEGO1\mxresult.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_MXATO) "$(INTDIR)" +"$(INTDIR)\legovideomanager.obj" : $(SOURCE) $(DEP_CPP_LEGOV) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + # End Source File ################################################################################ # Begin Source File + SOURCE=.\LEGO1\mxpalette.cpp DEP_CPP_MXPAL=\ + ".\LEGO1\mxbool.h"\ + ".\LEGO1\mxcore.h"\ ".\LEGO1\mxpalette.h"\ + ".\LEGO1\mxresult.h"\ "$(INTDIR)\mxpalette.obj" : $(SOURCE) $(DEP_CPP_MXPAL) "$(INTDIR)" @@ -1030,21 +1119,28 @@ SOURCE=.\ISLE\main.cpp DEP_CPP_MAIN_=\ ".\ISLE\define.h"\ ".\ISLE\isle.h"\ + ".\ISLE\res\resource.h"\ ".\LEGO1\lego3dmanager.h"\ ".\LEGO1\lego3dview.h"\ + ".\LEGO1\legoanimationmanager.h"\ + ".\LEGO1\legobuildingmanager.h"\ ".\LEGO1\legoentity.h"\ ".\LEGO1\legogamestate.h"\ ".\LEGO1\legoinc.h"\ ".\LEGO1\legoinputmanager.h"\ + ".\LEGO1\legomodelpresenter.h"\ ".\LEGO1\legonavcontroller.h"\ ".\LEGO1\legoomni.h"\ + ".\LEGO1\legopartpresenter.h"\ ".\LEGO1\legoroi.h"\ ".\LEGO1\legovideomanager.h"\ + ".\LEGO1\legoworldpresenter.h"\ ".\LEGO1\mxatomid.h"\ ".\LEGO1\mxbackgroundaudiomanager.h"\ ".\LEGO1\mxbool.h"\ ".\LEGO1\mxcore.h"\ ".\LEGO1\mxcriticalsection.h"\ + ".\LEGO1\mxdirectdraw.h"\ ".\LEGO1\mxdsaction.h"\ ".\LEGO1\mxdsfile.h"\ ".\LEGO1\mxdsobject.h"\ diff --git a/isle.mdp b/isle.mdp index 390064aa600f2bb5cc48156405e1040876938d6d..6eb00a3f6151026380a10a5a34d090fa1ea2a879 100644 GIT binary patch literal 52736 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 IhQK`h4@5i>LI3~&