From 5b7e62e74225cf77c184d9aebb11d5a541cd99c3 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Tue, 27 Jun 2023 20:50:16 +0200
Subject: [PATCH] merge

---
 LEGO1/mxpalette.cpp         |   0
 LEGO1/mxunknown100dc6b0.cpp |   0
 LEGO1/mxunknown100dc6b0.h   |   0
 LEGO1/mxvideomanager.cpp    |   0
 isle.mak                    |  85 ++----------------------------------
 isle.mdp                    | Bin 51200 -> 51200 bytes
 6 files changed, 3 insertions(+), 82 deletions(-)
 mode change 100755 => 100644 LEGO1/mxpalette.cpp
 mode change 100755 => 100644 LEGO1/mxunknown100dc6b0.cpp
 mode change 100755 => 100644 LEGO1/mxunknown100dc6b0.h
 mode change 100755 => 100644 LEGO1/mxvideomanager.cpp

diff --git a/LEGO1/mxpalette.cpp b/LEGO1/mxpalette.cpp
old mode 100755
new mode 100644
diff --git a/LEGO1/mxunknown100dc6b0.cpp b/LEGO1/mxunknown100dc6b0.cpp
old mode 100755
new mode 100644
diff --git a/LEGO1/mxunknown100dc6b0.h b/LEGO1/mxunknown100dc6b0.h
old mode 100755
new mode 100644
diff --git a/LEGO1/mxvideomanager.cpp b/LEGO1/mxvideomanager.cpp
old mode 100755
new mode 100644
diff --git a/isle.mak b/isle.mak
index 53ebd5a9..23583c29 100644
--- a/isle.mak
+++ b/isle.mak
@@ -913,6 +913,7 @@ DEP_CPP_MXPAL=\
 
 SOURCE=.\LEGO1\mxioinfo.cpp
 DEP_CPP_MXIOI=\
+	".\LEGO1\legoinc.h"\
 	".\LEGO1\mxioinfo.h"\
 	
 
@@ -926,6 +927,7 @@ DEP_CPP_MXIOI=\
 
 SOURCE=.\LEGO1\mxdsfile.cpp
 DEP_CPP_MXDSF=\
+	".\LEGO1\legoinc.h"\
 	".\LEGO1\mxbool.h"\
 	".\LEGO1\mxcore.h"\
 	".\LEGO1\mxdsfile.h"\
@@ -971,9 +973,6 @@ DEP_CPP_MXDSS=\
 # Begin Source File
 
 SOURCE=.\ISLE\isle.cpp
-
-!IF  "$(CFG)" == "ISLE - Win32 Release"
-
 DEP_CPP_ISLE_=\
 	".\ISLE\define.h"\
 	".\ISLE\isle.h"\
@@ -1034,70 +1033,6 @@ DEP_CPP_ISLE_=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "ISLE - Win32 Debug"
-
-DEP_CPP_ISLE_=\
-	".\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"\
-	".\LEGO1\mxdssource.h"\
-	".\LEGO1\mxeventmanager.h"\
-	".\LEGO1\mxioinfo.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)\isle.obj" : $(SOURCE) $(DEP_CPP_ISLE_) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
 # End Source File
 ################################################################################
 # Begin Source File
@@ -1542,29 +1477,15 @@ SOURCE=.\LEGO1\mxatomid.h
 # Begin Source File
 
 SOURCE=.\ISLE\define.cpp
-
-!IF  "$(CFG)" == "ISLE - Win32 Release"
-
 DEP_CPP_DEFIN=\
 	".\ISLE\define.h"\
+	".\LEGO1\legoinc.h"\
 	
 
 "$(INTDIR)\define.obj" : $(SOURCE) $(DEP_CPP_DEFIN) "$(INTDIR)"
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "ISLE - Win32 Debug"
-
-DEP_CPP_DEFIN=\
-	".\ISLE\define.h"\
-	
-
-"$(INTDIR)\define.obj" : $(SOURCE) $(DEP_CPP_DEFIN) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
 # End Source File
 # End Target
 # End Project
diff --git a/isle.mdp b/isle.mdp
index f1e307c6a475a4024595f1b3a8cf2d0f00cb7e6b..d9512305a07494826c1af13a85dc6a272fbd5283 100644
GIT binary patch
delta 719
zcmZpez}zr_c>{-(@OBo4&4;pB7!EMBFgy_NU{&H$n%tPEKiRXGn;F73WlJt705fB?
zCZ8?hf(XZI@n+^{=B4H9A<4!hbHZdN3&e9xzEH->4wFyJH-^jYEad~U6JsPc$#4h_
zydw+-gCkr9gCim|nKl=tuVvaCl(mgza$}q}Fv{5{$H%BlZir&#Nl8u1%u5ADDI??N
z&xziw#H!`UH)LfM@eKBHoorvC3T0)LBu<`C!ngT+NsRF3zz#{K%@eyWGEdIxQlG5d
yp*Hzeh05l(z9MOXE+&SKgGnq59nl@E3R)ekn+3T(uy5MLA+$L^>j&eaV@v?&W#kwD

delta 319
zcmZpez}zr_c>{-(KsFOYW}77o!vTg$h6Q|+ST_p3VB93bA%tDR0GEUdE{O<Drpb<(
z%9Fq62{P(WE=*V7oR;3oG?^(ud-7f>cBTxc$&Auklf%0tHtS^-vuysH=*>!sdX9WU
zRyI)|S9gEI$#x~GFlI(c;^xaG3Br?I`qVZXcStf#&hO-$tkx&D*{ACw^W;YrDx3TI
viljFyaB*;K+QcCw{GXBGA1D|MR3@_~Jeb6qnpZOUU%Wo18?zY~9b*CjeI94L