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

fix merge conflicts

Browse source
This commit is contained in:
Thomas May 2023-06-14 01:32:43 +01:00
parent fdbaf454aa
commit 8b58e6fe28
2 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
isle.mak
View file

@ -55,6 +55,7 @@ ALL : ".\Release\LEGO1.DLL"
CLEAN : CLEAN :
-@erase "$(INTDIR)\dllmain.obj" -@erase "$(INTDIR)\dllmain.obj"
-@erase "$(INTDIR)\legonavcontroller.obj"
-@erase "$(INTDIR)\legoomni.obj" -@erase "$(INTDIR)\legoomni.obj"
-@erase "$(INTDIR)\mxautolocker.obj" -@erase "$(INTDIR)\mxautolocker.obj"
-@erase "$(INTDIR)\mxcore.obj" -@erase "$(INTDIR)\mxcore.obj"
@ -125,6 +126,7 @@ LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
/out:"Release/LEGO1.DLL" /implib:"Release/LEGO1.LIB" /out:"Release/LEGO1.DLL" /implib:"Release/LEGO1.LIB"
LINK32_OBJS= \ LINK32_OBJS= \
"$(INTDIR)\dllmain.obj" \ "$(INTDIR)\dllmain.obj" \
"$(INTDIR)\legonavcontroller.obj" \
"$(INTDIR)\legoomni.obj" \ "$(INTDIR)\legoomni.obj" \
"$(INTDIR)\mxautolocker.obj" \ "$(INTDIR)\mxautolocker.obj" \
"$(INTDIR)\mxcore.obj" \ "$(INTDIR)\mxcore.obj" \
@ -162,6 +164,7 @@ ALL : ".\Debug\LEGO1.DLL"
CLEAN : CLEAN :
-@erase "$(INTDIR)\dllmain.obj" -@erase "$(INTDIR)\dllmain.obj"
-@erase "$(INTDIR)\legonavcontroller.obj"
-@erase "$(INTDIR)\legoomni.obj" -@erase "$(INTDIR)\legoomni.obj"
-@erase "$(INTDIR)\mxautolocker.obj" -@erase "$(INTDIR)\mxautolocker.obj"
-@erase "$(INTDIR)\mxcore.obj" -@erase "$(INTDIR)\mxcore.obj"
@ -236,6 +239,7 @@ LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
/out:"Debug/LEGO1.DLL" /implib:"$(OUTDIR)/LEGO1.lib" /out:"Debug/LEGO1.DLL" /implib:"$(OUTDIR)/LEGO1.lib"
LINK32_OBJS= \ LINK32_OBJS= \
"$(INTDIR)\dllmain.obj" \ "$(INTDIR)\dllmain.obj" \
"$(INTDIR)\legonavcontroller.obj" \
"$(INTDIR)\legoomni.obj" \ "$(INTDIR)\legoomni.obj" \
"$(INTDIR)\mxautolocker.obj" \ "$(INTDIR)\mxautolocker.obj" \
"$(INTDIR)\mxcore.obj" \ "$(INTDIR)\mxcore.obj" \
@ -678,6 +682,21 @@ DEP_CPP_MXOMNICR=\
$(CPP) $(CPP_PROJ) $(SOURCE) $(CPP) $(CPP_PROJ) $(SOURCE)
# End Source File
################################################################################
# Begin Source File
SOURCE=.\LEGO1\legonavcontroller.cpp
DEP_CPP_LEGON=\
".\LEGO1\legonavcontroller.h"\
".\LEGO1\mxbool.h"\
".\LEGO1\mxcore.h"\
"$(INTDIR)\legonavcontroller.obj" : $(SOURCE) $(DEP_CPP_LEGON) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
# End Source File # End Source File
# End Target # End Target
################################################################################ ################################################################################

BIN
isle.mdp
View file

Binary file not shown.