1 files changed, 33 insertions, 19 deletions

diff --git a/pumpkin.mak b/pumpkin.mak
index 9a40fa2..bd466fe 100644
--- a/pumpkin.mak
+++ b/pumpkin.mak
@@ -36,15 +36,15 @@ NULL=
 !ELSE 

 NULL=nul

 !ENDIF 

 ################################################################################

 # Begin Project

 # PROP Target_Last_Scanned "Install - Win32 Canned"

+CPP=cl.exe

 RSC=rc.exe

 MTL=mktyplib.exe

-CPP=cl.exe

 

 !IF  "$(CFG)" == "PumpKIN - Win32 Release"

 

 # PROP BASE Use_MFC 6

 # PROP BASE Use_Debug_Libraries 0

 # PROP BASE Output_Dir "Release"

@@ -74,13 +74,13 @@ CLEAN :
         -@erase "$(INTDIR)\pumpkin.cn_"

         -@erase "$(INTDIR)\pumpkin.cnt"

         -@erase "$(INTDIR)\pumpkin.hl_"

         -@erase "$(INTDIR)\pumpkin.hlp"

         -@erase "$(INTDIR)\PumpKIN.obj"

         -@erase "$(INTDIR)\pumpkin.pch"

-        -@erase "$(INTDIR)\PumpKIN.res"

+        -@erase "$(INTDIR)\pumpkin.res"

         -@erase "$(INTDIR)\PumpKINDlg.obj"

         -@erase "$(INTDIR)\RequestDlg.obj"

         -@erase "$(INTDIR)\Resolver.obj"

         -@erase "$(INTDIR)\Retrier.obj"

         -@erase "$(INTDIR)\StdAfx.obj"

         -@erase "$(INTDIR)\Trayer.obj"

@@ -99,13 +99,13 @@ CPP_OBJS=.\Release/
 CPP_SBRS=.\.

 # ADD BASE MTL /nologo /D "NDEBUG" /win32

 # ADD MTL /nologo /D "NDEBUG" /win32

 MTL_PROJ=/nologo /D "NDEBUG" /win32 

 # ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"

 # ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"

-RSC_PROJ=/l 0x409 /fo"$(INTDIR)/PumpKIN.res" /d "NDEBUG" /d "_AFXDLL" 

+RSC_PROJ=/l 0x409 /fo"$(INTDIR)/pumpkin.res" /d "NDEBUG" /d "_AFXDLL" 

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 BSC32_FLAGS=/nologo /o"$(OUTDIR)/pumpkin.bsc" 

 BSC32_SBRS= \

         

@@ -118,13 +118,13 @@ LINK32_OBJS= \
         "$(INTDIR)\ConfirmRRQDlg.obj" \

         "$(INTDIR)\ConfirmWRQDlg.obj" \

         "$(INTDIR)\PropsNetwork.obj" \

         "$(INTDIR)\PropsServer.obj" \

         "$(INTDIR)\PropsSounds.obj" \

         "$(INTDIR)\PumpKIN.obj" \

-        "$(INTDIR)\PumpKIN.res" \

+        "$(INTDIR)\pumpkin.res" \

         "$(INTDIR)\PumpKINDlg.obj" \

         "$(INTDIR)\RequestDlg.obj" \

         "$(INTDIR)\Resolver.obj" \

         "$(INTDIR)\Retrier.obj" \

         "$(INTDIR)\StdAfx.obj" \

         "$(INTDIR)\Trayer.obj"

@@ -182,13 +182,13 @@ CLEAN :
         -@erase "$(INTDIR)\pumpkin.cn_"

         -@erase "$(INTDIR)\pumpkin.cnt"

         -@erase "$(INTDIR)\pumpkin.hl_"

         -@erase "$(INTDIR)\pumpkin.hlp"

         -@erase "$(INTDIR)\PumpKIN.obj"

         -@erase "$(INTDIR)\pumpkin.pch"

-        -@erase "$(INTDIR)\PumpKIN.res"

+        -@erase "$(INTDIR)\pumpkin.res"

         -@erase "$(INTDIR)\PumpKIN.sbr"

         -@erase "$(INTDIR)\PumpKINDlg.obj"

         -@erase "$(INTDIR)\PumpKINDlg.sbr"

         -@erase "$(INTDIR)\RequestDlg.obj"

         -@erase "$(INTDIR)\RequestDlg.sbr"

         -@erase "$(INTDIR)\Resolver.obj"

