From d33cf2e0812ca0b820d3cdc0d20c0992adbcb813 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Mon, 19 Jun 2023 16:20:05 +0200 Subject: [PATCH] rename unit to avoid NMAKE issue --- ISLE/{mxdsobject.cpp => mx.cpp} | 0 isle.mak | 34 ++++++++++++++++++++++++-------- isle.mdp | Bin 49664 -> 50688 bytes 3 files changed, 26 insertions(+), 8 deletions(-) rename ISLE/{mxdsobject.cpp => mx.cpp} (100%) diff --git a/ISLE/mxdsobject.cpp b/ISLE/mx.cpp similarity index 100% rename from ISLE/mxdsobject.cpp rename to ISLE/mx.cpp diff --git a/isle.mak b/isle.mak index da5aac1b..b18f4372 100644 --- a/isle.mak +++ b/isle.mak @@ -288,7 +288,7 @@ CLEAN : -@erase "$(INTDIR)\isle.obj" -@erase "$(INTDIR)\isle.res" -@erase "$(INTDIR)\main.obj" - -@erase "$(INTDIR)\mxdsobject.obj" + -@erase "$(INTDIR)\mx.obj" -@erase "$(INTDIR)\vc40.pdb" -@erase ".\Release\ISLE.EXE" -@erase ".\Release\ISLE.PDB" @@ -350,7 +350,7 @@ LINK32_OBJS= \ "$(INTDIR)\isle.obj" \ "$(INTDIR)\isle.res" \ "$(INTDIR)\main.obj" \ - "$(INTDIR)\mxdsobject.obj" \ + "$(INTDIR)\mx.obj" \ ".\Release\LEGO1.LIB" ".\Release\ISLE.EXE" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) @@ -380,7 +380,7 @@ CLEAN : -@erase "$(INTDIR)\isle.obj" -@erase "$(INTDIR)\isle.res" -@erase "$(INTDIR)\main.obj" - -@erase "$(INTDIR)\mxdsobject.obj" + -@erase "$(INTDIR)\mx.obj" -@erase "$(INTDIR)\vc40.idb" -@erase "$(INTDIR)\vc40.pdb" -@erase ".\Debug\ISLE.EXE" @@ -444,7 +444,7 @@ LINK32_OBJS= \ "$(INTDIR)\isle.obj" \ "$(INTDIR)\isle.res" \ "$(INTDIR)\main.obj" \ - "$(INTDIR)\mxdsobject.obj" \ + "$(INTDIR)\mx.obj" \ ".\LEGO1\Debug\LEGO1.lib" ".\Debug\ISLE.EXE" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) @@ -484,6 +484,9 @@ DEP_CPP_MXCOR=\ # Begin Source File SOURCE=.\LEGO1\dllmain.cpp + +!IF "$(CFG)" == "LEGO1 - Win32 Release" + DEP_CPP_DLLMA=\ ".\LEGO1\legoinc.h"\ @@ -492,6 +495,18 @@ DEP_CPP_DLLMA=\ $(CPP) $(CPP_PROJ) $(SOURCE) +!ELSEIF "$(CFG)" == "LEGO1 - Win32 Debug" + +DEP_CPP_DLLMA=\ + ".\LEGO1\legoinc.h"\ + + +"$(INTDIR)\dllmain.obj" : $(SOURCE) $(DEP_CPP_DLLMA) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +!ENDIF + # End Source File ################################################################################ # Begin Source File @@ -1458,12 +1473,15 @@ SOURCE=.\LEGO1\mxvideoparamflags.h ################################################################################ # Begin Source File -SOURCE=.\ISLE\mxdsobject.cpp -NODEP_CPP_MXDSO=\ - ".\ISLE\mxdsobject.h"\ +SOURCE=.\ISLE\mx.cpp +DEP_CPP_MX_CP=\ + ".\LEGO1\mxatomid.h"\ + ".\LEGO1\mxbool.h"\ + ".\LEGO1\mxcore.h"\ + ".\LEGO1\mxdsobject.h"\ -"$(INTDIR)\mxdsobject.obj" : $(SOURCE) "$(INTDIR)" +"$(INTDIR)\mx.obj" : $(SOURCE) $(DEP_CPP_MX_CP) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) diff --git a/isle.mdp b/isle.mdp index d247552c84e8f5bc556728123d65f58269035690..12bc3e5211504dda3b8c58812559c2660f18f4f1 100644 GIT binary patch delta 702 zcmbtS&r2Io5T3XDUR*b6c!`E?i-)uz)k>23UOOaPv7@1%YeDapDjj6(>j!V|aZZL*;(^doIdx0L}ltL<+4tIy&_r zH1l?H?DdS9!~DEq%dd@2JE$*ld9K3QFYW@XUJ}l_XweN;`^J?H7l13K3UpV_8K>|2 ze9*v?xnbPeevEq+!}kgR94vDHrU0mp=@GR-C!x)hHe=A)8D`SnfBoa6J1DjKmDUjU z5}zdd@G#+STjea-98_CY)GIMVkYEtnOldRFN<~_otN9=|0;D=~+I-^zAYUIh;~&!a wWqZi`iDU=6%@MSQtS&De!k^p!5{|^WZ22z0Z@=^gE7bjJ4B}Pa8B^Tw7m9q^R{#J2 delta 620 zcmZqZVQy$)=J5)4H(+L9VMt_PVA?Fm^@VX06AKGZ0)rBR1jBzI;A7a#$n=465(f|C zKOpNf<0dW+0RdBP2D?X%>2TqQkvS_lw)Zobpy@8V-^q$+ipu&Y^^1sQ6lQ;C3 zOzxPf38Yykvrp5S{C^tIpvkI}r6=d&(D;sN@~&!?$$T|Bli$v&hZ>?kxvyGhvQ>@t zx8Op)RA>!f{E~+=VVS~uz+od8r5CI4|S-#3Z;3o^i--VqV;1J8GIl(mf zVx{D!nPQB{RtkybY-eHEoCsA`aVeQ;^28qb$@)_afZia*C1QG$``3$tTr&B52lwRA zVwufTW`E!mFk@ygeF!xk9B+bL9~d{SVPRrtVqjoPU}l`WepB+~ymjr9*KLXs3}9ej zNCRR`7(Ll=Q|RP^%@UL6Z4%l%YjYmgW(BUD%ouS#*)dCcvq0Qg#z{wnHVetTV*~(4 C|K(Z$