diff --git a/pcsx2/windows/VCprojects/pcsx2_2008.vcproj b/pcsx2/windows/VCprojects/pcsx2_2008.vcproj index a9f2e16257..f6e834f868 100644 --- a/pcsx2/windows/VCprojects/pcsx2_2008.vcproj +++ b/pcsx2/windows/VCprojects/pcsx2_2008.vcproj @@ -823,6 +823,10 @@ RelativePath="..\Cdrom02.ico" > + + @@ -3091,14 +3095,6 @@ RelativePath="..\..\Common.h" > - - - - @@ -3107,6 +3103,10 @@ RelativePath="..\..\Stats.h" > + + diff --git a/pcsx2/windows/Win32.h b/pcsx2/windows/Win32.h index 3f9b233168..19880a8806 100644 --- a/pcsx2/windows/Win32.h +++ b/pcsx2/windows/Win32.h @@ -29,6 +29,7 @@ #include "Misc.h" #include "resource.h" +#include "WinDebugResource.h" #define COMPILEDATE __DATE__ diff --git a/pcsx2/windows/WinDebugResource.h b/pcsx2/windows/WinDebugResource.h new file mode 100644 index 0000000000..c4c88bfb5d --- /dev/null +++ b/pcsx2/windows/WinDebugResource.h @@ -0,0 +1,343 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by debugger.rc +// +#define IDD_BPEXEC 103 +#define IDD_BPCNT 105 +#define IDD_DEBUG 108 +#define IDD_VU0REGS 111 +#define IDD_VU0INTEGER 113 +#define IDD_GPREGS 114 +#define IDD_CP0REGS 115 +#define IDD_CP1REGS 116 +#define IDD_VU1INTEGER 117 +#define IDD_VU1REGS 118 +#define IDD_RDEBUGPARAMS 121 +#define IDD_RDEBUG 123 +#define IDD_IOP_DEBUG 125 +#define IDD_IOPREGS 128 +#define IDD_DUMP 136 +#define IDD_DUMPMEM 137 +#define IDC_EXECBP 1001 +#define IDC_CNTBP 1002 +#define IDC_VU0_VF00 1005 +#define IDC_VU0_VF01 1006 +#define IDC_VU0_VF02 1007 +#define IDC_VU0_VF03 1008 +#define IDC_VU0_VF04 1009 +#define IDC_VU0_VF05 1010 +#define IDC_DEBUG_DISASM 1010 +#define IDC_VU0_VF06 1011 +#define IDC_VU0_VF07 1012 +#define IDC_VU0_VF08 1013 +#define IDC_VU0_VF09 1014 +#define IDC_VU0_VF10 1015 +#define IDC_VU0_VF11 1016 +#define IDC_VU0_VF12 1017 +#define IDC_VU0_VF13 1018 +#define IDC_VU0_VF14 1019 +#define IDC_VU0_VF15 1020 +#define IDC_CP07 1020 +#define IDC_VU0_VF16 1021 +#define IDC_VU0_VF17 1022 +#define IDC_VU0_VF18 1023 +#define IDC_VU0_VF19 1024 +#define IDC_VU0_VF20 1025 +#define IDC_VU0_VF21 1026 +#define IDC_VU0_VF22 1027 +#define IDC_VU0_VF23 1028 +#define IDC_VU0_VF24 1029 +#define IDC_DEBUG_CLOSE 1029 +#define IDC_VU0_VF25 1030 +#define IDC_DEBUG_STEP 1030 +#define IDC_VU0_VF26 1031 +#define IDC_DEBUG_SKIP 1031 +#define IDC_VU0_VF27 1032 +#define IDC_DEBUG_GO 1032 +#define IDC_VU0_VF28 1033 +#define IDC_DEBUG_BP_EXEC 1033 +#define IDC_VU0_VF29 1034 +#define IDC_DEBUG_SCROLL 1034 +#define IDC_CP021 1034 +#define IDC_VU0_VF30 1035 +#define IDC_DEBUG_RESETTOPC 1035 +#define IDC_CP022 1035 +#define IDC_VU0_VF31 1036 +#define IDC_DEBUG_JUMP 1036 +#define IDC_FPU_ACC 1036 +#define IDC_CP023 1036 +#define IDC_DEBUG_LOG 1037 +#define IDC_CP024 1037 +#define IDC_VU0_VI00 1038 +#define IDC_DEBUG_BP_COUNT 1038 +#define IDC_CP025 1038 +#define IDC_VU0_VI01 1039 +#define IDC_VU0_VI02 1040 +#define IDC_VU0_VI03 1041 +#define IDC_VU0_VI04 1042 +#define IDC_VU0_VI05 1043 +#define IDC_VU0_VI06 1044 +#define IDC_CP031 1044 +#define IDC_VU0_VI07 1045 +#define IDC_VU0_VI08 1046 +#define IDC_VU0_VI09 1047 +#define IDC_GPR0 1047 +#define IDC_VU0_VI10 1048 +#define IDC_GPR1 1048 +#define IDC_VU0_VI11 1049 +#define IDC_GPR2 1049 +#define IDC_VU0_VI12 1050 +#define IDC_GPR3 1050 +#define IDC_VU0_VI13 1051 +#define IDC_GPR4 1051 +#define IDC_VU0_VI14 1052 +#define IDC_GPR5 1052 +#define IDC_VU0_VI15 1053 +#define IDC_GPR6 1053 +#define IDC_VU0_VI16 1054 +#define IDC_GPR7 1054 +#define IDC_VU0_VI17 1055 +#define IDC_GPR8 1055 +#define IDC_VU0_VI18 1056 +#define IDC_GPR9 1056 +#define IDC_VU0_VI19 1057 +#define IDC_GPR10 1057 +#define IDC_VU0_VI20 1058 +#define IDC_VU0_VI21 1059 +#define IDC_VU0_VI22 1060 +#define IDC_VU0_VI23 1061 +#define IDC_VU0_VI24 1062 +#define IDC_VU0_VI25 1063 +#define IDC_GPR11 1063 +#define IDC_VU0_VI26 1064 +#define IDC_VU0_VI27 1065 +#define IDC_VU0_VI28 1066 +#define IDC_VU0_VI29 1067 +#define IDC_VU0_VI30 1068 +#define IDC_GPR12 1068 +#define IDC_VU0_VI31 1069 +#define IDC_GPR13 1069 +#define IDC_VU0_ACC 1070 +#define IDC_GPR14 1070 +#define IDC_VU1_VF00 1071 +#define IDC_GPR15 1071 +#define IDC_VU1_VF01 1072 +#define IDC_GPR16 1072 +#define IDC_VU1_VF02 1073 +#define IDC_GPR17 1073 +#define IDC_VU1_VF03 1074 +#define IDC_GPR18 1074 +#define IDC_VU1_VF04 1075 +#define IDC_GPR19 1075 +#define IDC_VU1_VF05 1076 +#define IDC_GPR20 1076 +#define IDC_VU1_VF06 1077 +#define IDC_GPR21 1077 +#define IDC_VU1_VF07 1078 +#define IDC_GPR22 1078 +#define IDC_VU1_VF08 1079 +#define IDC_GPR23 1079 +#define IDC_VU1_VF09 1080 +#define IDC_GPR24 1080 +#define IDC_VU1_VF10 1081 +#define IDC_GPR25 1081 +#define IDC_VU1_VF11 1082 +#define IDC_GPR26 1082 +#define IDC_VU1_VF12 1083 +#define IDC_GPR27 1083 +#define IDC_VU1_VF13 1084 +#define IDC_GPR28 1084 +#define IDC_VU1_VF14 1085 +#define IDC_GPR29 1085 +#define IDC_VU1_VF15 1086 +#define IDC_GPR30 1086 +#define IDC_VU1_VF16 1087 +#define IDC_GPR31 1087 +#define IDC_VU1_VF17 1088 +#define IDC_VU1_VF18 1089 +#define IDC_GPR_PC 1089 +#define IDC_VU1_VF19 1090 +#define IDC_VU1_VF20 1091 +#define IDC_GPR_HI 1091 +#define IDC_VU1_VF21 1092 +#define IDC_GPR_LO 1092 +#define IDC_VU1_VF22 1093 +#define IDC_CP00 1093 +#define IDC_VU1_VF23 1094 +#define IDC_CP01 1094 +#define IDC_VU1_VF24 1095 +#define IDC_CP02 1095 +#define IDC_VU1_VF25 1096 +#define IDC_CP03 1096 +#define IDC_VU1_VF26 1097 +#define IDC_DEBUG_DUMP 1097 +#define IDC_CP04 1097 +#define IDC_VU1_VF27 1098 +#define IDC_DUMP_END 1098 +#define IDC_DEBUG_MEMORY 1098 +#define IDC_CP05 1098 +#define IDC_VU1_VF28 1099 +#define IDC_DUMP_FNAME 1099 +#define IDC_DEBUG_BP_CLEAR 1099 +#define IDC_CP06 1099 +#define IDC_VU1_VF29 1100 +#define IDC_DUMP_ENDIOP 1100 +#define IDC_CP08 1100 +#define IDC_VU1_VF30 1101 +#define IDC_DUMP_FNAMEIOP 1101 +#define IDC_CP09 1101 +#define IDC_VU1_VF31 1102 +#define IDC_CP010 1102 +#define IDC_VU1_VI00 1103 +#define IDC_CP011 1103 +#define IDC_VU1_VI01 1104 +#define IDC_CP012 1104 +#define IDC_VU1_VI02 1105 +#define IDC_CP013 1105 +#define IDC_VU1_VI03 1106 +#define IDC_CP014 1106 +#define IDC_VU1_VI04 1107 +#define IDC_CP015 1107 +#define IDC_VU1_VI05 1108 +#define IDC_CP016 1108 +#define IDC_VU1_VI06 1109 +#define IDC_CP017 1109 +#define IDC_VU1_VI07 1110 +#define IDC_CP018 1110 +#define IDC_VU1_VI08 1111 +#define IDC_CP019 1111 +#define IDC_VU1_VI09 1112 +#define IDC_CP020 1112 +#define IDC_VU1_VI10 1113 +#define IDC_CP026 1113 +#define IDC_VU1_VI11 1114 +#define IDC_CP027 1114 +#define IDC_VU1_VI12 1115 +#define IDC_CP028 1115 +#define IDC_VU1_VI13 1116 +#define IDC_CP029 1116 +#define IDC_VU1_VI14 1117 +#define IDC_CP030 1117 +#define IDC_VU1_VI15 1118 +#define IDC_FP0 1118 +#define IDC_VU1_VI16 1119 +#define IDC_FP1 1119 +#define IDC_VU1_VI17 1120 +#define IDC_FP2 1120 +#define IDC_VU1_VI18 1121 +#define IDC_FP3 1121 +#define IDC_VU1_VI19 1122 +#define IDC_FP4 1122 +#define IDC_VU1_VI20 1123 +#define IDC_FP5 1123 +#define IDC_VU1_VI21 1124 +#define IDC_FP6 1124 +#define IDC_VU1_VI22 1125 +#define IDC_FP7 1125 +#define IDC_VU1_VI23 1126 +#define IDC_FP8 1126 +#define IDC_VU1_VI24 1127 +#define IDC_FP9 1127 +#define IDC_VU1_VI25 1128 +#define IDC_FP10 1128 +#define IDC_VU1_VI26 1129 +#define IDC_FP11 1129 +#define IDC_VU1_VI27 1130 +#define IDC_FP12 1130 +#define IDC_VU1_VI28 1131 +#define IDC_FP13 1131 +#define IDC_VU1_VI29 1132 +#define IDC_FP14 1132 +#define IDC_VU1_VI30 1133 +#define IDC_FP15 1133 +#define IDC_VU1_VI31 1134 +#define IDC_FP16 1134 +#define IDC_VU1_ACC 1135 +#define IDC_FP17 1135 +#define IDC_FP18 1136 +#define IDC_FP19 1137 +#define IDC_FP20 1138 +#define IDC_FP21 1139 +#define IDC_FP22 1140 +#define IDC_FP23 1141 +#define IDC_FP24 1142 +#define IDC_FP25 1143 +#define IDC_FP26 1144 +#define IDC_FP27 1145 +#define IDC_FP28 1146 +#define IDC_FP29 1147 +#define IDC_FP30 1148 +#define IDC_FP31 1149 +#define IDC_FCR0 1150 +#define IDC_FCR31 1151 +#define IDC_PORT 1157 +#define IDC_COMMUNICATION 1158 +#define IDC_CLEAR 1160 +#define IDC_DEBUGBIOS 1161 +#define IDC_EEPC 1162 +#define IDC_IOPPC 1163 +#define IDC_EECYCLE 1164 +#define IDC_IOPCYCLE 1165 +#define IDC_DUMP_START 1172 +#define IDC_DUMP_STARTIOP 1173 +#define IDC_CPUOP 1175 +#define IDC_DEBUGEE 1176 +#define IDC_DEBUGIOP 1177 +#define IDC_STOPAT 1178 +#define IDC_STOPAFTER 1179 +#define IDC_DUMPMEM_FNAME 1188 +#define IDC_DUMPMEM_END 1189 +#define IDC_DUMPMEM_START 1190 +#define IDC_DEBUG_DISASM_IOP 1193 +#define IDC_DEBUG_SCROLL_IOP 1194 +#define IDC_IOPGPR0 1220 +#define IDC_IOPGPR1 1221 +#define IDC_IOPGPR2 1222 +#define IDC_IOPGPR16 1223 +#define IDC_IOPGPR17 1224 +#define IDC_IOPGPR18 1225 +#define IDC_IOPGPR19 1226 +#define IDC_IOPGPR20 1227 +#define IDC_IOPGPR21 1228 +#define IDC_IOPGPR22 1229 +#define IDC_IOPGPR23 1230 +#define IDC_IOPGPR24 1231 +#define IDC_IOPGPR25 1232 +#define IDC_IOPGPR26 1233 +#define IDC_IOPGPR27 1234 +#define IDC_IOPGPR28 1235 +#define IDC_IOPGPR29 1236 +#define IDC_IOPGPR30 1237 +#define IDC_IOPGPR31 1238 +#define IDC_IOPGPR_LO 1239 +#define IDC_IOPGPR_HI 1240 +#define IDC_IOPGPR_PC 1241 +#define IDC_IOPGPR15 1242 +#define IDC_IOPGPR14 1243 +#define IDC_IOPGPR13 1244 +#define IDC_IOPGPR12 1245 +#define IDC_IOPGPR11 1246 +#define IDC_IOPGPR10 1247 +#define IDC_IOPGPR9 1248 +#define IDC_IOPGPR8 1249 +#define IDC_IOPGPR7 1250 +#define IDC_IOPGPR6 1251 +#define IDC_IOPGPR5 1252 +#define IDC_IOPGPR4 1253 +#define IDC_IOPGPR3 1254 +#define IDC_DEBUG_STEP_EE 1274 +#define IDC_DEBUG_STEP_OVER 1275 +#define IDC_DEBUG_RUN_TO_CURSOR 1276 +#define IDC_DEBUG_STEP_TO_CURSOR 1277 +#define IDC_DEBUG_BREAK 1278 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 101 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/pcsx2/windows/VCprojects/debugger.rc b/pcsx2/windows/debugger.rc similarity index 97% rename from pcsx2/windows/VCprojects/debugger.rc rename to pcsx2/windows/debugger.rc index 86951cb359..62dca42a75 100644 --- a/pcsx2/windows/VCprojects/debugger.rc +++ b/pcsx2/windows/debugger.rc @@ -1,13 +1,13 @@ // Microsoft Visual C++ generated resource script. // -#include "resource1.h" +#include "WinDebugResource.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "afxresmw.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -29,19 +29,17 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US 1 TEXTINCLUDE BEGIN - "resource1.h\0" + "WinDebugResource.\0" END 2 TEXTINCLUDE BEGIN - "#include ""afxres.h""\r\n" - "\0" + "#include ""afxresmw.h""\r\0" END 3 TEXTINCLUDE BEGIN - "\r\n" - "\0" + "\r\0" END #endif // APSTUDIO_INVOKED