@@ -219,13 +219,13 @@ CPP_OBJS=.\Debug/
 CPP_SBRS=.\Debug/

 # ADD BASE MTL /nologo /D "_DEBUG" /win32

 # ADD MTL /nologo /D "_DEBUG" /win32

 MTL_PROJ=/nologo /D "_DEBUG" /win32 

 # ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"

 # ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"

-RSC_PROJ=/l 0x409 /fo"$(INTDIR)/PumpKIN.res" /d "_DEBUG" /d "_AFXDLL" 

+RSC_PROJ=/l 0x409 /fo"$(INTDIR)/pumpkin.res" /d "_DEBUG" /d "_AFXDLL" 

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 BSC32_FLAGS=/nologo /o"$(OUTDIR)/pumpkin.bsc" 

 BSC32_SBRS= \

         "$(INTDIR)\ConfirmRRQDlg.sbr" \

@@ -255,13 +255,13 @@ LINK32_OBJS= \
         "$(INTDIR)\ConfirmRRQDlg.obj" \

         "$(INTDIR)\ConfirmWRQDlg.obj" \

         "$(INTDIR)\PropsNetwork.obj" \

         "$(INTDIR)\PropsServer.obj" \

         "$(INTDIR)\PropsSounds.obj" \

         "$(INTDIR)\PumpKIN.obj" \

-        "$(INTDIR)\PumpKIN.res" \

+        "$(INTDIR)\pumpkin.res" \

         "$(INTDIR)\PumpKINDlg.obj" \

         "$(INTDIR)\RequestDlg.obj" \

         "$(INTDIR)\Resolver.obj" \

         "$(INTDIR)\Retrier.obj" \

         "$(INTDIR)\StdAfx.obj" \

         "$(INTDIR)\Trayer.obj"

@@ -313,13 +313,13 @@ CLEAN :
         -@erase "$(INTDIR)\pumpkin.cn_"

         -@erase "$(INTDIR)\pumpkin.cnt"

         -@erase "$(INTDIR)\pumpkin.hl_"

         -@erase "$(INTDIR)\pumpkin.hlp"

         -@erase "$(INTDIR)\PumpKIN.obj"

         -@erase "$(INTDIR)\pumpkin.pch"

-        -@erase "$(INTDIR)\PumpKIN.res"

+        -@erase "$(INTDIR)\pumpkin.res"

         -@erase "$(INTDIR)\PumpKINDlg.obj"

         -@erase "$(INTDIR)\RequestDlg.obj"

         -@erase "$(INTDIR)\Resolver.obj"

         -@erase "$(INTDIR)\Retrier.obj"

         -@erase "$(INTDIR)\StdAfx.obj"

         -@erase "$(INTDIR)\Trayer.obj"

@@ -337,13 +337,13 @@ CPP_OBJS=.\Releast/
 CPP_SBRS=.\.

 # ADD BASE MTL /nologo /D "NDEBUG" /win32

 # ADD MTL /nologo /D "NDEBUG" /win32

 MTL_PROJ=/nologo /D "NDEBUG" /win32 

 # ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"

 # ADD RSC /l 0x409 /d "NDEBUG"

-RSC_PROJ=/l 0x409 /fo"$(INTDIR)/PumpKIN.res" /d "NDEBUG" 

+RSC_PROJ=/l 0x409 /fo"$(INTDIR)/pumpkin.res" /d "NDEBUG" 

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 BSC32_FLAGS=/nologo /o"$(OUTDIR)/pumpkin.bsc" 

 BSC32_SBRS= \

         

@@ -356,13 +356,13 @@ LINK32_OBJS= \
         "$(INTDIR)\ConfirmRRQDlg.obj" \

         "$(INTDIR)\ConfirmWRQDlg.obj" \

         "$(INTDIR)\PropsNetwork.obj" \

         "$(INTDIR)\PropsServer.obj" \

         "$(INTDIR)\PropsSounds.obj" \

         "$(INTDIR)\PumpKIN.obj" \

-        "$(INTDIR)\PumpKIN.res" \

