| 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 @@ -41,5 +41,5 @@ NULL=nul # PROP Target_Last_Scanned "Install - Win32 Canned"
+CPP=cl.exe
RSC=rc.exe
MTL=mktyplib.exe
-CPP=cl.exe
@@ -79,3 +79,3 @@ CLEAN : -@erase "$(INTDIR)\pumpkin.pch"
- -@erase "$(INTDIR)\PumpKIN.res"
+ -@erase "$(INTDIR)\pumpkin.res"
-@erase "$(INTDIR)\PumpKINDlg.obj"
@@ -104,3 +104,3 @@ MTL_PROJ=/nologo /D "NDEBUG" /win32 # 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
@@ -123,3 +123,3 @@ LINK32_OBJS= \ "$(INTDIR)\PumpKIN.obj" \
- "$(INTDIR)\PumpKIN.res" \
+ "$(INTDIR)\pumpkin.res" \
"$(INTDIR)\PumpKINDlg.obj" \
@@ -187,3 +187,3 @@ CLEAN : -@erase "$(INTDIR)\pumpkin.pch"
- -@erase "$(INTDIR)\PumpKIN.res"
+ -@erase "$(INTDIR)\pumpkin.res"
-@erase "$(INTDIR)\PumpKIN.sbr"
@@ -224,3 +224,3 @@ MTL_PROJ=/nologo /D "_DEBUG" /win32 # 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
@@ -260,3 +260,3 @@ LINK32_OBJS= \ "$(INTDIR)\PumpKIN.obj" \
- "$(INTDIR)\PumpKIN.res" \
+ "$(INTDIR)\pumpkin.res" \
"$(INTDIR)\PumpKINDlg.obj" \
@@ -318,3 +318,3 @@ CLEAN : -@erase "$(INTDIR)\pumpkin.pch"
- -@erase "$(INTDIR)\PumpKIN.res"
+ -@erase "$(INTDIR)\pumpkin.res"
-@erase "$(INTDIR)\PumpKINDlg.obj"
@@ -342,3 +342,3 @@ MTL_PROJ=/nologo /D "NDEBUG" /win32 # 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
@@ -361,3 +361,3 @@ LINK32_OBJS= \ "$(INTDIR)\PumpKIN.obj" \
- "$(INTDIR)\PumpKIN.res" \
+ "$(INTDIR)\pumpkin.res" \
"$(INTDIR)\PumpKINDlg.obj" \
@@ -463,3 +463,3 @@ INTDIR=.\Install\Pure -ALL : "$(OUTDIR)\Install.exe"
+ALL : "$(OUTDIR)\Install.exe" "$(OUTDIR)\Install.bsc"
@@ -468,2 +468,4 @@ CLEAN : -@erase "$(INTDIR)\Install.res"
+ -@erase "$(INTDIR)\install.sbr"
+ -@erase "$(OUTDIR)\Install.bsc"
-@erase "$(OUTDIR)\Install.exe"
@@ -474,7 +476,7 @@ 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
@@ -490,3 +492,9 @@ 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
@@ -831,3 +839,3 @@ DEP_RSC_PUMPKIN=\ -"$(INTDIR)\PumpKIN.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)"
+"$(INTDIR)\pumpkin.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)"
$(RSC) $(RSC_PROJ) $(SOURCE)
@@ -838,3 +846,3 @@ DEP_RSC_PUMPKIN=\ -"$(INTDIR)\PumpKIN.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)"
+"$(INTDIR)\pumpkin.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)"
$(RSC) $(RSC_PROJ) $(SOURCE)
@@ -845,3 +853,3 @@ DEP_RSC_PUMPKIN=\ -"$(INTDIR)\PumpKIN.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)"
+"$(INTDIR)\pumpkin.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)"
$(RSC) $(RSC_PROJ) $(SOURCE)
@@ -1399,5 +1407,11 @@ 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)
|