-rw-r--r-- | PumpKINDlg.cpp | 70 | ||||
-rw-r--r-- | PumpKINDlg.h | 3 | ||||
-rw-r--r-- | pumpkin.mak | 238 |
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 | |||
@@ -580,8 +580,8 @@ int rv = socket->SendTo(udpBase(),length,(SOCKADDR*)saddr,sizeof(SOCKADDR_IN)); | |||
580 | } | 580 | } |
581 | 581 | ||
582 | void CXferSocket::DoSelect() | 582 | void 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 | ||
@@ -855,9 +855,5 @@ tftp *p = tftp::Allocate(tftp::tftpDATA::tftpSize(m_blkSize)); | |||
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){ |
@@ -937,37 +933,45 @@ BOOL 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(); |
diff --git a/PumpKINDlg.h b/PumpKINDlg.h index c5469f1..23c2657 100644 --- a/PumpKINDlg.h +++ b/PumpKINDlg.h | |||
@@ -313,5 +313,5 @@ public: | |||
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); |
@@ -342,4 +342,5 @@ public: | |||
342 | class CRRQSocket : public CXferSocket { | 342 | class CRRQSocket : public CXferSocket { |
343 | public: | 343 | public: |
344 | UINT m_ACKtoClose; | ||
344 | void OnHostKnown(); | 345 | void OnHostKnown(); |
345 | virtual void OnResolved(); | 346 | virtual void OnResolved(); |
diff --git a/pumpkin.mak b/pumpkin.mak index a22a6fa..bf9e895 100644 --- a/pumpkin.mak +++ b/pumpkin.mak | |||
@@ -687,7 +687,4 @@ LINK32_OBJS= \ | |||
687 | 687 | ||
688 | SOURCE=.\PumpKIN.cpp | 688 | SOURCE=.\PumpKIN.cpp |
689 | |||
690 | !IF "$(CFG)" == "PumpKIN - Win32 Release" | ||
691 | |||
692 | DEP_CPP_PUMPK=\ | 689 | DEP_CPP_PUMPK=\ |
693 | ".\pumpkin.h"\ | 690 | ".\pumpkin.h"\ |
@@ -698,4 +695,7 @@ DEP_CPP_PUMPK=\ | |||
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" |
@@ -704,11 +704,4 @@ DEP_CPP_PUMPK=\ | |||
704 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" | 704 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" |
705 | 705 | ||
706 | DEP_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)"\ |
@@ -721,11 +714,4 @@ DEP_CPP_PUMPK=\ | |||
721 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" | 714 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" |
722 | 715 | ||
723 | DEP_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)"\ |
@@ -740,4 +726,7 @@ DEP_CPP_PUMPK=\ | |||
740 | 726 | ||
741 | SOURCE=.\PumpKINDlg.cpp | 727 | SOURCE=.\PumpKINDlg.cpp |
728 | |||
729 | !IF "$(CFG)" == "PumpKIN - Win32 Release" | ||
730 | |||
742 | DEP_CPP_PUMPKI=\ | 731 | DEP_CPP_PUMPKI=\ |
743 | ".\ACLTargetCombo.h"\ | 732 | ".\ACLTargetCombo.h"\ |
@@ -759,7 +748,4 @@ DEP_CPP_PUMPKI=\ | |||
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" |
@@ -768,4 +754,24 @@ DEP_CPP_PUMPKI=\ | |||
768 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" | 754 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" |
769 | 755 | ||
756 | DEP_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 | |||
773 | NODEP_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)"\ |
@@ -778,4 +784,22 @@ DEP_CPP_PUMPKI=\ | |||
778 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" | 784 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" |
779 | 785 | ||
786 | DEP_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)"\ |
@@ -987,7 +1011,4 @@ BuildCmds= \ | |||
987 | 1011 | ||
988 | SOURCE=.\PropsServer.cpp | 1012 | SOURCE=.\PropsServer.cpp |
989 | |||
990 | !IF "$(CFG)" == "PumpKIN - Win32 Release" | ||
991 | |||
992 | DEP_CPP_PROPS=\ | 1013 | DEP_CPP_PROPS=\ |
993 | ".\PropsServer.h"\ | 1014 | ".\PropsServer.h"\ |
@@ -998,4 +1019,7 @@ DEP_CPP_PROPS=\ | |||
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" |
@@ -1004,11 +1028,4 @@ DEP_CPP_PROPS=\ | |||
1004 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" | 1028 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" |
1005 | 1029 | ||
1006 | DEP_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)"\ |
@@ -1021,11 +1038,4 @@ DEP_CPP_PROPS=\ | |||
1021 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" | 1038 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" |
1022 | 1039 | ||
1023 | DEP_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)"\ |
@@ -1079,7 +1089,4 @@ DEP_CPP_PROPSN=\ | |||
1079 | 1089 | ||
1080 | SOURCE=.\ConfirmRRQDlg.cpp | 1090 | SOURCE=.\ConfirmRRQDlg.cpp |
1081 | |||
1082 | !IF "$(CFG)" == "PumpKIN - Win32 Release" | ||
1083 | |||
1084 | DEP_CPP_CONFI=\ | 1091 | DEP_CPP_CONFI=\ |
1085 | ".\ConfirmRRQDlg.h"\ | 1092 | ".\ConfirmRRQDlg.h"\ |
@@ -1091,4 +1098,7 @@ DEP_CPP_CONFI=\ | |||
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" |
@@ -1097,12 +1107,4 @@ DEP_CPP_CONFI=\ | |||
1097 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" | 1107 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" |
1098 | 1108 | ||
1099 | DEP_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)"\ |
@@ -1115,12 +1117,4 @@ DEP_CPP_CONFI=\ | |||
1115 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" | 1117 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" |
1116 | 1118 | ||
1117 | DEP_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)"\ |
@@ -1135,7 +1129,4 @@ DEP_CPP_CONFI=\ | |||
1135 | 1129 | ||
1136 | SOURCE=.\ConfirmWRQDlg.cpp | 1130 | SOURCE=.\ConfirmWRQDlg.cpp |
1137 | |||
1138 | !IF "$(CFG)" == "PumpKIN - Win32 Release" | ||
1139 | |||
1140 | DEP_CPP_CONFIR=\ | 1131 | DEP_CPP_CONFIR=\ |
1141 | ".\ConfirmWRQDlg.h"\ | 1132 | ".\ConfirmWRQDlg.h"\ |
@@ -1147,4 +1138,7 @@ DEP_CPP_CONFIR=\ | |||
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" |
@@ -1153,12 +1147,4 @@ DEP_CPP_CONFIR=\ | |||
1153 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" | 1147 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" |
1154 | 1148 | ||
1155 | DEP_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)"\ |
@@ -1171,12 +1157,4 @@ DEP_CPP_CONFIR=\ | |||
1171 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" | 1157 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" |
1172 | 1158 | ||
1173 | DEP_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)"\ |
@@ -1230,7 +1208,4 @@ DEP_CPP_REQUE=\ | |||
1230 | 1208 | ||
1231 | SOURCE=.\Resolver.cpp | 1209 | SOURCE=.\Resolver.cpp |
1232 | |||
1233 | !IF "$(CFG)" == "PumpKIN - Win32 Release" | ||
1234 | |||
1235 | DEP_CPP_RESOL=\ | 1210 | DEP_CPP_RESOL=\ |
1236 | ".\pumpkin.h"\ | 1211 | ".\pumpkin.h"\ |
@@ -1242,4 +1217,7 @@ DEP_CPP_RESOL=\ | |||
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" |
@@ -1248,12 +1226,4 @@ DEP_CPP_RESOL=\ | |||
1248 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" | 1226 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" |
1249 | 1227 | ||
1250 | DEP_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)"\ |
@@ -1266,12 +1236,4 @@ DEP_CPP_RESOL=\ | |||
1266 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" | 1236 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" |
1267 | 1237 | ||
1268 | DEP_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)"\ |
@@ -1286,7 +1248,4 @@ DEP_CPP_RESOL=\ | |||
1286 | 1248 | ||
1287 | SOURCE=.\Retrier.cpp | 1249 | SOURCE=.\Retrier.cpp |
1288 | |||
1289 | !IF "$(CFG)" == "PumpKIN - Win32 Release" | ||
1290 | |||
1291 | DEP_CPP_RETRI=\ | 1250 | DEP_CPP_RETRI=\ |
1292 | ".\pumpkin.h"\ | 1251 | ".\pumpkin.h"\ |
@@ -1298,4 +1257,7 @@ DEP_CPP_RETRI=\ | |||
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" |
@@ -1304,12 +1266,4 @@ DEP_CPP_RETRI=\ | |||
1304 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" | 1266 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" |
1305 | 1267 | ||
1306 | DEP_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)"\ |
@@ -1322,12 +1276,4 @@ DEP_CPP_RETRI=\ | |||
1322 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" | 1276 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" |
1323 | 1277 | ||
1324 | DEP_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)"\ |
@@ -1342,7 +1288,4 @@ DEP_CPP_RETRI=\ | |||
1342 | 1288 | ||
1343 | SOURCE=.\Trayer.cpp | 1289 | SOURCE=.\Trayer.cpp |
1344 | |||
1345 | !IF "$(CFG)" == "PumpKIN - Win32 Release" | ||
1346 | |||
1347 | DEP_CPP_TRAYE=\ | 1290 | DEP_CPP_TRAYE=\ |
1348 | ".\pumpkin.h"\ | 1291 | ".\pumpkin.h"\ |
@@ -1354,4 +1297,7 @@ DEP_CPP_TRAYE=\ | |||
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" |
@@ -1360,12 +1306,4 @@ DEP_CPP_TRAYE=\ | |||
1360 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" | 1306 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" |
1361 | 1307 | ||
1362 | DEP_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)"\ |
@@ -1378,12 +1316,4 @@ DEP_CPP_TRAYE=\ | |||
1378 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" | 1316 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" |
1379 | 1317 | ||
1380 | DEP_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)"\ |
@@ -1418,7 +1348,4 @@ SOURCE=.\help\pumpkin.cnt | |||
1418 | 1348 | ||
1419 | SOURCE=.\PropsSounds.cpp | 1349 | SOURCE=.\PropsSounds.cpp |
1420 | |||
1421 | !IF "$(CFG)" == "PumpKIN - Win32 Release" | ||
1422 | |||
1423 | DEP_CPP_PROPSS=\ | 1350 | DEP_CPP_PROPSS=\ |
1424 | ".\PropsSounds.h"\ | 1351 | ".\PropsSounds.h"\ |
@@ -1430,4 +1357,7 @@ DEP_CPP_PROPSS=\ | |||
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" |
@@ -1436,12 +1366,4 @@ DEP_CPP_PROPSS=\ | |||
1436 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" | 1366 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" |
1437 | 1367 | ||
1438 | DEP_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)"\ |
@@ -1454,12 +1376,4 @@ DEP_CPP_PROPSS=\ | |||
1454 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" | 1376 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" |
1455 | 1377 | ||
1456 | DEP_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)"\ |
@@ -1515,7 +1429,4 @@ DEP_CPP_PROPSA=\ | |||
1515 | 1429 | ||
1516 | SOURCE=.\ACLTargetCombo.cpp | 1430 | SOURCE=.\ACLTargetCombo.cpp |
1517 | |||
1518 | !IF "$(CFG)" == "PumpKIN - Win32 Release" | ||
1519 | |||
1520 | DEP_CPP_ACLTA=\ | 1431 | DEP_CPP_ACLTA=\ |
1521 | ".\ACLTargetCombo.h"\ | 1432 | ".\ACLTargetCombo.h"\ |
@@ -1527,4 +1438,7 @@ DEP_CPP_ACLTA=\ | |||
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" |
@@ -1533,12 +1447,4 @@ DEP_CPP_ACLTA=\ | |||
1533 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" | 1447 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" |
1534 | 1448 | ||
1535 | DEP_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)"\ |
@@ -1551,12 +1457,4 @@ DEP_CPP_ACLTA=\ | |||
1551 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" | 1457 | !ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" |
1552 | 1458 | ||
1553 | DEP_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)"\ |