+        "$(INTDIR)\pumpkin.res" \

         "$(INTDIR)\PumpKINDlg.obj" \

         "$(INTDIR)\RequestDlg.obj" \

         "$(INTDIR)\Resolver.obj" \

         "$(INTDIR)\Retrier.obj" \

         "$(INTDIR)\StdAfx.obj" \

         "$(INTDIR)\Trayer.obj"

@@ -458,40 +458,48 @@ LINK32_OBJS= \
 # PROP Output_Dir "Install\Pure"

 # PROP Intermediate_Dir "Install\Pure"

 # PROP Target_Dir "Install"

 OUTDIR=.\Install\Pure

 INTDIR=.\Install\Pure

 

-ALL : "$(OUTDIR)\Install.exe"

+ALL : "$(OUTDIR)\Install.exe" "$(OUTDIR)\Install.bsc"

 

 CLEAN : 

         -@erase "$(INTDIR)\install.obj"

         -@erase "$(INTDIR)\Install.res"

+        -@erase "$(INTDIR)\install.sbr"

+        -@erase "$(OUTDIR)\Install.bsc"

         -@erase "$(OUTDIR)\Install.exe"

 

 "$(OUTDIR)" :

     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

 

 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /YX /c

-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /c

+# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FR /YX /c

 CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D\

- "_MBCS" /Fp"$(INTDIR)/Install.pch" /YX /Fo"$(INTDIR)/" /c 

+ "_MBCS" /FR"$(INTDIR)/" /Fp"$(INTDIR)/Install.pch" /YX /Fo"$(INTDIR)/" /c 

 CPP_OBJS=.\Install\Pure/

-CPP_SBRS=.\.

+CPP_SBRS=.\Install\Pure/

 # ADD BASE MTL /nologo /D "NDEBUG" /win32

 # ADD MTL /nologo /D "NDEBUG" /win32

 MTL_PROJ=/nologo /D "NDEBUG" /win32 

 # ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"

 # ADD RSC /l 0x409 /d "NDEBUG"

 RSC_PROJ=/l 0x409 /fo"$(INTDIR)/Install.res" /d "NDEBUG" 

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 BSC32_FLAGS=/nologo /o"$(OUTDIR)/Install.bsc" 

 BSC32_SBRS= \

-        

+        "$(INTDIR)\install.sbr"

+

+"$(OUTDIR)\Install.bsc" : "$(OUTDIR)" $(BSC32_SBRS)

+    $(BSC32) @<<

+  $(BSC32_FLAGS) $(BSC32_SBRS)

+<<

+

 LINK32=link.exe

 # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386

 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib version.lib /nologo /subsystem:windows /machine:I386

 LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\

  advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\

  odbccp32.lib version.lib /nologo /subsystem:windows /incremental:no\

@@ -826,27 +834,27 @@ DEP_RSC_PUMPKIN=\
         ".\shared-data\play-icon.ico"\

         

 

 !IF  "$(CFG)" == "PumpKIN - Win32 Release"

 

 

-"$(INTDIR)\PumpKIN.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)"

+"$(INTDIR)\pumpkin.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)"

    $(RSC) $(RSC_PROJ) $(SOURCE)

 

 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Debug"

 

 

-"$(INTDIR)\PumpKIN.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)"

+"$(INTDIR)\pumpkin.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)"

    $(RSC) $(RSC_PROJ) $(SOURCE)

 

 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Static"

 

 

-"$(INTDIR)\PumpKIN.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)"

+"$(INTDIR)\pumpkin.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)"

    $(RSC) $(RSC_PROJ) $(SOURCE)

 

 

 !ENDIF 

 

 # End Source File

@@ -1394,15 +1402,21 @@ DEP_CPP_INSTAL=\
    $(CPP) $(CPP_PROJ) $(SOURCE)

 

 

 !ELSEIF  "$(CFG)" == "Install - Win32 Pure"

 

 

+BuildCmds= \

+        $(CPP) $(CPP_PROJ) $(SOURCE) \

+        

+

 "$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

+   $(BuildCmds)

 

+"$(INTDIR)\install.sbr" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)"

+   $(BuildCmds)

 

 !ELSEIF  "$(CFG)" == "Install - Win32 Static"

 

 

 "$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)"

    $(CPP) $(CPP_PROJ) $(SOURCE)