summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2006-07-02 22:16:25 (UTC)
committer Michael Krelin <hacker@klever.net>2006-07-02 22:16:25 (UTC)
commit577427e68ef10a4d2b75d28e42b22952ae3bcf23 (patch) (unidiff)
tree24c8fc94ea6524059cab7927ef76639bb1a1a98d
parent24e693797daef020ece3fa19bb5acce000e37165 (diff)
downloadpumpkin-577427e68ef10a4d2b75d28e42b22952ae3bcf23.zip
pumpkin-577427e68ef10a4d2b75d28e42b22952ae3bcf23.tar.gz
pumpkin-577427e68ef10a4d2b75d28e42b22952ae3bcf23.tar.bz2
Do not close RRQ socket until the last ACK is received.
git-svn-id: http://svn.klever.net/kin/pumpkin/trunk@152 fe716a7a-6dde-0310-88d9-d003556173a8
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--PumpKINDlg.cpp70
-rw-r--r--PumpKINDlg.h3
-rw-r--r--pumpkin.mak238
3 files changed, 107 insertions, 204 deletions
diff --git a/PumpKINDlg.cpp b/PumpKINDlg.cpp
index 070f3e8..2a01918 100644
--- a/PumpKINDlg.cpp
+++ b/PumpKINDlg.cpp
@@ -570,28 +570,28 @@ void CXferSocket::OnSend(int nErrorCode)
570 } 570 }
571} 571}
572 572
573BOOL tftp::Send(CAsyncSocket *socket,SOCKADDR_IN* saddr) 573BOOL tftp::Send(CAsyncSocket *socket,SOCKADDR_IN* saddr)
574{ 574{
575 ASSERT(socket); 575 ASSERT(socket);
576int rv = socket->SendTo(udpBase(),length,(SOCKADDR*)saddr,sizeof(SOCKADDR_IN)); 576int rv = socket->SendTo(udpBase(),length,(SOCKADDR*)saddr,sizeof(SOCKADDR_IN));
577 if(rv!=length) 577 if(rv!=length)
578 return FALSE; 578 return FALSE;
579 return TRUE; 579 return TRUE;
580} 580}
581 581
582void CXferSocket::DoSelect() 582void CXferSocket::DoSelect(BOOL do_select)
583{ 583{
584 if(m_Peer.sin_addr.s_addr!=INADDR_NONE) 584 if(m_Peer.sin_addr.s_addr!=INADDR_NONE)
585 AsyncSelect(FD_CLOSE|FD_READ|(m_Queue.IsEmpty()?0:FD_WRITE)); 585 AsyncSelect(FD_CLOSE|FD_READ|((m_Queue.IsEmpty()&&!do_select)?0:FD_WRITE));
586} 586}
587 587
588void CXferSocket::OnReceive(int nErrorCode) 588void CXferSocket::OnReceive(int nErrorCode)
589{ 589{
590 if(nErrorCode){ 590 if(nErrorCode){
591 ASSERT(m_Daddy); 591 ASSERT(m_Daddy);
592 m_Daddy->LogLine(IDS_LOG_XFERRECEIVE); 592 m_Daddy->LogLine(IDS_LOG_XFERRECEIVE);
593 return; 593 return;
594 } 594 }
595 ASSERT(m_Daddy); 595 ASSERT(m_Daddy);
596DWORD fionread = 0; 596DWORD fionread = 0;
597 VERIFY(IOCtl(FIONREAD,&fionread)); 597 VERIFY(IOCtl(FIONREAD,&fionread));
@@ -845,29 +845,25 @@ void CRRQSocket::DoXfer()
845{ 845{
846tftp *p = tftp::Allocate(tftp::tftpDATA::tftpSize(m_blkSize)); 846tftp *p = tftp::Allocate(tftp::tftpDATA::tftpSize(m_blkSize));
847 ASSERT(p); 847 ASSERT(p);
848 p->SetOpcode(tftp::opDATA); 848 p->SetOpcode(tftp::opDATA);
849 TRY{ 849 TRY{
850 m_File.Seek(m_ACK*m_blkSize,CFile::begin); 850 m_File.Seek(m_ACK*m_blkSize,CFile::begin);
851 int bytes = m_File.Read(p->data.m_DATA.data,m_blkSize); 851 int bytes = m_File.Read(p->data.m_DATA.data,m_blkSize);
852 p->data.m_DATA.SetBlock(m_ACK+1); 852 p->data.m_DATA.SetBlock(m_ACK+1);
853 p->length=p->length-m_blkSize+bytes; 853 p->length=p->length-m_blkSize+bytes;
854 m_LastSlack = m_blkSize-bytes; 854 m_LastSlack = m_blkSize-bytes;
855 PostTFTP(p); 855 PostTFTP(p);
856 if(bytes<m_blkSize){ 856 if(bytes<m_blkSize){
857 state=stateFinish; 857 state=stateClosing; m_ACKtoClose = m_ACK+1;
858 ASSERT(m_Daddy);
859 CString tmp;
860 tmp.Format(IDS_LOG_XFERRRQFINISHED,(LPCTSTR)m_FileName);
861 m_Daddy->LogLine(tmp);
862 } 858 }
863 }CATCH(CFileException,e){ 859 }CATCH(CFileException,e){
864 Deny(e); 860 Deny(e);
865 }END_CATCH 861 }END_CATCH
866} 862}
867 863
868UINT tftp::tftpDATA::tftpSize(UINT blkSize) 864UINT tftp::tftpDATA::tftpSize(UINT blkSize)
869{ 865{
870 return tftpHdrSize-tftpSlackSize+sizeof(tftp::tftpDATA) 866 return tftpHdrSize-tftpSlackSize+sizeof(tftp::tftpDATA)
871 -sizeof(BYTE)+blkSize; 867 -sizeof(BYTE)+blkSize;
872} 868}
873 869
@@ -927,57 +923,65 @@ UINT eMsgID;
927} 923}
928 924
929ULONG CRRQSocket::GetACK(void) 925ULONG CRRQSocket::GetACK(void)
930{ 926{
931 return (m_ACK*m_blkSize)-m_LastSlack; 927 return (m_ACK*m_blkSize)-m_LastSlack;
932} 928}
933 929
934BOOL CRRQSocket::OnTFTP(tftp* p) 930BOOL CRRQSocket::OnTFTP(tftp* p)
935{ 931{
936BOOL rv = TRUE; 932BOOL rv = TRUE;
937 switch(p->Opcode()){ 933 switch(p->Opcode()){
938 case tftp::opOACK: 934 case tftp::opOACK:
939 m_ACK=0; 935 {
940 ASSERT(state!=stateFinish); 936 m_ACK=0;
941 { 937 ASSERT(state!=stateFinish);
942 tftp::tftpOptions o; 938 tftp::tftpOptions o;
943 if(p->GetOptions(&o)){ 939 if(p->GetOptions(&o)){
944 CString v; 940 CString v;
945 if(o.Lookup(tftpoBSize,v)){ 941 if(o.Lookup(tftpoBSize,v)){
946 m_blkSize=atoi(v); 942 m_blkSize=atoi(v);
947 if(!m_blkSize){// *** More sanity checks 943 if(!m_blkSize){// *** More sanity checks
948 Deny(tftp::errOption,IDS_TFTP_ERROR_BSIZE); 944 Deny(tftp::errOption,IDS_TFTP_ERROR_BSIZE);
949 rv = TRUE; 945 rv = TRUE;
950 break; 946 break;
947 }
951 } 948 }
952 } 949 if(o.Lookup(tftpoTOut,v)){
953 if(o.Lookup(tftpoTOut,v)){ 950 m_timeOut=atoi(v);
954 m_timeOut=atoi(v); 951 if(!m_timeOut){// *** More sanity checks
955 if(!m_timeOut){// *** More sanity checks 952 Deny(tftp::errOption,IDS_TFTP_ERROR_TOUT);
956 Deny(tftp::errOption,IDS_TFTP_ERROR_TOUT); 953 rv = TRUE;
957 rv = TRUE; 954 break;
958 break; 955 }
956 }
957 if(o.Lookup(tftpoXResume,v)){
958 m_ACK=atoi(v);
959 } 959 }
960 } 960 }
961 if(o.Lookup(tftpoXResume,v)){ 961 UpdateList();
962 m_ACK=atoi(v); 962 DoXfer();
963 }
964 } 963 }
965 UpdateList();
966 DoXfer();
967 }
968 break; 964 break;
969 case tftp::opACK: 965 case tftp::opACK:
970 m_ACK=p->data.m_ACK.Block(); 966 m_ACK=p->data.m_ACK.Block();
971 if(state!=stateFinish){ 967 if(state==stateClosing && m_ACK==m_ACKtoClose) {
968 state = stateFinish;
969 ASSERT(m_Daddy);
970 CString tmp;
971 tmp.Format(IDS_LOG_XFERRRQFINISHED,(LPCTSTR)m_FileName);
972 m_Daddy->LogLine(tmp);
973 rv = FALSE;
974 DoSelect(TRUE);
975 }else if(state!=stateFinish){
972 UpdateList(); 976 UpdateList();
973 DoXfer(); 977 DoXfer();
974 } 978 }
975 break; 979 break;
976 case tftp::opERROR: 980 case tftp::opERROR:
977 { 981 {
978 ASSERT(m_Daddy); 982 ASSERT(m_Daddy);
979 CString tmp; 983 CString tmp;
980 tmp.Format(IDS_LOG_GOTTFTPERROR,p->data.m_ERROR.Code(),(LPCTSTR)p->errMessage()); 984 tmp.Format(IDS_LOG_GOTTFTPERROR,p->data.m_ERROR.Code(),(LPCTSTR)p->errMessage());
981 m_Daddy->LogLine(tmp); 985 m_Daddy->LogLine(tmp);
982 } 986 }
983 Destroy(FALSE); 987 Destroy(FALSE);
diff --git a/PumpKINDlg.h b/PumpKINDlg.h
index c5469f1..23c2657 100644
--- a/PumpKINDlg.h
+++ b/PumpKINDlg.h
@@ -303,25 +303,25 @@ public:
303 void PostError(UINT errCode,UINT errID); 303 void PostError(UINT errCode,UINT errID);
304 void PostTFTP(tftp* p,BOOL retryable=FALSE); 304 void PostTFTP(tftp* p,BOOL retryable=FALSE);
305 CXferSocket(CPumpKINDlg *daddy,LPCTSTR fileName,LPCTSTR type,SOCKADDR_IN* sin); 305 CXferSocket(CPumpKINDlg *daddy,LPCTSTR fileName,LPCTSTR type,SOCKADDR_IN* sin);
306 CFile m_File; 306 CFile m_File;
307 virtual ULONG GetACK(); 307 virtual ULONG GetACK();
308 CString m_Type; 308 CString m_Type;
309 CString m_FileName; 309 CString m_FileName;
310 CXferSocket(); 310 CXferSocket();
311 void UpdateList(); 311 void UpdateList();
312 void SetPeer(SOCKADDR_IN *sin); 312 void SetPeer(SOCKADDR_IN *sin);
313 virtual BOOL OnTFTP(tftp* p) = 0; 313 virtual BOOL OnTFTP(tftp* p) = 0;
314 virtual void OnReceive(int nErrorCode); 314 virtual void OnReceive(int nErrorCode);
315 void DoSelect(); 315 void DoSelect(BOOL do_select=FALSE);
316 SOCKADDR_IN m_Peer; 316 SOCKADDR_IN m_Peer;
317 virtual void OnSend(int nErrorCode); 317 virtual void OnSend(int nErrorCode);
318 CPumpKINDlg* m_Daddy; 318 CPumpKINDlg* m_Daddy;
319 CTFTPList m_Queue; 319 CTFTPList m_Queue;
320 320
321 DECLARE_DYNAMIC(CXferSocket) 321 DECLARE_DYNAMIC(CXferSocket)
322}; 322};
323class CWRQSocket : public CXferSocket { 323class CWRQSocket : public CXferSocket {
324public: 324public:
325 BOOL m_bResume; 325 BOOL m_bResume;
326 void OnHostKnown(); 326 void OnHostKnown();
327 virtual void OnResolved(); 327 virtual void OnResolved();
@@ -332,24 +332,25 @@ public:
332 BOOL SaveAs(CString& fn); 332 BOOL SaveAs(CString& fn);
333 BOOL RenameFile(CString& fn); 333 BOOL RenameFile(CString& fn);
334 BOOL m_Rename; 334 BOOL m_Rename;
335 BOOL ConfirmRequest(); 335 BOOL ConfirmRequest();
336 BOOL Create(LPCTSTR localFile=NULL,LPCTSTR hostName=NULL); 336 BOOL Create(LPCTSTR localFile=NULL,LPCTSTR hostName=NULL);
337 CWRQSocket(CPumpKINDlg* daddy,LPCTSTR fileName,LPCTSTR type,SOCKADDR_IN *sin); 337 CWRQSocket(CPumpKINDlg* daddy,LPCTSTR fileName,LPCTSTR type,SOCKADDR_IN *sin);
338 BOOL OnTFTP(tftp* p); 338 BOOL OnTFTP(tftp* p);
339 339
340 DECLARE_DYNAMIC(CWRQSocket) 340 DECLARE_DYNAMIC(CWRQSocket)
341}; 341};
342class CRRQSocket : public CXferSocket { 342class CRRQSocket : public CXferSocket {
343public: 343public:
344 UINT m_ACKtoClose;
344 void OnHostKnown(); 345 void OnHostKnown();
345 virtual void OnResolved(); 346 virtual void OnResolved();
346 BOOL ConfirmRequest(); 347 BOOL ConfirmRequest();
347 WORD m_LastSlack; 348 WORD m_LastSlack;
348 UINT m_ACK; 349 UINT m_ACK;
349 BOOL OnTFTP(tftp* p); 350 BOOL OnTFTP(tftp* p);
350 ULONG GetACK(void); 351 ULONG GetACK(void);
351 void DoXfer(); 352 void DoXfer();
352 CRRQSocket(CPumpKINDlg *daddy,LPCTSTR fileName,LPCTSTR type,SOCKADDR_IN *sin); 353 CRRQSocket(CPumpKINDlg *daddy,LPCTSTR fileName,LPCTSTR type,SOCKADDR_IN *sin);
353 BOOL Create(LPCTSTR localFile=NULL,LPCTSTR hostName=NULL); 354 BOOL Create(LPCTSTR localFile=NULL,LPCTSTR hostName=NULL);
354 355
355 DECLARE_DYNAMIC(CRRQSocket) 356 DECLARE_DYNAMIC(CRRQSocket)
diff --git a/pumpkin.mak b/pumpkin.mak
index a22a6fa..bf9e895 100644
--- a/pumpkin.mak
+++ b/pumpkin.mak
@@ -677,115 +677,139 @@ LINK32_OBJS= \
677!IF "$(CFG)" == "PumpKIN - Win32 Release" 677!IF "$(CFG)" == "PumpKIN - Win32 Release"
678 678
679!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" 679!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug"
680 680
681!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" 681!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static"
682 682
683!ENDIF 683!ENDIF
684 684
685################################################################################ 685################################################################################
686# Begin Source File 686# Begin Source File
687 687
688SOURCE=.\PumpKIN.cpp 688SOURCE=.\PumpKIN.cpp
689
690!IF "$(CFG)" == "PumpKIN - Win32 Release"
691
692DEP_CPP_PUMPK=\ 689DEP_CPP_PUMPK=\
693 ".\pumpkin.h"\ 690 ".\pumpkin.h"\
694 ".\PumpKINDlg.h"\ 691 ".\PumpKINDlg.h"\
695 ".\shared-code\BellsNWhistles.h"\ 692 ".\shared-code\BellsNWhistles.h"\
696 ".\shared-code\kHelpers.h"\ 693 ".\shared-code\kHelpers.h"\
697 ".\stdafx.h"\ 694 ".\stdafx.h"\
698 695
699 696
697!IF "$(CFG)" == "PumpKIN - Win32 Release"
698
699
700"$(INTDIR)\PumpKIN.obj" : $(SOURCE) $(DEP_CPP_PUMPK) "$(INTDIR)"\ 700"$(INTDIR)\PumpKIN.obj" : $(SOURCE) $(DEP_CPP_PUMPK) "$(INTDIR)"\
701 "$(INTDIR)\pumpkin.pch" 701 "$(INTDIR)\pumpkin.pch"
702 702
703 703
704!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" 704!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug"
705 705
706DEP_CPP_PUMPK=\
707 ".\pumpkin.h"\
708 ".\PumpKINDlg.h"\
709 ".\shared-code\BellsNWhistles.h"\
710 ".\shared-code\kHelpers.h"\
711 ".\stdafx.h"\
712
713 706
714"$(INTDIR)\PumpKIN.obj" : $(SOURCE) $(DEP_CPP_PUMPK) "$(INTDIR)"\ 707"$(INTDIR)\PumpKIN.obj" : $(SOURCE) $(DEP_CPP_PUMPK) "$(INTDIR)"\
715 "$(INTDIR)\pumpkin.pch" 708 "$(INTDIR)\pumpkin.pch"
716 709
717"$(INTDIR)\PumpKIN.sbr" : $(SOURCE) $(DEP_CPP_PUMPK) "$(INTDIR)"\ 710"$(INTDIR)\PumpKIN.sbr" : $(SOURCE) $(DEP_CPP_PUMPK) "$(INTDIR)"\
718 "$(INTDIR)\pumpkin.pch" 711 "$(INTDIR)\pumpkin.pch"
719 712
720 713
721!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" 714!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static"
722 715
723DEP_CPP_PUMPK=\
724 ".\pumpkin.h"\
725 ".\PumpKINDlg.h"\
726 ".\shared-code\BellsNWhistles.h"\
727 ".\shared-code\kHelpers.h"\
728 ".\stdafx.h"\
729
730 716
731"$(INTDIR)\PumpKIN.obj" : $(SOURCE) $(DEP_CPP_PUMPK) "$(INTDIR)"\ 717"$(INTDIR)\PumpKIN.obj" : $(SOURCE) $(DEP_CPP_PUMPK) "$(INTDIR)"\
732 "$(INTDIR)\pumpkin.pch" 718 "$(INTDIR)\pumpkin.pch"
733 719
734 720
735!ENDIF 721!ENDIF
736 722
737# End Source File 723# End Source File
738################################################################################ 724################################################################################
739# Begin Source File 725# Begin Source File
740 726
741SOURCE=.\PumpKINDlg.cpp 727SOURCE=.\PumpKINDlg.cpp
728
729!IF "$(CFG)" == "PumpKIN - Win32 Release"
730
742DEP_CPP_PUMPKI=\ 731DEP_CPP_PUMPKI=\
743 ".\ACLTargetCombo.h"\ 732 ".\ACLTargetCombo.h"\
744 ".\ConfirmRRQDlg.h"\ 733 ".\ConfirmRRQDlg.h"\
745 ".\ConfirmWRQDlg.h"\ 734 ".\ConfirmWRQDlg.h"\
746 ".\PropsACL.h"\ 735 ".\PropsACL.h"\
747 ".\PropsNetwork.h"\ 736 ".\PropsNetwork.h"\
748 ".\PropsServer.h"\ 737 ".\PropsServer.h"\
749 ".\PropsSounds.h"\ 738 ".\PropsSounds.h"\
750 ".\pumpkin.h"\ 739 ".\pumpkin.h"\
751 ".\PumpKINDlg.h"\ 740 ".\PumpKINDlg.h"\
752 ".\RequestDlg.h"\ 741 ".\RequestDlg.h"\
753 ".\Resolver.h"\ 742 ".\Resolver.h"\
754 ".\Retrier.h"\ 743 ".\Retrier.h"\
755 ".\shared-code\BellsNWhistles.h"\ 744 ".\shared-code\BellsNWhistles.h"\
756 ".\shared-code\kHelpers.h"\ 745 ".\shared-code\kHelpers.h"\
757 ".\stdafx.h"\ 746 ".\stdafx.h"\
758 ".\Trayer.h"\ 747 ".\Trayer.h"\
759 748
760 749
761!IF "$(CFG)" == "PumpKIN - Win32 Release"
762
763
764"$(INTDIR)\PumpKINDlg.obj" : $(SOURCE) $(DEP_CPP_PUMPKI) "$(INTDIR)"\ 750"$(INTDIR)\PumpKINDlg.obj" : $(SOURCE) $(DEP_CPP_PUMPKI) "$(INTDIR)"\
765 "$(INTDIR)\pumpkin.pch" 751 "$(INTDIR)\pumpkin.pch"
766 752
767 753
768!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" 754!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug"
769 755
756DEP_CPP_PUMPKI=\
757 ".\ACLTargetCombo.h"\
758 ".\ConfirmRRQDlg.h"\
759 ".\ConfirmWRQDlg.h"\
760 ".\PropsACL.h"\
761 ".\PropsNetwork.h"\
762 ".\PropsServer.h"\
763 ".\PropsSounds.h"\
764 ".\pumpkin.h"\
765 ".\PumpKINDlg.h"\
766 ".\RequestDlg.h"\
767 ".\Resolver.h"\
768 ".\Retrier.h"\
769 ".\shared-code\kHelpers.h"\
770 ".\stdafx.h"\
771 ".\Trayer.h"\
772
773NODEP_CPP_PUMPKI=\
774 ".\DoSelect"\
775
770 776
771"$(INTDIR)\PumpKINDlg.obj" : $(SOURCE) $(DEP_CPP_PUMPKI) "$(INTDIR)"\ 777"$(INTDIR)\PumpKINDlg.obj" : $(SOURCE) $(DEP_CPP_PUMPKI) "$(INTDIR)"\
772 "$(INTDIR)\pumpkin.pch" 778 "$(INTDIR)\pumpkin.pch"
773 779
774"$(INTDIR)\PumpKINDlg.sbr" : $(SOURCE) $(DEP_CPP_PUMPKI) "$(INTDIR)"\ 780"$(INTDIR)\PumpKINDlg.sbr" : $(SOURCE) $(DEP_CPP_PUMPKI) "$(INTDIR)"\
775 "$(INTDIR)\pumpkin.pch" 781 "$(INTDIR)\pumpkin.pch"
776 782
777 783
778!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" 784!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static"
779 785
786DEP_CPP_PUMPKI=\
787 ".\ACLTargetCombo.h"\
788 ".\ConfirmRRQDlg.h"\
789 ".\ConfirmWRQDlg.h"\
790 ".\PropsACL.h"\
791 ".\PropsNetwork.h"\
792 ".\PropsServer.h"\
793 ".\PropsSounds.h"\
794 ".\pumpkin.h"\
795 ".\PumpKINDlg.h"\
796 ".\RequestDlg.h"\
797 ".\Resolver.h"\
798 ".\Retrier.h"\
799 ".\shared-code\BellsNWhistles.h"\
800 ".\shared-code\kHelpers.h"\
801 ".\stdafx.h"\
802 ".\Trayer.h"\
803
780 804
781"$(INTDIR)\PumpKINDlg.obj" : $(SOURCE) $(DEP_CPP_PUMPKI) "$(INTDIR)"\ 805"$(INTDIR)\PumpKINDlg.obj" : $(SOURCE) $(DEP_CPP_PUMPKI) "$(INTDIR)"\
782 "$(INTDIR)\pumpkin.pch" 806 "$(INTDIR)\pumpkin.pch"
783 807
784 808
785!ENDIF 809!ENDIF
786 810
787# End Source File 811# End Source File
788################################################################################ 812################################################################################
789# Begin Source File 813# Begin Source File
790 814
791SOURCE=.\StdAfx.cpp 815SOURCE=.\StdAfx.cpp
@@ -977,65 +1001,51 @@ BuildCmds= \
977 1001
978"$(OutDir)\$(TargetName).cn_" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" 1002"$(OutDir)\$(TargetName).cn_" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
979 $(BuildCmds) 1003 $(BuildCmds)
980# End Custom Build 1004# End Custom Build
981 1005
982!ENDIF 1006!ENDIF
983 1007
984# End Source File 1008# End Source File
985################################################################################ 1009################################################################################
986# Begin Source File 1010# Begin Source File
987 1011
988SOURCE=.\PropsServer.cpp 1012SOURCE=.\PropsServer.cpp
989
990!IF "$(CFG)" == "PumpKIN - Win32 Release"
991
992DEP_CPP_PROPS=\ 1013DEP_CPP_PROPS=\
993 ".\PropsServer.h"\ 1014 ".\PropsServer.h"\
994 ".\pumpkin.h"\ 1015 ".\pumpkin.h"\
995 ".\shared-code\BellsNWhistles.h"\ 1016 ".\shared-code\BellsNWhistles.h"\
996 ".\shared-code\kHelpers.h"\ 1017 ".\shared-code\kHelpers.h"\
997 ".\stdafx.h"\ 1018 ".\stdafx.h"\
998 1019
999 1020
1021!IF "$(CFG)" == "PumpKIN - Win32 Release"
1022
1023
1000"$(INTDIR)\PropsServer.obj" : $(SOURCE) $(DEP_CPP_PROPS) "$(INTDIR)"\ 1024"$(INTDIR)\PropsServer.obj" : $(SOURCE) $(DEP_CPP_PROPS) "$(INTDIR)"\
1001 "$(INTDIR)\pumpkin.pch" 1025 "$(INTDIR)\pumpkin.pch"
1002 1026
1003 1027
1004!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" 1028!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug"
1005 1029
1006DEP_CPP_PROPS=\
1007 ".\PropsServer.h"\
1008 ".\pumpkin.h"\
1009 ".\shared-code\BellsNWhistles.h"\
1010 ".\shared-code\kHelpers.h"\
1011 ".\stdafx.h"\
1012
1013 1030
1014"$(INTDIR)\PropsServer.obj" : $(SOURCE) $(DEP_CPP_PROPS) "$(INTDIR)"\ 1031"$(INTDIR)\PropsServer.obj" : $(SOURCE) $(DEP_CPP_PROPS) "$(INTDIR)"\
1015 "$(INTDIR)\pumpkin.pch" 1032 "$(INTDIR)\pumpkin.pch"
1016 1033
1017"$(INTDIR)\PropsServer.sbr" : $(SOURCE) $(DEP_CPP_PROPS) "$(INTDIR)"\ 1034"$(INTDIR)\PropsServer.sbr" : $(SOURCE) $(DEP_CPP_PROPS) "$(INTDIR)"\
1018 "$(INTDIR)\pumpkin.pch" 1035 "$(INTDIR)\pumpkin.pch"
1019 1036
1020 1037
1021!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" 1038!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static"
1022 1039
1023DEP_CPP_PROPS=\
1024 ".\PropsServer.h"\
1025 ".\pumpkin.h"\
1026 ".\shared-code\BellsNWhistles.h"\
1027 ".\shared-code\kHelpers.h"\
1028 ".\stdafx.h"\
1029
1030 1040
1031"$(INTDIR)\PropsServer.obj" : $(SOURCE) $(DEP_CPP_PROPS) "$(INTDIR)"\ 1041"$(INTDIR)\PropsServer.obj" : $(SOURCE) $(DEP_CPP_PROPS) "$(INTDIR)"\
1032 "$(INTDIR)\pumpkin.pch" 1042 "$(INTDIR)\pumpkin.pch"
1033 1043
1034 1044
1035!ENDIF 1045!ENDIF
1036 1046
1037# End Source File 1047# End Source File
1038################################################################################ 1048################################################################################
1039# Begin Source File 1049# Begin Source File
1040 1050
1041SOURCE=.\PropsNetwork.cpp 1051SOURCE=.\PropsNetwork.cpp
@@ -1069,124 +1079,92 @@ DEP_CPP_PROPSN=\
1069 1079
1070"$(INTDIR)\PropsNetwork.obj" : $(SOURCE) $(DEP_CPP_PROPSN) "$(INTDIR)"\ 1080"$(INTDIR)\PropsNetwork.obj" : $(SOURCE) $(DEP_CPP_PROPSN) "$(INTDIR)"\
1071 "$(INTDIR)\pumpkin.pch" 1081 "$(INTDIR)\pumpkin.pch"
1072 1082
1073 1083
1074!ENDIF 1084!ENDIF
1075 1085
1076# End Source File 1086# End Source File
1077################################################################################ 1087################################################################################
1078# Begin Source File 1088# Begin Source File
1079 1089
1080SOURCE=.\ConfirmRRQDlg.cpp 1090SOURCE=.\ConfirmRRQDlg.cpp
1081
1082!IF "$(CFG)" == "PumpKIN - Win32 Release"
1083
1084DEP_CPP_CONFI=\ 1091DEP_CPP_CONFI=\
1085 ".\ConfirmRRQDlg.h"\ 1092 ".\ConfirmRRQDlg.h"\
1086 ".\pumpkin.h"\ 1093 ".\pumpkin.h"\
1087 ".\PumpKINDlg.h"\ 1094 ".\PumpKINDlg.h"\
1088 ".\shared-code\BellsNWhistles.h"\ 1095 ".\shared-code\BellsNWhistles.h"\
1089 ".\shared-code\kHelpers.h"\ 1096 ".\shared-code\kHelpers.h"\
1090 ".\stdafx.h"\ 1097 ".\stdafx.h"\
1091 1098
1092 1099
1100!IF "$(CFG)" == "PumpKIN - Win32 Release"
1101
1102
1093"$(INTDIR)\ConfirmRRQDlg.obj" : $(SOURCE) $(DEP_CPP_CONFI) "$(INTDIR)"\ 1103"$(INTDIR)\ConfirmRRQDlg.obj" : $(SOURCE) $(DEP_CPP_CONFI) "$(INTDIR)"\
1094 "$(INTDIR)\pumpkin.pch" 1104 "$(INTDIR)\pumpkin.pch"
1095 1105
1096 1106
1097!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" 1107!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug"
1098 1108
1099DEP_CPP_CONFI=\
1100 ".\ConfirmRRQDlg.h"\
1101 ".\pumpkin.h"\
1102 ".\PumpKINDlg.h"\
1103 ".\shared-code\BellsNWhistles.h"\
1104 ".\shared-code\kHelpers.h"\
1105 ".\stdafx.h"\
1106
1107 1109
1108"$(INTDIR)\ConfirmRRQDlg.obj" : $(SOURCE) $(DEP_CPP_CONFI) "$(INTDIR)"\ 1110"$(INTDIR)\ConfirmRRQDlg.obj" : $(SOURCE) $(DEP_CPP_CONFI) "$(INTDIR)"\
1109 "$(INTDIR)\pumpkin.pch" 1111 "$(INTDIR)\pumpkin.pch"
1110 1112
1111"$(INTDIR)\ConfirmRRQDlg.sbr" : $(SOURCE) $(DEP_CPP_CONFI) "$(INTDIR)"\ 1113"$(INTDIR)\ConfirmRRQDlg.sbr" : $(SOURCE) $(DEP_CPP_CONFI) "$(INTDIR)"\
1112 "$(INTDIR)\pumpkin.pch" 1114 "$(INTDIR)\pumpkin.pch"
1113 1115
1114 1116
1115!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" 1117!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static"
1116 1118
1117DEP_CPP_CONFI=\
1118 ".\ConfirmRRQDlg.h"\
1119 ".\pumpkin.h"\
1120 ".\PumpKINDlg.h"\
1121 ".\shared-code\BellsNWhistles.h"\
1122 ".\shared-code\kHelpers.h"\
1123 ".\stdafx.h"\
1124
1125 1119
1126"$(INTDIR)\ConfirmRRQDlg.obj" : $(SOURCE) $(DEP_CPP_CONFI) "$(INTDIR)"\ 1120"$(INTDIR)\ConfirmRRQDlg.obj" : $(SOURCE) $(DEP_CPP_CONFI) "$(INTDIR)"\
1127 "$(INTDIR)\pumpkin.pch" 1121 "$(INTDIR)\pumpkin.pch"
1128 1122
1129 1123
1130!ENDIF 1124!ENDIF
1131 1125
1132# End Source File 1126# End Source File
1133################################################################################ 1127################################################################################
1134# Begin Source File 1128# Begin Source File
1135 1129
1136SOURCE=.\ConfirmWRQDlg.cpp 1130SOURCE=.\ConfirmWRQDlg.cpp
1137
1138!IF "$(CFG)" == "PumpKIN - Win32 Release"
1139
1140DEP_CPP_CONFIR=\ 1131DEP_CPP_CONFIR=\
1141 ".\ConfirmWRQDlg.h"\ 1132 ".\ConfirmWRQDlg.h"\
1142 ".\pumpkin.h"\ 1133 ".\pumpkin.h"\
1143 ".\PumpKINDlg.h"\ 1134 ".\PumpKINDlg.h"\
1144 ".\shared-code\BellsNWhistles.h"\ 1135 ".\shared-code\BellsNWhistles.h"\
1145 ".\shared-code\kHelpers.h"\ 1136 ".\shared-code\kHelpers.h"\
1146 ".\stdafx.h"\ 1137 ".\stdafx.h"\
1147 1138
1148 1139
1140!IF "$(CFG)" == "PumpKIN - Win32 Release"
1141
1142
1149"$(INTDIR)\ConfirmWRQDlg.obj" : $(SOURCE) $(DEP_CPP_CONFIR) "$(INTDIR)"\ 1143"$(INTDIR)\ConfirmWRQDlg.obj" : $(SOURCE) $(DEP_CPP_CONFIR) "$(INTDIR)"\
1150 "$(INTDIR)\pumpkin.pch" 1144 "$(INTDIR)\pumpkin.pch"
1151 1145
1152 1146
1153!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" 1147!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug"
1154 1148
1155DEP_CPP_CONFIR=\
1156 ".\ConfirmWRQDlg.h"\
1157 ".\pumpkin.h"\
1158 ".\PumpKINDlg.h"\
1159 ".\shared-code\BellsNWhistles.h"\
1160 ".\shared-code\kHelpers.h"\
1161 ".\stdafx.h"\
1162
1163 1149
1164"$(INTDIR)\ConfirmWRQDlg.obj" : $(SOURCE) $(DEP_CPP_CONFIR) "$(INTDIR)"\ 1150"$(INTDIR)\ConfirmWRQDlg.obj" : $(SOURCE) $(DEP_CPP_CONFIR) "$(INTDIR)"\
1165 "$(INTDIR)\pumpkin.pch" 1151 "$(INTDIR)\pumpkin.pch"
1166 1152
1167"$(INTDIR)\ConfirmWRQDlg.sbr" : $(SOURCE) $(DEP_CPP_CONFIR) "$(INTDIR)"\ 1153"$(INTDIR)\ConfirmWRQDlg.sbr" : $(SOURCE) $(DEP_CPP_CONFIR) "$(INTDIR)"\
1168 "$(INTDIR)\pumpkin.pch" 1154 "$(INTDIR)\pumpkin.pch"
1169 1155
1170 1156
1171!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" 1157!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static"
1172 1158
1173DEP_CPP_CONFIR=\
1174 ".\ConfirmWRQDlg.h"\
1175 ".\pumpkin.h"\
1176 ".\PumpKINDlg.h"\
1177 ".\shared-code\BellsNWhistles.h"\
1178 ".\shared-code\kHelpers.h"\
1179 ".\stdafx.h"\
1180
1181 1159
1182"$(INTDIR)\ConfirmWRQDlg.obj" : $(SOURCE) $(DEP_CPP_CONFIR) "$(INTDIR)"\ 1160"$(INTDIR)\ConfirmWRQDlg.obj" : $(SOURCE) $(DEP_CPP_CONFIR) "$(INTDIR)"\
1183 "$(INTDIR)\pumpkin.pch" 1161 "$(INTDIR)\pumpkin.pch"
1184 1162
1185 1163
1186!ENDIF 1164!ENDIF
1187 1165
1188# End Source File 1166# End Source File
1189################################################################################ 1167################################################################################
1190# Begin Source File 1168# Begin Source File
1191 1169
1192SOURCE=.\RequestDlg.cpp 1170SOURCE=.\RequestDlg.cpp
@@ -1220,180 +1198,132 @@ DEP_CPP_REQUE=\
1220 1198
1221"$(INTDIR)\RequestDlg.obj" : $(SOURCE) $(DEP_CPP_REQUE) "$(INTDIR)"\ 1199"$(INTDIR)\RequestDlg.obj" : $(SOURCE) $(DEP_CPP_REQUE) "$(INTDIR)"\
1222 "$(INTDIR)\pumpkin.pch" 1200 "$(INTDIR)\pumpkin.pch"
1223 1201
1224 1202
1225!ENDIF 1203!ENDIF
1226 1204
1227# End Source File 1205# End Source File
1228################################################################################ 1206################################################################################
1229# Begin Source File 1207# Begin Source File
1230 1208
1231SOURCE=.\Resolver.cpp 1209SOURCE=.\Resolver.cpp
1232
1233!IF "$(CFG)" == "PumpKIN - Win32 Release"
1234
1235DEP_CPP_RESOL=\ 1210DEP_CPP_RESOL=\
1236 ".\pumpkin.h"\ 1211 ".\pumpkin.h"\
1237 ".\PumpKINDlg.h"\ 1212 ".\PumpKINDlg.h"\
1238 ".\Resolver.h"\ 1213 ".\Resolver.h"\
1239 ".\shared-code\BellsNWhistles.h"\ 1214 ".\shared-code\BellsNWhistles.h"\
1240 ".\shared-code\kHelpers.h"\ 1215 ".\shared-code\kHelpers.h"\
1241 ".\stdafx.h"\ 1216 ".\stdafx.h"\
1242 1217
1243 1218
1219!IF "$(CFG)" == "PumpKIN - Win32 Release"
1220
1221
1244"$(INTDIR)\Resolver.obj" : $(SOURCE) $(DEP_CPP_RESOL) "$(INTDIR)"\ 1222"$(INTDIR)\Resolver.obj" : $(SOURCE) $(DEP_CPP_RESOL) "$(INTDIR)"\
1245 "$(INTDIR)\pumpkin.pch" 1223 "$(INTDIR)\pumpkin.pch"
1246 1224
1247 1225
1248!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" 1226!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug"
1249 1227
1250DEP_CPP_RESOL=\
1251 ".\pumpkin.h"\
1252 ".\PumpKINDlg.h"\
1253 ".\Resolver.h"\
1254 ".\shared-code\BellsNWhistles.h"\
1255 ".\shared-code\kHelpers.h"\
1256 ".\stdafx.h"\
1257
1258 1228
1259"$(INTDIR)\Resolver.obj" : $(SOURCE) $(DEP_CPP_RESOL) "$(INTDIR)"\ 1229"$(INTDIR)\Resolver.obj" : $(SOURCE) $(DEP_CPP_RESOL) "$(INTDIR)"\
1260 "$(INTDIR)\pumpkin.pch" 1230 "$(INTDIR)\pumpkin.pch"
1261 1231
1262"$(INTDIR)\Resolver.sbr" : $(SOURCE) $(DEP_CPP_RESOL) "$(INTDIR)"\ 1232"$(INTDIR)\Resolver.sbr" : $(SOURCE) $(DEP_CPP_RESOL) "$(INTDIR)"\
1263 "$(INTDIR)\pumpkin.pch" 1233 "$(INTDIR)\pumpkin.pch"
1264 1234
1265 1235
1266!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" 1236!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static"
1267 1237
1268DEP_CPP_RESOL=\
1269 ".\pumpkin.h"\
1270 ".\PumpKINDlg.h"\
1271 ".\Resolver.h"\
1272 ".\shared-code\BellsNWhistles.h"\
1273 ".\shared-code\kHelpers.h"\
1274 ".\stdafx.h"\
1275
1276 1238
1277"$(INTDIR)\Resolver.obj" : $(SOURCE) $(DEP_CPP_RESOL) "$(INTDIR)"\ 1239"$(INTDIR)\Resolver.obj" : $(SOURCE) $(DEP_CPP_RESOL) "$(INTDIR)"\
1278 "$(INTDIR)\pumpkin.pch" 1240 "$(INTDIR)\pumpkin.pch"
1279 1241
1280 1242
1281!ENDIF 1243!ENDIF
1282 1244
1283# End Source File 1245# End Source File
1284################################################################################ 1246################################################################################
1285# Begin Source File 1247# Begin Source File
1286 1248
1287SOURCE=.\Retrier.cpp 1249SOURCE=.\Retrier.cpp
1288
1289!IF "$(CFG)" == "PumpKIN - Win32 Release"
1290
1291DEP_CPP_RETRI=\ 1250DEP_CPP_RETRI=\
1292 ".\pumpkin.h"\ 1251 ".\pumpkin.h"\
1293 ".\PumpKINDlg.h"\ 1252 ".\PumpKINDlg.h"\
1294 ".\Retrier.h"\ 1253 ".\Retrier.h"\
1295 ".\shared-code\BellsNWhistles.h"\ 1254 ".\shared-code\BellsNWhistles.h"\
1296 ".\shared-code\kHelpers.h"\ 1255 ".\shared-code\kHelpers.h"\
1297 ".\stdafx.h"\ 1256 ".\stdafx.h"\
1298 1257
1299 1258
1259!IF "$(CFG)" == "PumpKIN - Win32 Release"
1260
1261
1300"$(INTDIR)\Retrier.obj" : $(SOURCE) $(DEP_CPP_RETRI) "$(INTDIR)"\ 1262"$(INTDIR)\Retrier.obj" : $(SOURCE) $(DEP_CPP_RETRI) "$(INTDIR)"\
1301 "$(INTDIR)\pumpkin.pch" 1263 "$(INTDIR)\pumpkin.pch"
1302 1264
1303 1265
1304!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" 1266!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug"
1305 1267
1306DEP_CPP_RETRI=\
1307 ".\pumpkin.h"\
1308 ".\PumpKINDlg.h"\
1309 ".\Retrier.h"\
1310 ".\shared-code\BellsNWhistles.h"\
1311 ".\shared-code\kHelpers.h"\
1312 ".\stdafx.h"\
1313
1314 1268
1315"$(INTDIR)\Retrier.obj" : $(SOURCE) $(DEP_CPP_RETRI) "$(INTDIR)"\ 1269"$(INTDIR)\Retrier.obj" : $(SOURCE) $(DEP_CPP_RETRI) "$(INTDIR)"\
1316 "$(INTDIR)\pumpkin.pch" 1270 "$(INTDIR)\pumpkin.pch"
1317 1271
1318"$(INTDIR)\Retrier.sbr" : $(SOURCE) $(DEP_CPP_RETRI) "$(INTDIR)"\ 1272"$(INTDIR)\Retrier.sbr" : $(SOURCE) $(DEP_CPP_RETRI) "$(INTDIR)"\
1319 "$(INTDIR)\pumpkin.pch" 1273 "$(INTDIR)\pumpkin.pch"
1320 1274
1321 1275
1322!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" 1276!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static"
1323 1277
1324DEP_CPP_RETRI=\
1325 ".\pumpkin.h"\
1326 ".\PumpKINDlg.h"\
1327 ".\Retrier.h"\
1328 ".\shared-code\BellsNWhistles.h"\
1329 ".\shared-code\kHelpers.h"\
1330 ".\stdafx.h"\
1331
1332 1278
1333"$(INTDIR)\Retrier.obj" : $(SOURCE) $(DEP_CPP_RETRI) "$(INTDIR)"\ 1279"$(INTDIR)\Retrier.obj" : $(SOURCE) $(DEP_CPP_RETRI) "$(INTDIR)"\
1334 "$(INTDIR)\pumpkin.pch" 1280 "$(INTDIR)\pumpkin.pch"
1335 1281
1336 1282
1337!ENDIF 1283!ENDIF
1338 1284
1339# End Source File 1285# End Source File
1340################################################################################ 1286################################################################################
1341# Begin Source File 1287# Begin Source File
1342 1288
1343SOURCE=.\Trayer.cpp 1289SOURCE=.\Trayer.cpp
1344
1345!IF "$(CFG)" == "PumpKIN - Win32 Release"
1346
1347DEP_CPP_TRAYE=\ 1290DEP_CPP_TRAYE=\
1348 ".\pumpkin.h"\ 1291 ".\pumpkin.h"\
1349 ".\PumpKINDlg.h"\ 1292 ".\PumpKINDlg.h"\
1350 ".\shared-code\BellsNWhistles.h"\ 1293 ".\shared-code\BellsNWhistles.h"\
1351 ".\shared-code\kHelpers.h"\ 1294 ".\shared-code\kHelpers.h"\
1352 ".\stdafx.h"\ 1295 ".\stdafx.h"\
1353 ".\Trayer.h"\ 1296 ".\Trayer.h"\
1354 1297
1355 1298
1299!IF "$(CFG)" == "PumpKIN - Win32 Release"
1300
1301
1356"$(INTDIR)\Trayer.obj" : $(SOURCE) $(DEP_CPP_TRAYE) "$(INTDIR)"\ 1302"$(INTDIR)\Trayer.obj" : $(SOURCE) $(DEP_CPP_TRAYE) "$(INTDIR)"\
1357 "$(INTDIR)\pumpkin.pch" 1303 "$(INTDIR)\pumpkin.pch"
1358 1304
1359 1305
1360!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" 1306!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug"
1361 1307
1362DEP_CPP_TRAYE=\
1363 ".\pumpkin.h"\
1364 ".\PumpKINDlg.h"\
1365 ".\shared-code\BellsNWhistles.h"\
1366 ".\shared-code\kHelpers.h"\
1367 ".\stdafx.h"\
1368 ".\Trayer.h"\
1369
1370 1308
1371"$(INTDIR)\Trayer.obj" : $(SOURCE) $(DEP_CPP_TRAYE) "$(INTDIR)"\ 1309"$(INTDIR)\Trayer.obj" : $(SOURCE) $(DEP_CPP_TRAYE) "$(INTDIR)"\
1372 "$(INTDIR)\pumpkin.pch" 1310 "$(INTDIR)\pumpkin.pch"
1373 1311
1374"$(INTDIR)\Trayer.sbr" : $(SOURCE) $(DEP_CPP_TRAYE) "$(INTDIR)"\ 1312"$(INTDIR)\Trayer.sbr" : $(SOURCE) $(DEP_CPP_TRAYE) "$(INTDIR)"\
1375 "$(INTDIR)\pumpkin.pch" 1313 "$(INTDIR)\pumpkin.pch"
1376 1314
1377 1315
1378!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" 1316!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static"
1379 1317
1380DEP_CPP_TRAYE=\
1381 ".\pumpkin.h"\
1382 ".\PumpKINDlg.h"\
1383 ".\shared-code\BellsNWhistles.h"\
1384 ".\shared-code\kHelpers.h"\
1385 ".\stdafx.h"\
1386 ".\Trayer.h"\
1387
1388 1318
1389"$(INTDIR)\Trayer.obj" : $(SOURCE) $(DEP_CPP_TRAYE) "$(INTDIR)"\ 1319"$(INTDIR)\Trayer.obj" : $(SOURCE) $(DEP_CPP_TRAYE) "$(INTDIR)"\
1390 "$(INTDIR)\pumpkin.pch" 1320 "$(INTDIR)\pumpkin.pch"
1391 1321
1392 1322
1393!ENDIF 1323!ENDIF
1394 1324
1395# End Source File 1325# End Source File
1396################################################################################ 1326################################################################################
1397# Begin Source File 1327# Begin Source File
1398 1328
1399SOURCE=.\help\pumpkin.cnt 1329SOURCE=.\help\pumpkin.cnt
@@ -1408,68 +1338,52 @@ SOURCE=.\help\pumpkin.cnt
1408 1338
1409!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" 1339!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static"
1410 1340
1411# PROP Exclude_From_Build 1 1341# PROP Exclude_From_Build 1
1412 1342
1413!ENDIF 1343!ENDIF
1414 1344
1415# End Source File 1345# End Source File
1416################################################################################ 1346################################################################################
1417# Begin Source File 1347# Begin Source File
1418 1348
1419SOURCE=.\PropsSounds.cpp 1349SOURCE=.\PropsSounds.cpp
1420
1421!IF "$(CFG)" == "PumpKIN - Win32 Release"
1422
1423DEP_CPP_PROPSS=\ 1350DEP_CPP_PROPSS=\
1424 ".\PropsSounds.h"\ 1351 ".\PropsSounds.h"\
1425 ".\pumpkin.h"\ 1352 ".\pumpkin.h"\
1426 ".\PumpKINDlg.h"\ 1353 ".\PumpKINDlg.h"\
1427 ".\shared-code\BellsNWhistles.h"\ 1354 ".\shared-code\BellsNWhistles.h"\
1428 ".\shared-code\kHelpers.h"\ 1355 ".\shared-code\kHelpers.h"\
1429 ".\stdafx.h"\ 1356 ".\stdafx.h"\
1430 1357
1431 1358
1359!IF "$(CFG)" == "PumpKIN - Win32 Release"
1360
1361
1432"$(INTDIR)\PropsSounds.obj" : $(SOURCE) $(DEP_CPP_PROPSS) "$(INTDIR)"\ 1362"$(INTDIR)\PropsSounds.obj" : $(SOURCE) $(DEP_CPP_PROPSS) "$(INTDIR)"\
1433 "$(INTDIR)\pumpkin.pch" 1363 "$(INTDIR)\pumpkin.pch"
1434 1364
1435 1365
1436!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" 1366!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug"
1437 1367
1438DEP_CPP_PROPSS=\
1439 ".\PropsSounds.h"\
1440 ".\pumpkin.h"\
1441 ".\PumpKINDlg.h"\
1442 ".\shared-code\BellsNWhistles.h"\
1443 ".\shared-code\kHelpers.h"\
1444 ".\stdafx.h"\
1445
1446 1368
1447"$(INTDIR)\PropsSounds.obj" : $(SOURCE) $(DEP_CPP_PROPSS) "$(INTDIR)"\ 1369"$(INTDIR)\PropsSounds.obj" : $(SOURCE) $(DEP_CPP_PROPSS) "$(INTDIR)"\
1448 "$(INTDIR)\pumpkin.pch" 1370 "$(INTDIR)\pumpkin.pch"
1449 1371
1450"$(INTDIR)\PropsSounds.sbr" : $(SOURCE) $(DEP_CPP_PROPSS) "$(INTDIR)"\ 1372"$(INTDIR)\PropsSounds.sbr" : $(SOURCE) $(DEP_CPP_PROPSS) "$(INTDIR)"\
1451 "$(INTDIR)\pumpkin.pch" 1373 "$(INTDIR)\pumpkin.pch"
1452 1374
1453 1375
1454!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" 1376!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static"
1455 1377
1456DEP_CPP_PROPSS=\
1457 ".\PropsSounds.h"\
1458 ".\pumpkin.h"\
1459 ".\PumpKINDlg.h"\
1460 ".\shared-code\BellsNWhistles.h"\
1461 ".\shared-code\kHelpers.h"\
1462 ".\stdafx.h"\
1463
1464 1378
1465"$(INTDIR)\PropsSounds.obj" : $(SOURCE) $(DEP_CPP_PROPSS) "$(INTDIR)"\ 1379"$(INTDIR)\PropsSounds.obj" : $(SOURCE) $(DEP_CPP_PROPSS) "$(INTDIR)"\
1466 "$(INTDIR)\pumpkin.pch" 1380 "$(INTDIR)\pumpkin.pch"
1467 1381
1468 1382
1469!ENDIF 1383!ENDIF
1470 1384
1471# End Source File 1385# End Source File
1472################################################################################ 1386################################################################################
1473# Begin Source File 1387# Begin Source File
1474 1388
1475SOURCE=.\PropsACL.cpp 1389SOURCE=.\PropsACL.cpp
@@ -1505,68 +1419,52 @@ DEP_CPP_PROPSA=\
1505 1419
1506"$(INTDIR)\PropsACL.obj" : $(SOURCE) $(DEP_CPP_PROPSA) "$(INTDIR)"\ 1420"$(INTDIR)\PropsACL.obj" : $(SOURCE) $(DEP_CPP_PROPSA) "$(INTDIR)"\
1507 "$(INTDIR)\pumpkin.pch" 1421 "$(INTDIR)\pumpkin.pch"
1508 1422
1509 1423
1510!ENDIF 1424!ENDIF
1511 1425
1512# End Source File 1426# End Source File
1513################################################################################ 1427################################################################################
1514# Begin Source File 1428# Begin Source File
1515 1429
1516SOURCE=.\ACLTargetCombo.cpp 1430SOURCE=.\ACLTargetCombo.cpp
1517
1518!IF "$(CFG)" == "PumpKIN - Win32 Release"
1519
1520DEP_CPP_ACLTA=\ 1431DEP_CPP_ACLTA=\
1521 ".\ACLTargetCombo.h"\ 1432 ".\ACLTargetCombo.h"\
1522 ".\pumpkin.h"\ 1433 ".\pumpkin.h"\
1523 ".\PumpKINDlg.h"\ 1434 ".\PumpKINDlg.h"\
1524 ".\shared-code\BellsNWhistles.h"\ 1435 ".\shared-code\BellsNWhistles.h"\
1525 ".\shared-code\kHelpers.h"\ 1436 ".\shared-code\kHelpers.h"\
1526 ".\stdafx.h"\ 1437 ".\stdafx.h"\
1527 1438
1528 1439
1440!IF "$(CFG)" == "PumpKIN - Win32 Release"
1441
1442
1529"$(INTDIR)\ACLTargetCombo.obj" : $(SOURCE) $(DEP_CPP_ACLTA) "$(INTDIR)"\ 1443"$(INTDIR)\ACLTargetCombo.obj" : $(SOURCE) $(DEP_CPP_ACLTA) "$(INTDIR)"\
1530 "$(INTDIR)\pumpkin.pch" 1444 "$(INTDIR)\pumpkin.pch"
1531 1445
1532 1446
1533!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" 1447!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug"
1534 1448
1535DEP_CPP_ACLTA=\
1536 ".\ACLTargetCombo.h"\
1537 ".\pumpkin.h"\
1538 ".\PumpKINDlg.h"\
1539 ".\shared-code\BellsNWhistles.h"\
1540 ".\shared-code\kHelpers.h"\
1541 ".\stdafx.h"\
1542
1543 1449
1544"$(INTDIR)\ACLTargetCombo.obj" : $(SOURCE) $(DEP_CPP_ACLTA) "$(INTDIR)"\ 1450"$(INTDIR)\ACLTargetCombo.obj" : $(SOURCE) $(DEP_CPP_ACLTA) "$(INTDIR)"\
1545 "$(INTDIR)\pumpkin.pch" 1451 "$(INTDIR)\pumpkin.pch"
1546 1452
1547"$(INTDIR)\ACLTargetCombo.sbr" : $(SOURCE) $(DEP_CPP_ACLTA) "$(INTDIR)"\ 1453"$(INTDIR)\ACLTargetCombo.sbr" : $(SOURCE) $(DEP_CPP_ACLTA) "$(INTDIR)"\
1548 "$(INTDIR)\pumpkin.pch" 1454 "$(INTDIR)\pumpkin.pch"
1549 1455
1550 1456
1551!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" 1457!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static"
1552 1458
1553DEP_CPP_ACLTA=\
1554 ".\ACLTargetCombo.h"\
1555 ".\pumpkin.h"\
1556 ".\PumpKINDlg.h"\
1557 ".\shared-code\BellsNWhistles.h"\
1558 ".\shared-code\kHelpers.h"\
1559 ".\stdafx.h"\
1560
1561 1459
1562"$(INTDIR)\ACLTargetCombo.obj" : $(SOURCE) $(DEP_CPP_ACLTA) "$(INTDIR)"\ 1460"$(INTDIR)\ACLTargetCombo.obj" : $(SOURCE) $(DEP_CPP_ACLTA) "$(INTDIR)"\
1563 "$(INTDIR)\pumpkin.pch" 1461 "$(INTDIR)\pumpkin.pch"
1564 1462
1565 1463
1566!ENDIF 1464!ENDIF
1567 1465
1568# End Source File 1466# End Source File
1569# End Target 1467# End Target
1570################################################################################ 1468################################################################################
1571# Begin Target 1469# Begin Target
1572 1470