| author | Michael Krelin <hacker@klever.net> | 2005-08-06 13:52:52 (UTC) |
|---|---|---|
| committer | Michael Krelin <hacker@klever.net> | 2005-08-06 13:52:52 (UTC) |
| commit | 79e1fbc641b946452a37f2dbf845b0d86ccc3c53 (patch) (side-by-side diff) | |
| tree | 7bf6da3a4ac8dfbb1122e33273566d5c7d3f20d4 /pumpkin.mak | |
| parent | 81636a2fb6f93863cdca3fdad8ff3df753b17d5e (diff) | |
| download | pumpkin-79e1fbc641b946452a37f2dbf845b0d86ccc3c53.zip pumpkin-79e1fbc641b946452a37f2dbf845b0d86ccc3c53.tar.gz pumpkin-79e1fbc641b946452a37f2dbf845b0d86ccc3c53.tar.bz2 | |
XP uninstall fixed and 2.6 release ready
git-svn-id: http://svn.klever.net/kin/pumpkin/trunk@134 fe716a7a-6dde-0310-88d9-d003556173a8
| -rw-r--r-- | pumpkin.mak | 52 |
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 @@ -40,7 +40,7 @@ NULL=nul # 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"
@@ -78,5 +78,5 @@ CLEAN : -@erase "$(INTDIR)\PumpKIN.obj"
-@erase "$(INTDIR)\pumpkin.pch"
- -@erase "$(INTDIR)\PumpKIN.res"
+ -@erase "$(INTDIR)\pumpkin.res"
-@erase "$(INTDIR)\PumpKINDlg.obj"
-@erase "$(INTDIR)\RequestDlg.obj"
@@ -103,5 +103,5 @@ 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
@@ -122,5 +122,5 @@ LINK32_OBJS= \ "$(INTDIR)\PropsSounds.obj" \
"$(INTDIR)\PumpKIN.obj" \
- "$(INTDIR)\PumpKIN.res" \
+ "$(INTDIR)\pumpkin.res" \
"$(INTDIR)\PumpKINDlg.obj" \
"$(INTDIR)\RequestDlg.obj" \
@@ -186,5 +186,5 @@ CLEAN : -@erase "$(INTDIR)\PumpKIN.obj"
-@erase "$(INTDIR)\pumpkin.pch"
- -@erase "$(INTDIR)\PumpKIN.res"
+ -@erase "$(INTDIR)\pumpkin.res"
-@erase "$(INTDIR)\PumpKIN.sbr"
-@erase "$(INTDIR)\PumpKINDlg.obj"
@@ -223,5 +223,5 @@ 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
@@ -259,5 +259,5 @@ LINK32_OBJS= \ "$(INTDIR)\PropsSounds.obj" \
"$(INTDIR)\PumpKIN.obj" \
- "$(INTDIR)\PumpKIN.res" \
+ "$(INTDIR)\pumpkin.res" \
"$(INTDIR)\PumpKINDlg.obj" \
"$(INTDIR)\RequestDlg.obj" \
@@ -317,5 +317,5 @@ CLEAN : -@erase "$(INTDIR)\PumpKIN.obj"
-@erase "$(INTDIR)\pumpkin.pch"
- -@erase "$(INTDIR)\PumpKIN.res"
+ -@erase "$(INTDIR)\pumpkin.res"
-@erase "$(INTDIR)\PumpKINDlg.obj"
-@erase "$(INTDIR)\RequestDlg.obj"
@@ -341,5 +341,5 @@ 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
@@ -360,5 +360,5 @@ LINK32_OBJS= \ "$(INTDIR)\PropsSounds.obj" \
"$(INTDIR)\PumpKIN.obj" \
- "$(INTDIR)\PumpKIN.res" \
+ "$(INTDIR)\pumpkin.res" \
"$(INTDIR)\PumpKINDlg.obj" \
"$(INTDIR)\RequestDlg.obj" \
@@ -462,9 +462,11 @@ 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"
@@ -473,9 +475,9 @@ CLEAN : # 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
@@ -489,5 +491,11 @@ BSC32=bscmake.exe 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
@@ -830,5 +838,5 @@ DEP_RSC_PUMPKIN=\ -"$(INTDIR)\PumpKIN.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)"
+"$(INTDIR)\pumpkin.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)"
$(RSC) $(RSC_PROJ) $(SOURCE)
@@ -837,5 +845,5 @@ DEP_RSC_PUMPKIN=\ -"$(INTDIR)\PumpKIN.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)"
+"$(INTDIR)\pumpkin.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)"
$(RSC) $(RSC_PROJ) $(SOURCE)
@@ -844,5 +852,5 @@ DEP_RSC_PUMPKIN=\ -"$(INTDIR)\PumpKIN.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)"
+"$(INTDIR)\pumpkin.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)"
$(RSC) $(RSC_PROJ) $(SOURCE)
@@ -1398,7 +1406,13 @@ DEP_CPP_INSTAL=\ +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"
|