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) (unidiff) | |
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 | |||
40 | # Begin Project | 40 | # Begin Project |
41 | # PROP Target_Last_Scanned "Install - Win32 Canned" | 41 | # PROP Target_Last_Scanned "Install - Win32 Canned" |
42 | CPP=cl.exe | ||
42 | RSC=rc.exe | 43 | RSC=rc.exe |
43 | MTL=mktyplib.exe | 44 | MTL=mktyplib.exe |
44 | CPP=cl.exe | ||
45 | 45 | ||
46 | !IF "$(CFG)" == "PumpKIN - Win32 Release" | 46 | !IF "$(CFG)" == "PumpKIN - Win32 Release" |
@@ -78,5 +78,5 @@ CLEAN : | |||
78 | -@erase "$(INTDIR)\PumpKIN.obj" | 78 | -@erase "$(INTDIR)\PumpKIN.obj" |
79 | -@erase "$(INTDIR)\pumpkin.pch" | 79 | -@erase "$(INTDIR)\pumpkin.pch" |
80 | -@erase "$(INTDIR)\PumpKIN.res" | 80 | -@erase "$(INTDIR)\pumpkin.res" |
81 | -@erase "$(INTDIR)\PumpKINDlg.obj" | 81 | -@erase "$(INTDIR)\PumpKINDlg.obj" |
82 | -@erase "$(INTDIR)\RequestDlg.obj" | 82 | -@erase "$(INTDIR)\RequestDlg.obj" |
@@ -103,5 +103,5 @@ MTL_PROJ=/nologo /D "NDEBUG" /win32 | |||
103 | # ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" | 103 | # ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" |
104 | # ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" | 104 | # ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" |
105 | RSC_PROJ=/l 0x409 /fo"$(INTDIR)/PumpKIN.res" /d "NDEBUG" /d "_AFXDLL" | 105 | RSC_PROJ=/l 0x409 /fo"$(INTDIR)/pumpkin.res" /d "NDEBUG" /d "_AFXDLL" |
106 | BSC32=bscmake.exe | 106 | BSC32=bscmake.exe |
107 | # ADD BASE BSC32 /nologo | 107 | # ADD BASE BSC32 /nologo |
@@ -122,5 +122,5 @@ LINK32_OBJS= \ | |||
122 | "$(INTDIR)\PropsSounds.obj" \ | 122 | "$(INTDIR)\PropsSounds.obj" \ |
123 | "$(INTDIR)\PumpKIN.obj" \ | 123 | "$(INTDIR)\PumpKIN.obj" \ |
124 | "$(INTDIR)\PumpKIN.res" \ | 124 | "$(INTDIR)\pumpkin.res" \ |
125 | "$(INTDIR)\PumpKINDlg.obj" \ | 125 | "$(INTDIR)\PumpKINDlg.obj" \ |
126 | "$(INTDIR)\RequestDlg.obj" \ | 126 | "$(INTDIR)\RequestDlg.obj" \ |
@@ -186,5 +186,5 @@ CLEAN : | |||
186 | -@erase "$(INTDIR)\PumpKIN.obj" | 186 | -@erase "$(INTDIR)\PumpKIN.obj" |
187 | -@erase "$(INTDIR)\pumpkin.pch" | 187 | -@erase "$(INTDIR)\pumpkin.pch" |
188 | -@erase "$(INTDIR)\PumpKIN.res" | 188 | -@erase "$(INTDIR)\pumpkin.res" |
189 | -@erase "$(INTDIR)\PumpKIN.sbr" | 189 | -@erase "$(INTDIR)\PumpKIN.sbr" |
190 | -@erase "$(INTDIR)\PumpKINDlg.obj" | 190 | -@erase "$(INTDIR)\PumpKINDlg.obj" |
@@ -223,5 +223,5 @@ MTL_PROJ=/nologo /D "_DEBUG" /win32 | |||
223 | # ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" | 223 | # ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" |
224 | # ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" | 224 | # ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" |
225 | RSC_PROJ=/l 0x409 /fo"$(INTDIR)/PumpKIN.res" /d "_DEBUG" /d "_AFXDLL" | 225 | RSC_PROJ=/l 0x409 /fo"$(INTDIR)/pumpkin.res" /d "_DEBUG" /d "_AFXDLL" |
226 | BSC32=bscmake.exe | 226 | BSC32=bscmake.exe |
227 | # ADD BASE BSC32 /nologo | 227 | # ADD BASE BSC32 /nologo |
@@ -259,5 +259,5 @@ LINK32_OBJS= \ | |||
259 | "$(INTDIR)\PropsSounds.obj" \ | 259 | "$(INTDIR)\PropsSounds.obj" \ |
260 | "$(INTDIR)\PumpKIN.obj" \ | 260 | "$(INTDIR)\PumpKIN.obj" \ |
261 | "$(INTDIR)\PumpKIN.res" \ | 261 | "$(INTDIR)\pumpkin.res" \ |
262 | "$(INTDIR)\PumpKINDlg.obj" \ | 262 | "$(INTDIR)\PumpKINDlg.obj" \ |
263 | "$(INTDIR)\RequestDlg.obj" \ | 263 | "$(INTDIR)\RequestDlg.obj" \ |
@@ -317,5 +317,5 @@ CLEAN : | |||
317 | -@erase "$(INTDIR)\PumpKIN.obj" | 317 | -@erase "$(INTDIR)\PumpKIN.obj" |
318 | -@erase "$(INTDIR)\pumpkin.pch" | 318 | -@erase "$(INTDIR)\pumpkin.pch" |
319 | -@erase "$(INTDIR)\PumpKIN.res" | 319 | -@erase "$(INTDIR)\pumpkin.res" |
320 | -@erase "$(INTDIR)\PumpKINDlg.obj" | 320 | -@erase "$(INTDIR)\PumpKINDlg.obj" |
321 | -@erase "$(INTDIR)\RequestDlg.obj" | 321 | -@erase "$(INTDIR)\RequestDlg.obj" |
@@ -341,5 +341,5 @@ MTL_PROJ=/nologo /D "NDEBUG" /win32 | |||
341 | # ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" | 341 | # ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" |
342 | # ADD RSC /l 0x409 /d "NDEBUG" | 342 | # ADD RSC /l 0x409 /d "NDEBUG" |
343 | RSC_PROJ=/l 0x409 /fo"$(INTDIR)/PumpKIN.res" /d "NDEBUG" | 343 | RSC_PROJ=/l 0x409 /fo"$(INTDIR)/pumpkin.res" /d "NDEBUG" |
344 | BSC32=bscmake.exe | 344 | BSC32=bscmake.exe |
345 | # ADD BASE BSC32 /nologo | 345 | # ADD BASE BSC32 /nologo |
@@ -360,5 +360,5 @@ LINK32_OBJS= \ | |||
360 | "$(INTDIR)\PropsSounds.obj" \ | 360 | "$(INTDIR)\PropsSounds.obj" \ |
361 | "$(INTDIR)\PumpKIN.obj" \ | 361 | "$(INTDIR)\PumpKIN.obj" \ |
362 | "$(INTDIR)\PumpKIN.res" \ | 362 | "$(INTDIR)\pumpkin.res" \ |
363 | "$(INTDIR)\PumpKINDlg.obj" \ | 363 | "$(INTDIR)\PumpKINDlg.obj" \ |
364 | "$(INTDIR)\RequestDlg.obj" \ | 364 | "$(INTDIR)\RequestDlg.obj" \ |
@@ -462,9 +462,11 @@ OUTDIR=.\Install\Pure | |||
462 | INTDIR=.\Install\Pure | 462 | INTDIR=.\Install\Pure |
463 | 463 | ||
464 | ALL : "$(OUTDIR)\Install.exe" | 464 | ALL : "$(OUTDIR)\Install.exe" "$(OUTDIR)\Install.bsc" |
465 | 465 | ||
466 | CLEAN : | 466 | CLEAN : |
467 | -@erase "$(INTDIR)\install.obj" | 467 | -@erase "$(INTDIR)\install.obj" |
468 | -@erase "$(INTDIR)\Install.res" | 468 | -@erase "$(INTDIR)\Install.res" |
469 | -@erase "$(INTDIR)\install.sbr" | ||
470 | -@erase "$(OUTDIR)\Install.bsc" | ||
469 | -@erase "$(OUTDIR)\Install.exe" | 471 | -@erase "$(OUTDIR)\Install.exe" |
470 | 472 | ||
@@ -473,9 +475,9 @@ CLEAN : | |||
473 | 475 | ||
474 | # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /YX /c | 476 | # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /YX /c |
475 | # ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /c | 477 | # ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FR /YX /c |
476 | CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D\ | 478 | CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D\ |
477 | "_MBCS" /Fp"$(INTDIR)/Install.pch" /YX /Fo"$(INTDIR)/" /c | 479 | "_MBCS" /FR"$(INTDIR)/" /Fp"$(INTDIR)/Install.pch" /YX /Fo"$(INTDIR)/" /c |
478 | CPP_OBJS=.\Install\Pure/ | 480 | CPP_OBJS=.\Install\Pure/ |
479 | CPP_SBRS=.\. | 481 | CPP_SBRS=.\Install\Pure/ |
480 | # ADD BASE MTL /nologo /D "NDEBUG" /win32 | 482 | # ADD BASE MTL /nologo /D "NDEBUG" /win32 |
481 | # ADD MTL /nologo /D "NDEBUG" /win32 | 483 | # ADD MTL /nologo /D "NDEBUG" /win32 |
@@ -489,5 +491,11 @@ BSC32=bscmake.exe | |||
489 | BSC32_FLAGS=/nologo /o"$(OUTDIR)/Install.bsc" | 491 | BSC32_FLAGS=/nologo /o"$(OUTDIR)/Install.bsc" |
490 | BSC32_SBRS= \ | 492 | BSC32_SBRS= \ |
491 | 493 | "$(INTDIR)\install.sbr" | |
494 | |||
495 | "$(OUTDIR)\Install.bsc" : "$(OUTDIR)" $(BSC32_SBRS) | ||
496 | $(BSC32) @<< | ||
497 | $(BSC32_FLAGS) $(BSC32_SBRS) | ||
498 | << | ||
499 | |||
492 | LINK32=link.exe | 500 | LINK32=link.exe |
493 | # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386 | 501 | # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386 |
@@ -830,5 +838,5 @@ DEP_RSC_PUMPKIN=\ | |||
830 | 838 | ||
831 | 839 | ||
832 | "$(INTDIR)\PumpKIN.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)" | 840 | "$(INTDIR)\pumpkin.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)" |
833 | $(RSC) $(RSC_PROJ) $(SOURCE) | 841 | $(RSC) $(RSC_PROJ) $(SOURCE) |
834 | 842 | ||
@@ -837,5 +845,5 @@ DEP_RSC_PUMPKIN=\ | |||
837 | 845 | ||
838 | 846 | ||
839 | "$(INTDIR)\PumpKIN.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)" | 847 | "$(INTDIR)\pumpkin.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)" |
840 | $(RSC) $(RSC_PROJ) $(SOURCE) | 848 | $(RSC) $(RSC_PROJ) $(SOURCE) |
841 | 849 | ||
@@ -844,5 +852,5 @@ DEP_RSC_PUMPKIN=\ | |||
844 | 852 | ||
845 | 853 | ||
846 | "$(INTDIR)\PumpKIN.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)" | 854 | "$(INTDIR)\pumpkin.res" : $(SOURCE) $(DEP_RSC_PUMPKIN) "$(INTDIR)" |
847 | $(RSC) $(RSC_PROJ) $(SOURCE) | 855 | $(RSC) $(RSC_PROJ) $(SOURCE) |
848 | 856 | ||
@@ -1398,7 +1406,13 @@ DEP_CPP_INSTAL=\ | |||
1398 | 1406 | ||
1399 | 1407 | ||
1408 | BuildCmds= \ | ||
1409 | $(CPP) $(CPP_PROJ) $(SOURCE) \ | ||
1410 | |||
1411 | |||
1400 | "$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)" | 1412 | "$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)" |
1401 | $(CPP) $(CPP_PROJ) $(SOURCE) | 1413 | $(BuildCmds) |
1402 | 1414 | ||
1415 | "$(INTDIR)\install.sbr" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)" | ||
1416 | $(BuildCmds) | ||
1403 | 1417 | ||
1404 | !ELSEIF "$(CFG)" == "Install - Win32 Static" | 1418 | !ELSEIF "$(CFG)" == "Install - Win32 Static" |