summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--COPYING2
-rw-r--r--KTAGS2
-rw-r--r--help/pumpkin.xml7
-rw-r--r--install/install.cpp9
-rw-r--r--install/install.rc10
-rw-r--r--pumpkin.mak50
-rw-r--r--pumpkin.rc14
7 files changed, 60 insertions, 34 deletions
diff --git a/COPYING b/COPYING
index e7ef42e..b830fe7 100644
--- a/COPYING
+++ b/COPYING
@@ -1,19 +1,19 @@
1Copyright (c) 1997-2004 Klever Group (http://www.klever.net/) 1Copyright (c) 1997-2005 Klever Group (http://www.klever.net/)
2 2
3Permission is hereby granted, free of charge, to any person obtaining a copy of 3Permission is hereby granted, free of charge, to any person obtaining a copy of
4this software and associated documentation files (the "Software"), to deal in 4this software and associated documentation files (the "Software"), to deal in
5the Software without restriction, including without limitation the rights to 5the Software without restriction, including without limitation the rights to
6use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies 6use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
7of the Software, and to permit persons to whom the Software is furnished to do 7of the Software, and to permit persons to whom the Software is furnished to do
8so, subject to the following conditions: 8so, subject to the following conditions:
9 9
10The above copyright notice and this permission notice shall be included in all 10The above copyright notice and this permission notice shall be included in all
11copies or substantial portions of the Software. 11copies or substantial portions of the Software.
12 12
13THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 13THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 14IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 15FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 16AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 17LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 18OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
19SOFTWARE. 19SOFTWARE.
diff --git a/KTAGS b/KTAGS
index 36d22e5..b27cd12 100644
--- a/KTAGS
+++ b/KTAGS
@@ -1,12 +1,12 @@
1 about-date pumpkin.rc /LTEXT\s\+"Copyright /;"kind:d 1 about-date pumpkin.rc /LTEXT\s\+"Copyright /;"kind:d
2 about-version pumpkin.rc /LTEXT\s\+"PumpKIN, Version /;"kind:v 2 about-version pumpkin.rc /LTEXT\s\+"PumpKIN, Version /;"kind:v
3 help-license-date ./help/pumpkin.xml /<license\s/;"kind:d 3 help-license-date ./help/pumpkin.xml /<license\s/;"kind:d
4 help-news ./help/pumpkin.xml/<newsfor\s/ 4 help-news ./help/pumpkin.xml/<newsfor\s/
5 install-version ./install/install.cpp /^#define\s\+KINAME\s\+"/;"kind:v 5 install-version ./install/install.cpp /^#define\s\+VERSION\s\+"/;"kind:v
6 install-vsinfo-date install/install.rc /^\s\+VALUE\s\+"LegalCopyright",/;"kind:d 6 install-vsinfo-date install/install.rc /^\s\+VALUE\s\+"LegalCopyright",/;"kind:d
7 install-vsinfo-numeric-version install/install.rc /^\s\+FILEVERSION\s\+/;"kind:v 7 install-vsinfo-numeric-version install/install.rc /^\s\+FILEVERSION\s\+/;"kind:v
8 install-vsinfo-string-version install/install.rc /^\s\+VALUE\s\+"FileVersion",/;"kind:v 8 install-vsinfo-string-version install/install.rc /^\s\+VALUE\s\+"FileVersion",/;"kind:v
9 license-date COPYING :1;"kind:d 9 license-date COPYING :1;"kind:d
10 vsinfo-date pumpkin.rc /VALUE\s\+"LegalCopyright",/;"kind:d 10 vsinfo-date pumpkin.rc /VALUE\s\+"LegalCopyright",/;"kind:d
11 vsinfo-numeric-version pumpkin.rc /^\s\+FILEVERSION\s\+/;"kind:v 11 vsinfo-numeric-version pumpkin.rc /^\s\+FILEVERSION\s\+/;"kind:v
12 vsinfo-string-version pumpkin.rc /^\s\+VALUE\s\+"FileVersion",/;"kind:v 12 vsinfo-string-version pumpkin.rc /^\s\+VALUE\s\+"FileVersion",/;"kind:v
diff --git a/help/pumpkin.xml b/help/pumpkin.xml
index 2ccd23a..d283fcd 100644
--- a/help/pumpkin.xml
+++ b/help/pumpkin.xml
@@ -1,59 +1,64 @@
1<?xml version="1.0"?> 1<?xml version="1.0"?>
2<winhelp> 2<winhelp>
3 <topic id="About" title="About PumpKIN" keywords="about"> 3 <topic id="About" title="About PumpKIN" keywords="about">
4 <heading scroll="no">About <kin>PumpKIN</kin></heading> 4 <heading scroll="no">About <kin>PumpKIN</kin></heading>
5 <p><kin>PumpKIN</kin> is a program designed to send and receive files over the net while having <kin href="http://kin.klever.net/T42/">T42</kin> or <product>Wintalk</product> session running using <term>TFTP</term> (<rfc num="1350"/>) protocol. It includes full-functional <term>TFTP</term> server/client so it may be useful for maintaining <a href="http://www.cisco.com/">CISCO</a> routers and other network equipment.</p> 5 <p><kin>PumpKIN</kin> is a program designed to send and receive files over the net while having <kin href="http://kin.klever.net/T42/">T42</kin> or <product>Wintalk</product> session running using <term>TFTP</term> (<rfc num="1350"/>) protocol. It includes full-functional <term>TFTP</term> server/client so it may be useful for maintaining <a href="http://www.cisco.com/">CISCO</a> routers and other network equipment.</p>
6 <p/> 6 <p/>
7 <p><b><i>Enjoy!</i></b></p> 7 <p><b><i>Enjoy!</i></b></p>
8 <license years="1997-2004"/> 8 <license years="1997-2005"/>
9 <credist/> 9 <credist/>
10 </topic> 10 </topic>
11 <topic id="News" title="What's New"> 11 <topic id="News" title="What's New">
12 <newsfor version="2.6" date="August 6th, 2005">
13 <ni>more robust solution to the backslash/slash dilemma</ni>
14 <ni>A bit more elaborate error reporting</ni>
15 <ni>Fixed uninstall procedure so that it works on XP</ni>
16 </newfor>
12 <newsfor version="2.5" date="July 11th, 2004"> 17 <newsfor version="2.5" date="July 11th, 2004">
13 <ni>Change of <a href="#About">license</a> and opening the source.</ni> 18 <ni>Change of <a href="#About">license</a> and opening the source.</ni>
14 <ni>Minor cosmetic changes</ni> 19 <ni>Minor cosmetic changes</ni>
15 </newsfor> 20 </newsfor>
16 <newsfor version="2.0" date="June 13th, 1998"> 21 <newsfor version="2.0" date="June 13th, 1998">
17 <ni>Sounds customization. Now you can customize <kin>PumpKIN</kin> bells and whistles or turn them off completely.</ni> 22 <ni>Sounds customization. Now you can customize <kin>PumpKIN</kin> bells and whistles or turn them off completely.</ni>
18 <ni>Previous version of <kin>PumpKIN</kin> had a bug causing it to misbehave when you're requesting file from remote <term>tftp</term> server using <b>IP Address</b> (as opposed to <b>hostname</b>).</ni> 23 <ni>Previous version of <kin>PumpKIN</kin> had a bug causing it to misbehave when you're requesting file from remote <term>tftp</term> server using <b>IP Address</b> (as opposed to <b>hostname</b>).</ni>
19 <ni>Typo causing <kin>PumpKIN</kin> to log outgoing request in reverse (i.e. <i>Requesting 'hostname' from 'filename'</i>) fixed.</ni> 24 <ni>Typo causing <kin>PumpKIN</kin> to log outgoing request in reverse (i.e. <i>Requesting 'hostname' from 'filename'</i>) fixed.</ni>
20 <ni>Something else that you may not notice and I can not remember.</ni> 25 <ni>Something else that you may not notice and I can not remember.</ni>
21 </newsfor> 26 </newsfor>
22 <newsfor version="1.5" date="February 12th, 1998"> 27 <newsfor version="1.5" date="February 12th, 1998">
23 <ni>Transfer resumes. No checking on file contents is done, so it's up to you to decide whether you want to start transmission from the beginning or resume unfinished transfer.</ni> 28 <ni>Transfer resumes. No checking on file contents is done, so it's up to you to decide whether you want to start transmission from the beginning or resume unfinished transfer.</ni>
24 <ni>Support for <b>block size</b>, <b>trasnfer size</b> and <b>transfer timeout</b> options as described in <rfc num="1782"/>, <rfc num="1783"/> and <rfc num="1784"/>. I'm not sure if there are any other <term>TFTP</term> implementations supporting this, but at least it makes sense if you use <kin>PumpKIN</kin> on both ends.</ni> 29 <ni>Support for <b>block size</b>, <b>trasnfer size</b> and <b>transfer timeout</b> options as described in <rfc num="1782"/>, <rfc num="1783"/> and <rfc num="1784"/>. I'm not sure if there are any other <term>TFTP</term> implementations supporting this, but at least it makes sense if you use <kin>PumpKIN</kin> on both ends.</ni>
25 <ni>New Install program</ni> 30 <ni>New Install program</ni>
26 </newsfor> 31 </newsfor>
27 </topic> 32 </topic>
28 <topic id="Using" title="Using PumpKIN"> 33 <topic id="Using" title="Using PumpKIN">
29 <heading scroll="no">Using <kin>PumpKIN</kin></heading> 34 <heading scroll="no">Using <kin>PumpKIN</kin></heading>
30 <p>This is a simple program for file exchange between two parties. It allows you to send files over the network to your party while having a <kin href="http://kin.klever.net/T42/">T42</kin> or <product>Wintalk</product> conversation. It uses open sessions to determine IP address of your party. Also you may use it as a <term>TFTP</term> client/server by itself. To get/put files from/to <term>TFTP</term> server you need to enter host name/IP address manually in the <a href="#Request">Request Dialog</a>.</p> 35 <p>This is a simple program for file exchange between two parties. It allows you to send files over the network to your party while having a <kin href="http://kin.klever.net/T42/">T42</kin> or <product>Wintalk</product> conversation. It uses open sessions to determine IP address of your party. Also you may use it as a <term>TFTP</term> client/server by itself. To get/put files from/to <term>TFTP</term> server you need to enter host name/IP address manually in the <a href="#Request">Request Dialog</a>.</p>
31 <p>To Abort transfer(s) currently in progress - select transfer(s) you want to terminate in the list and click <b>Abort xfer</b> button.</p> 36 <p>To Abort transfer(s) currently in progress - select transfer(s) you want to terminate in the list and click <b>Abort xfer</b> button.</p>
32 <p>You may want to hide <kin>PumpKIN</kin> window and leave it as a tray icon only. Just click the <image source="pumpkin.bmp"/> icon in the tray or simply close the window.</p> 37 <p>You may want to hide <kin>PumpKIN</kin> window and leave it as a tray icon only. Just click the <image source="pumpkin.bmp"/> icon in the tray or simply close the window.</p>
33 <p>Use <a href="#Options">Options</a> button to set <kin>PumpKIN</kin> options.</p> 38 <p>Use <a href="#Options">Options</a> button to set <kin>PumpKIN</kin> options.</p>
34 </topic> 39 </topic>
35 <topic id="ConfirmRRQ" title="Confirm Read Request Dialog"> 40 <topic id="ConfirmRRQ" title="Confirm Read Request Dialog">
36 <heading scroll="no">Confirm Read Request Dialog</heading> 41 <heading scroll="no">Confirm Read Request Dialog</heading>
37 <p>When the file is requested from your <term>TFTP</term> server you may choose to <b>Grant Access</b> to this file or to <b>Deny Access</b>. If you hesitate to answer for <a href="#ConfirmationTimeout"><b>Confirmation timeout</b></a> (<i>default - 30 seconds</i>) <kin>PumpKIN</kin> defaults to denial of all requests.</p> 42 <p>When the file is requested from your <term>TFTP</term> server you may choose to <b>Grant Access</b> to this file or to <b>Deny Access</b>. If you hesitate to answer for <a href="#ConfirmationTimeout"><b>Confirmation timeout</b></a> (<i>default - 30 seconds</i>) <kin>PumpKIN</kin> defaults to denial of all requests.</p>
38 </topic> 43 </topic>
39 <topic id="ConfirmWRQ" title="Confirm Write Request Dialog"> 44 <topic id="ConfirmWRQ" title="Confirm Write Request Dialog">
40 <heading scroll="no">Confirm Write Request Dialog</heading> 45 <heading scroll="no">Confirm Write Request Dialog</heading>
41 <p>Whenever your party sends you a file you have always a choice to accept it or not. You can also save the file under a different name by choosing the <b>Rename</b> option. If you already have file with such name you may chose to <b>resume</b> transfer. No checking on file contents is done. This option may or may not work depending on remote implementation of protocol. It does work if you use <kin>PumpKIN</kin> on both ends. If you are still unsure for <a href="#ConfirmationTimeOut"><b>Confirmation timeout</b></a> (<i>default - 30 seconds</i>) <kin>PumpKIN</kin> will make safe decision for you (deny).</p> 46 <p>Whenever your party sends you a file you have always a choice to accept it or not. You can also save the file under a different name by choosing the <b>Rename</b> option. If you already have file with such name you may chose to <b>resume</b> transfer. No checking on file contents is done. This option may or may not work depending on remote implementation of protocol. It does work if you use <kin>PumpKIN</kin> on both ends. If you are still unsure for <a href="#ConfirmationTimeOut"><b>Confirmation timeout</b></a> (<i>default - 30 seconds</i>) <kin>PumpKIN</kin> will make safe decision for you (deny).</p>
42 </topic> 47 </topic>
43 <topic id="Request" title="Request Dialog"> 48 <topic id="Request" title="Request Dialog">
44 <heading scroll="no">Request Dialog</heading> 49 <heading scroll="no">Request Dialog</heading>
45 <p>Request dialog is aimed to let you form read or write request. You may set the following options:</p> 50 <p>Request dialog is aimed to let you form read or write request. You may set the following options:</p>
46 <ul> 51 <ul>
47 <li><b>Local File</b> - You can change the name of the file you're sending (or destination in case you're receiving) right here. You may also use <b>Browse</b> button to select the file.</li> 52 <li><b>Local File</b> - You can change the name of the file you're sending (or destination in case you're receiving) right here. You may also use <b>Browse</b> button to select the file.</li>
48 <li><b>Remote File</b> Specifies the name of file on the remote host you're requesting (in case of read request) or the name of file you want your file to appear as (in case of write request).</li> 53 <li><b>Remote File</b> Specifies the name of file on the remote host you're requesting (in case of read request) or the name of file you want your file to appear as (in case of write request).</li>
49 <li><b>Remote Host</b> is your party's host or <term>TFTP</term> server you're requesting file from/sending file to. To refresh the list of your talk windows use <b>REFRESH</b> button.</li> 54 <li><b>Remote Host</b> is your party's host or <term>TFTP</term> server you're requesting file from/sending file to. To refresh the list of your talk windows use <b>REFRESH</b> button.</li>
50 <li><b>Type</b> is the type of transfer as defined in <rfc num="1350"/>. Doesn't mean much, really. Defined types are '<i>octet</i>' or '<i>netascii</i>'. Default is '<i>octet</i>'.</li> 55 <li><b>Type</b> is the type of transfer as defined in <rfc num="1350"/>. Doesn't mean much, really. Defined types are '<i>octet</i>' or '<i>netascii</i>'. Default is '<i>octet</i>'.</li>
51 <li><b>Block Size</b> - Use this block size if remote is <rfc num="1783"/>-compliant. If remote doesn't support this option <kin>PumpKIN</kin> will fallback to 512 bytes per block.</li> 56 <li><b>Block Size</b> - Use this block size if remote is <rfc num="1783"/>-compliant. If remote doesn't support this option <kin>PumpKIN</kin> will fallback to 512 bytes per block.</li>
52 </ul> 57 </ul>
53 </topic> 58 </topic>
54 <topic id="Options" title="Options"> 59 <topic id="Options" title="Options">
55 <heading scroll="no">Options</heading> 60 <heading scroll="no">Options</heading>
56 <p><kin>PumpKIN</kin> options property sheet consists of two tabs. For more information see <a href="#NetworkOptions"><b>Network</b></a> and <a herf="#ServerOptions"><b>Server</b></a> options.</p> 61 <p><kin>PumpKIN</kin> options property sheet consists of two tabs. For more information see <a href="#NetworkOptions"><b>Network</b></a> and <a herf="#ServerOptions"><b>Server</b></a> options.</p>
57 </topic> 62 </topic>
58 <topic id="NetworkOptions" title="Network Options"> 63 <topic id="NetworkOptions" title="Network Options">
59 <heading scroll="no">Network Options</heading> 64 <heading scroll="no">Network Options</heading>
diff --git a/install/install.cpp b/install/install.cpp
index 6fa4ae4..d11de03 100644
--- a/install/install.cpp
+++ b/install/install.cpp
@@ -1,67 +1,74 @@
1#include "resource.h" 1#include "resource.h"
2#include "../shared-code/install.h" 2#include "../shared-code/install.h"
3 3
4 #defineKINAME "PumpKIN 2.5.1-trunk" 4#define VERSION "2.6"
5 #defineKINAME "PumpKIN " VERSION
5#define SKINAME "PumpKIN" 6#define SKINAME "PumpKIN"
6 7
7BOOL Install(void) 8BOOL Install(void)
8{ 9{
9STRING dPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group",SKINAME "Path"); 10STRING dPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group",SKINAME "Path");
10STRING kPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group","KINPath"); 11STRING kPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group","KINPath");
11LPCSTR qPath = ((LPCSTR)dPath)?(LPCSTR)dPath:(((LPCSTR)kPath)?(LPSTR)kPath:"C:\\Program Files\\Klever\\Nothings"); 12LPCSTR qPath = ((LPCSTR)dPath)?(LPCSTR)dPath:(((LPCSTR)kPath)?(LPSTR)kPath:"C:\\Program Files\\Klever\\Nothings");
12STRING path = REQUESTPATH(" " KINAME,"\nEnter destination path:",qPath); 13STRING path = REQUESTPATH(" " KINAME,"\nEnter destination path:",qPath);
13 if(!path) 14 if(!path)
14 return NULL; 15 return NULL;
15 16
16 #ifdefK_ANNED 17 #ifdefK_ANNED
17STRING sysDir(_MAX_PATH); 18STRING sysDir(_MAX_PATH);
18 GetSystemDirectory(sysDir,_MAX_PATH); 19 GetSystemDirectory(sysDir,_MAX_PATH);
19 INSTALLFILE("mfc42.dl_",sysDir,"mfc42.dll"); 20 INSTALLFILE("mfc42.dl_",sysDir,"mfc42.dll");
20#endif 21#endif
21 22
22 MAKE_PATH(path); 23 MAKE_PATH(path);
23STRING shortPath = GET_SHORT_PATH(path); 24STRING shortPath = GET_SHORT_PATH(path);
24 if(!shortPath){ 25 if(!shortPath){
25 MessageBox(NULL,"Failed to install " KINAME " in specified directory",NULL,MB_ICONERROR|MB_OK); 26 MessageBox(NULL,"Failed to install " KINAME " in specified directory",NULL,MB_ICONERROR|MB_OK);
26 return FALSE; 27 return FALSE;
27 } 28 }
28 29
29 if(!( 30 if(!(
30 INSTALLFILE(SKINAME ".ex_",path,SKINAME ".exe") && 31 INSTALLFILE(SKINAME ".ex_",path,SKINAME ".exe") &&
31 INSTALLFILE(SKINAME ".hl_",path,SKINAME ".hlp") && 32 INSTALLFILE(SKINAME ".hl_",path,SKINAME ".hlp") &&
32 INSTALLFILE(SKINAME ".cn_",path,SKINAME ".cnt") 33 INSTALLFILE(SKINAME ".cn_",path,SKINAME ".cnt")
33 )){ 34 )){
34 MessageBox(NULL,"Failed to install " KINAME " in specified directory",NULL,MB_ICONERROR|MB_OK); 35 MessageBox(NULL,"Failed to install " KINAME " in specified directory",NULL,MB_ICONERROR|MB_OK);
35 return FALSE; 36 return FALSE;
36 } 37 }
37 ADDMENU("Klever Group",SKINAME,path, SKINAME ".exe"); 38 ADDMENU("Klever Group",SKINAME,path, SKINAME ".exe");
38 39
39 strSET_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group",SKINAME "Path",path); 40 strSET_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group",SKINAME "Path",path);
40 strSET_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group","KINPath",path); 41 strSET_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group","KINPath",path);
41 42
42FILE* inf=CREATE_INF_FILE(path,SKINAME ".INF"); 43FILE* inf=CREATE_INF_FILE(path,SKINAME ".INF");
43 if(!inf){ 44 if(!inf){
44 MessageBox(NULL,"Failed to install " KINAME,NULL,MB_ICONERROR|MB_OK); 45 MessageBox(NULL,"Failed to install " KINAME,NULL,MB_ICONERROR|MB_OK);
45 return FALSE; 46 return FALSE;
46 } 47 }
47 INF_FILE_HEADER(inf); 48 INF_FILE_HEADER(inf);
48 INF_FILE_SECTION(inf,"Uninstall"); 49 INF_FILE_SECTION(inf,"Uninstall");
49 fprintf(inf,"AddReg=kFiles\nDelReg=kReg\nUpdateInis=kMenu\n"); 50 fprintf(inf,"AddReg=kFiles\nDelReg=kReg\nUpdateInis=kMenu\n");
50 INF_FILE_SECTION(inf,"kFiles"); 51 INF_FILE_SECTION(inf,"kFiles");
51 INF_REMOVE_ROOT(inf,SKINAME "Files",shortPath); 52 INF_REMOVE_ROOT(inf,SKINAME "Files",shortPath);
52 INF_REMOVE_FILE(inf,SKINAME "Files",SKINAME ".exe"); 53 INF_REMOVE_FILE(inf,SKINAME "Files",SKINAME ".exe");
53 INF_REMOVE_HELP_FILE(inf,SKINAME "Files",SKINAME); 54 INF_REMOVE_HELP_FILE(inf,SKINAME "Files",SKINAME);
54 INF_REMOVE_FILE(inf,SKINAME "Files",SKINAME ".inf"); 55 INF_REMOVE_FILE(inf,SKINAME "Files",SKINAME ".inf");
55 INF_FILE_SECTION(inf,"kReg"); 56 INF_FILE_SECTION(inf,"kReg");
56 INF_UNINSTALL_REG(inf,SKINAME); 57 INF_UNINSTALL_REG(inf,SKINAME);
57 INF_FILE_SECTION(inf,"kMenu"); 58 INF_FILE_SECTION(inf,"kMenu");
58 INF_MENU_GROUP(inf,1,"Klever Group"); 59 INF_MENU_GROUP(inf,1,"Klever Group");
59 INF_MENU_ITEM(inf,1,SKINAME); 60 INF_MENU_ITEM(inf,1,SKINAME);
60 fclose(inf); 61 fclose(inf);
61 62
62 REG_UNINSTALL_COMMAND(SKINAME,"Klever " KINAME,shortPath,SKINAME ".INF","Uninstall"); 63 REG_UNINSTALL_COMMAND(SKINAME,"Klever " KINAME,shortPath,SKINAME ".INF","Uninstall");
64 REG_UNINSTALL_ICON(SKINAME,path,SKINAME ".exe",0);
65 REG_UNINSTALL_COMMENT(SKINAME,"Klever PumpKIN");
66 REG_UNINSTALL_VERSION(SKINAME,VERSION);
67 REG_UNINSTALL_LOCATION(SKINAME,path);
68 REG_UNINSTALL_PUBLISHER(SKINAME,"Klever Group");
69 REG_UNINSTALL_URLS(SKINAME,"http://www.klever.net/","http://kin.klever.net/pumpkin/");
63 70
64 MessageBox(NULL,KINAME " installed successfully, you may now run it from 'Programs/Klever Group' menu or remove it using Control Panel Add/Remove Programs applet."," Rejoice!",MB_ICONINFORMATION|MB_OK); 71 MessageBox(NULL,KINAME " installed successfully, you may now run it from 'Programs/Klever Group' menu or remove it using Control Panel Add/Remove Programs applet."," Rejoice!",MB_ICONINFORMATION|MB_OK);
65 72
66 return TRUE; 73 return TRUE;
67} 74}
diff --git a/install/install.rc b/install/install.rc
index 30907ad..cc621ad 100644
--- a/install/install.rc
+++ b/install/install.rc
@@ -86,97 +86,97 @@ BEGIN
86 BOTTOMMARGIN, 66 86 BOTTOMMARGIN, 66
87 HORZGUIDE, 37 87 HORZGUIDE, 37
88 END 88 END
89END 89END
90#endif // APSTUDIO_INVOKED 90#endif // APSTUDIO_INVOKED
91 91
92 92
93#ifdef APSTUDIO_INVOKED 93#ifdef APSTUDIO_INVOKED
94///////////////////////////////////////////////////////////////////////////// 94/////////////////////////////////////////////////////////////////////////////
95// 95//
96// TEXTINCLUDE 96// TEXTINCLUDE
97// 97//
98 98
991 TEXTINCLUDE DISCARDABLE 991 TEXTINCLUDE DISCARDABLE
100BEGIN 100BEGIN
101 "resource.h\0" 101 "resource.h\0"
102END 102END
103 103
1042 TEXTINCLUDE DISCARDABLE 1042 TEXTINCLUDE DISCARDABLE
105BEGIN 105BEGIN
106 "#include ""afxres.h""\r\n" 106 "#include ""afxres.h""\r\n"
107 "\0" 107 "\0"
108END 108END
109 109
1103 TEXTINCLUDE DISCARDABLE 1103 TEXTINCLUDE DISCARDABLE
111BEGIN 111BEGIN
112 "#include ""custom.rch""\0" 112 "#include ""custom.rch""\0"
113END 113END
114 114
115#endif // APSTUDIO_INVOKED 115#endif // APSTUDIO_INVOKED
116 116
117 117
118///////////////////////////////////////////////////////////////////////////// 118/////////////////////////////////////////////////////////////////////////////
119// 119//
120// Icon 120// Icon
121// 121//
122 122
123// Icon with lowest ID value placed first to ensure application icon 123// Icon with lowest ID value placed first to ensure application icon
124// remains consistent on all systems. 124// remains consistent on all systems.
125IDI_ICON ICON DISCARDABLE "../shared-data/install-icon.ico" 125IDI_ICON ICON DISCARDABLE "../shared-data/install-icon.ico"
126 126
127#ifndef _MAC 127#ifndef _MAC
128///////////////////////////////////////////////////////////////////////////// 128/////////////////////////////////////////////////////////////////////////////
129// 129//
130// Version 130// Version
131// 131//
132 132
133VS_VERSION_INFO VERSIONINFO 133VS_VERSION_INFO VERSIONINFO
134 FILEVERSION 2,5,1,0 134 FILEVERSION 2,6,0,0
135 PRODUCTVERSION 2,5,1,0 135 PRODUCTVERSION 2,6,0,0
136 FILEFLAGSMASK 0x3fL 136 FILEFLAGSMASK 0x3fL
137#ifdef _DEBUG 137#ifdef _DEBUG
138 FILEFLAGS 0x1L 138 FILEFLAGS 0x1L
139#else 139#else
140 FILEFLAGS 0x0L 140 FILEFLAGS 0x0L
141#endif 141#endif
142 FILEOS 0x40004L 142 FILEOS 0x40004L
143 FILETYPE 0x1L 143 FILETYPE 0x1L
144 FILESUBTYPE 0x0L 144 FILESUBTYPE 0x0L
145BEGIN 145BEGIN
146 BLOCK "StringFileInfo" 146 BLOCK "StringFileInfo"
147 BEGIN 147 BEGIN
148 BLOCK "040904b0" 148 BLOCK "040904b0"
149 BEGIN 149 BEGIN
150 VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0" 150 VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0"
151 VALUE "FileDescription", "INSTALL: PumpKIN, tftp client/daemon\0" 151 VALUE "FileDescription", "INSTALL: PumpKIN, tftp client/daemon\0"
152 VALUE "FileVersion", "2, 5, 1, 0\0" 152 VALUE "FileVersion", "2, 6, 0, 0\0"
153 VALUE "InternalName", "INSTALL\0" 153 VALUE "InternalName", "INSTALL\0"
154 VALUE "LegalCopyright", "Copyright © 1997-2004 Klever Group (http://www.klever.net/)\0" 154 VALUE "LegalCopyright", "Copyright © 1997-2005 Klever Group (http://www.klever.net/)\0"
155 VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0" 155 VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0"
156 VALUE "OriginalFilename", "INSTALL.EXE\0" 156 VALUE "OriginalFilename", "INSTALL.EXE\0"
157 VALUE "ProductName", "PumpKIN\0" 157 VALUE "ProductName", "PumpKIN\0"
158 VALUE "ProductVersion", "2, 5, 1, 0\0" 158 VALUE "ProductVersion", "2, 6, 0, 0\0"
159 END 159 END
160 END 160 END
161 BLOCK "VarFileInfo" 161 BLOCK "VarFileInfo"
162 BEGIN 162 BEGIN
163 VALUE "Translation", 0x409, 1200 163 VALUE "Translation", 0x409, 1200
164 END 164 END
165END 165END
166 166
167#endif // !_MAC 167#endif // !_MAC
168 168
169#endif // English (U.S.) resources 169#endif // English (U.S.) resources
170///////////////////////////////////////////////////////////////////////////// 170/////////////////////////////////////////////////////////////////////////////
171 171
172 172
173 173
174#ifndef APSTUDIO_INVOKED 174#ifndef APSTUDIO_INVOKED
175///////////////////////////////////////////////////////////////////////////// 175/////////////////////////////////////////////////////////////////////////////
176// 176//
177// Generated from the TEXTINCLUDE 3 resource. 177// Generated from the TEXTINCLUDE 3 resource.
178// 178//
179#include "custom.rch" 179#include "custom.rch"
180///////////////////////////////////////////////////////////////////////////// 180/////////////////////////////////////////////////////////////////////////////
181#endif // not APSTUDIO_INVOKED 181#endif // not APSTUDIO_INVOKED
182 182
diff --git a/pumpkin.mak b/pumpkin.mak
index 9a40fa2..bd466fe 100644
--- a/pumpkin.mak
+++ b/pumpkin.mak
@@ -1,410 +1,410 @@
1# Microsoft Developer Studio Generated NMAKE File, Format Version 4.20 1# Microsoft Developer Studio Generated NMAKE File, Format Version 4.20
2# ** DO NOT EDIT ** 2# ** DO NOT EDIT **
3 3
4# TARGTYPE "Win32 (x86) Application" 0x0101 4# TARGTYPE "Win32 (x86) Application" 0x0101
5 5
6!IF "$(CFG)" == "" 6!IF "$(CFG)" == ""
7CFG=Install - Win32 Debug 7CFG=Install - Win32 Debug
8!MESSAGE No configuration specified. Defaulting to Install - Win32 Debug. 8!MESSAGE No configuration specified. Defaulting to Install - Win32 Debug.
9!ENDIF 9!ENDIF
10 10
11!IF "$(CFG)" != "PumpKIN - Win32 Release" && "$(CFG)" !=\ 11!IF "$(CFG)" != "PumpKIN - Win32 Release" && "$(CFG)" !=\
12 "PumpKIN - Win32 Debug" && "$(CFG)" != "PumpKIN - Win32 Static" && "$(CFG)" !=\ 12 "PumpKIN - Win32 Debug" && "$(CFG)" != "PumpKIN - Win32 Static" && "$(CFG)" !=\
13 "Install - Win32 Debug" && "$(CFG)" != "Install - Win32 Pure" && "$(CFG)" !=\ 13 "Install - Win32 Debug" && "$(CFG)" != "Install - Win32 Pure" && "$(CFG)" !=\
14 "Install - Win32 Static" && "$(CFG)" != "Install - Win32 Canned" 14 "Install - Win32 Static" && "$(CFG)" != "Install - Win32 Canned"
15!MESSAGE Invalid configuration "$(CFG)" specified. 15!MESSAGE Invalid configuration "$(CFG)" specified.
16!MESSAGE You can specify a configuration when running NMAKE on this makefile 16!MESSAGE You can specify a configuration when running NMAKE on this makefile
17!MESSAGE by defining the macro CFG on the command line. For example: 17!MESSAGE by defining the macro CFG on the command line. For example:
18!MESSAGE 18!MESSAGE
19!MESSAGE NMAKE /f "pumpkin.mak" CFG="Install - Win32 Debug" 19!MESSAGE NMAKE /f "pumpkin.mak" CFG="Install - Win32 Debug"
20!MESSAGE 20!MESSAGE
21!MESSAGE Possible choices for configuration are: 21!MESSAGE Possible choices for configuration are:
22!MESSAGE 22!MESSAGE
23!MESSAGE "PumpKIN - Win32 Release" (based on "Win32 (x86) Application") 23!MESSAGE "PumpKIN - Win32 Release" (based on "Win32 (x86) Application")
24!MESSAGE "PumpKIN - Win32 Debug" (based on "Win32 (x86) Application") 24!MESSAGE "PumpKIN - Win32 Debug" (based on "Win32 (x86) Application")
25!MESSAGE "PumpKIN - Win32 Static" (based on "Win32 (x86) Application") 25!MESSAGE "PumpKIN - Win32 Static" (based on "Win32 (x86) Application")
26!MESSAGE "Install - Win32 Debug" (based on "Win32 (x86) Application") 26!MESSAGE "Install - Win32 Debug" (based on "Win32 (x86) Application")
27!MESSAGE "Install - Win32 Pure" (based on "Win32 (x86) Application") 27!MESSAGE "Install - Win32 Pure" (based on "Win32 (x86) Application")
28!MESSAGE "Install - Win32 Static" (based on "Win32 (x86) Application") 28!MESSAGE "Install - Win32 Static" (based on "Win32 (x86) Application")
29!MESSAGE "Install - Win32 Canned" (based on "Win32 (x86) Application") 29!MESSAGE "Install - Win32 Canned" (based on "Win32 (x86) Application")
30!MESSAGE 30!MESSAGE
31!ERROR An invalid configuration is specified. 31!ERROR An invalid configuration is specified.
32!ENDIF 32!ENDIF
33 33
34!IF "$(OS)" == "Windows_NT" 34!IF "$(OS)" == "Windows_NT"
35NULL= 35NULL=
36!ELSE 36!ELSE
37NULL=nul 37NULL=nul
38!ENDIF 38!ENDIF
39################################################################################ 39################################################################################
40# Begin Project 40# Begin Project
41# PROP Target_Last_Scanned "Install - Win32 Canned" 41# PROP Target_Last_Scanned "Install - Win32 Canned"
42CPP=cl.exe
42RSC=rc.exe 43RSC=rc.exe
43MTL=mktyplib.exe 44MTL=mktyplib.exe
44CPP=cl.exe
45 45
46!IF "$(CFG)" == "PumpKIN - Win32 Release" 46!IF "$(CFG)" == "PumpKIN - Win32 Release"
47 47
48# PROP BASE Use_MFC 6 48# PROP BASE Use_MFC 6
49# PROP BASE Use_Debug_Libraries 0 49# PROP BASE Use_Debug_Libraries 0
50# PROP BASE Output_Dir "Release" 50# PROP BASE Output_Dir "Release"
51# PROP BASE Intermediate_Dir "Release" 51# PROP BASE Intermediate_Dir "Release"
52# PROP BASE Target_Dir "" 52# PROP BASE Target_Dir ""
53# PROP Use_MFC 6 53# PROP Use_MFC 6
54# PROP Use_Debug_Libraries 0 54# PROP Use_Debug_Libraries 0
55# PROP Output_Dir "Release" 55# PROP Output_Dir "Release"
56# PROP Intermediate_Dir "Release" 56# PROP Intermediate_Dir "Release"
57# PROP Target_Dir "" 57# PROP Target_Dir ""
58OUTDIR=.\Release 58OUTDIR=.\Release
59INTDIR=.\Release 59INTDIR=.\Release
60# Begin Custom Macros 60# Begin Custom Macros
61OutDir=.\Release 61OutDir=.\Release
62TargetName=pumpkin 62TargetName=pumpkin
63# End Custom Macros 63# End Custom Macros
64 64
65ALL : "$(OUTDIR)\pumpkin.exe" "$(OUTDIR)\pumpkin.ex_" "$(OUTDIR)\pumpkin.hlp"\ 65ALL : "$(OUTDIR)\pumpkin.exe" "$(OUTDIR)\pumpkin.ex_" "$(OUTDIR)\pumpkin.hlp"\
66 "$(OUTDIR)\pumpkin.cnt" "$(OUTDIR)\pumpkin.hl_" "$(OUTDIR)\pumpkin.cn_" 66 "$(OUTDIR)\pumpkin.cnt" "$(OUTDIR)\pumpkin.hl_" "$(OUTDIR)\pumpkin.cn_"
67 67
68CLEAN : 68CLEAN :
69 -@erase "$(INTDIR)\ConfirmRRQDlg.obj" 69 -@erase "$(INTDIR)\ConfirmRRQDlg.obj"
70 -@erase "$(INTDIR)\ConfirmWRQDlg.obj" 70 -@erase "$(INTDIR)\ConfirmWRQDlg.obj"
71 -@erase "$(INTDIR)\PropsNetwork.obj" 71 -@erase "$(INTDIR)\PropsNetwork.obj"
72 -@erase "$(INTDIR)\PropsServer.obj" 72 -@erase "$(INTDIR)\PropsServer.obj"
73 -@erase "$(INTDIR)\PropsSounds.obj" 73 -@erase "$(INTDIR)\PropsSounds.obj"
74 -@erase "$(INTDIR)\pumpkin.cn_" 74 -@erase "$(INTDIR)\pumpkin.cn_"
75 -@erase "$(INTDIR)\pumpkin.cnt" 75 -@erase "$(INTDIR)\pumpkin.cnt"
76 -@erase "$(INTDIR)\pumpkin.hl_" 76 -@erase "$(INTDIR)\pumpkin.hl_"
77 -@erase "$(INTDIR)\pumpkin.hlp" 77 -@erase "$(INTDIR)\pumpkin.hlp"
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"
83 -@erase "$(INTDIR)\Resolver.obj" 83 -@erase "$(INTDIR)\Resolver.obj"
84 -@erase "$(INTDIR)\Retrier.obj" 84 -@erase "$(INTDIR)\Retrier.obj"
85 -@erase "$(INTDIR)\StdAfx.obj" 85 -@erase "$(INTDIR)\StdAfx.obj"
86 -@erase "$(INTDIR)\Trayer.obj" 86 -@erase "$(INTDIR)\Trayer.obj"
87 -@erase "$(OUTDIR)\pumpkin.ex_" 87 -@erase "$(OUTDIR)\pumpkin.ex_"
88 -@erase "$(OUTDIR)\pumpkin.exe" 88 -@erase "$(OUTDIR)\pumpkin.exe"
89 89
90"$(OUTDIR)" : 90"$(OUTDIR)" :
91 if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" 91 if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
92 92
93# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /Yu"stdafx.h" /c 93# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /Yu"stdafx.h" /c
94# ADD CPP /nologo /Zp1 /MD /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /Yu"stdafx.h" /c 94# ADD CPP /nologo /Zp1 /MD /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /Yu"stdafx.h" /c
95CPP_PROJ=/nologo /Zp1 /MD /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D\ 95CPP_PROJ=/nologo /Zp1 /MD /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D\
96 "_AFXDLL" /D "_MBCS" /Fp"$(INTDIR)/pumpkin.pch" /Yu"stdafx.h" /Fo"$(INTDIR)/"\ 96 "_AFXDLL" /D "_MBCS" /Fp"$(INTDIR)/pumpkin.pch" /Yu"stdafx.h" /Fo"$(INTDIR)/"\
97 /c 97 /c
98CPP_OBJS=.\Release/ 98CPP_OBJS=.\Release/
99CPP_SBRS=.\. 99CPP_SBRS=.\.
100# ADD BASE MTL /nologo /D "NDEBUG" /win32 100# ADD BASE MTL /nologo /D "NDEBUG" /win32
101# ADD MTL /nologo /D "NDEBUG" /win32 101# ADD MTL /nologo /D "NDEBUG" /win32
102MTL_PROJ=/nologo /D "NDEBUG" /win32 102MTL_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"
105RSC_PROJ=/l 0x409 /fo"$(INTDIR)/PumpKIN.res" /d "NDEBUG" /d "_AFXDLL" 105RSC_PROJ=/l 0x409 /fo"$(INTDIR)/pumpkin.res" /d "NDEBUG" /d "_AFXDLL"
106BSC32=bscmake.exe 106BSC32=bscmake.exe
107# ADD BASE BSC32 /nologo 107# ADD BASE BSC32 /nologo
108# ADD BSC32 /nologo 108# ADD BSC32 /nologo
109BSC32_FLAGS=/nologo /o"$(OUTDIR)/pumpkin.bsc" 109BSC32_FLAGS=/nologo /o"$(OUTDIR)/pumpkin.bsc"
110BSC32_SBRS= \ 110BSC32_SBRS= \
111 111
112LINK32=link.exe 112LINK32=link.exe
113# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386 113# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386
114# ADD LINK32 /nologo /subsystem:windows /machine:I386 114# ADD LINK32 /nologo /subsystem:windows /machine:I386
115LINK32_FLAGS=/nologo /subsystem:windows /incremental:no\ 115LINK32_FLAGS=/nologo /subsystem:windows /incremental:no\
116 /pdb:"$(OUTDIR)/pumpkin.pdb" /machine:I386 /out:"$(OUTDIR)/pumpkin.exe" 116 /pdb:"$(OUTDIR)/pumpkin.pdb" /machine:I386 /out:"$(OUTDIR)/pumpkin.exe"
117LINK32_OBJS= \ 117LINK32_OBJS= \
118 "$(INTDIR)\ConfirmRRQDlg.obj" \ 118 "$(INTDIR)\ConfirmRRQDlg.obj" \
119 "$(INTDIR)\ConfirmWRQDlg.obj" \ 119 "$(INTDIR)\ConfirmWRQDlg.obj" \
120 "$(INTDIR)\PropsNetwork.obj" \ 120 "$(INTDIR)\PropsNetwork.obj" \
121 "$(INTDIR)\PropsServer.obj" \ 121 "$(INTDIR)\PropsServer.obj" \
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" \
127 "$(INTDIR)\Resolver.obj" \ 127 "$(INTDIR)\Resolver.obj" \
128 "$(INTDIR)\Retrier.obj" \ 128 "$(INTDIR)\Retrier.obj" \
129 "$(INTDIR)\StdAfx.obj" \ 129 "$(INTDIR)\StdAfx.obj" \
130 "$(INTDIR)\Trayer.obj" 130 "$(INTDIR)\Trayer.obj"
131 131
132"$(OUTDIR)\pumpkin.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) 132"$(OUTDIR)\pumpkin.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
133 $(LINK32) @<< 133 $(LINK32) @<<
134 $(LINK32_FLAGS) $(LINK32_OBJS) 134 $(LINK32_FLAGS) $(LINK32_OBJS)
135<< 135<<
136 136
137# Begin Custom Build 137# Begin Custom Build
138OutDir=.\Release 138OutDir=.\Release
139TargetName=pumpkin 139TargetName=pumpkin
140InputPath=.\Release\pumpkin.exe 140InputPath=.\Release\pumpkin.exe
141SOURCE=$(InputPath) 141SOURCE=$(InputPath)
142 142
143"$(OutDir)\$(TargetName).ex_" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" 143"$(OutDir)\$(TargetName).ex_" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
144 compress $(OutDir)\$(TargetName).exe $(OutDir)\$(TargetName).ex_ 144 compress $(OutDir)\$(TargetName).exe $(OutDir)\$(TargetName).ex_
145 145
146# End Custom Build 146# End Custom Build
147 147
148!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" 148!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug"
149 149
150# PROP BASE Use_MFC 6 150# PROP BASE Use_MFC 6
151# PROP BASE Use_Debug_Libraries 1 151# PROP BASE Use_Debug_Libraries 1
152# PROP BASE Output_Dir "Debug" 152# PROP BASE Output_Dir "Debug"
153# PROP BASE Intermediate_Dir "Debug" 153# PROP BASE Intermediate_Dir "Debug"
154# PROP BASE Target_Dir "" 154# PROP BASE Target_Dir ""
155# PROP Use_MFC 6 155# PROP Use_MFC 6
156# PROP Use_Debug_Libraries 1 156# PROP Use_Debug_Libraries 1
157# PROP Output_Dir "Debug" 157# PROP Output_Dir "Debug"
158# PROP Intermediate_Dir "Debug" 158# PROP Intermediate_Dir "Debug"
159# PROP Target_Dir "" 159# PROP Target_Dir ""
160OUTDIR=.\Debug 160OUTDIR=.\Debug
161INTDIR=.\Debug 161INTDIR=.\Debug
162# Begin Custom Macros 162# Begin Custom Macros
163OutDir=.\Debug 163OutDir=.\Debug
164TargetName=pumpkin 164TargetName=pumpkin
165# End Custom Macros 165# End Custom Macros
166 166
167ALL : "$(OUTDIR)\pumpkin.exe" "$(OUTDIR)\pumpkin.bsc" "$(OUTDIR)\pumpkin.ex_"\ 167ALL : "$(OUTDIR)\pumpkin.exe" "$(OUTDIR)\pumpkin.bsc" "$(OUTDIR)\pumpkin.ex_"\
168 "$(OUTDIR)\pumpkin.hlp" "$(OUTDIR)\pumpkin.cnt" "$(OUTDIR)\pumpkin.hl_"\ 168 "$(OUTDIR)\pumpkin.hlp" "$(OUTDIR)\pumpkin.cnt" "$(OUTDIR)\pumpkin.hl_"\
169 "$(OUTDIR)\pumpkin.cn_" 169 "$(OUTDIR)\pumpkin.cn_"
170 170
171CLEAN : 171CLEAN :
172 -@erase "$(INTDIR)\ConfirmRRQDlg.obj" 172 -@erase "$(INTDIR)\ConfirmRRQDlg.obj"
173 -@erase "$(INTDIR)\ConfirmRRQDlg.sbr" 173 -@erase "$(INTDIR)\ConfirmRRQDlg.sbr"
174 -@erase "$(INTDIR)\ConfirmWRQDlg.obj" 174 -@erase "$(INTDIR)\ConfirmWRQDlg.obj"
175 -@erase "$(INTDIR)\ConfirmWRQDlg.sbr" 175 -@erase "$(INTDIR)\ConfirmWRQDlg.sbr"
176 -@erase "$(INTDIR)\PropsNetwork.obj" 176 -@erase "$(INTDIR)\PropsNetwork.obj"
177 -@erase "$(INTDIR)\PropsNetwork.sbr" 177 -@erase "$(INTDIR)\PropsNetwork.sbr"
178 -@erase "$(INTDIR)\PropsServer.obj" 178 -@erase "$(INTDIR)\PropsServer.obj"
179 -@erase "$(INTDIR)\PropsServer.sbr" 179 -@erase "$(INTDIR)\PropsServer.sbr"
180 -@erase "$(INTDIR)\PropsSounds.obj" 180 -@erase "$(INTDIR)\PropsSounds.obj"
181 -@erase "$(INTDIR)\PropsSounds.sbr" 181 -@erase "$(INTDIR)\PropsSounds.sbr"
182 -@erase "$(INTDIR)\pumpkin.cn_" 182 -@erase "$(INTDIR)\pumpkin.cn_"
183 -@erase "$(INTDIR)\pumpkin.cnt" 183 -@erase "$(INTDIR)\pumpkin.cnt"
184 -@erase "$(INTDIR)\pumpkin.hl_" 184 -@erase "$(INTDIR)\pumpkin.hl_"
185 -@erase "$(INTDIR)\pumpkin.hlp" 185 -@erase "$(INTDIR)\pumpkin.hlp"
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"
191 -@erase "$(INTDIR)\PumpKINDlg.sbr" 191 -@erase "$(INTDIR)\PumpKINDlg.sbr"
192 -@erase "$(INTDIR)\RequestDlg.obj" 192 -@erase "$(INTDIR)\RequestDlg.obj"
193 -@erase "$(INTDIR)\RequestDlg.sbr" 193 -@erase "$(INTDIR)\RequestDlg.sbr"
194 -@erase "$(INTDIR)\Resolver.obj" 194 -@erase "$(INTDIR)\Resolver.obj"
195 -@erase "$(INTDIR)\Resolver.sbr" 195 -@erase "$(INTDIR)\Resolver.sbr"
196 -@erase "$(INTDIR)\Retrier.obj" 196 -@erase "$(INTDIR)\Retrier.obj"
197 -@erase "$(INTDIR)\Retrier.sbr" 197 -@erase "$(INTDIR)\Retrier.sbr"
198 -@erase "$(INTDIR)\StdAfx.obj" 198 -@erase "$(INTDIR)\StdAfx.obj"
199 -@erase "$(INTDIR)\StdAfx.sbr" 199 -@erase "$(INTDIR)\StdAfx.sbr"
200 -@erase "$(INTDIR)\Trayer.obj" 200 -@erase "$(INTDIR)\Trayer.obj"
201 -@erase "$(INTDIR)\Trayer.sbr" 201 -@erase "$(INTDIR)\Trayer.sbr"
202 -@erase "$(INTDIR)\vc40.idb" 202 -@erase "$(INTDIR)\vc40.idb"
203 -@erase "$(INTDIR)\vc40.pdb" 203 -@erase "$(INTDIR)\vc40.pdb"
204 -@erase "$(OUTDIR)\pumpkin.bsc" 204 -@erase "$(OUTDIR)\pumpkin.bsc"
205 -@erase "$(OUTDIR)\pumpkin.ex_" 205 -@erase "$(OUTDIR)\pumpkin.ex_"
206 -@erase "$(OUTDIR)\pumpkin.exe" 206 -@erase "$(OUTDIR)\pumpkin.exe"
207 -@erase "$(OUTDIR)\pumpkin.ilk" 207 -@erase "$(OUTDIR)\pumpkin.ilk"
208 -@erase "$(OUTDIR)\pumpkin.pdb" 208 -@erase "$(OUTDIR)\pumpkin.pdb"
209 209
210"$(OUTDIR)" : 210"$(OUTDIR)" :
211 if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" 211 if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
212 212
213# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /Yu"stdafx.h" /c 213# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /Yu"stdafx.h" /c
214# ADD CPP /nologo /Zp1 /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /FR /Yu"stdafx.h" /c 214# ADD CPP /nologo /Zp1 /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /FR /Yu"stdafx.h" /c
215CPP_PROJ=/nologo /Zp1 /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D\ 215CPP_PROJ=/nologo /Zp1 /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D\
216 "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /FR"$(INTDIR)/" /Fp"$(INTDIR)/pumpkin.pch"\ 216 "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /FR"$(INTDIR)/" /Fp"$(INTDIR)/pumpkin.pch"\
217 /Yu"stdafx.h" /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c 217 /Yu"stdafx.h" /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c
218CPP_OBJS=.\Debug/ 218CPP_OBJS=.\Debug/
219CPP_SBRS=.\Debug/ 219CPP_SBRS=.\Debug/
220# ADD BASE MTL /nologo /D "_DEBUG" /win32 220# ADD BASE MTL /nologo /D "_DEBUG" /win32
221# ADD MTL /nologo /D "_DEBUG" /win32 221# ADD MTL /nologo /D "_DEBUG" /win32
222MTL_PROJ=/nologo /D "_DEBUG" /win32 222MTL_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"
225RSC_PROJ=/l 0x409 /fo"$(INTDIR)/PumpKIN.res" /d "_DEBUG" /d "_AFXDLL" 225RSC_PROJ=/l 0x409 /fo"$(INTDIR)/pumpkin.res" /d "_DEBUG" /d "_AFXDLL"
226BSC32=bscmake.exe 226BSC32=bscmake.exe
227# ADD BASE BSC32 /nologo 227# ADD BASE BSC32 /nologo
228# ADD BSC32 /nologo 228# ADD BSC32 /nologo
229BSC32_FLAGS=/nologo /o"$(OUTDIR)/pumpkin.bsc" 229BSC32_FLAGS=/nologo /o"$(OUTDIR)/pumpkin.bsc"
230BSC32_SBRS= \ 230BSC32_SBRS= \
231 "$(INTDIR)\ConfirmRRQDlg.sbr" \ 231 "$(INTDIR)\ConfirmRRQDlg.sbr" \
232 "$(INTDIR)\ConfirmWRQDlg.sbr" \ 232 "$(INTDIR)\ConfirmWRQDlg.sbr" \
233 "$(INTDIR)\PropsNetwork.sbr" \ 233 "$(INTDIR)\PropsNetwork.sbr" \
234 "$(INTDIR)\PropsServer.sbr" \ 234 "$(INTDIR)\PropsServer.sbr" \
235 "$(INTDIR)\PropsSounds.sbr" \ 235 "$(INTDIR)\PropsSounds.sbr" \
236 "$(INTDIR)\PumpKIN.sbr" \ 236 "$(INTDIR)\PumpKIN.sbr" \
237 "$(INTDIR)\PumpKINDlg.sbr" \ 237 "$(INTDIR)\PumpKINDlg.sbr" \
238 "$(INTDIR)\RequestDlg.sbr" \ 238 "$(INTDIR)\RequestDlg.sbr" \
239 "$(INTDIR)\Resolver.sbr" \ 239 "$(INTDIR)\Resolver.sbr" \
240 "$(INTDIR)\Retrier.sbr" \ 240 "$(INTDIR)\Retrier.sbr" \
241 "$(INTDIR)\StdAfx.sbr" \ 241 "$(INTDIR)\StdAfx.sbr" \
242 "$(INTDIR)\Trayer.sbr" 242 "$(INTDIR)\Trayer.sbr"
243 243
244"$(OUTDIR)\pumpkin.bsc" : "$(OUTDIR)" $(BSC32_SBRS) 244"$(OUTDIR)\pumpkin.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
245 $(BSC32) @<< 245 $(BSC32) @<<
246 $(BSC32_FLAGS) $(BSC32_SBRS) 246 $(BSC32_FLAGS) $(BSC32_SBRS)
247<< 247<<
248 248
249LINK32=link.exe 249LINK32=link.exe
250# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 250# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386
251# ADD LINK32 /nologo /subsystem:windows /debug /machine:I386 251# ADD LINK32 /nologo /subsystem:windows /debug /machine:I386
252LINK32_FLAGS=/nologo /subsystem:windows /incremental:yes\ 252LINK32_FLAGS=/nologo /subsystem:windows /incremental:yes\
253 /pdb:"$(OUTDIR)/pumpkin.pdb" /debug /machine:I386 /out:"$(OUTDIR)/pumpkin.exe" 253 /pdb:"$(OUTDIR)/pumpkin.pdb" /debug /machine:I386 /out:"$(OUTDIR)/pumpkin.exe"
254LINK32_OBJS= \ 254LINK32_OBJS= \
255 "$(INTDIR)\ConfirmRRQDlg.obj" \ 255 "$(INTDIR)\ConfirmRRQDlg.obj" \
256 "$(INTDIR)\ConfirmWRQDlg.obj" \ 256 "$(INTDIR)\ConfirmWRQDlg.obj" \
257 "$(INTDIR)\PropsNetwork.obj" \ 257 "$(INTDIR)\PropsNetwork.obj" \
258 "$(INTDIR)\PropsServer.obj" \ 258 "$(INTDIR)\PropsServer.obj" \
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" \
264 "$(INTDIR)\Resolver.obj" \ 264 "$(INTDIR)\Resolver.obj" \
265 "$(INTDIR)\Retrier.obj" \ 265 "$(INTDIR)\Retrier.obj" \
266 "$(INTDIR)\StdAfx.obj" \ 266 "$(INTDIR)\StdAfx.obj" \
267 "$(INTDIR)\Trayer.obj" 267 "$(INTDIR)\Trayer.obj"
268 268
269"$(OUTDIR)\pumpkin.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) 269"$(OUTDIR)\pumpkin.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
270 $(LINK32) @<< 270 $(LINK32) @<<
271 $(LINK32_FLAGS) $(LINK32_OBJS) 271 $(LINK32_FLAGS) $(LINK32_OBJS)
272<< 272<<
273 273
274# Begin Custom Build 274# Begin Custom Build
275OutDir=.\Debug 275OutDir=.\Debug
276TargetName=pumpkin 276TargetName=pumpkin
277InputPath=.\Debug\pumpkin.exe 277InputPath=.\Debug\pumpkin.exe
278SOURCE=$(InputPath) 278SOURCE=$(InputPath)
279 279
280"$(OutDir)\$(TargetName).ex_" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" 280"$(OutDir)\$(TargetName).ex_" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
281 compress $(OutDir)\$(TargetName).exe $(OutDir)\$(TargetName).ex_ 281 compress $(OutDir)\$(TargetName).exe $(OutDir)\$(TargetName).ex_
282 282
283# End Custom Build 283# End Custom Build
284 284
285!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" 285!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static"
286 286
287# PROP BASE Use_MFC 6 287# PROP BASE Use_MFC 6
288# PROP BASE Use_Debug_Libraries 0 288# PROP BASE Use_Debug_Libraries 0
289# PROP BASE Output_Dir "PumpKIN_" 289# PROP BASE Output_Dir "PumpKIN_"
290# PROP BASE Intermediate_Dir "PumpKIN_" 290# PROP BASE Intermediate_Dir "PumpKIN_"
291# PROP BASE Target_Dir "" 291# PROP BASE Target_Dir ""
292# PROP Use_MFC 5 292# PROP Use_MFC 5
293# PROP Use_Debug_Libraries 0 293# PROP Use_Debug_Libraries 0
294# PROP Output_Dir "Releast" 294# PROP Output_Dir "Releast"
295# PROP Intermediate_Dir "Releast" 295# PROP Intermediate_Dir "Releast"
296# PROP Target_Dir "" 296# PROP Target_Dir ""
297OUTDIR=.\Releast 297OUTDIR=.\Releast
298INTDIR=.\Releast 298INTDIR=.\Releast
299# Begin Custom Macros 299# Begin Custom Macros
300OutDir=.\Releast 300OutDir=.\Releast
301TargetName=pumpkin 301TargetName=pumpkin
302# End Custom Macros 302# End Custom Macros
303 303
304ALL : "$(OUTDIR)\pumpkin.exe" "$(OUTDIR)\pumpkin.ex_" "$(OUTDIR)\pumpkin.hlp"\ 304ALL : "$(OUTDIR)\pumpkin.exe" "$(OUTDIR)\pumpkin.ex_" "$(OUTDIR)\pumpkin.hlp"\
305 "$(OUTDIR)\pumpkin.cnt" "$(OUTDIR)\pumpkin.hl_" "$(OUTDIR)\pumpkin.cn_" 305 "$(OUTDIR)\pumpkin.cnt" "$(OUTDIR)\pumpkin.hl_" "$(OUTDIR)\pumpkin.cn_"
306 306
307CLEAN : 307CLEAN :
308 -@erase "$(INTDIR)\ConfirmRRQDlg.obj" 308 -@erase "$(INTDIR)\ConfirmRRQDlg.obj"
309 -@erase "$(INTDIR)\ConfirmWRQDlg.obj" 309 -@erase "$(INTDIR)\ConfirmWRQDlg.obj"
310 -@erase "$(INTDIR)\PropsNetwork.obj" 310 -@erase "$(INTDIR)\PropsNetwork.obj"
311 -@erase "$(INTDIR)\PropsServer.obj" 311 -@erase "$(INTDIR)\PropsServer.obj"
312 -@erase "$(INTDIR)\PropsSounds.obj" 312 -@erase "$(INTDIR)\PropsSounds.obj"
313 -@erase "$(INTDIR)\pumpkin.cn_" 313 -@erase "$(INTDIR)\pumpkin.cn_"
314 -@erase "$(INTDIR)\pumpkin.cnt" 314 -@erase "$(INTDIR)\pumpkin.cnt"
315 -@erase "$(INTDIR)\pumpkin.hl_" 315 -@erase "$(INTDIR)\pumpkin.hl_"
316 -@erase "$(INTDIR)\pumpkin.hlp" 316 -@erase "$(INTDIR)\pumpkin.hlp"
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"
322 -@erase "$(INTDIR)\Resolver.obj" 322 -@erase "$(INTDIR)\Resolver.obj"
323 -@erase "$(INTDIR)\Retrier.obj" 323 -@erase "$(INTDIR)\Retrier.obj"
324 -@erase "$(INTDIR)\StdAfx.obj" 324 -@erase "$(INTDIR)\StdAfx.obj"
325 -@erase "$(INTDIR)\Trayer.obj" 325 -@erase "$(INTDIR)\Trayer.obj"
326 -@erase "$(OUTDIR)\pumpkin.ex_" 326 -@erase "$(OUTDIR)\pumpkin.ex_"
327 -@erase "$(OUTDIR)\pumpkin.exe" 327 -@erase "$(OUTDIR)\pumpkin.exe"
328 328
329"$(OUTDIR)" : 329"$(OUTDIR)" :
330 if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" 330 if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
331 331
332# ADD BASE CPP /nologo /Zp1 /MD /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /Yu"stdafx.h" /c 332# ADD BASE CPP /nologo /Zp1 /MD /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /Yu"stdafx.h" /c
333# ADD CPP /nologo /Zp1 /MT /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"stdafx.h" /c 333# ADD CPP /nologo /Zp1 /MT /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"stdafx.h" /c
334CPP_PROJ=/nologo /Zp1 /MT /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D\ 334CPP_PROJ=/nologo /Zp1 /MT /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D\
335 "_MBCS" /Fp"$(INTDIR)/pumpkin.pch" /Yu"stdafx.h" /Fo"$(INTDIR)/" /c 335 "_MBCS" /Fp"$(INTDIR)/pumpkin.pch" /Yu"stdafx.h" /Fo"$(INTDIR)/" /c
336CPP_OBJS=.\Releast/ 336CPP_OBJS=.\Releast/
337CPP_SBRS=.\. 337CPP_SBRS=.\.
338# ADD BASE MTL /nologo /D "NDEBUG" /win32 338# ADD BASE MTL /nologo /D "NDEBUG" /win32
339# ADD MTL /nologo /D "NDEBUG" /win32 339# ADD MTL /nologo /D "NDEBUG" /win32
340MTL_PROJ=/nologo /D "NDEBUG" /win32 340MTL_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"
343RSC_PROJ=/l 0x409 /fo"$(INTDIR)/PumpKIN.res" /d "NDEBUG" 343RSC_PROJ=/l 0x409 /fo"$(INTDIR)/pumpkin.res" /d "NDEBUG"
344BSC32=bscmake.exe 344BSC32=bscmake.exe
345# ADD BASE BSC32 /nologo 345# ADD BASE BSC32 /nologo
346# ADD BSC32 /nologo 346# ADD BSC32 /nologo
347BSC32_FLAGS=/nologo /o"$(OUTDIR)/pumpkin.bsc" 347BSC32_FLAGS=/nologo /o"$(OUTDIR)/pumpkin.bsc"
348BSC32_SBRS= \ 348BSC32_SBRS= \
349 349
350LINK32=link.exe 350LINK32=link.exe
351# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386 351# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386
352# ADD LINK32 /nologo /subsystem:windows /machine:I386 352# ADD LINK32 /nologo /subsystem:windows /machine:I386
353LINK32_FLAGS=/nologo /subsystem:windows /incremental:no\ 353LINK32_FLAGS=/nologo /subsystem:windows /incremental:no\
354 /pdb:"$(OUTDIR)/pumpkin.pdb" /machine:I386 /out:"$(OUTDIR)/pumpkin.exe" 354 /pdb:"$(OUTDIR)/pumpkin.pdb" /machine:I386 /out:"$(OUTDIR)/pumpkin.exe"
355LINK32_OBJS= \ 355LINK32_OBJS= \
356 "$(INTDIR)\ConfirmRRQDlg.obj" \ 356 "$(INTDIR)\ConfirmRRQDlg.obj" \
357 "$(INTDIR)\ConfirmWRQDlg.obj" \ 357 "$(INTDIR)\ConfirmWRQDlg.obj" \
358 "$(INTDIR)\PropsNetwork.obj" \ 358 "$(INTDIR)\PropsNetwork.obj" \
359 "$(INTDIR)\PropsServer.obj" \ 359 "$(INTDIR)\PropsServer.obj" \
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" \
365 "$(INTDIR)\Resolver.obj" \ 365 "$(INTDIR)\Resolver.obj" \
366 "$(INTDIR)\Retrier.obj" \ 366 "$(INTDIR)\Retrier.obj" \
367 "$(INTDIR)\StdAfx.obj" \ 367 "$(INTDIR)\StdAfx.obj" \
368 "$(INTDIR)\Trayer.obj" 368 "$(INTDIR)\Trayer.obj"
369 369
370"$(OUTDIR)\pumpkin.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) 370"$(OUTDIR)\pumpkin.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
371 $(LINK32) @<< 371 $(LINK32) @<<
372 $(LINK32_FLAGS) $(LINK32_OBJS) 372 $(LINK32_FLAGS) $(LINK32_OBJS)
373<< 373<<
374 374
375# Begin Custom Build 375# Begin Custom Build
376OutDir=.\Releast 376OutDir=.\Releast
377TargetName=pumpkin 377TargetName=pumpkin
378InputPath=.\Releast\pumpkin.exe 378InputPath=.\Releast\pumpkin.exe
379SOURCE=$(InputPath) 379SOURCE=$(InputPath)
380 380
381"$(OutDir)\$(TargetName).ex_" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" 381"$(OutDir)\$(TargetName).ex_" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
382 compress $(OutDir)\$(TargetName).exe $(OutDir)\$(TargetName).ex_ 382 compress $(OutDir)\$(TargetName).exe $(OutDir)\$(TargetName).ex_
383 383
384# End Custom Build 384# End Custom Build
385 385
386!ELSEIF "$(CFG)" == "Install - Win32 Debug" 386!ELSEIF "$(CFG)" == "Install - Win32 Debug"
387 387
388# PROP BASE Use_MFC 2 388# PROP BASE Use_MFC 2
389# PROP BASE Use_Debug_Libraries 1 389# PROP BASE Use_Debug_Libraries 1
390# PROP BASE Output_Dir "Install\Debug" 390# PROP BASE Output_Dir "Install\Debug"
391# PROP BASE Intermediate_Dir "Install\Debug" 391# PROP BASE Intermediate_Dir "Install\Debug"
392# PROP BASE Target_Dir "Install" 392# PROP BASE Target_Dir "Install"
393# PROP Use_MFC 0 393# PROP Use_MFC 0
394# PROP Use_Debug_Libraries 1 394# PROP Use_Debug_Libraries 1
395# PROP Output_Dir "Install\Debug" 395# PROP Output_Dir "Install\Debug"
396# PROP Intermediate_Dir "Install\Debug" 396# PROP Intermediate_Dir "Install\Debug"
397# PROP Target_Dir "Install" 397# PROP Target_Dir "Install"
398OUTDIR=.\Install\Debug 398OUTDIR=.\Install\Debug
399INTDIR=.\Install\Debug 399INTDIR=.\Install\Debug
400 400
401ALL : "$(OUTDIR)\Install.exe" 401ALL : "$(OUTDIR)\Install.exe"
402 402
403CLEAN : 403CLEAN :
404 -@erase "$(INTDIR)\install.obj" 404 -@erase "$(INTDIR)\install.obj"
405 -@erase "$(INTDIR)\Install.res" 405 -@erase "$(INTDIR)\Install.res"
406 -@erase "$(INTDIR)\vc40.idb" 406 -@erase "$(INTDIR)\vc40.idb"
407 -@erase "$(INTDIR)\vc40.pdb" 407 -@erase "$(INTDIR)\vc40.pdb"
408 -@erase "$(OUTDIR)\Install.exe" 408 -@erase "$(OUTDIR)\Install.exe"
409 -@erase "$(OUTDIR)\Install.ilk" 409 -@erase "$(OUTDIR)\Install.ilk"
410 -@erase "$(OUTDIR)\Install.pdb" 410 -@erase "$(OUTDIR)\Install.pdb"
@@ -416,123 +416,131 @@ CLEAN :
416# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /c 416# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /c
417CPP_PROJ=/nologo /MLd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS"\ 417CPP_PROJ=/nologo /MLd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS"\
418 /D "_MBCS" /Fp"$(INTDIR)/Install.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c 418 /D "_MBCS" /Fp"$(INTDIR)/Install.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c
419CPP_OBJS=.\Install\Debug/ 419CPP_OBJS=.\Install\Debug/
420CPP_SBRS=.\. 420CPP_SBRS=.\.
421# ADD BASE MTL /nologo /D "_DEBUG" /win32 421# ADD BASE MTL /nologo /D "_DEBUG" /win32
422# ADD MTL /nologo /D "_DEBUG" /win32 422# ADD MTL /nologo /D "_DEBUG" /win32
423MTL_PROJ=/nologo /D "_DEBUG" /win32 423MTL_PROJ=/nologo /D "_DEBUG" /win32
424# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" 424# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
425# ADD RSC /l 0x409 /d "_DEBUG" 425# ADD RSC /l 0x409 /d "_DEBUG"
426RSC_PROJ=/l 0x409 /fo"$(INTDIR)/Install.res" /d "_DEBUG" 426RSC_PROJ=/l 0x409 /fo"$(INTDIR)/Install.res" /d "_DEBUG"
427BSC32=bscmake.exe 427BSC32=bscmake.exe
428# ADD BASE BSC32 /nologo 428# ADD BASE BSC32 /nologo
429# ADD BSC32 /nologo 429# ADD BSC32 /nologo
430BSC32_FLAGS=/nologo /o"$(OUTDIR)/Install.bsc" 430BSC32_FLAGS=/nologo /o"$(OUTDIR)/Install.bsc"
431BSC32_SBRS= \ 431BSC32_SBRS= \
432 432
433LINK32=link.exe 433LINK32=link.exe
434# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 434# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386
435# 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 /debug /machine:I386 435# 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 /debug /machine:I386
436LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\ 436LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
437 advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\ 437 advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
438 odbccp32.lib version.lib /nologo /subsystem:windows /incremental:yes\ 438 odbccp32.lib version.lib /nologo /subsystem:windows /incremental:yes\
439 /pdb:"$(OUTDIR)/Install.pdb" /debug /machine:I386 /out:"$(OUTDIR)/Install.exe" 439 /pdb:"$(OUTDIR)/Install.pdb" /debug /machine:I386 /out:"$(OUTDIR)/Install.exe"
440LINK32_OBJS= \ 440LINK32_OBJS= \
441 "$(INTDIR)\install.obj" \ 441 "$(INTDIR)\install.obj" \
442 "$(INTDIR)\Install.res" 442 "$(INTDIR)\Install.res"
443 443
444"$(OUTDIR)\Install.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) 444"$(OUTDIR)\Install.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
445 $(LINK32) @<< 445 $(LINK32) @<<
446 $(LINK32_FLAGS) $(LINK32_OBJS) 446 $(LINK32_FLAGS) $(LINK32_OBJS)
447<< 447<<
448 448
449!ELSEIF "$(CFG)" == "Install - Win32 Pure" 449!ELSEIF "$(CFG)" == "Install - Win32 Pure"
450 450
451# PROP BASE Use_MFC 2 451# PROP BASE Use_MFC 2
452# PROP BASE Use_Debug_Libraries 0 452# PROP BASE Use_Debug_Libraries 0
453# PROP BASE Output_Dir "Install\Pure" 453# PROP BASE Output_Dir "Install\Pure"
454# PROP BASE Intermediate_Dir "Install\Pure" 454# PROP BASE Intermediate_Dir "Install\Pure"
455# PROP BASE Target_Dir "Install" 455# PROP BASE Target_Dir "Install"
456# PROP Use_MFC 0 456# PROP Use_MFC 0
457# PROP Use_Debug_Libraries 0 457# PROP Use_Debug_Libraries 0
458# PROP Output_Dir "Install\Pure" 458# PROP Output_Dir "Install\Pure"
459# PROP Intermediate_Dir "Install\Pure" 459# PROP Intermediate_Dir "Install\Pure"
460# PROP Target_Dir "Install" 460# PROP Target_Dir "Install"
461OUTDIR=.\Install\Pure 461OUTDIR=.\Install\Pure
462INTDIR=.\Install\Pure 462INTDIR=.\Install\Pure
463 463
464ALL : "$(OUTDIR)\Install.exe" 464ALL : "$(OUTDIR)\Install.exe" "$(OUTDIR)\Install.bsc"
465 465
466CLEAN : 466CLEAN :
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
471"$(OUTDIR)" : 473"$(OUTDIR)" :
472 if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" 474 if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
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
476CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D\ 478CPP_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
478CPP_OBJS=.\Install\Pure/ 480CPP_OBJS=.\Install\Pure/
479CPP_SBRS=.\. 481CPP_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
482MTL_PROJ=/nologo /D "NDEBUG" /win32 484MTL_PROJ=/nologo /D "NDEBUG" /win32
483# ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" 485# ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
484# ADD RSC /l 0x409 /d "NDEBUG" 486# ADD RSC /l 0x409 /d "NDEBUG"
485RSC_PROJ=/l 0x409 /fo"$(INTDIR)/Install.res" /d "NDEBUG" 487RSC_PROJ=/l 0x409 /fo"$(INTDIR)/Install.res" /d "NDEBUG"
486BSC32=bscmake.exe 488BSC32=bscmake.exe
487# ADD BASE BSC32 /nologo 489# ADD BASE BSC32 /nologo
488# ADD BSC32 /nologo 490# ADD BSC32 /nologo
489BSC32_FLAGS=/nologo /o"$(OUTDIR)/Install.bsc" 491BSC32_FLAGS=/nologo /o"$(OUTDIR)/Install.bsc"
490BSC32_SBRS= \ 492BSC32_SBRS= \
493 "$(INTDIR)\install.sbr"
494
495"$(OUTDIR)\Install.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
496 $(BSC32) @<<
497 $(BSC32_FLAGS) $(BSC32_SBRS)
498<<
491 499
492LINK32=link.exe 500LINK32=link.exe
493# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386 501# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386
494# 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 502# 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
495LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\ 503LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
496 advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\ 504 advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
497 odbccp32.lib version.lib /nologo /subsystem:windows /incremental:no\ 505 odbccp32.lib version.lib /nologo /subsystem:windows /incremental:no\
498 /pdb:"$(OUTDIR)/Install.pdb" /machine:I386 /out:"$(OUTDIR)/Install.exe" 506 /pdb:"$(OUTDIR)/Install.pdb" /machine:I386 /out:"$(OUTDIR)/Install.exe"
499LINK32_OBJS= \ 507LINK32_OBJS= \
500 "$(INTDIR)\install.obj" \ 508 "$(INTDIR)\install.obj" \
501 "$(INTDIR)\Install.res" 509 "$(INTDIR)\Install.res"
502 510
503"$(OUTDIR)\Install.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) 511"$(OUTDIR)\Install.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
504 $(LINK32) @<< 512 $(LINK32) @<<
505 $(LINK32_FLAGS) $(LINK32_OBJS) 513 $(LINK32_FLAGS) $(LINK32_OBJS)
506<< 514<<
507 515
508!ELSEIF "$(CFG)" == "Install - Win32 Static" 516!ELSEIF "$(CFG)" == "Install - Win32 Static"
509 517
510# PROP BASE Use_MFC 2 518# PROP BASE Use_MFC 2
511# PROP BASE Use_Debug_Libraries 0 519# PROP BASE Use_Debug_Libraries 0
512# PROP BASE Output_Dir "Install\Static" 520# PROP BASE Output_Dir "Install\Static"
513# PROP BASE Intermediate_Dir "Install\Static" 521# PROP BASE Intermediate_Dir "Install\Static"
514# PROP BASE Target_Dir "Install" 522# PROP BASE Target_Dir "Install"
515# PROP Use_MFC 0 523# PROP Use_MFC 0
516# PROP Use_Debug_Libraries 0 524# PROP Use_Debug_Libraries 0
517# PROP Output_Dir "Install\Static" 525# PROP Output_Dir "Install\Static"
518# PROP Intermediate_Dir "Install\Static" 526# PROP Intermediate_Dir "Install\Static"
519# PROP Target_Dir "Install" 527# PROP Target_Dir "Install"
520OUTDIR=.\Install\Static 528OUTDIR=.\Install\Static
521INTDIR=.\Install\Static 529INTDIR=.\Install\Static
522 530
523ALL : "$(OUTDIR)\Install.exe" 531ALL : "$(OUTDIR)\Install.exe"
524 532
525CLEAN : 533CLEAN :
526 -@erase "$(INTDIR)\install.obj" 534 -@erase "$(INTDIR)\install.obj"
527 -@erase "$(INTDIR)\Install.res" 535 -@erase "$(INTDIR)\Install.res"
528 -@erase "$(OUTDIR)\Install.exe" 536 -@erase "$(OUTDIR)\Install.exe"
529 537
530"$(OUTDIR)" : 538"$(OUTDIR)" :
531 if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" 539 if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
532 540
533# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /YX /c 541# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /YX /c
534# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "STATI_K" /YX /c 542# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "STATI_K" /YX /c
535CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D\ 543CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D\
536 "_MBCS" /D "STATI_K" /Fp"$(INTDIR)/Install.pch" /YX /Fo"$(INTDIR)/" /c 544 "_MBCS" /D "STATI_K" /Fp"$(INTDIR)/Install.pch" /YX /Fo"$(INTDIR)/" /c
537CPP_OBJS=.\Install\Static/ 545CPP_OBJS=.\Install\Static/
538CPP_SBRS=.\. 546CPP_SBRS=.\.
@@ -784,111 +792,111 @@ BuildCmds= \
784"$(INTDIR)\StdAfx.obj" : $(SOURCE) $(DEP_CPP_STDAF) "$(INTDIR)" 792"$(INTDIR)\StdAfx.obj" : $(SOURCE) $(DEP_CPP_STDAF) "$(INTDIR)"
785 $(BuildCmds) 793 $(BuildCmds)
786 794
787"$(INTDIR)\StdAfx.sbr" : $(SOURCE) $(DEP_CPP_STDAF) "$(INTDIR)" 795"$(INTDIR)\StdAfx.sbr" : $(SOURCE) $(DEP_CPP_STDAF) "$(INTDIR)"
788 $(BuildCmds) 796 $(BuildCmds)
789 797
790"$(INTDIR)\pumpkin.pch" : $(SOURCE) $(DEP_CPP_STDAF) "$(INTDIR)" 798"$(INTDIR)\pumpkin.pch" : $(SOURCE) $(DEP_CPP_STDAF) "$(INTDIR)"
791 $(BuildCmds) 799 $(BuildCmds)
792 800
793!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" 801!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static"
794 802
795# ADD BASE CPP /Yc"stdafx.h" 803# ADD BASE CPP /Yc"stdafx.h"
796# ADD CPP /Yc"stdafx.h" 804# ADD CPP /Yc"stdafx.h"
797 805
798BuildCmds= \ 806BuildCmds= \
799 $(CPP) /nologo /Zp1 /MT /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D\ 807 $(CPP) /nologo /Zp1 /MT /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D\
800 "_MBCS" /Fp"$(INTDIR)/pumpkin.pch" /Yc"stdafx.h" /Fo"$(INTDIR)/" /c $(SOURCE) \ 808 "_MBCS" /Fp"$(INTDIR)/pumpkin.pch" /Yc"stdafx.h" /Fo"$(INTDIR)/" /c $(SOURCE) \
801 809
802 810
803"$(INTDIR)\StdAfx.obj" : $(SOURCE) $(DEP_CPP_STDAF) "$(INTDIR)" 811"$(INTDIR)\StdAfx.obj" : $(SOURCE) $(DEP_CPP_STDAF) "$(INTDIR)"
804 $(BuildCmds) 812 $(BuildCmds)
805 813
806"$(INTDIR)\pumpkin.pch" : $(SOURCE) $(DEP_CPP_STDAF) "$(INTDIR)" 814"$(INTDIR)\pumpkin.pch" : $(SOURCE) $(DEP_CPP_STDAF) "$(INTDIR)"
807 $(BuildCmds) 815 $(BuildCmds)
808 816
809!ENDIF 817!ENDIF
810 818
811# End Source File 819# End Source File
812################################################################################ 820################################################################################
813# Begin Source File 821# Begin Source File
814 822
815SOURCE=.\pumpkin.rc 823SOURCE=.\pumpkin.rc
816DEP_RSC_PUMPKIN=\ 824DEP_RSC_PUMPKIN=\
817 ".\res\failed.wav"\ 825 ".\res\failed.wav"\
818 ".\res\finished.wav"\ 826 ".\res\finished.wav"\
819 ".\res\PumpKIN.ico"\ 827 ".\res\PumpKIN.ico"\
820 ".\res\pumpkin.rc2"\ 828 ".\res\pumpkin.rc2"\
821 ".\res\ring.wav"\ 829 ".\res\ring.wav"\
822 ".\res\rrq.ico"\ 830 ".\res\rrq.ico"\
823 ".\res\wrq.ico"\ 831 ".\res\wrq.ico"\
824 ".\shared-data\browse-icon.ico"\ 832 ".\shared-data\browse-icon.ico"\
825 ".\shared-data\klever-background.bmp"\ 833 ".\shared-data\klever-background.bmp"\
826 ".\shared-data\play-icon.ico"\ 834 ".\shared-data\play-icon.ico"\
827 835
828 836
829!IF "$(CFG)" == "PumpKIN - Win32 Release" 837!IF "$(CFG)" == "PumpKIN - Win32 Release"
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
835 843
836!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" 844!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug"
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
842 850
843!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" 851!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static"
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
849 857
850!ENDIF 858!ENDIF
851 859
852# End Source File 860# End Source File
853################################################################################ 861################################################################################
854# Begin Source File 862# Begin Source File
855 863
856SOURCE=.\help\pumpkin.hpj 864SOURCE=.\help\pumpkin.hpj
857 865
858!IF "$(CFG)" == "PumpKIN - Win32 Release" 866!IF "$(CFG)" == "PumpKIN - Win32 Release"
859 867
860# Begin Custom Build - Making help files... 868# Begin Custom Build - Making help files...
861OutDir=.\Release 869OutDir=.\Release
862ProjDir=. 870ProjDir=.
863TargetName=pumpkin 871TargetName=pumpkin
864InputPath=.\help\pumpkin.hpj 872InputPath=.\help\pumpkin.hpj
865 873
866BuildCmds= \ 874BuildCmds= \
867 "$(ProjDir)\makehelp.bat" \ 875 "$(ProjDir)\makehelp.bat" \
868 compress $(OutDir)\$(TargetName).hlp $(OutDir)\$(TargetName).hl_ \ 876 compress $(OutDir)\$(TargetName).hlp $(OutDir)\$(TargetName).hl_ \
869 compress $(OutDir)\$(TargetName).cnt $(OutDir)\$(TargetName).cn_ \ 877 compress $(OutDir)\$(TargetName).cnt $(OutDir)\$(TargetName).cn_ \
870 878
871 879
872"$(OutDir)\$(TargetName).hlp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" 880"$(OutDir)\$(TargetName).hlp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
873 $(BuildCmds) 881 $(BuildCmds)
874 882
875"$(OutDir)\$(TargetName).cnt" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" 883"$(OutDir)\$(TargetName).cnt" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
876 $(BuildCmds) 884 $(BuildCmds)
877 885
878"$(OutDir)\$(TargetName).hl_" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" 886"$(OutDir)\$(TargetName).hl_" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
879 $(BuildCmds) 887 $(BuildCmds)
880 888
881"$(OutDir)\$(TargetName).cn_" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" 889"$(OutDir)\$(TargetName).cn_" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
882 $(BuildCmds) 890 $(BuildCmds)
883# End Custom Build 891# End Custom Build
884 892
885!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" 893!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug"
886 894
887# Begin Custom Build - Making help files... 895# Begin Custom Build - Making help files...
888OutDir=.\Debug 896OutDir=.\Debug
889ProjDir=. 897ProjDir=.
890TargetName=pumpkin 898TargetName=pumpkin
891InputPath=.\help\pumpkin.hpj 899InputPath=.\help\pumpkin.hpj
892 900
893BuildCmds= \ 901BuildCmds= \
894 "$(ProjDir)\makehelp.bat" \ 902 "$(ProjDir)\makehelp.bat" \
@@ -1352,78 +1360,84 @@ DEP_RSC_INSTA=\
1352 $(SOURCE) 1360 $(SOURCE)
1353 1361
1354 1362
1355!ELSEIF "$(CFG)" == "Install - Win32 Pure" 1363!ELSEIF "$(CFG)" == "Install - Win32 Pure"
1356 1364
1357 1365
1358"$(INTDIR)\Install.res" : $(SOURCE) $(DEP_RSC_INSTA) "$(INTDIR)" 1366"$(INTDIR)\Install.res" : $(SOURCE) $(DEP_RSC_INSTA) "$(INTDIR)"
1359 $(RSC) /l 0x409 /fo"$(INTDIR)/Install.res" /i "Install" /d "NDEBUG"\ 1367 $(RSC) /l 0x409 /fo"$(INTDIR)/Install.res" /i "Install" /d "NDEBUG"\
1360 $(SOURCE) 1368 $(SOURCE)
1361 1369
1362 1370
1363!ELSEIF "$(CFG)" == "Install - Win32 Static" 1371!ELSEIF "$(CFG)" == "Install - Win32 Static"
1364 1372
1365 1373
1366"$(INTDIR)\Install.res" : $(SOURCE) $(DEP_RSC_INSTA) "$(INTDIR)" 1374"$(INTDIR)\Install.res" : $(SOURCE) $(DEP_RSC_INSTA) "$(INTDIR)"
1367 $(RSC) /l 0x409 /fo"$(INTDIR)/Install.res" /i "Install" /d "NDEBUG" /d\ 1375 $(RSC) /l 0x409 /fo"$(INTDIR)/Install.res" /i "Install" /d "NDEBUG" /d\
1368 "STATI_K" $(SOURCE) 1376 "STATI_K" $(SOURCE)
1369 1377
1370 1378
1371!ELSEIF "$(CFG)" == "Install - Win32 Canned" 1379!ELSEIF "$(CFG)" == "Install - Win32 Canned"
1372 1380
1373 1381
1374"$(INTDIR)\Install.res" : $(SOURCE) $(DEP_RSC_INSTA) "$(INTDIR)" 1382"$(INTDIR)\Install.res" : $(SOURCE) $(DEP_RSC_INSTA) "$(INTDIR)"
1375 $(RSC) /l 0x409 /fo"$(INTDIR)/Install.res" /i "Install" /d "NDEBUG" /d\ 1383 $(RSC) /l 0x409 /fo"$(INTDIR)/Install.res" /i "Install" /d "NDEBUG" /d\
1376 "K_ANNED" $(SOURCE) 1384 "K_ANNED" $(SOURCE)
1377 1385
1378 1386
1379!ENDIF 1387!ENDIF
1380 1388
1381# End Source File 1389# End Source File
1382################################################################################ 1390################################################################################
1383# Begin Source File 1391# Begin Source File
1384 1392
1385SOURCE=.\Install\install.cpp 1393SOURCE=.\Install\install.cpp
1386DEP_CPP_INSTAL=\ 1394DEP_CPP_INSTAL=\
1387 ".\shared-code\install.h"\ 1395 ".\shared-code\install.h"\
1388 1396
1389 1397
1390!IF "$(CFG)" == "Install - Win32 Debug" 1398!IF "$(CFG)" == "Install - Win32 Debug"
1391 1399
1392 1400
1393"$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)" 1401"$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)"
1394 $(CPP) $(CPP_PROJ) $(SOURCE) 1402 $(CPP) $(CPP_PROJ) $(SOURCE)
1395 1403
1396 1404
1397!ELSEIF "$(CFG)" == "Install - Win32 Pure" 1405!ELSEIF "$(CFG)" == "Install - Win32 Pure"
1398 1406
1399 1407
1408BuildCmds= \
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"
1405 1419
1406 1420
1407"$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)" 1421"$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)"
1408 $(CPP) $(CPP_PROJ) $(SOURCE) 1422 $(CPP) $(CPP_PROJ) $(SOURCE)
1409 1423
1410 1424
1411!ELSEIF "$(CFG)" == "Install - Win32 Canned" 1425!ELSEIF "$(CFG)" == "Install - Win32 Canned"
1412 1426
1413 1427
1414"$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)" 1428"$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)"
1415 $(CPP) $(CPP_PROJ) $(SOURCE) 1429 $(CPP) $(CPP_PROJ) $(SOURCE)
1416 1430
1417 1431
1418!ENDIF 1432!ENDIF
1419 1433
1420# End Source File 1434# End Source File
1421# End Target 1435# End Target
1422# End Project 1436# End Project
1423################################################################################ 1437################################################################################
1424################################################################################ 1438################################################################################
1425# Section PumpKIN : {4FD78B34-1FD7-11D0-A9FB-444553540000} 1439# Section PumpKIN : {4FD78B34-1FD7-11D0-A9FB-444553540000}
1426 # 2:11:CPumpKINDlg:1 1440 # 2:11:CPumpKINDlg:1
1427 # 2:11:CRequestDlg:1 1441 # 2:11:CRequestDlg:1
1428# End Section 1442# End Section
1429################################################################################ 1443################################################################################
diff --git a/pumpkin.rc b/pumpkin.rc
index 1bf0fd3..7dafe04 100644
--- a/pumpkin.rc
+++ b/pumpkin.rc
@@ -37,99 +37,99 @@ BEGIN
37 "#include ""afxres.h""\r\n" 37 "#include ""afxres.h""\r\n"
38 "\0" 38 "\0"
39END 39END
40 40
413 TEXTINCLUDE DISCARDABLE 413 TEXTINCLUDE DISCARDABLE
42BEGIN 42BEGIN
43 "#define _AFX_NO_SPLITTER_RESOURCES\r\n" 43 "#define _AFX_NO_SPLITTER_RESOURCES\r\n"
44 "#define _AFX_NO_OLE_RESOURCES\r\n" 44 "#define _AFX_NO_OLE_RESOURCES\r\n"
45 "#define _AFX_NO_TRACKER_RESOURCES\r\n" 45 "#define _AFX_NO_TRACKER_RESOURCES\r\n"
46 "#define _AFX_NO_PROPERTY_RESOURCES\r\n" 46 "#define _AFX_NO_PROPERTY_RESOURCES\r\n"
47 "\r\n" 47 "\r\n"
48 "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n" 48 "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"
49 "#ifdef _WIN32\r\n" 49 "#ifdef _WIN32\r\n"
50 "LANGUAGE 9, 1\r\n" 50 "LANGUAGE 9, 1\r\n"
51 "#pragma code_page(1252)\r\n" 51 "#pragma code_page(1252)\r\n"
52 "#endif\r\n" 52 "#endif\r\n"
53 "#include ""res\\PumpKIN.rc2"" // non-Microsoft Visual C++ edited resources\r\n" 53 "#include ""res\\PumpKIN.rc2"" // non-Microsoft Visual C++ edited resources\r\n"
54 "#include ""afxres.rc"" // Standard components\r\n" 54 "#include ""afxres.rc"" // Standard components\r\n"
55 "#endif\0" 55 "#endif\0"
56END 56END
57 57
58#endif // APSTUDIO_INVOKED 58#endif // APSTUDIO_INVOKED
59 59
60 60
61///////////////////////////////////////////////////////////////////////////// 61/////////////////////////////////////////////////////////////////////////////
62// 62//
63// Icon 63// Icon
64// 64//
65 65
66// Icon with lowest ID value placed first to ensure application icon 66// Icon with lowest ID value placed first to ensure application icon
67// remains consistent on all systems. 67// remains consistent on all systems.
68IDI_RRQ ICON DISCARDABLE "res\\wrq.ico" 68IDI_RRQ ICON DISCARDABLE "res\\wrq.ico"
69IDI_WRQ ICON DISCARDABLE "res\\rrq.ico" 69IDI_WRQ ICON DISCARDABLE "res\\rrq.ico"
70IDI_BROWSE ICON DISCARDABLE "shared-data/browse-icon.ico" 70IDI_BROWSE ICON DISCARDABLE "shared-data/browse-icon.ico"
71IDR_MAINFRAME ICON DISCARDABLE "res\\pumpkin.ico" 71IDR_MAINFRAME ICON DISCARDABLE "res\\pumpkin.ico"
72IDI_PLAY ICON DISCARDABLE "shared-data/play-icon.ico" 72IDI_PLAY ICON DISCARDABLE "shared-data/play-icon.ico"
73 73
74///////////////////////////////////////////////////////////////////////////// 74/////////////////////////////////////////////////////////////////////////////
75// 75//
76// Dialog 76// Dialog
77// 77//
78 78
79IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 217, 74 79IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 217, 74
80STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU 80STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
81CAPTION "About PumpKIN" 81CAPTION "About PumpKIN"
82FONT 8, "MS Sans Serif" 82FONT 8, "MS Sans Serif"
83BEGIN 83BEGIN
84 ICON IDR_MAINFRAME,IDC_STATIC,7,17,18,20 84 ICON IDR_MAINFRAME,IDC_STATIC,7,17,18,20
85 LTEXT "PumpKIN, Version 2.5.1-trunk",IDC_STATIC,40,15,119,8, 85 LTEXT "PumpKIN, Version 2.6",IDC_STATIC,40,15,119,8,
86 SS_NOPREFIX 86 SS_NOPREFIX
87 LTEXT "Copyright © 1997-2004 Klever Group",IDC_STATIC,40,30, 87 LTEXT "Copyright © 1997-2005 Klever Group",IDC_STATIC,40,30,
88 170,8 88 170,8
89 DEFPUSHBUTTON "OK",IDOK,178,7,32,14,WS_GROUP 89 DEFPUSHBUTTON "OK",IDOK,178,7,32,14,WS_GROUP
90 PUSHBUTTON "http://www.klever.net/",IDC_KLEVERNET,124,53,86,14 90 PUSHBUTTON "http://www.klever.net/",IDC_KLEVERNET,124,53,86,14
91END 91END
92 92
93IDD_PUMPKIN_DIALOG DIALOGEX 0, 0, 362, 191 93IDD_PUMPKIN_DIALOG DIALOGEX 0, 0, 362, 191
94STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | 94STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION |
95 WS_SYSMENU 95 WS_SYSMENU
96EXSTYLE WS_EX_ACCEPTFILES | WS_EX_APPWINDOW 96EXSTYLE WS_EX_ACCEPTFILES | WS_EX_APPWINDOW
97CAPTION " PumpKIN" 97CAPTION " PumpKIN"
98FONT 8, "MS Sans Serif", 0, 0, 0x1 98FONT 8, "MS Sans Serif", 0, 0, 0x1
99BEGIN 99BEGIN
100 CONTROL "List1",IDC_CONNECTIONS,"SysListView32",LVS_REPORT | 100 CONTROL "List1",IDC_CONNECTIONS,"SysListView32",LVS_REPORT |
101 LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,7,7,295,108, 101 LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,7,7,295,108,
102 WS_EX_DLGMODALFRAME 102 WS_EX_DLGMODALFRAME
103 PUSHBUTTON "&Get File",IDC_GET,305,7,50,17,BS_NOTIFY, 103 PUSHBUTTON "&Get File",IDC_GET,305,7,50,17,BS_NOTIFY,
104 WS_EX_CLIENTEDGE 104 WS_EX_CLIENTEDGE
105 PUSHBUTTON "&Put File",IDC_PUT,305,25,50,17,BS_NOTIFY, 105 PUSHBUTTON "&Put File",IDC_PUT,305,25,50,17,BS_NOTIFY,
106 WS_EX_CLIENTEDGE 106 WS_EX_CLIENTEDGE
107 PUSHBUTTON "&Abort xfer",IDC_ABORT,305,43,50,17,BS_NOTIFY, 107 PUSHBUTTON "&Abort xfer",IDC_ABORT,305,43,50,17,BS_NOTIFY,
108 WS_EX_CLIENTEDGE 108 WS_EX_CLIENTEDGE
109 PUSHBUTTON "&Options",IDC_OPTIONS,305,61,50,17,BS_NOTIFY, 109 PUSHBUTTON "&Options",IDC_OPTIONS,305,61,50,17,BS_NOTIFY,
110 WS_EX_CLIENTEDGE 110 WS_EX_CLIENTEDGE
111 PUSHBUTTON "E&xit",IDC_EXIT,305,79,50,17,BS_NOTIFY,WS_EX_CLIENTEDGE 111 PUSHBUTTON "E&xit",IDC_EXIT,305,79,50,17,BS_NOTIFY,WS_EX_CLIENTEDGE
112 PUSHBUTTON "&Help",ID_HELP,305,97,50,17,BS_NOTIFY,WS_EX_CLIENTEDGE 112 PUSHBUTTON "&Help",ID_HELP,305,97,50,17,BS_NOTIFY,WS_EX_CLIENTEDGE
113 LISTBOX IDC_LOG,7,115,348,69,LBS_USETABSTOPS | LBS_NOSEL | 113 LISTBOX IDC_LOG,7,115,348,69,LBS_USETABSTOPS | LBS_NOSEL |
114 WS_VSCROLL | WS_HSCROLL,WS_EX_DLGMODALFRAME 114 WS_VSCROLL | WS_HSCROLL,WS_EX_DLGMODALFRAME
115 PUSHBUTTON "..",IDCANCEL,0,183,6,7,NOT WS_VISIBLE | NOT WS_TABSTOP 115 PUSHBUTTON "..",IDCANCEL,0,183,6,7,NOT WS_VISIBLE | NOT WS_TABSTOP
116END 116END
117 117
118IDD_PROPS_SERVER DIALOG DISCARDABLE 0, 0, 210, 154 118IDD_PROPS_SERVER DIALOG DISCARDABLE 0, 0, 210, 154
119STYLE WS_CHILD | WS_DISABLED | WS_CAPTION 119STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
120CAPTION "Server" 120CAPTION "Server"
121FONT 8, "MS Sans Serif" 121FONT 8, "MS Sans Serif"
122BEGIN 122BEGIN
123 GROUPBOX "TFTP filesystem &root (download path)",IDC_STATIC,7,7, 123 GROUPBOX "TFTP filesystem &root (download path)",IDC_STATIC,7,7,
124 196,38 124 196,38
125 EDITTEXT IDC_TFTPROOT,13,16,170,13,ES_AUTOHSCROLL 125 EDITTEXT IDC_TFTPROOT,13,16,170,13,ES_AUTOHSCROLL
126 PUSHBUTTON "&B",IDC_BROWSE,186,16,13,13,BS_ICON 126 PUSHBUTTON "&B",IDC_BROWSE,186,16,13,13,BS_ICON
127 CONTROL "Allow access to &subdirectories",IDC_TFTPSUBDIRS, 127 CONTROL "Allow access to &subdirectories",IDC_TFTPSUBDIRS,
128 "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,31,111,10 128 "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,31,111,10
129 GROUPBOX "Read Request Behavior",IDC_STATIC,7,48,153,42 129 GROUPBOX "Read Request Behavior",IDC_STATIC,7,48,153,42
130 CONTROL "Give &all files",IDC_RRQ_GIVEALL,"Button", 130 CONTROL "Give &all files",IDC_RRQ_GIVEALL,"Button",
131 BS_AUTORADIOBUTTON | BS_NOTIFY | WS_GROUP,13,57,53,10 131 BS_AUTORADIOBUTTON | BS_NOTIFY | WS_GROUP,13,57,53,10
132 CONTROL "&Prompt before giving file",IDC_RRQ_ALWAYSCONFIRM, 132 CONTROL "&Prompt before giving file",IDC_RRQ_ALWAYSCONFIRM,
133 "Button",BS_AUTORADIOBUTTON | BS_NOTIFY,23,67,91,10 133 "Button",BS_AUTORADIOBUTTON | BS_NOTIFY,23,67,91,10
134 CONTROL "&Deny all requests",IDC_RRQ_DENYALL,"Button", 134 CONTROL "&Deny all requests",IDC_RRQ_DENYALL,"Button",
135 BS_AUTORADIOBUTTON | BS_NOTIFY,33,77,70,10 135 BS_AUTORADIOBUTTON | BS_NOTIFY,33,77,70,10
@@ -242,121 +242,121 @@ BEGIN
242 LTEXT "Remote &host:",IDC_STATIC,7,61,43,8,SS_NOTIFY 242 LTEXT "Remote &host:",IDC_STATIC,7,61,43,8,SS_NOTIFY
243 COMBOBOX IDC_TALKS,7,72,157,66,CBS_SIMPLE | CBS_AUTOHSCROLL | 243 COMBOBOX IDC_TALKS,7,72,157,66,CBS_SIMPLE | CBS_AUTOHSCROLL |
244 CBS_SORT | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | 244 CBS_SORT | CBS_NOINTEGRALHEIGHT | WS_VSCROLL |
245 WS_TABSTOP,WS_EX_CLIENTEDGE | WS_EX_STATICEDGE 245 WS_TABSTOP,WS_EX_CLIENTEDGE | WS_EX_STATICEDGE
246 PUSHBUTTON "R\nE\n&F\nR\nE\nS\nH",IDC_REFRESH,165,72,19,66, 246 PUSHBUTTON "R\nE\n&F\nR\nE\nS\nH",IDC_REFRESH,165,72,19,66,
247 BS_CENTER | BS_VCENTER | BS_MULTILINE | BS_NOTIFY, 247 BS_CENTER | BS_VCENTER | BS_MULTILINE | BS_NOTIFY,
248 WS_EX_CLIENTEDGE 248 WS_EX_CLIENTEDGE
249 LTEXT "&Type:",IDC_STATIC,58,34,19,8 249 LTEXT "&Type:",IDC_STATIC,58,34,19,8
250 COMBOBOX IDC_TYPE,80,31,43,41,CBS_DROPDOWN | CBS_AUTOHSCROLL | 250 COMBOBOX IDC_TYPE,80,31,43,41,CBS_DROPDOWN | CBS_AUTOHSCROLL |
251 CBS_LOWERCASE | WS_VSCROLL | WS_TABSTOP 251 CBS_LOWERCASE | WS_VSCROLL | WS_TABSTOP
252 LTEXT "&Block:",IDC_STATIC,127,34,21,8 252 LTEXT "&Block:",IDC_STATIC,127,34,21,8
253 COMBOBOX IDC_BSIZE,149,31,35,53,CBS_DROPDOWN | WS_VSCROLL | 253 COMBOBOX IDC_BSIZE,149,31,35,53,CBS_DROPDOWN | WS_VSCROLL |
254 WS_TABSTOP 254 WS_TABSTOP
255 DEFPUSHBUTTON "OK",IDOK,35,140,50,14 255 DEFPUSHBUTTON "OK",IDOK,35,140,50,14
256 PUSHBUTTON "Cancel",IDCANCEL,101,140,50,14 256 PUSHBUTTON "Cancel",IDCANCEL,101,140,50,14
257 CONTROL "",IDC_STATIC,"Static",SS_ETCHEDVERT,52,32,1,11 257 CONTROL "",IDC_STATIC,"Static",SS_ETCHEDVERT,52,32,1,11
258END 258END
259 259
260IDD_PROPS_SOUNDS DIALOG DISCARDABLE 0, 0, 210, 154 260IDD_PROPS_SOUNDS DIALOG DISCARDABLE 0, 0, 210, 154
261STYLE WS_CHILD | WS_DISABLED | WS_CAPTION 261STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
262CAPTION "Sounds" 262CAPTION "Sounds"
263FONT 8, "MS Sans Serif" 263FONT 8, "MS Sans Serif"
264BEGIN 264BEGIN
265 LTEXT "&Incoming request:",IDC_STATIC,7,9,57,8 265 LTEXT "&Incoming request:",IDC_STATIC,7,9,57,8
266 COMBOBOX IDC_RING,70,7,103,100,CBS_DROPDOWN | CBS_AUTOHSCROLL | 266 COMBOBOX IDC_RING,70,7,103,100,CBS_DROPDOWN | CBS_AUTOHSCROLL |
267 CBS_SORT | WS_VSCROLL | WS_TABSTOP 267 CBS_SORT | WS_VSCROLL | WS_TABSTOP
268 PUSHBUTTON "browse",IDC_RING_BROWSE,175,7,13,13,BS_ICON 268 PUSHBUTTON "browse",IDC_RING_BROWSE,175,7,13,13,BS_ICON
269 PUSHBUTTON "play",IDC_RING_PLAY,190,7,13,13,BS_ICON 269 PUSHBUTTON "play",IDC_RING_PLAY,190,7,13,13,BS_ICON
270 LTEXT "xfer &finished:",IDC_STATIC,7,25,57,8 270 LTEXT "xfer &finished:",IDC_STATIC,7,25,57,8
271 COMBOBOX IDC_FINISHED,70,22,103,100,CBS_DROPDOWN | 271 COMBOBOX IDC_FINISHED,70,22,103,100,CBS_DROPDOWN |
272 CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP 272 CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP
273 PUSHBUTTON "browse",IDC_FINISHED_BROWSE,175,22,13,13,BS_ICON 273 PUSHBUTTON "browse",IDC_FINISHED_BROWSE,175,22,13,13,BS_ICON
274 PUSHBUTTON "play",IDC_FINISHED_PLAY,190,22,13,13,BS_ICON 274 PUSHBUTTON "play",IDC_FINISHED_PLAY,190,22,13,13,BS_ICON
275 LTEXT "xfer &aborted:",IDC_STATIC,7,40,57,8 275 LTEXT "xfer &aborted:",IDC_STATIC,7,40,57,8
276 COMBOBOX IDC_ABORTED,70,37,103,100,CBS_DROPDOWN | CBS_AUTOHSCROLL | 276 COMBOBOX IDC_ABORTED,70,37,103,100,CBS_DROPDOWN | CBS_AUTOHSCROLL |
277 CBS_SORT | WS_VSCROLL | WS_TABSTOP 277 CBS_SORT | WS_VSCROLL | WS_TABSTOP
278 PUSHBUTTON "browse",IDC_ABORTED_BROWSE,175,37,13,13,BS_ICON 278 PUSHBUTTON "browse",IDC_ABORTED_BROWSE,175,37,13,13,BS_ICON
279 PUSHBUTTON "play",IDC_ABORTED_PLAY,190,37,13,13,BS_ICON 279 PUSHBUTTON "play",IDC_ABORTED_PLAY,190,37,13,13,BS_ICON
280END 280END
281 281
282 282
283#ifndef _MAC 283#ifndef _MAC
284///////////////////////////////////////////////////////////////////////////// 284/////////////////////////////////////////////////////////////////////////////
285// 285//
286// Version 286// Version
287// 287//
288 288
289VS_VERSION_INFO VERSIONINFO 289VS_VERSION_INFO VERSIONINFO
290 FILEVERSION 2,5,1,0 290 FILEVERSION 2,6,0,0
291 PRODUCTVERSION 2,5,1,0 291 PRODUCTVERSION 2,6,0,0
292 FILEFLAGSMASK 0x3fL 292 FILEFLAGSMASK 0x3fL
293#ifdef _DEBUG 293#ifdef _DEBUG
294 FILEFLAGS 0x1L 294 FILEFLAGS 0x1L
295#else 295#else
296 FILEFLAGS 0x0L 296 FILEFLAGS 0x0L
297#endif 297#endif
298 FILEOS 0x4L 298 FILEOS 0x4L
299 FILETYPE 0x1L 299 FILETYPE 0x1L
300 FILESUBTYPE 0x0L 300 FILESUBTYPE 0x0L
301BEGIN 301BEGIN
302 BLOCK "StringFileInfo" 302 BLOCK "StringFileInfo"
303 BEGIN 303 BEGIN
304 BLOCK "040904b0" 304 BLOCK "040904b0"
305 BEGIN 305 BEGIN
306 VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0" 306 VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0"
307 VALUE "FileDescription", "PumpKIN, tftp client/daemon\0" 307 VALUE "FileDescription", "PumpKIN, tftp client/daemon\0"
308 VALUE "FileVersion", "2, 5, 1, 0\0" 308 VALUE "FileVersion", "2, 6, 0, 0\0"
309 VALUE "InternalName", "PUMPKIN\0" 309 VALUE "InternalName", "PUMPKIN\0"
310 VALUE "LegalCopyright", "Copyright © 1997-2004 Klever Group (http://www.klever.net)\0" 310 VALUE "LegalCopyright", "Copyright © 1997-2005 Klever Group (http://www.klever.net)\0"
311 VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0" 311 VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0"
312 VALUE "OriginalFilename", "PUMPKIN.EXE\0" 312 VALUE "OriginalFilename", "PUMPKIN.EXE\0"
313 VALUE "ProductName", "PumpKIN\0" 313 VALUE "ProductName", "PumpKIN\0"
314 VALUE "ProductVersion", "2, 5, 1, 0\0" 314 VALUE "ProductVersion", "2, 6, 0, 0\0"
315 END 315 END
316 END 316 END
317 BLOCK "VarFileInfo" 317 BLOCK "VarFileInfo"
318 BEGIN 318 BEGIN
319 VALUE "Translation", 0x409, 1200 319 VALUE "Translation", 0x409, 1200
320 END 320 END
321END 321END
322 322
323#endif // !_MAC 323#endif // !_MAC
324 324
325 325
326///////////////////////////////////////////////////////////////////////////// 326/////////////////////////////////////////////////////////////////////////////
327// 327//
328// DESIGNINFO 328// DESIGNINFO
329// 329//
330 330
331#ifdef APSTUDIO_INVOKED 331#ifdef APSTUDIO_INVOKED
332GUIDELINES DESIGNINFO DISCARDABLE 332GUIDELINES DESIGNINFO DISCARDABLE
333BEGIN 333BEGIN
334 IDD_ABOUTBOX, DIALOG 334 IDD_ABOUTBOX, DIALOG
335 BEGIN 335 BEGIN
336 LEFTMARGIN, 7 336 LEFTMARGIN, 7
337 RIGHTMARGIN, 210 337 RIGHTMARGIN, 210
338 TOPMARGIN, 7 338 TOPMARGIN, 7
339 BOTTOMMARGIN, 67 339 BOTTOMMARGIN, 67
340 END 340 END
341 341
342 IDD_PUMPKIN_DIALOG, DIALOG 342 IDD_PUMPKIN_DIALOG, DIALOG
343 BEGIN 343 BEGIN
344 LEFTMARGIN, 7 344 LEFTMARGIN, 7
345 RIGHTMARGIN, 355 345 RIGHTMARGIN, 355
346 TOPMARGIN, 7 346 TOPMARGIN, 7
347 BOTTOMMARGIN, 184 347 BOTTOMMARGIN, 184
348 HORZGUIDE, 115 348 HORZGUIDE, 115
349 END 349 END
350 350
351 IDD_PROPS_SERVER, DIALOG 351 IDD_PROPS_SERVER, DIALOG
352 BEGIN 352 BEGIN
353 LEFTMARGIN, 7 353 LEFTMARGIN, 7
354 RIGHTMARGIN, 203 354 RIGHTMARGIN, 203
355 TOPMARGIN, 7 355 TOPMARGIN, 7
356 BOTTOMMARGIN, 147 356 BOTTOMMARGIN, 147
357 END 357 END
358 358
359 IDD_PROPS_NETWORK, DIALOG 359 IDD_PROPS_NETWORK, DIALOG
360 BEGIN 360 BEGIN
361 LEFTMARGIN, 7 361 LEFTMARGIN, 7
362 RIGHTMARGIN, 203 362 RIGHTMARGIN, 203