Browse code

fix win32 proj files

aCaB authored on 2010/10/30 11:18:10
Showing 4 changed files
... ...
@@ -72,124 +72,124 @@ Global
72 72
 		Release|x64 = Release|x64
73 73
 	EndGlobalSection
74 74
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
75
-		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Debug|Win32.ActiveCfg = Release|x64
76
-		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Debug|Win32.Build.0 = Release|x64
77
-		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Debug|x64.ActiveCfg = Release|x64
78
-		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Debug|x64.Build.0 = Release|x64
79
-		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Release|Win32.ActiveCfg = Release|x64
80
-		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Release|Win32.Build.0 = Release|x64
75
+		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Debug|Win32.ActiveCfg = Debug|Win32
76
+		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Debug|Win32.Build.0 = Debug|Win32
77
+		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Debug|x64.ActiveCfg = Debug|x64
78
+		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Debug|x64.Build.0 = Debug|x64
79
+		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Release|Win32.ActiveCfg = Release|Win32
80
+		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Release|Win32.Build.0 = Release|Win32
81 81
 		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Release|x64.ActiveCfg = Release|x64
82 82
 		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Release|x64.Build.0 = Release|x64
83
-		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.Debug|Win32.ActiveCfg = Release|x64
84
-		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.Debug|Win32.Build.0 = Release|x64
85
-		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.Debug|x64.ActiveCfg = Release|x64
86
-		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.Debug|x64.Build.0 = Release|x64
87
-		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.Release|Win32.ActiveCfg = Release|x64
88
-		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.Release|Win32.Build.0 = Release|x64
83
+		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.Debug|Win32.ActiveCfg = Debug|Win32
84
+		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.Debug|Win32.Build.0 = Debug|Win32
85
+		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.Debug|x64.ActiveCfg = Debug|x64
86
+		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.Debug|x64.Build.0 = Debug|x64
87
+		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.Release|Win32.ActiveCfg = Release|Win32
88
+		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.Release|Win32.Build.0 = Release|Win32
89 89
 		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.Release|x64.ActiveCfg = Release|x64
90 90
 		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.Release|x64.Build.0 = Release|x64
91
-		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Debug|Win32.ActiveCfg = Release|x64
92
-		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Debug|Win32.Build.0 = Release|x64
93
-		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Debug|x64.ActiveCfg = Release|x64
94
-		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Debug|x64.Build.0 = Release|x64
95
-		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Release|Win32.ActiveCfg = Release|x64
96
-		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Release|Win32.Build.0 = Release|x64
91
+		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Debug|Win32.ActiveCfg = Debug|Win32
92
+		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Debug|Win32.Build.0 = Debug|Win32
93
+		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Debug|x64.ActiveCfg = Debug|x64
94
+		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Debug|x64.Build.0 = Debug|x64
95
+		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Release|Win32.ActiveCfg = Release|Win32
96
+		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Release|Win32.Build.0 = Release|Win32
97 97
 		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Release|x64.ActiveCfg = Release|x64
98 98
 		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Release|x64.Build.0 = Release|x64
99
-		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Debug|Win32.ActiveCfg = Release|x64
100
-		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Debug|Win32.Build.0 = Release|x64
101
-		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Debug|x64.ActiveCfg = Release|x64
102
-		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Debug|x64.Build.0 = Release|x64
103
-		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Release|Win32.ActiveCfg = Release|x64
104
-		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Release|Win32.Build.0 = Release|x64
99
+		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Debug|Win32.ActiveCfg = Debug|Win32
100
+		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Debug|Win32.Build.0 = Debug|Win32
101
+		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Debug|x64.ActiveCfg = Debug|x64
102
+		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Debug|x64.Build.0 = Debug|x64
103
+		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Release|Win32.ActiveCfg = Release|Win32
104
+		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Release|Win32.Build.0 = Release|Win32
105 105
 		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Release|x64.ActiveCfg = Release|x64
106 106
 		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Release|x64.Build.0 = Release|x64
107
-		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Debug|Win32.ActiveCfg = Release|x64
108
-		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Debug|Win32.Build.0 = Release|x64
109
-		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Debug|x64.ActiveCfg = Release|x64
110
-		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Debug|x64.Build.0 = Release|x64
111
-		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Release|Win32.ActiveCfg = Release|x64
112
-		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Release|Win32.Build.0 = Release|x64
107
+		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Debug|Win32.ActiveCfg = Debug|Win32
108
+		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Debug|Win32.Build.0 = Debug|Win32
109
+		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Debug|x64.ActiveCfg = Debug|x64
110
+		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Debug|x64.Build.0 = Debug|x64
111
+		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Release|Win32.ActiveCfg = Release|Win32
112
+		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Release|Win32.Build.0 = Release|Win32
113 113
 		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Release|x64.ActiveCfg = Release|x64
114 114
 		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Release|x64.Build.0 = Release|x64
115
-		{09D341E9-7372-46E9-B0D7-CAAF77984190}.Debug|Win32.ActiveCfg = Release|x64
116
-		{09D341E9-7372-46E9-B0D7-CAAF77984190}.Debug|Win32.Build.0 = Release|x64
117
-		{09D341E9-7372-46E9-B0D7-CAAF77984190}.Debug|x64.ActiveCfg = Release|x64
118
-		{09D341E9-7372-46E9-B0D7-CAAF77984190}.Debug|x64.Build.0 = Release|x64
119
-		{09D341E9-7372-46E9-B0D7-CAAF77984190}.Release|Win32.ActiveCfg = Release|x64
120
-		{09D341E9-7372-46E9-B0D7-CAAF77984190}.Release|Win32.Build.0 = Release|x64
115
+		{09D341E9-7372-46E9-B0D7-CAAF77984190}.Debug|Win32.ActiveCfg = Debug|Win32
116
+		{09D341E9-7372-46E9-B0D7-CAAF77984190}.Debug|Win32.Build.0 = Debug|Win32
117
+		{09D341E9-7372-46E9-B0D7-CAAF77984190}.Debug|x64.ActiveCfg = Debug|x64
118
+		{09D341E9-7372-46E9-B0D7-CAAF77984190}.Debug|x64.Build.0 = Debug|x64
119
+		{09D341E9-7372-46E9-B0D7-CAAF77984190}.Release|Win32.ActiveCfg = Release|Win32
120
+		{09D341E9-7372-46E9-B0D7-CAAF77984190}.Release|Win32.Build.0 = Release|Win32
121 121
 		{09D341E9-7372-46E9-B0D7-CAAF77984190}.Release|x64.ActiveCfg = Release|x64
122 122
 		{09D341E9-7372-46E9-B0D7-CAAF77984190}.Release|x64.Build.0 = Release|x64
123
-		{05957B93-39F9-45EC-87BD-86B7AF571557}.Debug|Win32.ActiveCfg = Release|x64
124
-		{05957B93-39F9-45EC-87BD-86B7AF571557}.Debug|Win32.Build.0 = Release|x64
125
-		{05957B93-39F9-45EC-87BD-86B7AF571557}.Debug|x64.ActiveCfg = Release|x64
126
-		{05957B93-39F9-45EC-87BD-86B7AF571557}.Debug|x64.Build.0 = Release|x64
127
-		{05957B93-39F9-45EC-87BD-86B7AF571557}.Release|Win32.ActiveCfg = Release|x64
128
-		{05957B93-39F9-45EC-87BD-86B7AF571557}.Release|Win32.Build.0 = Release|x64
123
+		{05957B93-39F9-45EC-87BD-86B7AF571557}.Debug|Win32.ActiveCfg = Debug|Win32
124
+		{05957B93-39F9-45EC-87BD-86B7AF571557}.Debug|Win32.Build.0 = Debug|Win32
125
+		{05957B93-39F9-45EC-87BD-86B7AF571557}.Debug|x64.ActiveCfg = Debug|x64
126
+		{05957B93-39F9-45EC-87BD-86B7AF571557}.Debug|x64.Build.0 = Debug|x64
127
+		{05957B93-39F9-45EC-87BD-86B7AF571557}.Release|Win32.ActiveCfg = Release|Win32
128
+		{05957B93-39F9-45EC-87BD-86B7AF571557}.Release|Win32.Build.0 = Release|Win32
129 129
 		{05957B93-39F9-45EC-87BD-86B7AF571557}.Release|x64.ActiveCfg = Release|x64
130 130
 		{05957B93-39F9-45EC-87BD-86B7AF571557}.Release|x64.Build.0 = Release|x64
131
-		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Debug|Win32.ActiveCfg = Release|x64
132
-		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Debug|Win32.Build.0 = Release|x64
133
-		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Debug|x64.ActiveCfg = Release|x64
134
-		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Debug|x64.Build.0 = Release|x64
135
-		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Release|Win32.ActiveCfg = Release|x64
136
-		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Release|Win32.Build.0 = Release|x64
131
+		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Debug|Win32.ActiveCfg = Debug|Win32
132
+		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Debug|Win32.Build.0 = Debug|Win32
133
+		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Debug|x64.ActiveCfg = Debug|x64
134
+		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Debug|x64.Build.0 = Debug|x64
135
+		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Release|Win32.ActiveCfg = Release|Win32
136
+		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Release|Win32.Build.0 = Release|Win32
137 137
 		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Release|x64.ActiveCfg = Release|x64
138 138
 		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Release|x64.Build.0 = Release|x64
139
-		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Debug|Win32.ActiveCfg = Release|x64
140
-		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Debug|Win32.Build.0 = Release|x64
141
-		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Debug|x64.ActiveCfg = Release|x64
142
-		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Debug|x64.Build.0 = Release|x64
143
-		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Release|Win32.ActiveCfg = Release|x64
144
-		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Release|Win32.Build.0 = Release|x64
139
+		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Debug|Win32.ActiveCfg = Debug|Win32
140
+		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Debug|Win32.Build.0 = Debug|Win32
141
+		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Debug|x64.ActiveCfg = Debug|x64
142
+		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Debug|x64.Build.0 = Debug|x64
143
+		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Release|Win32.ActiveCfg = Release|Win32
144
+		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Release|Win32.Build.0 = Release|Win32
145 145
 		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Release|x64.ActiveCfg = Release|x64
146 146
 		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Release|x64.Build.0 = Release|x64
147
-		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.Debug|Win32.ActiveCfg = Release|x64
148
-		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.Debug|Win32.Build.0 = Release|x64
149
-		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.Debug|x64.ActiveCfg = Release|x64
150
-		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.Debug|x64.Build.0 = Release|x64
151
-		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.Release|Win32.ActiveCfg = Release|x64
152
-		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.Release|Win32.Build.0 = Release|x64
147
+		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.Debug|Win32.ActiveCfg = Debug|Win32
148
+		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.Debug|Win32.Build.0 = Debug|Win32
149
+		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.Debug|x64.ActiveCfg = Debug|x64
150
+		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.Debug|x64.Build.0 = Debug|x64
151
+		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.Release|Win32.ActiveCfg = Release|Win32
152
+		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.Release|Win32.Build.0 = Release|Win32
153 153
 		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.Release|x64.ActiveCfg = Release|x64
154 154
 		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.Release|x64.Build.0 = Release|x64
155
-		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.Debug|Win32.ActiveCfg = Release|x64
156
-		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.Debug|Win32.Build.0 = Release|x64
157
-		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.Debug|x64.ActiveCfg = Release|x64
158
-		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.Debug|x64.Build.0 = Release|x64
159
-		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.Release|Win32.ActiveCfg = Release|x64
160
-		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.Release|Win32.Build.0 = Release|x64
155
+		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.Debug|Win32.ActiveCfg = Debug|Win32
156
+		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.Debug|Win32.Build.0 = Debug|Win32
157
+		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.Debug|x64.ActiveCfg = Debug|x64
158
+		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.Debug|x64.Build.0 = Debug|x64
159
+		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.Release|Win32.ActiveCfg = Release|Win32
160
+		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.Release|Win32.Build.0 = Release|Win32
161 161
 		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.Release|x64.ActiveCfg = Release|x64
162 162
 		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.Release|x64.Build.0 = Release|x64
163
-		{390D68E1-5228-40A8-9BE4-DD19026001B7}.Debug|Win32.ActiveCfg = Release|x64
164
-		{390D68E1-5228-40A8-9BE4-DD19026001B7}.Debug|Win32.Build.0 = Release|x64
165
-		{390D68E1-5228-40A8-9BE4-DD19026001B7}.Debug|x64.ActiveCfg = Release|x64
166
-		{390D68E1-5228-40A8-9BE4-DD19026001B7}.Debug|x64.Build.0 = Release|x64
167
-		{390D68E1-5228-40A8-9BE4-DD19026001B7}.Release|Win32.ActiveCfg = Release|x64
168
-		{390D68E1-5228-40A8-9BE4-DD19026001B7}.Release|Win32.Build.0 = Release|x64
163
+		{390D68E1-5228-40A8-9BE4-DD19026001B7}.Debug|Win32.ActiveCfg = Debug|Win32
164
+		{390D68E1-5228-40A8-9BE4-DD19026001B7}.Debug|Win32.Build.0 = Debug|Win32
165
+		{390D68E1-5228-40A8-9BE4-DD19026001B7}.Debug|x64.ActiveCfg = Debug|x64
166
+		{390D68E1-5228-40A8-9BE4-DD19026001B7}.Debug|x64.Build.0 = Debug|x64
167
+		{390D68E1-5228-40A8-9BE4-DD19026001B7}.Release|Win32.ActiveCfg = Release|Win32
168
+		{390D68E1-5228-40A8-9BE4-DD19026001B7}.Release|Win32.Build.0 = Release|Win32
169 169
 		{390D68E1-5228-40A8-9BE4-DD19026001B7}.Release|x64.ActiveCfg = Release|x64
170 170
 		{390D68E1-5228-40A8-9BE4-DD19026001B7}.Release|x64.Build.0 = Release|x64
171
-		{30BC968B-C4F7-4598-A672-AC69375C9155}.Debug|Win32.ActiveCfg = Release|x64
172
-		{30BC968B-C4F7-4598-A672-AC69375C9155}.Debug|Win32.Build.0 = Release|x64
173
-		{30BC968B-C4F7-4598-A672-AC69375C9155}.Debug|x64.ActiveCfg = Release|x64
174
-		{30BC968B-C4F7-4598-A672-AC69375C9155}.Debug|x64.Build.0 = Release|x64
175
-		{30BC968B-C4F7-4598-A672-AC69375C9155}.Release|Win32.ActiveCfg = Release|x64
176
-		{30BC968B-C4F7-4598-A672-AC69375C9155}.Release|Win32.Build.0 = Release|x64
171
+		{30BC968B-C4F7-4598-A672-AC69375C9155}.Debug|Win32.ActiveCfg = Debug|Win32
172
+		{30BC968B-C4F7-4598-A672-AC69375C9155}.Debug|Win32.Build.0 = Debug|Win32
173
+		{30BC968B-C4F7-4598-A672-AC69375C9155}.Debug|x64.ActiveCfg = Debug|x64
174
+		{30BC968B-C4F7-4598-A672-AC69375C9155}.Debug|x64.Build.0 = Debug|x64
175
+		{30BC968B-C4F7-4598-A672-AC69375C9155}.Release|Win32.ActiveCfg = Release|Win32
176
+		{30BC968B-C4F7-4598-A672-AC69375C9155}.Release|Win32.Build.0 = Release|Win32
177 177
 		{30BC968B-C4F7-4598-A672-AC69375C9155}.Release|x64.ActiveCfg = Release|x64
178 178
 		{30BC968B-C4F7-4598-A672-AC69375C9155}.Release|x64.Build.0 = Release|x64
179
-		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Debug|Win32.ActiveCfg = Release|x64
180
-		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Debug|Win32.Build.0 = Release|x64
181
-		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Debug|x64.ActiveCfg = Release|x64
182
-		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Debug|x64.Build.0 = Release|x64
183
-		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Release|Win32.ActiveCfg = Release|x64
184
-		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Release|Win32.Build.0 = Release|x64
179
+		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Debug|Win32.ActiveCfg = Debug|Win32
180
+		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Debug|Win32.Build.0 = Debug|Win32
181
+		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Debug|x64.ActiveCfg = Debug|x64
182
+		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Debug|x64.Build.0 = Debug|x64
183
+		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Release|Win32.ActiveCfg = Release|Win32
184
+		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Release|Win32.Build.0 = Release|Win32
185 185
 		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Release|x64.ActiveCfg = Release|x64
186 186
 		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Release|x64.Build.0 = Release|x64
187
-		{2E93DF6C-3C8A-4768-9539-12FB67417224}.Debug|Win32.ActiveCfg = Release|x64
188
-		{2E93DF6C-3C8A-4768-9539-12FB67417224}.Debug|Win32.Build.0 = Release|x64
189
-		{2E93DF6C-3C8A-4768-9539-12FB67417224}.Debug|x64.ActiveCfg = Release|x64
190
-		{2E93DF6C-3C8A-4768-9539-12FB67417224}.Debug|x64.Build.0 = Release|x64
191
-		{2E93DF6C-3C8A-4768-9539-12FB67417224}.Release|Win32.ActiveCfg = Release|x64
192
-		{2E93DF6C-3C8A-4768-9539-12FB67417224}.Release|Win32.Build.0 = Release|x64
187
+		{2E93DF6C-3C8A-4768-9539-12FB67417224}.Debug|Win32.ActiveCfg = Debug|Win32
188
+		{2E93DF6C-3C8A-4768-9539-12FB67417224}.Debug|Win32.Build.0 = Debug|Win32
189
+		{2E93DF6C-3C8A-4768-9539-12FB67417224}.Debug|x64.ActiveCfg = Debug|x64
190
+		{2E93DF6C-3C8A-4768-9539-12FB67417224}.Debug|x64.Build.0 = Debug|x64
191
+		{2E93DF6C-3C8A-4768-9539-12FB67417224}.Release|Win32.ActiveCfg = Release|Win32
192
+		{2E93DF6C-3C8A-4768-9539-12FB67417224}.Release|Win32.Build.0 = Release|Win32
193 193
 		{2E93DF6C-3C8A-4768-9539-12FB67417224}.Release|x64.ActiveCfg = Release|x64
194 194
 		{2E93DF6C-3C8A-4768-9539-12FB67417224}.Release|x64.Build.0 = Release|x64
195 195
 	EndGlobalSection
... ...
@@ -15,181 +15,50 @@ Global
15 15
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
16 16
 		Debug|Win32 = Debug|Win32
17 17
 		Debug|x64 = Debug|x64
18
-		DLL Debug|Win32 = DLL Debug|Win32
19
-		DLL Debug|x64 = DLL Debug|x64
20
-		DLL Release|Win32 = DLL Release|Win32
21
-		DLL Release|x64 = DLL Release|x64
22
-		DLL Universal Debug|Win32 = DLL Universal Debug|Win32
23
-		DLL Universal Debug|x64 = DLL Universal Debug|x64
24
-		DLL Universal Release|Win32 = DLL Universal Release|Win32
25
-		DLL Universal Release|x64 = DLL Universal Release|x64
26 18
 		Release|Win32 = Release|Win32
27 19
 		Release|x64 = Release|x64
28
-		Universal Debug|Win32 = Universal Debug|Win32
29
-		Universal Debug|x64 = Universal Debug|x64
30
-		Universal Release|Win32 = Universal Release|Win32
31
-		Universal Release|x64 = Universal Release|x64
32 20
 	EndGlobalSection
33 21
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
34 22
 		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.Debug|Win32.ActiveCfg = Debug|Win32
35 23
 		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.Debug|Win32.Build.0 = Debug|Win32
36 24
 		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.Debug|x64.ActiveCfg = Debug|x64
37 25
 		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.Debug|x64.Build.0 = Debug|x64
38
-		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.DLL Debug|Win32.ActiveCfg = Debug|Win32
39
-		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.DLL Debug|Win32.Build.0 = Debug|Win32
40
-		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.DLL Debug|x64.ActiveCfg = Debug|x64
41
-		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.DLL Debug|x64.Build.0 = Debug|x64
42
-		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.DLL Release|Win32.ActiveCfg = Release|Win32
43
-		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.DLL Release|Win32.Build.0 = Release|Win32
44
-		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.DLL Release|x64.ActiveCfg = Release|x64
45
-		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.DLL Release|x64.Build.0 = Release|x64
46
-		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.DLL Universal Debug|Win32.ActiveCfg = Debug|Win32
47
-		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.DLL Universal Debug|Win32.Build.0 = Debug|Win32
48
-		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.DLL Universal Debug|x64.ActiveCfg = Debug|x64
49
-		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.DLL Universal Debug|x64.Build.0 = Debug|x64
50
-		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.DLL Universal Release|Win32.ActiveCfg = Release|Win32
51
-		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.DLL Universal Release|Win32.Build.0 = Release|Win32
52
-		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.DLL Universal Release|x64.ActiveCfg = Release|x64
53
-		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.DLL Universal Release|x64.Build.0 = Release|x64
54 26
 		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.Release|Win32.ActiveCfg = Release|Win32
55 27
 		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.Release|Win32.Build.0 = Release|Win32
56 28
 		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.Release|x64.ActiveCfg = Release|x64
57 29
 		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.Release|x64.Build.0 = Release|x64
58
-		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.Universal Debug|Win32.ActiveCfg = Debug|Win32
59
-		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.Universal Debug|Win32.Build.0 = Debug|Win32
60
-		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.Universal Debug|x64.ActiveCfg = Debug|x64
61
-		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.Universal Debug|x64.Build.0 = Debug|x64
62
-		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.Universal Release|Win32.ActiveCfg = Release|Win32
63
-		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.Universal Release|Win32.Build.0 = Release|Win32
64
-		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.Universal Release|x64.ActiveCfg = Release|x64
65
-		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.Universal Release|x64.Build.0 = Release|x64
66 30
 		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.Debug|Win32.ActiveCfg = Debug|Win32
67 31
 		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.Debug|Win32.Build.0 = Debug|Win32
68
-		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.Debug|x64.ActiveCfg = Debug|Win32
69
-		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.DLL Debug|Win32.ActiveCfg = Debug|Win32
70
-		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.DLL Debug|Win32.Build.0 = Debug|Win32
71
-		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.DLL Debug|x64.ActiveCfg = Debug|x64
72
-		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.DLL Debug|x64.Build.0 = Debug|x64
73
-		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.DLL Release|Win32.ActiveCfg = Release|Win32
74
-		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.DLL Release|Win32.Build.0 = Release|Win32
75
-		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.DLL Release|x64.ActiveCfg = Release|x64
76
-		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.DLL Release|x64.Build.0 = Release|x64
77
-		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.DLL Universal Debug|Win32.ActiveCfg = Debug|Win32
78
-		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.DLL Universal Debug|Win32.Build.0 = Debug|Win32
79
-		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.DLL Universal Debug|x64.ActiveCfg = Debug|x64
80
-		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.DLL Universal Debug|x64.Build.0 = Debug|x64
81
-		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.DLL Universal Release|Win32.ActiveCfg = Release|Win32
82
-		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.DLL Universal Release|Win32.Build.0 = Release|Win32
83
-		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.DLL Universal Release|x64.ActiveCfg = Release|x64
84
-		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.DLL Universal Release|x64.Build.0 = Release|x64
32
+		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.Debug|x64.ActiveCfg = Debug|x64
33
+		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.Debug|x64.Build.0 = Debug|x64
85 34
 		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.Release|Win32.ActiveCfg = Release|Win32
86 35
 		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.Release|Win32.Build.0 = Release|Win32
87 36
 		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.Release|x64.ActiveCfg = Release|x64
88 37
 		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.Release|x64.Build.0 = Release|x64
89
-		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.Universal Debug|Win32.ActiveCfg = Debug|Win32
90
-		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.Universal Debug|Win32.Build.0 = Debug|Win32
91
-		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.Universal Debug|x64.ActiveCfg = Debug|x64
92
-		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.Universal Debug|x64.Build.0 = Debug|x64
93
-		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.Universal Release|Win32.ActiveCfg = Release|Win32
94
-		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.Universal Release|Win32.Build.0 = Release|Win32
95
-		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.Universal Release|x64.ActiveCfg = Release|x64
96
-		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.Universal Release|x64.Build.0 = Release|x64
97 38
 		{853D1FD7-20AB-586C-9699-9680F84AC985}.Debug|Win32.ActiveCfg = Debug|Win32
98 39
 		{853D1FD7-20AB-586C-9699-9680F84AC985}.Debug|Win32.Build.0 = Debug|Win32
99 40
 		{853D1FD7-20AB-586C-9699-9680F84AC985}.Debug|x64.ActiveCfg = Debug|x64
100 41
 		{853D1FD7-20AB-586C-9699-9680F84AC985}.Debug|x64.Build.0 = Debug|x64
101
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Debug|Win32.ActiveCfg = Debug|Win32
102
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Debug|Win32.Build.0 = Debug|Win32
103
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Debug|x64.ActiveCfg = Debug|x64
104
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Debug|x64.Build.0 = Debug|x64
105
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Release|Win32.ActiveCfg = Release|Win32
106
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Release|Win32.Build.0 = Release|Win32
107
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Release|x64.ActiveCfg = Release|x64
108
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Release|x64.Build.0 = Release|x64
109
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Universal Debug|Win32.ActiveCfg = Debug|Win32
110
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Universal Debug|Win32.Build.0 = Debug|Win32
111
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Universal Debug|x64.ActiveCfg = Debug|x64
112
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Universal Debug|x64.Build.0 = Debug|x64
113
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Universal Release|Win32.ActiveCfg = Release|Win32
114
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Universal Release|Win32.Build.0 = Release|Win32
115
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Universal Release|x64.ActiveCfg = Release|x64
116
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Universal Release|x64.Build.0 = Release|x64
117 42
 		{853D1FD7-20AB-586C-9699-9680F84AC985}.Release|Win32.ActiveCfg = Release|Win32
118 43
 		{853D1FD7-20AB-586C-9699-9680F84AC985}.Release|Win32.Build.0 = Release|Win32
119 44
 		{853D1FD7-20AB-586C-9699-9680F84AC985}.Release|x64.ActiveCfg = Release|x64
120 45
 		{853D1FD7-20AB-586C-9699-9680F84AC985}.Release|x64.Build.0 = Release|x64
121
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.Universal Debug|Win32.ActiveCfg = Debug|Win32
122
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.Universal Debug|Win32.Build.0 = Debug|Win32
123
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.Universal Debug|x64.ActiveCfg = Debug|x64
124
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.Universal Debug|x64.Build.0 = Debug|x64
125
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.Universal Release|Win32.ActiveCfg = Release|Win32
126
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.Universal Release|Win32.Build.0 = Release|Win32
127
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.Universal Release|x64.ActiveCfg = Release|x64
128
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.Universal Release|x64.Build.0 = Release|x64
129 46
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.ActiveCfg = Debug|Win32
130 47
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.Build.0 = Debug|Win32
131 48
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|x64.ActiveCfg = Debug|x64
132 49
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|x64.Build.0 = Debug|x64
133
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
134
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
135
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
136
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Debug|x64.Build.0 = DLL Debug|x64
137
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
138
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|Win32.Build.0 = DLL Release|Win32
139
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|x64.ActiveCfg = DLL Release|x64
140
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|x64.Build.0 = DLL Release|x64
141
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
142
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
143
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Universal Debug|x64.ActiveCfg = DLL Universal Debug|x64
144
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Universal Debug|x64.Build.0 = DLL Universal Debug|x64
145
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
146
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
147
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Universal Release|x64.ActiveCfg = DLL Universal Release|x64
148
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Universal Release|x64.Build.0 = DLL Universal Release|x64
149 50
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.ActiveCfg = Release|Win32
150 51
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.Build.0 = Release|Win32
151 52
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|x64.ActiveCfg = Release|x64
152 53
 		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|x64.Build.0 = Release|x64
153
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
154
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
155
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Universal Debug|x64.ActiveCfg = Universal Debug|x64
156
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Universal Debug|x64.Build.0 = Universal Debug|x64
157
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
158
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Universal Release|Win32.Build.0 = Universal Release|Win32
159
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Universal Release|x64.ActiveCfg = Universal Release|x64
160
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Universal Release|x64.Build.0 = Universal Release|x64
161 54
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.ActiveCfg = Debug|Win32
162 55
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.Build.0 = Debug|Win32
163 56
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|x64.ActiveCfg = Debug|x64
164 57
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|x64.Build.0 = Debug|x64
165
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
166
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
167
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
168
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Debug|x64.Build.0 = DLL Debug|x64
169
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
170
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|Win32.Build.0 = DLL Release|Win32
171
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|x64.ActiveCfg = DLL Release|x64
172
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|x64.Build.0 = DLL Release|x64
173
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
174
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
175
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Universal Debug|x64.ActiveCfg = DLL Universal Debug|x64
176
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Universal Debug|x64.Build.0 = DLL Universal Debug|x64
177
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
178
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
179
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Universal Release|x64.ActiveCfg = DLL Universal Release|x64
180
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Universal Release|x64.Build.0 = DLL Universal Release|x64
181 58
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.ActiveCfg = Release|Win32
182 59
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.Build.0 = Release|Win32
183 60
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|x64.ActiveCfg = Release|x64
184 61
 		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|x64.Build.0 = Release|x64
185
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
186
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
187
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Universal Debug|x64.ActiveCfg = Universal Debug|x64
188
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Universal Debug|x64.Build.0 = Universal Debug|x64
189
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
190
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Universal Release|Win32.Build.0 = Universal Release|Win32
191
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Universal Release|x64.ActiveCfg = Universal Release|x64
192
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Universal Release|x64.Build.0 = Universal Release|x64
193 62
 	EndGlobalSection
194 63
 	GlobalSection(SolutionProperties) = preSolution
195 64
 		HideSolutionNode = FALSE
... ...
@@ -5,254 +5,70 @@
5 5
       <Configuration>Debug</Configuration>
6 6
       <Platform>Win32</Platform>
7 7
     </ProjectConfiguration>
8
-    <ProjectConfiguration Include="Debug|x64">
9
-      <Configuration>Debug</Configuration>
10
-      <Platform>x64</Platform>
11
-    </ProjectConfiguration>
12
-    <ProjectConfiguration Include="DLL Debug|Win32">
13
-      <Configuration>DLL Debug</Configuration>
14
-      <Platform>Win32</Platform>
15
-    </ProjectConfiguration>
16
-    <ProjectConfiguration Include="DLL Debug|x64">
17
-      <Configuration>DLL Debug</Configuration>
18
-      <Platform>x64</Platform>
19
-    </ProjectConfiguration>
20
-    <ProjectConfiguration Include="DLL Release|Win32">
21
-      <Configuration>DLL Release</Configuration>
22
-      <Platform>Win32</Platform>
23
-    </ProjectConfiguration>
24
-    <ProjectConfiguration Include="DLL Release|x64">
25
-      <Configuration>DLL Release</Configuration>
26
-      <Platform>x64</Platform>
27
-    </ProjectConfiguration>
28
-    <ProjectConfiguration Include="DLL Universal Debug|Win32">
29
-      <Configuration>DLL Universal Debug</Configuration>
30
-      <Platform>Win32</Platform>
31
-    </ProjectConfiguration>
32
-    <ProjectConfiguration Include="DLL Universal Debug|x64">
33
-      <Configuration>DLL Universal Debug</Configuration>
34
-      <Platform>x64</Platform>
35
-    </ProjectConfiguration>
36
-    <ProjectConfiguration Include="DLL Universal Release|Win32">
37
-      <Configuration>DLL Universal Release</Configuration>
38
-      <Platform>Win32</Platform>
8
+    <ProjectConfiguration Include="Debug|x64">
9
+      <Configuration>Debug</Configuration>
10
+      <Platform>x64</Platform>
39 11
     </ProjectConfiguration>
40
-    <ProjectConfiguration Include="DLL Universal Release|x64">
41
-      <Configuration>DLL Universal Release</Configuration>
42
-      <Platform>x64</Platform>
43
-    </ProjectConfiguration>
44 12
     <ProjectConfiguration Include="Release|Win32">
45 13
       <Configuration>Release</Configuration>
46 14
       <Platform>Win32</Platform>
47 15
     </ProjectConfiguration>
48
-    <ProjectConfiguration Include="Release|x64">
49
-      <Configuration>Release</Configuration>
50
-      <Platform>x64</Platform>
51
-    </ProjectConfiguration>
52
-    <ProjectConfiguration Include="Universal Debug|Win32">
53
-      <Configuration>Universal Debug</Configuration>
54
-      <Platform>Win32</Platform>
55
-    </ProjectConfiguration>
56
-    <ProjectConfiguration Include="Universal Debug|x64">
57
-      <Configuration>Universal Debug</Configuration>
58
-      <Platform>x64</Platform>
59
-    </ProjectConfiguration>
60
-    <ProjectConfiguration Include="Universal Release|Win32">
61
-      <Configuration>Universal Release</Configuration>
62
-      <Platform>Win32</Platform>
16
+    <ProjectConfiguration Include="Release|x64">
17
+      <Configuration>Release</Configuration>
18
+      <Platform>x64</Platform>
63 19
     </ProjectConfiguration>
64
-    <ProjectConfiguration Include="Universal Release|x64">
65
-      <Configuration>Universal Release</Configuration>
66
-      <Platform>x64</Platform>
67
-    </ProjectConfiguration>
68 20
   </ItemGroup>
69 21
   <PropertyGroup Label="Globals">
70 22
     <ProjectName>base</ProjectName>
71 23
     <ProjectGuid>{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}</ProjectGuid>
72 24
   </PropertyGroup>
73 25
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
74
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'" Label="Configuration">
75
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
76
-    <UseOfMfc>false</UseOfMfc>
77
-    <CharacterSet>Unicode</CharacterSet>
78
-  </PropertyGroup>
79
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'" Label="Configuration">
80
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
81
-    <UseOfMfc>false</UseOfMfc>
82
-    <CharacterSet>Unicode</CharacterSet>
83
-  </PropertyGroup>
84
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'" Label="Configuration">
85
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
86
-    <UseOfMfc>false</UseOfMfc>
87
-    <CharacterSet>Unicode</CharacterSet>
88
-  </PropertyGroup>
89
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'" Label="Configuration">
90
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
91
-    <UseOfMfc>false</UseOfMfc>
92
-    <CharacterSet>Unicode</CharacterSet>
93
-  </PropertyGroup>
94
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'" Label="Configuration">
95
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
96
-    <UseOfMfc>false</UseOfMfc>
97
-    <CharacterSet>Unicode</CharacterSet>
98
-  </PropertyGroup>
99
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'" Label="Configuration">
100
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
101
-    <UseOfMfc>false</UseOfMfc>
102
-    <CharacterSet>Unicode</CharacterSet>
103
-  </PropertyGroup>
104
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'" Label="Configuration">
105
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
106
-    <UseOfMfc>false</UseOfMfc>
107
-    <CharacterSet>Unicode</CharacterSet>
108
-  </PropertyGroup>
109
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'" Label="Configuration">
110
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
111
-    <UseOfMfc>false</UseOfMfc>
112
-    <CharacterSet>Unicode</CharacterSet>
113
-  </PropertyGroup>
114
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'" Label="Configuration">
26
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
115 27
     <ConfigurationType>StaticLibrary</ConfigurationType>
116 28
     <UseOfMfc>false</UseOfMfc>
117 29
     <CharacterSet>Unicode</CharacterSet>
118 30
   </PropertyGroup>
119
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'" Label="Configuration">
120
-    <ConfigurationType>StaticLibrary</ConfigurationType>
121
-    <UseOfMfc>false</UseOfMfc>
122
-    <CharacterSet>Unicode</CharacterSet>
123
-  </PropertyGroup>
124
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'" Label="Configuration">
31
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
125 32
     <ConfigurationType>StaticLibrary</ConfigurationType>
126 33
     <UseOfMfc>false</UseOfMfc>
127 34
     <CharacterSet>Unicode</CharacterSet>
128 35
   </PropertyGroup>
129
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'" Label="Configuration">
130
-    <ConfigurationType>StaticLibrary</ConfigurationType>
131
-    <UseOfMfc>false</UseOfMfc>
132
-    <CharacterSet>Unicode</CharacterSet>
133
-  </PropertyGroup>
134
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
36
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
135 37
     <ConfigurationType>StaticLibrary</ConfigurationType>
136 38
     <UseOfMfc>false</UseOfMfc>
137 39
     <CharacterSet>Unicode</CharacterSet>
138 40
   </PropertyGroup>
139
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
140
-    <ConfigurationType>StaticLibrary</ConfigurationType>
141
-    <UseOfMfc>false</UseOfMfc>
142
-    <CharacterSet>Unicode</CharacterSet>
143
-  </PropertyGroup>
144
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
41
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
145 42
     <ConfigurationType>StaticLibrary</ConfigurationType>
146 43
     <UseOfMfc>false</UseOfMfc>
147 44
     <CharacterSet>Unicode</CharacterSet>
148 45
   </PropertyGroup>
149
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
150
-    <ConfigurationType>StaticLibrary</ConfigurationType>
151
-    <UseOfMfc>false</UseOfMfc>
152
-    <CharacterSet>Unicode</CharacterSet>
153
-  </PropertyGroup>
154 46
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
155 47
   <ImportGroup Label="ExtensionSettings">
156 48
   </ImportGroup>
157
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'" Label="PropertySheets">
158
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
159
-  </ImportGroup>
160
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'" Label="PropertySheets">
161
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
162
-  </ImportGroup>
163
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'" Label="PropertySheets">
164
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
165
-  </ImportGroup>
166
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'" Label="PropertySheets">
167
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
168
-  </ImportGroup>
169
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'" Label="PropertySheets">
170
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
171
-  </ImportGroup>
172
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'" Label="PropertySheets">
173
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
174
-  </ImportGroup>
175
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'" Label="PropertySheets">
176
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
177
-  </ImportGroup>
178
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'" Label="PropertySheets">
179
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
180
-  </ImportGroup>
181
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'" Label="PropertySheets">
49
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
182 50
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
183 51
   </ImportGroup>
184
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'" Label="PropertySheets">
185
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
186
-  </ImportGroup>
187
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'" Label="PropertySheets">
52
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
188 53
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
189 54
   </ImportGroup>
190
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'" Label="PropertySheets">
191
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
192
-  </ImportGroup>
193
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
55
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
194 56
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
195 57
   </ImportGroup>
196
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
197
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
198
-  </ImportGroup>
199
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
58
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
200 59
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
201 60
   </ImportGroup>
202
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
203
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
204
-  </ImportGroup>
205 61
   <PropertyGroup Label="UserMacros" />
206 62
   <PropertyGroup>
207 63
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
208
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
209
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
210
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)</IntDir>
211
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\$(PlatformName)\$(Configuration)</IntDir>
212
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
213
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
214
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)build\$(PlatformName)\$(Configuration)</IntDir>
215
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\$(PlatformName)\$(Configuration)</IntDir>
216
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
217
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
218
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">$(SolutionDir)build\$(PlatformName)\$(Configuration)</IntDir>
219
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">$(SolutionDir)build\$(PlatformName)\$(Configuration)</IntDir>
220
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
221
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
222
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">$(SolutionDir)build\$(PlatformName)\$(Configuration)</IntDir>
223
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">$(SolutionDir)build\$(PlatformName)\$(Configuration)</IntDir>
224
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
225
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
226
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">$(SolutionDir)build\$(PlatformName)\$(Configuration)</IntDir>
227
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">$(SolutionDir)build\$(PlatformName)\$(Configuration)</IntDir>
228
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</LinkIncremental>
229
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</LinkIncremental>
230
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</GenerateManifest>
231
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</GenerateManifest>
232
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
233
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
234
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">$(SolutionDir)build\$(PlatformName)\$(Configuration)</IntDir>
235
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">$(SolutionDir)build\$(PlatformName)\$(Configuration)</IntDir>
236
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">false</LinkIncremental>
237
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">false</LinkIncremental>
238
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</GenerateManifest>
239
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</GenerateManifest>
240
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
241
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
242
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">$(SolutionDir)build\$(PlatformName)\$(Configuration)</IntDir>
243
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">$(SolutionDir)build\$(PlatformName)\$(Configuration)</IntDir>
244
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</LinkIncremental>
245
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</LinkIncremental>
246
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</GenerateManifest>
247
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</GenerateManifest>
248
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
249
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
250
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">$(SolutionDir)build\$(PlatformName)\$(Configuration)</IntDir>
251
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">$(SolutionDir)build\$(PlatformName)\$(Configuration)</IntDir>
252
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">false</LinkIncremental>
253
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">false</LinkIncremental>
254
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</GenerateManifest>
255
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</GenerateManifest>
64
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
65
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
66
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)</IntDir>
67
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\$(PlatformName)\$(Configuration)</IntDir>
68
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
69
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
70
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)build\$(PlatformName)\$(Configuration)</IntDir>
71
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\$(PlatformName)\$(Configuration)</IntDir>
256 72
   </PropertyGroup>
257 73
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
258 74
     <Midl>
... ...
@@ -262,7 +78,7 @@
262 262
     <ClCompile>
263 263
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
264 264
       <Optimization>Disabled</Optimization>
265
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
265
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
266 266
       <PreprocessorDefinitions>WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
267 267
       <ExceptionHandling>Sync</ExceptionHandling>
268 268
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
... ...
@@ -272,8 +88,8 @@
272 272
       <PrecompiledHeader>Use</PrecompiledHeader>
273 273
       <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
274 274
       <PrecompiledHeaderOutputFile>vc_mswud\wxprec_baselib.pch</PrecompiledHeaderOutputFile>
275
-      <ObjectFileName>$(IntDir)</ObjectFileName>
276
-      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
275
+      <ObjectFileName>$(IntDir)</ObjectFileName>
276
+      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
277 277
       <WarningLevel>Level4</WarningLevel>
278 278
       <SuppressStartupBanner>true</SuppressStartupBanner>
279 279
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
... ...
@@ -282,96 +98,10 @@
282 282
     <ResourceCompile>
283 283
       <PreprocessorDefinitions>_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
284 284
       <Culture>0x0409</Culture>
285
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
286
-    </ResourceCompile>
287
-    <Lib>
288
-      <OutputFile>$(SolutionDir)$(PlatformName)\$(Configuration)\wxbase29u.lib</OutputFile>
289
-      <SuppressStartupBanner>true</SuppressStartupBanner>
290
-    </Lib>
291
-    <Bscmake>
292
-      <OutputFile>..\..\lib\vc_lib\wx_vc10_base.bsc</OutputFile>
293
-      <SuppressStartupBanner>true</SuppressStartupBanner>
294
-    </Bscmake>
295
-    <PreBuildEvent>
296
-      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
297
-    </PreBuildEvent>
298
-  </ItemDefinitionGroup>
299
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
300
-    <Midl>
301
-      <PreprocessorDefinitions>WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
302
-      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
303
-    </Midl>
304
-    <ClCompile>
305
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
306
-      <Optimization>Disabled</Optimization>
307
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
308
-      <PreprocessorDefinitions>WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
309
-      <ExceptionHandling>Sync</ExceptionHandling>
310
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
311
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
312
-      <BufferSecurityCheck>true</BufferSecurityCheck>
313
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
314
-      <PrecompiledHeader>Use</PrecompiledHeader>
315
-      <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
316
-      <PrecompiledHeaderOutputFile>vc_mswud\wxprec_baselib.pch</PrecompiledHeaderOutputFile>
317
-      <ObjectFileName>$(IntDir)</ObjectFileName>
318
-      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
319
-      <WarningLevel>Level4</WarningLevel>
320
-      <SuppressStartupBanner>true</SuppressStartupBanner>
321
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
322
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
323
-    </ClCompile>
324
-    <ResourceCompile>
325
-      <PreprocessorDefinitions>_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
326
-      <Culture>0x0409</Culture>
327
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
328
-    </ResourceCompile>
329
-    <Lib>
330
-      <OutputFile>$(SolutionDir)$(PlatformName)\$(Configuration)\wxbase29u.lib</OutputFile>
331
-      <SuppressStartupBanner>true</SuppressStartupBanner>
332
-    </Lib>
333
-    <Bscmake>
334
-      <OutputFile>..\..\lib\vc_lib\wx_vc10_base.bsc</OutputFile>
335
-      <SuppressStartupBanner>true</SuppressStartupBanner>
336
-    </Bscmake>
337
-    <PreBuildEvent>
338
-      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
339
-    </PreBuildEvent>
340
-  </ItemDefinitionGroup>
341
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
342
-    <Midl>
343
-      <PreprocessorDefinitions>WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
344
-      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
345
-    </Midl>
346
-    <ClCompile>
347
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
348
-      <Optimization>MinSpace</Optimization>
349
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
350
-      <PreprocessorDefinitions>WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
351
-      <ExceptionHandling>Sync</ExceptionHandling>
352
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
353
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
354
-      <PrecompiledHeader>Use</PrecompiledHeader>
355
-      <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
356
-      <PrecompiledHeaderOutputFile>vc_mswu\wxprec_baselib.pch</PrecompiledHeaderOutputFile>
357
-      <ObjectFileName>$(IntDir)</ObjectFileName>
358
-      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
359
-      <WarningLevel>Level4</WarningLevel>
360
-      <SuppressStartupBanner>true</SuppressStartupBanner>
361
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
362
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
363
-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
364
-      <OmitFramePointers>true</OmitFramePointers>
365
-      <WholeProgramOptimization>false</WholeProgramOptimization>
366
-      <FunctionLevelLinking>true</FunctionLevelLinking>
367
-    </ClCompile>
368
-    <ResourceCompile>
369
-      <PreprocessorDefinitions>__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
370
-      <Culture>0x0409</Culture>
371
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
285
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
372 286
     </ResourceCompile>
373 287
     <Lib>
374
-      <OutputFile>$(SolutionDir)$(PlatformName)\$(Configuration)\wxbase29u.lib</OutputFile>
288
+      <OutputFile>$(SolutionDir)$(PlatformName)\$(Configuration)\wxbase29u.lib</OutputFile>
375 289
       <SuppressStartupBanner>true</SuppressStartupBanner>
376 290
     </Lib>
377 291
     <Bscmake>
... ...
@@ -379,63 +109,19 @@
379 379
       <SuppressStartupBanner>true</SuppressStartupBanner>
380 380
     </Bscmake>
381 381
     <PreBuildEvent>
382
-      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
382
+      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
383 383
     </PreBuildEvent>
384 384
   </ItemDefinitionGroup>
385
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
386
-    <Midl>
387
-      <PreprocessorDefinitions>WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
388
-      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
389
-    </Midl>
390
-    <ClCompile>
391
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
392
-      <Optimization>MinSpace</Optimization>
393
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
394
-      <PreprocessorDefinitions>WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
395
-      <ExceptionHandling>Sync</ExceptionHandling>
396
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
397
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
398
-      <PrecompiledHeader>Use</PrecompiledHeader>
399
-      <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
400
-      <PrecompiledHeaderOutputFile>vc_mswu\wxprec_baselib.pch</PrecompiledHeaderOutputFile>
401
-      <ObjectFileName>$(IntDir)</ObjectFileName>
402
-      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
403
-      <WarningLevel>Level4</WarningLevel>
404
-      <SuppressStartupBanner>true</SuppressStartupBanner>
405
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
406
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
407
-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
408
-      <OmitFramePointers>true</OmitFramePointers>
409
-      <WholeProgramOptimization>false</WholeProgramOptimization>
410
-      <FunctionLevelLinking>true</FunctionLevelLinking>
411
-    </ClCompile>
412
-    <ResourceCompile>
413
-      <PreprocessorDefinitions>__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
414
-      <Culture>0x0409</Culture>
415
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
416
-    </ResourceCompile>
417
-    <Lib>
418
-      <OutputFile>$(SolutionDir)$(PlatformName)\$(Configuration)\wxbase29u.lib</OutputFile>
419
-      <SuppressStartupBanner>true</SuppressStartupBanner>
420
-    </Lib>
421
-    <Bscmake>
422
-      <OutputFile>..\..\lib\vc_lib\wx_vc10_base.bsc</OutputFile>
423
-      <SuppressStartupBanner>true</SuppressStartupBanner>
424
-    </Bscmake>
425
-    <PreBuildEvent>
426
-      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
427
-    </PreBuildEvent>
428
-  </ItemDefinitionGroup>
429
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">
385
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
430 386
     <Midl>
431
-      <PreprocessorDefinitions>WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
432
-      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
387
+      <PreprocessorDefinitions>WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
388
+      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
433 389
     </Midl>
434 390
     <ClCompile>
435 391
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
436 392
       <Optimization>Disabled</Optimization>
437
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
438
-      <PreprocessorDefinitions>WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
393
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
394
+      <PreprocessorDefinitions>WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
439 395
       <ExceptionHandling>Sync</ExceptionHandling>
440 396
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
441 397
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
... ...
@@ -443,21 +129,21 @@
443 443
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
444 444
       <PrecompiledHeader>Use</PrecompiledHeader>
445 445
       <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
446
-      <PrecompiledHeaderOutputFile>vc_mswunivud\wxprec_baselib.pch</PrecompiledHeaderOutputFile>
447
-      <ObjectFileName>$(IntDir)</ObjectFileName>
448
-      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
446
+      <PrecompiledHeaderOutputFile>vc_mswud\wxprec_baselib.pch</PrecompiledHeaderOutputFile>
447
+      <ObjectFileName>$(IntDir)</ObjectFileName>
448
+      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
449 449
       <WarningLevel>Level4</WarningLevel>
450 450
       <SuppressStartupBanner>true</SuppressStartupBanner>
451 451
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
452 452
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
453 453
     </ClCompile>
454 454
     <ResourceCompile>
455
-      <PreprocessorDefinitions>_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
455
+      <PreprocessorDefinitions>_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
456 456
       <Culture>0x0409</Culture>
457
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
457
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
458 458
     </ResourceCompile>
459 459
     <Lib>
460
-      <OutputFile>..\..\lib\vc_lib\wxbase29ud.lib</OutputFile>
460
+      <OutputFile>$(SolutionDir)$(PlatformName)\$(Configuration)\wxbase29u.lib</OutputFile>
461 461
       <SuppressStartupBanner>true</SuppressStartupBanner>
462 462
     </Lib>
463 463
     <Bscmake>
... ...
@@ -465,81 +151,43 @@
465 465
       <SuppressStartupBanner>true</SuppressStartupBanner>
466 466
     </Bscmake>
467 467
     <PreBuildEvent>
468
-      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
468
+      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
469 469
     </PreBuildEvent>
470 470
   </ItemDefinitionGroup>
471
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">
472
-    <Midl>
473
-      <PreprocessorDefinitions>WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
474
-      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
475
-    </Midl>
476
-    <ClCompile>
477
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
478
-      <Optimization>Disabled</Optimization>
479
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
480
-      <PreprocessorDefinitions>WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
481
-      <ExceptionHandling>Sync</ExceptionHandling>
482
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
483
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
484
-      <BufferSecurityCheck>true</BufferSecurityCheck>
485
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
486
-      <PrecompiledHeader>Use</PrecompiledHeader>
487
-      <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
488
-      <PrecompiledHeaderOutputFile>vc_mswunivud\wxprec_baselib.pch</PrecompiledHeaderOutputFile>
489
-      <ObjectFileName>$(IntDir)</ObjectFileName>
490
-      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
491
-      <WarningLevel>Level4</WarningLevel>
492
-      <SuppressStartupBanner>true</SuppressStartupBanner>
493
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
494
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
495
-    </ClCompile>
496
-    <ResourceCompile>
497
-      <PreprocessorDefinitions>_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
498
-      <Culture>0x0409</Culture>
499
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
500
-    </ResourceCompile>
501
-    <Lib>
502
-      <OutputFile>..\..\lib\vc_lib\wxbase29ud.lib</OutputFile>
503
-      <SuppressStartupBanner>true</SuppressStartupBanner>
504
-    </Lib>
505
-    <Bscmake>
506
-      <OutputFile>..\..\lib\vc_lib\wx_vc10_base.bsc</OutputFile>
507
-      <SuppressStartupBanner>true</SuppressStartupBanner>
508
-    </Bscmake>
509
-    <PreBuildEvent>
510
-      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
511
-    </PreBuildEvent>
512
-  </ItemDefinitionGroup>
513
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">
471
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
514 472
     <Midl>
515
-      <PreprocessorDefinitions>WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
516
-      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
473
+      <PreprocessorDefinitions>WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
474
+      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
517 475
     </Midl>
518 476
     <ClCompile>
519 477
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
520
-      <Optimization>MaxSpeed</Optimization>
521
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
522
-      <PreprocessorDefinitions>WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
478
+      <Optimization>MinSpace</Optimization>
479
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
480
+      <PreprocessorDefinitions>WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
523 481
       <ExceptionHandling>Sync</ExceptionHandling>
524 482
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
525
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
483
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
526 484
       <PrecompiledHeader>Use</PrecompiledHeader>
527 485
       <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
528
-      <PrecompiledHeaderOutputFile>vc_mswunivu\wxprec_baselib.pch</PrecompiledHeaderOutputFile>
529
-      <ObjectFileName>$(IntDir)</ObjectFileName>
530
-      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
486
+      <PrecompiledHeaderOutputFile>vc_mswu\wxprec_baselib.pch</PrecompiledHeaderOutputFile>
487
+      <ObjectFileName>$(IntDir)</ObjectFileName>
488
+      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
531 489
       <WarningLevel>Level4</WarningLevel>
532 490
       <SuppressStartupBanner>true</SuppressStartupBanner>
533 491
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
534 492
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
493
+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
494
+      <OmitFramePointers>true</OmitFramePointers>
495
+      <WholeProgramOptimization>false</WholeProgramOptimization>
496
+      <FunctionLevelLinking>true</FunctionLevelLinking>
535 497
     </ClCompile>
536 498
     <ResourceCompile>
537
-      <PreprocessorDefinitions>__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
499
+      <PreprocessorDefinitions>__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
538 500
       <Culture>0x0409</Culture>
539
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
501
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
540 502
     </ResourceCompile>
541 503
     <Lib>
542
-      <OutputFile>..\..\lib\vc_lib\wxbase29u.lib</OutputFile>
504
+      <OutputFile>$(SolutionDir)$(PlatformName)\$(Configuration)\wxbase29u.lib</OutputFile>
543 505
       <SuppressStartupBanner>true</SuppressStartupBanner>
544 506
     </Lib>
545 507
     <Bscmake>
... ...
@@ -547,437 +195,53 @@
547 547
       <SuppressStartupBanner>true</SuppressStartupBanner>
548 548
     </Bscmake>
549 549
     <PreBuildEvent>
550
-      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
550
+      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
551 551
     </PreBuildEvent>
552 552
   </ItemDefinitionGroup>
553
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">
554
-    <Midl>
555
-      <PreprocessorDefinitions>WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
556
-      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
557
-    </Midl>
558
-    <ClCompile>
559
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
560
-      <Optimization>MaxSpeed</Optimization>
561
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
562
-      <PreprocessorDefinitions>WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
563
-      <ExceptionHandling>Sync</ExceptionHandling>
564
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
565
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
566
-      <PrecompiledHeader>Use</PrecompiledHeader>
567
-      <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
568
-      <PrecompiledHeaderOutputFile>vc_mswunivu\wxprec_baselib.pch</PrecompiledHeaderOutputFile>
569
-      <ObjectFileName>$(IntDir)</ObjectFileName>
570
-      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
571
-      <WarningLevel>Level4</WarningLevel>
572
-      <SuppressStartupBanner>true</SuppressStartupBanner>
573
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
574
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
575
-    </ClCompile>
576
-    <ResourceCompile>
577
-      <PreprocessorDefinitions>__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
578
-      <Culture>0x0409</Culture>
579
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
580
-    </ResourceCompile>
581
-    <Lib>
582
-      <OutputFile>..\..\lib\vc_lib\wxbase29u.lib</OutputFile>
583
-      <SuppressStartupBanner>true</SuppressStartupBanner>
584
-    </Lib>
585
-    <Bscmake>
586
-      <OutputFile>..\..\lib\vc_lib\wx_vc10_base.bsc</OutputFile>
587
-      <SuppressStartupBanner>true</SuppressStartupBanner>
588
-    </Bscmake>
589
-    <PreBuildEvent>
590
-      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
591
-    </PreBuildEvent>
592
-  </ItemDefinitionGroup>
593
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">
553
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
594 554
     <Midl>
595
-      <PreprocessorDefinitions>WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
596
-      <AdditionalIncludeDirectories>..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
597
-    </Midl>
598
-    <ClCompile>
599
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
600
-      <Optimization>Disabled</Optimization>
601
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
602
-      <PreprocessorDefinitions>WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
603
-      <ExceptionHandling>Sync</ExceptionHandling>
604
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
605
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
606
-      <BufferSecurityCheck>true</BufferSecurityCheck>
607
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
608
-      <PrecompiledHeader>Use</PrecompiledHeader>
609
-      <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
610
-      <PrecompiledHeaderOutputFile>vc_mswuddll\wxprec_basedll.pch</PrecompiledHeaderOutputFile>
611
-      <ObjectFileName>$(IntDir)</ObjectFileName>
612
-      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
613
-      <WarningLevel>Level4</WarningLevel>
614
-      <SuppressStartupBanner>true</SuppressStartupBanner>
615
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
616
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
617
-    </ClCompile>
618
-    <ResourceCompile>
619
-      <PreprocessorDefinitions>_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase291ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
620
-      <Culture>0x0409</Culture>
621
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
622
-    </ResourceCompile>
623
-    <Link>
624
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
625
-      <AdditionalDependencies>wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
626
-      <OutputFile>..\..\lib\vc_dll\wxbase291ud_vc_custom.dll</OutputFile>
627
-      <ImportLibrary>..\..\lib\vc_dll\wxbase29ud.lib</ImportLibrary>
628
-      <SuppressStartupBanner>true</SuppressStartupBanner>
629
-      <AdditionalLibraryDirectories>..\..\lib\vc_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
630
-      <GenerateDebugInformation>true</GenerateDebugInformation>
631
-      <ProgramDatabaseFile>..\..\lib\vc_dll\wxbase291ud_vc_custom.pdb</ProgramDatabaseFile>
632
-      <TargetMachine>MachineX86</TargetMachine>
633
-    </Link>
634
-    <Bscmake>
635
-      <OutputFile>..\..\lib\vc_dll\wx_vc10_base.bsc</OutputFile>
636
-      <SuppressStartupBanner>true</SuppressStartupBanner>
637
-    </Bscmake>
638
-    <PreBuildEvent>
639
-      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
640
-    </PreBuildEvent>
641
-  </ItemDefinitionGroup>
642
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">
643
-    <Midl>
644
-      <PreprocessorDefinitions>WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
645
-      <AdditionalIncludeDirectories>..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
646
-    </Midl>
647
-    <ClCompile>
648
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
649
-      <Optimization>Disabled</Optimization>
650
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
651
-      <PreprocessorDefinitions>WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
652
-      <ExceptionHandling>Sync</ExceptionHandling>
653
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
654
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
655
-      <BufferSecurityCheck>true</BufferSecurityCheck>
656
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
657
-      <PrecompiledHeader>Use</PrecompiledHeader>
658
-      <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
659
-      <PrecompiledHeaderOutputFile>vc_mswuddll\wxprec_basedll.pch</PrecompiledHeaderOutputFile>
660
-      <ObjectFileName>$(IntDir)</ObjectFileName>
661
-      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
662
-      <WarningLevel>Level4</WarningLevel>
663
-      <SuppressStartupBanner>true</SuppressStartupBanner>
664
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
665
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
666
-    </ClCompile>
667
-    <ResourceCompile>
668
-      <PreprocessorDefinitions>_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase291ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
669
-      <Culture>0x0409</Culture>
670
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
671
-    </ResourceCompile>
672
-    <Link>
673
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
674
-      <AdditionalDependencies>wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
675
-      <OutputFile>..\..\lib\vc_dll\wxbase291ud_vc_custom.dll</OutputFile>
676
-      <ImportLibrary>..\..\lib\vc_dll\wxbase29ud.lib</ImportLibrary>
677
-      <SuppressStartupBanner>true</SuppressStartupBanner>
678
-      <AdditionalLibraryDirectories>..\..\lib\vc_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
679
-      <GenerateDebugInformation>true</GenerateDebugInformation>
680
-      <ProgramDatabaseFile>..\..\lib\vc_dll\wxbase291ud_vc_custom.pdb</ProgramDatabaseFile>
681
-    </Link>
682
-    <Bscmake>
683
-      <OutputFile>..\..\lib\vc_dll\wx_vc10_base.bsc</OutputFile>
684
-      <SuppressStartupBanner>true</SuppressStartupBanner>
685
-    </Bscmake>
686
-    <PreBuildEvent>
687
-      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
688
-    </PreBuildEvent>
689
-  </ItemDefinitionGroup>
690
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">
691
-    <Midl>
692
-      <PreprocessorDefinitions>WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
693
-      <AdditionalIncludeDirectories>..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
694
-    </Midl>
695
-    <ClCompile>
696
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
697
-      <Optimization>MaxSpeed</Optimization>
698
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
699
-      <PreprocessorDefinitions>WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
700
-      <ExceptionHandling>Sync</ExceptionHandling>
701
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
702
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
703
-      <PrecompiledHeader>Use</PrecompiledHeader>
704
-      <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
705
-      <PrecompiledHeaderOutputFile>vc_mswudll\wxprec_basedll.pch</PrecompiledHeaderOutputFile>
706
-      <ObjectFileName>$(IntDir)</ObjectFileName>
707
-      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
708
-      <WarningLevel>Level4</WarningLevel>
709
-      <SuppressStartupBanner>true</SuppressStartupBanner>
710
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
711
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
712
-    </ClCompile>
713
-    <ResourceCompile>
714
-      <PreprocessorDefinitions>__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase291u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
715
-      <Culture>0x0409</Culture>
716
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
717
-    </ResourceCompile>
718
-    <Link>
719
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
720
-      <AdditionalDependencies>wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
721
-      <OutputFile>..\..\lib\vc_dll\wxbase291u_vc_custom.dll</OutputFile>
722
-      <ImportLibrary>..\..\lib\vc_dll\wxbase29u.lib</ImportLibrary>
723
-      <SuppressStartupBanner>true</SuppressStartupBanner>
724
-      <AdditionalLibraryDirectories>..\..\lib\vc_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
725
-      <GenerateDebugInformation>true</GenerateDebugInformation>
726
-      <ProgramDatabaseFile>..\..\lib\vc_dll\wxbase291u_vc_custom.pdb</ProgramDatabaseFile>
727
-      <TargetMachine>MachineX86</TargetMachine>
728
-      <OptimizeReferences>true</OptimizeReferences>
729
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
730
-    </Link>
731
-    <Bscmake>
732
-      <OutputFile>..\..\lib\vc_dll\wx_vc10_base.bsc</OutputFile>
733
-      <SuppressStartupBanner>true</SuppressStartupBanner>
734
-    </Bscmake>
735
-    <PreBuildEvent>
736
-      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
737
-    </PreBuildEvent>
738
-  </ItemDefinitionGroup>
739
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">
740
-    <Midl>
741
-      <PreprocessorDefinitions>WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
742
-      <AdditionalIncludeDirectories>..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
743
-    </Midl>
744
-    <ClCompile>
745
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
746
-      <Optimization>MaxSpeed</Optimization>
747
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
748
-      <PreprocessorDefinitions>WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
749
-      <ExceptionHandling>Sync</ExceptionHandling>
750
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
751
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
752
-      <PrecompiledHeader>Use</PrecompiledHeader>
753
-      <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
754
-      <PrecompiledHeaderOutputFile>vc_mswudll\wxprec_basedll.pch</PrecompiledHeaderOutputFile>
755
-      <ObjectFileName>$(IntDir)</ObjectFileName>
756
-      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
757
-      <WarningLevel>Level4</WarningLevel>
758
-      <SuppressStartupBanner>true</SuppressStartupBanner>
759
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
760
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
761
-    </ClCompile>
762
-    <ResourceCompile>
763
-      <PreprocessorDefinitions>__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase291u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
764
-      <Culture>0x0409</Culture>
765
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
766
-    </ResourceCompile>
767
-    <Link>
768
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
769
-      <AdditionalDependencies>wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
770
-      <OutputFile>..\..\lib\vc_dll\wxbase291u_vc_custom.dll</OutputFile>
771
-      <ImportLibrary>..\..\lib\vc_dll\wxbase29u.lib</ImportLibrary>
772
-      <SuppressStartupBanner>true</SuppressStartupBanner>
773
-      <AdditionalLibraryDirectories>..\..\lib\vc_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
774
-      <GenerateDebugInformation>true</GenerateDebugInformation>
775
-      <ProgramDatabaseFile>..\..\lib\vc_dll\wxbase291u_vc_custom.pdb</ProgramDatabaseFile>
776
-      <OptimizeReferences>true</OptimizeReferences>
777
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
778
-    </Link>
779
-    <Bscmake>
780
-      <OutputFile>..\..\lib\vc_dll\wx_vc10_base.bsc</OutputFile>
781
-      <SuppressStartupBanner>true</SuppressStartupBanner>
782
-    </Bscmake>
783
-    <PreBuildEvent>
784
-      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
785
-    </PreBuildEvent>
786
-  </ItemDefinitionGroup>
787
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">
788
-    <Midl>
789
-      <PreprocessorDefinitions>WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
790
-      <AdditionalIncludeDirectories>..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
791
-    </Midl>
792
-    <ClCompile>
793
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
794
-      <Optimization>Disabled</Optimization>
795
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
796
-      <PreprocessorDefinitions>WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
797
-      <ExceptionHandling>Sync</ExceptionHandling>
798
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
799
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
800
-      <BufferSecurityCheck>true</BufferSecurityCheck>
801
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
802
-      <PrecompiledHeader>Use</PrecompiledHeader>
803
-      <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
804
-      <PrecompiledHeaderOutputFile>vc_mswunivuddll\wxprec_basedll.pch</PrecompiledHeaderOutputFile>
805
-      <ObjectFileName>$(IntDir)</ObjectFileName>
806
-      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
807
-      <WarningLevel>Level4</WarningLevel>
808
-      <SuppressStartupBanner>true</SuppressStartupBanner>
809
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
810
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
811
-    </ClCompile>
812
-    <ResourceCompile>
813
-      <PreprocessorDefinitions>_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase291ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
814
-      <Culture>0x0409</Culture>
815
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
816
-    </ResourceCompile>
817
-    <Link>
818
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
819
-      <AdditionalDependencies>wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
820
-      <OutputFile>..\..\lib\vc_dll\wxbase291ud_vc_custom.dll</OutputFile>
821
-      <ImportLibrary>..\..\lib\vc_dll\wxbase29ud.lib</ImportLibrary>
822
-      <SuppressStartupBanner>true</SuppressStartupBanner>
823
-      <AdditionalLibraryDirectories>..\..\lib\vc_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
824
-      <GenerateDebugInformation>true</GenerateDebugInformation>
825
-      <ProgramDatabaseFile>..\..\lib\vc_dll\wxbase291ud_vc_custom.pdb</ProgramDatabaseFile>
826
-      <TargetMachine>MachineX86</TargetMachine>
827
-    </Link>
828
-    <Bscmake>
829
-      <OutputFile>..\..\lib\vc_dll\wx_vc10_base.bsc</OutputFile>
830
-      <SuppressStartupBanner>true</SuppressStartupBanner>
831
-    </Bscmake>
832
-    <PreBuildEvent>
833
-      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
834
-    </PreBuildEvent>
835
-  </ItemDefinitionGroup>
836
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">
837
-    <Midl>
838
-      <PreprocessorDefinitions>WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
839
-      <AdditionalIncludeDirectories>..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
840
-    </Midl>
841
-    <ClCompile>
842
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
843
-      <Optimization>Disabled</Optimization>
844
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
845
-      <PreprocessorDefinitions>WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
846
-      <ExceptionHandling>Sync</ExceptionHandling>
847
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
848
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
849
-      <BufferSecurityCheck>true</BufferSecurityCheck>
850
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
851
-      <PrecompiledHeader>Use</PrecompiledHeader>
852
-      <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
853
-      <PrecompiledHeaderOutputFile>vc_mswunivuddll\wxprec_basedll.pch</PrecompiledHeaderOutputFile>
854
-      <ObjectFileName>$(IntDir)</ObjectFileName>
855
-      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
856
-      <WarningLevel>Level4</WarningLevel>
857
-      <SuppressStartupBanner>true</SuppressStartupBanner>
858
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
859
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
860
-    </ClCompile>
861
-    <ResourceCompile>
862
-      <PreprocessorDefinitions>_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase291ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
863
-      <Culture>0x0409</Culture>
864
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
865
-    </ResourceCompile>
866
-    <Link>
867
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
868
-      <AdditionalDependencies>wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
869
-      <OutputFile>..\..\lib\vc_dll\wxbase291ud_vc_custom.dll</OutputFile>
870
-      <ImportLibrary>..\..\lib\vc_dll\wxbase29ud.lib</ImportLibrary>
871
-      <SuppressStartupBanner>true</SuppressStartupBanner>
872
-      <AdditionalLibraryDirectories>..\..\lib\vc_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
873
-      <GenerateDebugInformation>true</GenerateDebugInformation>
874
-      <ProgramDatabaseFile>..\..\lib\vc_dll\wxbase291ud_vc_custom.pdb</ProgramDatabaseFile>
875
-    </Link>
876
-    <Bscmake>
877
-      <OutputFile>..\..\lib\vc_dll\wx_vc10_base.bsc</OutputFile>
878
-      <SuppressStartupBanner>true</SuppressStartupBanner>
879
-    </Bscmake>
880
-    <PreBuildEvent>
881
-      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
882
-    </PreBuildEvent>
883
-  </ItemDefinitionGroup>
884
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">
885
-    <Midl>
886
-      <PreprocessorDefinitions>WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
887
-      <AdditionalIncludeDirectories>..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
555
+      <PreprocessorDefinitions>WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
556
+      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
888 557
     </Midl>
889 558
     <ClCompile>
890 559
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
891
-      <Optimization>MaxSpeed</Optimization>
892
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
893
-      <PreprocessorDefinitions>WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
560
+      <Optimization>MinSpace</Optimization>
561
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
562
+      <PreprocessorDefinitions>WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
894 563
       <ExceptionHandling>Sync</ExceptionHandling>
895 564
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
896
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
565
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
897 566
       <PrecompiledHeader>Use</PrecompiledHeader>
898 567
       <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
899
-      <PrecompiledHeaderOutputFile>vc_mswunivudll\wxprec_basedll.pch</PrecompiledHeaderOutputFile>
900
-      <ObjectFileName>$(IntDir)</ObjectFileName>
901
-      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
568
+      <PrecompiledHeaderOutputFile>vc_mswu\wxprec_baselib.pch</PrecompiledHeaderOutputFile>
569
+      <ObjectFileName>$(IntDir)</ObjectFileName>
570
+      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
902 571
       <WarningLevel>Level4</WarningLevel>
903 572
       <SuppressStartupBanner>true</SuppressStartupBanner>
904 573
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
905 574
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
575
+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
576
+      <OmitFramePointers>true</OmitFramePointers>
577
+      <WholeProgramOptimization>false</WholeProgramOptimization>
578
+      <FunctionLevelLinking>true</FunctionLevelLinking>
906 579
     </ClCompile>
907 580
     <ResourceCompile>
908
-      <PreprocessorDefinitions>__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase291u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
581
+      <PreprocessorDefinitions>__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
909 582
       <Culture>0x0409</Culture>
910
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
583
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
911 584
     </ResourceCompile>
912
-    <Link>
913
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
914
-      <AdditionalDependencies>wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
915
-      <OutputFile>..\..\lib\vc_dll\wxbase291u_vc_custom.dll</OutputFile>
916
-      <ImportLibrary>..\..\lib\vc_dll\wxbase29u.lib</ImportLibrary>
585
+    <Lib>
586
+      <OutputFile>$(SolutionDir)$(PlatformName)\$(Configuration)\wxbase29u.lib</OutputFile>
917 587
       <SuppressStartupBanner>true</SuppressStartupBanner>
918
-      <AdditionalLibraryDirectories>..\..\lib\vc_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
919
-      <GenerateDebugInformation>true</GenerateDebugInformation>
920
-      <ProgramDatabaseFile>..\..\lib\vc_dll\wxbase291u_vc_custom.pdb</ProgramDatabaseFile>
921
-      <TargetMachine>MachineX86</TargetMachine>
922
-      <OptimizeReferences>true</OptimizeReferences>
923
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
924
-    </Link>
588
+    </Lib>
925 589
     <Bscmake>
926
-      <OutputFile>..\..\lib\vc_dll\wx_vc10_base.bsc</OutputFile>
590
+      <OutputFile>..\..\lib\vc_lib\wx_vc10_base.bsc</OutputFile>
927 591
       <SuppressStartupBanner>true</SuppressStartupBanner>
928 592
     </Bscmake>
929 593
     <PreBuildEvent>
930
-      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
594
+      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
931 595
     </PreBuildEvent>
932 596
   </ItemDefinitionGroup>
933
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">
934
-    <Midl>
935
-      <PreprocessorDefinitions>WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
936
-      <AdditionalIncludeDirectories>..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
937
-    </Midl>
938
-    <ClCompile>
939
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
940
-      <Optimization>MaxSpeed</Optimization>
941
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
942
-      <PreprocessorDefinitions>WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
943
-      <ExceptionHandling>Sync</ExceptionHandling>
944
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
945
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
946
-      <PrecompiledHeader>Use</PrecompiledHeader>
947
-      <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
948
-      <PrecompiledHeaderOutputFile>vc_mswunivudll\wxprec_basedll.pch</PrecompiledHeaderOutputFile>
949
-      <ObjectFileName>$(IntDir)</ObjectFileName>
950
-      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
951
-      <WarningLevel>Level4</WarningLevel>
952
-      <SuppressStartupBanner>true</SuppressStartupBanner>
953
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
954
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
955
-    </ClCompile>
956
-    <ResourceCompile>
957
-      <PreprocessorDefinitions>__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase291u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
958
-      <Culture>0x0409</Culture>
959
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
960
-    </ResourceCompile>
961
-    <Link>
962
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
963
-      <AdditionalDependencies>wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
964
-      <OutputFile>..\..\lib\vc_dll\wxbase291u_vc_custom.dll</OutputFile>
965
-      <ImportLibrary>..\..\lib\vc_dll\wxbase29u.lib</ImportLibrary>
966
-      <SuppressStartupBanner>true</SuppressStartupBanner>
967
-      <AdditionalLibraryDirectories>..\..\lib\vc_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
968
-      <GenerateDebugInformation>true</GenerateDebugInformation>
969
-      <ProgramDatabaseFile>..\..\lib\vc_dll\wxbase291u_vc_custom.pdb</ProgramDatabaseFile>
970
-      <OptimizeReferences>true</OptimizeReferences>
971
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
972
-    </Link>
973
-    <Bscmake>
974
-      <OutputFile>..\..\lib\vc_dll\wx_vc10_base.bsc</OutputFile>
975
-      <SuppressStartupBanner>true</SuppressStartupBanner>
976
-    </Bscmake>
977
-    <PreBuildEvent>
978
-      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
979
-    </PreBuildEvent>
980
-  </ItemDefinitionGroup>
981 597
   <ItemGroup>
982 598
     <ClCompile Include="..\..\src\common\any.cpp" />
983 599
     <ClCompile Include="..\..\src\common\appbase.cpp" />
... ...
@@ -995,22 +259,10 @@
995 995
     <ClCompile Include="..\..\src\common\datstrm.cpp" />
996 996
     <ClCompile Include="..\..\src\common\dircmn.cpp" />
997 997
     <ClCompile Include="..\..\src\common\dummy.cpp">
998
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">Create</PrecompiledHeader>
999
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">Create</PrecompiledHeader>
1000
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">Create</PrecompiledHeader>
1001
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">Create</PrecompiledHeader>
1002
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">Create</PrecompiledHeader>
1003
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">Create</PrecompiledHeader>
1004
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">Create</PrecompiledHeader>
1005
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">Create</PrecompiledHeader>
1006 998
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
1007
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
999
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
1008 1000
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
1009
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
1010
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">Create</PrecompiledHeader>
1011
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">Create</PrecompiledHeader>
1012
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">Create</PrecompiledHeader>
1013
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">Create</PrecompiledHeader>
1001
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
1014 1002
     </ClCompile>
1015 1003
     <ClCompile Include="..\..\src\common\dynarray.cpp" />
1016 1004
     <ClCompile Include="..\..\src\common\dynlib.cpp" />
... ...
@@ -1019,38 +271,14 @@
1019 1019
     <ClCompile Include="..\..\src\common\event.cpp" />
1020 1020
     <ClCompile Include="..\..\src\common\evtloopcmn.cpp" />
1021 1021
     <ClCompile Include="..\..\src\common\extended.c">
1022
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">
1023
-      </PrecompiledHeader>
1024
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">
1025
-      </PrecompiledHeader>
1026
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">
1027
-      </PrecompiledHeader>
1028
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">
1029
-      </PrecompiledHeader>
1030
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">
1031
-      </PrecompiledHeader>
1032
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">
1033
-      </PrecompiledHeader>
1034
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">
1035
-      </PrecompiledHeader>
1036
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">
1037
-      </PrecompiledHeader>
1038 1022
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
1039 1023
       </PrecompiledHeader>
1040
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
1041
-      </PrecompiledHeader>
1042
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
1024
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
1043 1025
       </PrecompiledHeader>
1044
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
1045
-      </PrecompiledHeader>
1046
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">
1026
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
1047 1027
       </PrecompiledHeader>
1048
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">
1049
-      </PrecompiledHeader>
1050
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">
1028
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
1051 1029
       </PrecompiledHeader>
1052
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">
1053
-      </PrecompiledHeader>
1054 1030
     </ClCompile>
1055 1031
     <ClCompile Include="..\..\src\common\ffile.cpp" />
1056 1032
     <ClCompile Include="..\..\src\common\file.cpp" />
... ...
@@ -1144,111 +372,35 @@
1144 1144
   <ItemGroup>
1145 1145
     <ResourceCompile Include="..\..\src\msw\version.rc">
1146 1146
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
1147
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
1147
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
1148 1148
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
1149
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
1150
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1151
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1152
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1153
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1149
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
1154 1150
     </ResourceCompile>
1155 1151
   </ItemGroup>
1156 1152
   <ItemGroup>
1157 1153
     <ClInclude Include="..\..\include\wx\msw\setup.h">
1158
-      <Message Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">Creating ..\..\lib\vc_dll\mswud\wx\setup.h</Message>
1159
-      <Message Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">Creating ..\..\lib\vc_dll\mswud\wx\setup.h</Message>
1160
-      <Command Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">copy "%(FullPath)" ..\..\lib\vc_dll\mswud\wx\setup.h</Command>
1161
-      <Command Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">copy "%(FullPath)" ..\..\lib\vc_dll\mswud\wx\setup.h</Command>
1162
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">..\..\lib\vc_dll\mswud\wx\setup.h;%(Outputs)</Outputs>
1163
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">..\..\lib\vc_dll\mswud\wx\setup.h;%(Outputs)</Outputs>
1164
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">$(INTDIR) $(OUTDIR);%(AdditionalInputs)</AdditionalInputs>
1165
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">$(INTDIR) $(OUTDIR);%(AdditionalInputs)</AdditionalInputs>
1166
-      <Message Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">Creating ..\..\lib\vc_dll\mswu\wx\setup.h</Message>
1167
-      <Message Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">Creating ..\..\lib\vc_dll\mswu\wx\setup.h</Message>
1168
-      <Command Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">copy "%(FullPath)" ..\..\lib\vc_dll\mswu\wx\setup.h</Command>
1169
-      <Command Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">copy "%(FullPath)" ..\..\lib\vc_dll\mswu\wx\setup.h</Command>
1170
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">..\..\lib\vc_dll\mswu\wx\setup.h;%(Outputs)</Outputs>
1171
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">..\..\lib\vc_dll\mswu\wx\setup.h;%(Outputs)</Outputs>
1172
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">$(INTDIR) $(OUTDIR);%(AdditionalInputs)</AdditionalInputs>
1173
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">$(INTDIR) $(OUTDIR);%(AdditionalInputs)</AdditionalInputs>
1174 1154
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Creating ..\..\lib\vc_lib\mswud\wx\setup.h</Message>
1175
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Creating ..\..\lib\vc_lib\mswud\wx\setup.h</Message>
1155
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Creating ..\..\lib\vc_lib\mswud\wx\setup.h</Message>
1176 1156
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" ..\..\lib\vc_lib\mswud\wx\setup.h</Command>
1177
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy "%(FullPath)" ..\..\lib\vc_lib\mswud\wx\setup.h</Command>
1157
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy "%(FullPath)" ..\..\lib\vc_lib\mswud\wx\setup.h</Command>
1178 1158
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\lib\vc_lib\mswud\wx\setup.h;%(Outputs)</Outputs>
1179
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\lib\vc_lib\mswud\wx\setup.h;%(Outputs)</Outputs>
1159
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\lib\vc_lib\mswud\wx\setup.h;%(Outputs)</Outputs>
1180 1160
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(INTDIR) $(OUTDIR);%(AdditionalInputs)</AdditionalInputs>
1181
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(INTDIR) $(OUTDIR);%(AdditionalInputs)</AdditionalInputs>
1161
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(INTDIR) $(OUTDIR);%(AdditionalInputs)</AdditionalInputs>
1182 1162
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Creating ..\..\lib\vc_lib\mswu\wx\setup.h</Message>
1183
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Creating ..\..\lib\vc_lib\mswu\wx\setup.h</Message>
1163
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Creating ..\..\lib\vc_lib\mswu\wx\setup.h</Message>
1184 1164
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy "%(FullPath)" ..\..\lib\vc_lib\mswu\wx\setup.h</Command>
1185
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy "%(FullPath)" ..\..\lib\vc_lib\mswu\wx\setup.h</Command>
1165
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy "%(FullPath)" ..\..\lib\vc_lib\mswu\wx\setup.h</Command>
1186 1166
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\lib\vc_lib\mswu\wx\setup.h;%(Outputs)</Outputs>
1187
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\lib\vc_lib\mswu\wx\setup.h;%(Outputs)</Outputs>
1167
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\lib\vc_lib\mswu\wx\setup.h;%(Outputs)</Outputs>
1188 1168
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(INTDIR) $(OUTDIR);%(AdditionalInputs)</AdditionalInputs>
1189
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(INTDIR) $(OUTDIR);%(AdditionalInputs)</AdditionalInputs>
1190
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
1191
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
1192
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
1193
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
1194
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1195
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1196
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1197
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1169
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(INTDIR) $(OUTDIR);%(AdditionalInputs)</AdditionalInputs>
1198 1170
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
1199
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
1200
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1201
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1202
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1203
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1171
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
1204 1172
     </ClInclude>
1205 1173
     <ClInclude Include="..\..\include\wx\univ\setup.h">
1206
-      <Message Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h</Message>
1207
-      <Message Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h</Message>
1208
-      <Command Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">copy "%(FullPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h</Command>
1209
-      <Command Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">copy "%(FullPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h</Command>
1210
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">..\..\lib\vc_dll\mswunivud\wx\setup.h;%(Outputs)</Outputs>
1211
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">..\..\lib\vc_dll\mswunivud\wx\setup.h;%(Outputs)</Outputs>
1212
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">$(INTDIR) $(OUTDIR);%(AdditionalInputs)</AdditionalInputs>
1213
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">$(INTDIR) $(OUTDIR);%(AdditionalInputs)</AdditionalInputs>
1214
-      <Message Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h</Message>
1215
-      <Message Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h</Message>
1216
-      <Command Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">copy "%(FullPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h</Command>
1217
-      <Command Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">copy "%(FullPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h</Command>
1218
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">..\..\lib\vc_dll\mswunivu\wx\setup.h;%(Outputs)</Outputs>
1219
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">..\..\lib\vc_dll\mswunivu\wx\setup.h;%(Outputs)</Outputs>
1220
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">$(INTDIR) $(OUTDIR);%(AdditionalInputs)</AdditionalInputs>
1221
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">$(INTDIR) $(OUTDIR);%(AdditionalInputs)</AdditionalInputs>
1222
-      <Message Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h</Message>
1223
-      <Message Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h</Message>
1224
-      <Command Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">copy "%(FullPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h</Command>
1225
-      <Command Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">copy "%(FullPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h</Command>
1226
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">..\..\lib\vc_lib\mswunivud\wx\setup.h;%(Outputs)</Outputs>
1227
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">..\..\lib\vc_lib\mswunivud\wx\setup.h;%(Outputs)</Outputs>
1228
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">$(INTDIR) $(OUTDIR);%(AdditionalInputs)</AdditionalInputs>
1229
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">$(INTDIR) $(OUTDIR);%(AdditionalInputs)</AdditionalInputs>
1230
-      <Message Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h</Message>
1231
-      <Message Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h</Message>
1232
-      <Command Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">copy "%(FullPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h</Command>
1233
-      <Command Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">copy "%(FullPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h</Command>
1234
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">..\..\lib\vc_lib\mswunivu\wx\setup.h;%(Outputs)</Outputs>
1235
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">..\..\lib\vc_lib\mswunivu\wx\setup.h;%(Outputs)</Outputs>
1236
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">$(INTDIR) $(OUTDIR);%(AdditionalInputs)</AdditionalInputs>
1237
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">$(INTDIR) $(OUTDIR);%(AdditionalInputs)</AdditionalInputs>
1238
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
1239
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
1240
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
1241
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
1242
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1243
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1244
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1245
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1246 1174
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
1247
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
1248
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1249
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1250
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1251
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1175
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
1252 1176
     </ClInclude>
1253 1177
     <ClInclude Include="..\..\include\wx\msw\apptbase.h" />
1254 1178
     <ClInclude Include="..\..\include\wx\msw\apptrait.h" />
... ...
@@ -1259,70 +411,22 @@
1259 1259
     <ClInclude Include="..\..\include\wx\msw\fswatcher.h" />
1260 1260
     <ClInclude Include="..\..\include\wx\msw\gccpriv.h" />
1261 1261
     <CustomBuild Include="..\..\include\wx\msw\genrcdefs.h">
1262
-      <Message Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h</Message>
1263
-      <Message Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h</Message>
1264
-      <Command Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">cl /EP /nologo "%(FullPath)" &gt; "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"</Command>
1265
-      <Command Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">cl /EP /nologo "%(FullPath)" &gt; "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"</Command>
1266
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h;%(Outputs)</Outputs>
1267
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h;%(Outputs)</Outputs>
1268
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">..\..\lib\vc_dll\mswud\wx\msw;%(AdditionalInputs)</AdditionalInputs>
1269
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">..\..\lib\vc_dll\mswud\wx\msw;%(AdditionalInputs)</AdditionalInputs>
1270
-      <Message Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h</Message>
1271
-      <Message Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h</Message>
1272
-      <Command Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">cl /EP /nologo "%(FullPath)" &gt; "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"</Command>
1273
-      <Command Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">cl /EP /nologo "%(FullPath)" &gt; "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"</Command>
1274
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h;%(Outputs)</Outputs>
1275
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h;%(Outputs)</Outputs>
1276
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">..\..\lib\vc_dll\mswu\wx\msw;%(AdditionalInputs)</AdditionalInputs>
1277
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">..\..\lib\vc_dll\mswu\wx\msw;%(AdditionalInputs)</AdditionalInputs>
1278
-      <Message Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h</Message>
1279
-      <Message Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h</Message>
1280
-      <Command Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">cl /EP /nologo "%(FullPath)" &gt; "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"</Command>
1281
-      <Command Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">cl /EP /nologo "%(FullPath)" &gt; "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"</Command>
1282
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h;%(Outputs)</Outputs>
1283
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h;%(Outputs)</Outputs>
1284
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">..\..\lib\vc_dll\mswunivud\wx\msw;%(AdditionalInputs)</AdditionalInputs>
1285
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">..\..\lib\vc_dll\mswunivud\wx\msw;%(AdditionalInputs)</AdditionalInputs>
1286
-      <Message Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h</Message>
1287
-      <Message Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h</Message>
1288
-      <Command Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">cl /EP /nologo "%(FullPath)" &gt; "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"</Command>
1289
-      <Command Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">cl /EP /nologo "%(FullPath)" &gt; "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"</Command>
1290
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h;%(Outputs)</Outputs>
1291
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h;%(Outputs)</Outputs>
1292
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">..\..\lib\vc_dll\mswunivu\wx\msw;%(AdditionalInputs)</AdditionalInputs>
1293
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">..\..\lib\vc_dll\mswunivu\wx\msw;%(AdditionalInputs)</AdditionalInputs>
1294 1262
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h</Message>
1295
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h</Message>
1263
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h</Message>
1296 1264
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cl /EP /nologo "%(FullPath)" &gt; "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"</Command>
1297
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cl /EP /nologo "%(FullPath)" &gt; "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"</Command>
1265
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cl /EP /nologo "%(FullPath)" &gt; "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"</Command>
1298 1266
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs)</Outputs>
1299
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs)</Outputs>
1267
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs)</Outputs>
1300 1268
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\lib\vc_lib\mswud\wx\msw;%(AdditionalInputs)</AdditionalInputs>
1301
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\lib\vc_lib\mswud\wx\msw;%(AdditionalInputs)</AdditionalInputs>
1269
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\lib\vc_lib\mswud\wx\msw;%(AdditionalInputs)</AdditionalInputs>
1302 1270
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h</Message>
1303
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h</Message>
1271
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h</Message>
1304 1272
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cl /EP /nologo "%(FullPath)" &gt; "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"</Command>
1305
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cl /EP /nologo "%(FullPath)" &gt; "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"</Command>
1273
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cl /EP /nologo "%(FullPath)" &gt; "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"</Command>
1306 1274
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs)</Outputs>
1307
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs)</Outputs>
1275
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs)</Outputs>
1308 1276
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\lib\vc_lib\mswu\wx\msw;%(AdditionalInputs)</AdditionalInputs>
1309
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\lib\vc_lib\mswu\wx\msw;%(AdditionalInputs)</AdditionalInputs>
1310
-      <Message Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h</Message>
1311
-      <Message Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h</Message>
1312
-      <Command Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">cl /EP /nologo "%(FullPath)" &gt; "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"</Command>
1313
-      <Command Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">cl /EP /nologo "%(FullPath)" &gt; "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"</Command>
1314
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h;%(Outputs)</Outputs>
1315
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h;%(Outputs)</Outputs>
1316
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">..\..\lib\vc_lib\mswunivud\wx\msw;%(AdditionalInputs)</AdditionalInputs>
1317
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">..\..\lib\vc_lib\mswunivud\wx\msw;%(AdditionalInputs)</AdditionalInputs>
1318
-      <Message Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h</Message>
1319
-      <Message Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h</Message>
1320
-      <Command Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">cl /EP /nologo "%(FullPath)" &gt; "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"</Command>
1321
-      <Command Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">cl /EP /nologo "%(FullPath)" &gt; "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"</Command>
1322
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h;%(Outputs)</Outputs>
1323
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h;%(Outputs)</Outputs>
1324
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">..\..\lib\vc_lib\mswunivu\wx\msw;%(AdditionalInputs)</AdditionalInputs>
1325
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">..\..\lib\vc_lib\mswunivu\wx\msw;%(AdditionalInputs)</AdditionalInputs>
1277
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\lib\vc_lib\mswu\wx\msw;%(AdditionalInputs)</AdditionalInputs>
1326 1278
     </CustomBuild>
1327 1279
     <ClInclude Include="..\..\include\wx\msw\libraries.h" />
1328 1280
     <ClInclude Include="..\..\include\wx\msw\mimetype.h" />
... ...
@@ -5,254 +5,70 @@
5 5
       <Configuration>Debug</Configuration>
6 6
       <Platform>Win32</Platform>
7 7
     </ProjectConfiguration>
8
-    <ProjectConfiguration Include="Debug|x64">
9
-      <Configuration>Debug</Configuration>
10
-      <Platform>x64</Platform>
11
-    </ProjectConfiguration>
12
-    <ProjectConfiguration Include="DLL Debug|Win32">
13
-      <Configuration>DLL Debug</Configuration>
14
-      <Platform>Win32</Platform>
15
-    </ProjectConfiguration>
16
-    <ProjectConfiguration Include="DLL Debug|x64">
17
-      <Configuration>DLL Debug</Configuration>
18
-      <Platform>x64</Platform>
19
-    </ProjectConfiguration>
20
-    <ProjectConfiguration Include="DLL Release|Win32">
21
-      <Configuration>DLL Release</Configuration>
22
-      <Platform>Win32</Platform>
23
-    </ProjectConfiguration>
24
-    <ProjectConfiguration Include="DLL Release|x64">
25
-      <Configuration>DLL Release</Configuration>
26
-      <Platform>x64</Platform>
27
-    </ProjectConfiguration>
28
-    <ProjectConfiguration Include="DLL Universal Debug|Win32">
29
-      <Configuration>DLL Universal Debug</Configuration>
30
-      <Platform>Win32</Platform>
31
-    </ProjectConfiguration>
32
-    <ProjectConfiguration Include="DLL Universal Debug|x64">
33
-      <Configuration>DLL Universal Debug</Configuration>
34
-      <Platform>x64</Platform>
35
-    </ProjectConfiguration>
36
-    <ProjectConfiguration Include="DLL Universal Release|Win32">
37
-      <Configuration>DLL Universal Release</Configuration>
38
-      <Platform>Win32</Platform>
8
+    <ProjectConfiguration Include="Debug|x64">
9
+      <Configuration>Debug</Configuration>
10
+      <Platform>x64</Platform>
39 11
     </ProjectConfiguration>
40
-    <ProjectConfiguration Include="DLL Universal Release|x64">
41
-      <Configuration>DLL Universal Release</Configuration>
42
-      <Platform>x64</Platform>
43
-    </ProjectConfiguration>
44 12
     <ProjectConfiguration Include="Release|Win32">
45 13
       <Configuration>Release</Configuration>
46 14
       <Platform>Win32</Platform>
47 15
     </ProjectConfiguration>
48
-    <ProjectConfiguration Include="Release|x64">
49
-      <Configuration>Release</Configuration>
50
-      <Platform>x64</Platform>
51
-    </ProjectConfiguration>
52
-    <ProjectConfiguration Include="Universal Debug|Win32">
53
-      <Configuration>Universal Debug</Configuration>
54
-      <Platform>Win32</Platform>
55
-    </ProjectConfiguration>
56
-    <ProjectConfiguration Include="Universal Debug|x64">
57
-      <Configuration>Universal Debug</Configuration>
58
-      <Platform>x64</Platform>
59
-    </ProjectConfiguration>
60
-    <ProjectConfiguration Include="Universal Release|Win32">
61
-      <Configuration>Universal Release</Configuration>
62
-      <Platform>Win32</Platform>
16
+    <ProjectConfiguration Include="Release|x64">
17
+      <Configuration>Release</Configuration>
18
+      <Platform>x64</Platform>
63 19
     </ProjectConfiguration>
64
-    <ProjectConfiguration Include="Universal Release|x64">
65
-      <Configuration>Universal Release</Configuration>
66
-      <Platform>x64</Platform>
67
-    </ProjectConfiguration>
68 20
   </ItemGroup>
69 21
   <PropertyGroup Label="Globals">
70 22
     <ProjectName>core</ProjectName>
71 23
     <ProjectGuid>{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}</ProjectGuid>
72 24
   </PropertyGroup>
73 25
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
74
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'" Label="Configuration">
75
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
76
-    <UseOfMfc>false</UseOfMfc>
77
-    <CharacterSet>Unicode</CharacterSet>
78
-  </PropertyGroup>
79
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'" Label="Configuration">
80
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
81
-    <UseOfMfc>false</UseOfMfc>
82
-    <CharacterSet>Unicode</CharacterSet>
83
-  </PropertyGroup>
84
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'" Label="Configuration">
85
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
86
-    <UseOfMfc>false</UseOfMfc>
87
-    <CharacterSet>Unicode</CharacterSet>
88
-  </PropertyGroup>
89
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'" Label="Configuration">
90
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
91
-    <UseOfMfc>false</UseOfMfc>
92
-    <CharacterSet>Unicode</CharacterSet>
93
-  </PropertyGroup>
94
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'" Label="Configuration">
95
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
96
-    <UseOfMfc>false</UseOfMfc>
97
-    <CharacterSet>Unicode</CharacterSet>
98
-  </PropertyGroup>
99
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'" Label="Configuration">
100
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
101
-    <UseOfMfc>false</UseOfMfc>
102
-    <CharacterSet>Unicode</CharacterSet>
103
-  </PropertyGroup>
104
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'" Label="Configuration">
105
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
106
-    <UseOfMfc>false</UseOfMfc>
107
-    <CharacterSet>Unicode</CharacterSet>
108
-  </PropertyGroup>
109
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'" Label="Configuration">
110
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
111
-    <UseOfMfc>false</UseOfMfc>
112
-    <CharacterSet>Unicode</CharacterSet>
113
-  </PropertyGroup>
114
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'" Label="Configuration">
26
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
115 27
     <ConfigurationType>StaticLibrary</ConfigurationType>
116 28
     <UseOfMfc>false</UseOfMfc>
117 29
     <CharacterSet>Unicode</CharacterSet>
118 30
   </PropertyGroup>
119
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'" Label="Configuration">
120
-    <ConfigurationType>StaticLibrary</ConfigurationType>
121
-    <UseOfMfc>false</UseOfMfc>
122
-    <CharacterSet>Unicode</CharacterSet>
123
-  </PropertyGroup>
124
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'" Label="Configuration">
31
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
125 32
     <ConfigurationType>StaticLibrary</ConfigurationType>
126 33
     <UseOfMfc>false</UseOfMfc>
127 34
     <CharacterSet>Unicode</CharacterSet>
128 35
   </PropertyGroup>
129
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'" Label="Configuration">
130
-    <ConfigurationType>StaticLibrary</ConfigurationType>
131
-    <UseOfMfc>false</UseOfMfc>
132
-    <CharacterSet>Unicode</CharacterSet>
133
-  </PropertyGroup>
134
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
36
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
135 37
     <ConfigurationType>StaticLibrary</ConfigurationType>
136 38
     <UseOfMfc>false</UseOfMfc>
137 39
     <CharacterSet>Unicode</CharacterSet>
138 40
   </PropertyGroup>
139
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
140
-    <ConfigurationType>StaticLibrary</ConfigurationType>
141
-    <UseOfMfc>false</UseOfMfc>
142
-    <CharacterSet>Unicode</CharacterSet>
143
-  </PropertyGroup>
144
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
41
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
145 42
     <ConfigurationType>StaticLibrary</ConfigurationType>
146 43
     <UseOfMfc>false</UseOfMfc>
147 44
     <CharacterSet>Unicode</CharacterSet>
148 45
   </PropertyGroup>
149
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
150
-    <ConfigurationType>StaticLibrary</ConfigurationType>
151
-    <UseOfMfc>false</UseOfMfc>
152
-    <CharacterSet>Unicode</CharacterSet>
153
-  </PropertyGroup>
154 46
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
155 47
   <ImportGroup Label="ExtensionSettings">
156 48
   </ImportGroup>
157
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'" Label="PropertySheets">
158
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
159
-  </ImportGroup>
160
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'" Label="PropertySheets">
161
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
162
-  </ImportGroup>
163
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'" Label="PropertySheets">
164
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
165
-  </ImportGroup>
166
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'" Label="PropertySheets">
167
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
168
-  </ImportGroup>
169
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'" Label="PropertySheets">
170
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
171
-  </ImportGroup>
172
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'" Label="PropertySheets">
173
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
174
-  </ImportGroup>
175
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'" Label="PropertySheets">
49
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
176 50
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
177 51
   </ImportGroup>
178
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'" Label="PropertySheets">
179
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
180
-  </ImportGroup>
181
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'" Label="PropertySheets">
52
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
182 53
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
183 54
   </ImportGroup>
184
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'" Label="PropertySheets">
185
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
186
-  </ImportGroup>
187
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'" Label="PropertySheets">
55
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
188 56
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
189 57
   </ImportGroup>
190
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'" Label="PropertySheets">
191
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
192
-  </ImportGroup>
193
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
58
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
194 59
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
195 60
   </ImportGroup>
196
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
197
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
198
-  </ImportGroup>
199
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
200
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
201
-  </ImportGroup>
202
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
203
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
204
-  </ImportGroup>
205 61
   <PropertyGroup Label="UserMacros" />
206 62
   <PropertyGroup>
207 63
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
208
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
209
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
210
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)</IntDir>
211
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)</IntDir>
212
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
213
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
214
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)</IntDir>
215
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)</IntDir>
216
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
217
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
218
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)</IntDir>
219
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)</IntDir>
220
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
221
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
222
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)</IntDir>
223
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)</IntDir>
224
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
225
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
226
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)</IntDir>
227
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)</IntDir>
228
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</LinkIncremental>
229
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</LinkIncremental>
230
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</GenerateManifest>
231
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</GenerateManifest>
232
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
233
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
234
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)</IntDir>
235
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)</IntDir>
236
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">false</LinkIncremental>
237
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">false</LinkIncremental>
238
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</GenerateManifest>
239
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</GenerateManifest>
240
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
241
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
242
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)</IntDir>
243
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)</IntDir>
244
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</LinkIncremental>
245
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</LinkIncremental>
246
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</GenerateManifest>
247
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</GenerateManifest>
248
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
249
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
250
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)</IntDir>
251
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)</IntDir>
252
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">false</LinkIncremental>
253
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">false</LinkIncremental>
254
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</GenerateManifest>
255
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</GenerateManifest>
64
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
65
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
66
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)</IntDir>
67
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)</IntDir>
68
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
69
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
70
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)</IntDir>
71
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)</IntDir>
256 72
   </PropertyGroup>
257 73
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
258 74
     <Midl>
... ...
@@ -262,7 +78,7 @@
262 262
     <ClCompile>
263 263
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
264 264
       <Optimization>Disabled</Optimization>
265
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
265
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
266 266
       <PreprocessorDefinitions>WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
267 267
       <ExceptionHandling>Sync</ExceptionHandling>
268 268
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
... ...
@@ -272,8 +88,8 @@
272 272
       <PrecompiledHeader>Use</PrecompiledHeader>
273 273
       <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
274 274
       <PrecompiledHeaderOutputFile>vc_mswud\wxprec_corelib.pch</PrecompiledHeaderOutputFile>
275
-      <ObjectFileName>$(IntDir)</ObjectFileName>
276
-      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
275
+      <ObjectFileName>$(IntDir)</ObjectFileName>
276
+      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
277 277
       <WarningLevel>Level4</WarningLevel>
278 278
       <SuppressStartupBanner>true</SuppressStartupBanner>
279 279
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
... ...
@@ -282,96 +98,10 @@
282 282
     <ResourceCompile>
283 283
       <PreprocessorDefinitions>_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
284 284
       <Culture>0x0409</Culture>
285
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
286
-    </ResourceCompile>
287
-    <Lib>
288
-      <OutputFile>$(SolutionDir)$(PlatformName)\$(Configuration)\wxmsw29u_core.lib</OutputFile>
289
-      <SuppressStartupBanner>true</SuppressStartupBanner>
290
-    </Lib>
291
-    <Bscmake>
292
-      <OutputFile>..\..\lib\vc_lib\wx_vc10_core.bsc</OutputFile>
293
-      <SuppressStartupBanner>true</SuppressStartupBanner>
294
-    </Bscmake>
295
-    <PreBuildEvent>
296
-      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
297
-    </PreBuildEvent>
298
-  </ItemDefinitionGroup>
299
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
300
-    <Midl>
301
-      <PreprocessorDefinitions>WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
302
-      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
303
-    </Midl>
304
-    <ClCompile>
305
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
306
-      <Optimization>Disabled</Optimization>
307
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
308
-      <PreprocessorDefinitions>WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
309
-      <ExceptionHandling>Sync</ExceptionHandling>
310
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
311
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
312
-      <BufferSecurityCheck>true</BufferSecurityCheck>
313
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
314
-      <PrecompiledHeader>Use</PrecompiledHeader>
315
-      <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
316
-      <PrecompiledHeaderOutputFile>vc_mswud\wxprec_corelib.pch</PrecompiledHeaderOutputFile>
317
-      <ObjectFileName>$(IntDir)</ObjectFileName>
318
-      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
319
-      <WarningLevel>Level4</WarningLevel>
320
-      <SuppressStartupBanner>true</SuppressStartupBanner>
321
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
322
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
323
-    </ClCompile>
324
-    <ResourceCompile>
325
-      <PreprocessorDefinitions>_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
326
-      <Culture>0x0409</Culture>
327
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
328
-    </ResourceCompile>
329
-    <Lib>
330
-      <OutputFile>$(SolutionDir)$(PlatformName)\$(Configuration)\wxmsw29u_core.lib</OutputFile>
331
-      <SuppressStartupBanner>true</SuppressStartupBanner>
332
-    </Lib>
333
-    <Bscmake>
334
-      <OutputFile>..\..\lib\vc_lib\wx_vc10_core.bsc</OutputFile>
335
-      <SuppressStartupBanner>true</SuppressStartupBanner>
336
-    </Bscmake>
337
-    <PreBuildEvent>
338
-      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
339
-    </PreBuildEvent>
340
-  </ItemDefinitionGroup>
341
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
342
-    <Midl>
343
-      <PreprocessorDefinitions>WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
344
-      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
345
-    </Midl>
346
-    <ClCompile>
347
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
348
-      <Optimization>MinSpace</Optimization>
349
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
350
-      <PreprocessorDefinitions>WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
351
-      <ExceptionHandling>Sync</ExceptionHandling>
352
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
353
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
354
-      <PrecompiledHeader>Use</PrecompiledHeader>
355
-      <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
356
-      <PrecompiledHeaderOutputFile>vc_mswu\wxprec_corelib.pch</PrecompiledHeaderOutputFile>
357
-      <ObjectFileName>$(IntDir)</ObjectFileName>
358
-      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
359
-      <WarningLevel>Level4</WarningLevel>
360
-      <SuppressStartupBanner>true</SuppressStartupBanner>
361
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
362
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
363
-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
364
-      <OmitFramePointers>true</OmitFramePointers>
365
-      <WholeProgramOptimization>false</WholeProgramOptimization>
366
-      <FunctionLevelLinking>true</FunctionLevelLinking>
367
-    </ClCompile>
368
-    <ResourceCompile>
369
-      <PreprocessorDefinitions>__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
370
-      <Culture>0x0409</Culture>
371
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
285
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
372 286
     </ResourceCompile>
373 287
     <Lib>
374
-      <OutputFile>$(SolutionDir)$(PlatformName)\$(Configuration)\wxmsw29u_core.lib</OutputFile>
288
+      <OutputFile>$(SolutionDir)$(PlatformName)\$(Configuration)\wxmsw29u_core.lib</OutputFile>
375 289
       <SuppressStartupBanner>true</SuppressStartupBanner>
376 290
     </Lib>
377 291
     <Bscmake>
... ...
@@ -379,63 +109,19 @@
379 379
       <SuppressStartupBanner>true</SuppressStartupBanner>
380 380
     </Bscmake>
381 381
     <PreBuildEvent>
382
-      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
382
+      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
383 383
     </PreBuildEvent>
384 384
   </ItemDefinitionGroup>
385
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
386
-    <Midl>
387
-      <PreprocessorDefinitions>WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
388
-      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
389
-    </Midl>
390
-    <ClCompile>
391
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
392
-      <Optimization>MinSpace</Optimization>
393
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
394
-      <PreprocessorDefinitions>WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
395
-      <ExceptionHandling>Sync</ExceptionHandling>
396
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
397
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
398
-      <PrecompiledHeader>Use</PrecompiledHeader>
399
-      <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
400
-      <PrecompiledHeaderOutputFile>vc_mswu\wxprec_corelib.pch</PrecompiledHeaderOutputFile>
401
-      <ObjectFileName>$(IntDir)</ObjectFileName>
402
-      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
403
-      <WarningLevel>Level4</WarningLevel>
404
-      <SuppressStartupBanner>true</SuppressStartupBanner>
405
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
406
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
407
-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
408
-      <OmitFramePointers>true</OmitFramePointers>
409
-      <WholeProgramOptimization>false</WholeProgramOptimization>
410
-      <FunctionLevelLinking>true</FunctionLevelLinking>
411
-    </ClCompile>
412
-    <ResourceCompile>
413
-      <PreprocessorDefinitions>__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
414
-      <Culture>0x0409</Culture>
415
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
416
-    </ResourceCompile>
417
-    <Lib>
418
-      <OutputFile>$(SolutionDir)$(PlatformName)\$(Configuration)\wxmsw29u_core.lib</OutputFile>
419
-      <SuppressStartupBanner>true</SuppressStartupBanner>
420
-    </Lib>
421
-    <Bscmake>
422
-      <OutputFile>..\..\lib\vc_lib\wx_vc10_core.bsc</OutputFile>
423
-      <SuppressStartupBanner>true</SuppressStartupBanner>
424
-    </Bscmake>
425
-    <PreBuildEvent>
426
-      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
427
-    </PreBuildEvent>
428
-  </ItemDefinitionGroup>
429
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">
385
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
430 386
     <Midl>
431
-      <PreprocessorDefinitions>WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
432
-      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
387
+      <PreprocessorDefinitions>WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
388
+      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
433 389
     </Midl>
434 390
     <ClCompile>
435 391
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
436 392
       <Optimization>Disabled</Optimization>
437
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
438
-      <PreprocessorDefinitions>WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
393
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
394
+      <PreprocessorDefinitions>WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
439 395
       <ExceptionHandling>Sync</ExceptionHandling>
440 396
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
441 397
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
... ...
@@ -443,21 +129,21 @@
443 443
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
444 444
       <PrecompiledHeader>Use</PrecompiledHeader>
445 445
       <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
446
-      <PrecompiledHeaderOutputFile>vc_mswunivud\wxprec_corelib.pch</PrecompiledHeaderOutputFile>
447
-      <ObjectFileName>$(IntDir)</ObjectFileName>
448
-      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
446
+      <PrecompiledHeaderOutputFile>vc_mswud\wxprec_corelib.pch</PrecompiledHeaderOutputFile>
447
+      <ObjectFileName>$(IntDir)</ObjectFileName>
448
+      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
449 449
       <WarningLevel>Level4</WarningLevel>
450 450
       <SuppressStartupBanner>true</SuppressStartupBanner>
451 451
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
452 452
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
453 453
     </ClCompile>
454 454
     <ResourceCompile>
455
-      <PreprocessorDefinitions>_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
455
+      <PreprocessorDefinitions>_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
456 456
       <Culture>0x0409</Culture>
457
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
457
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
458 458
     </ResourceCompile>
459 459
     <Lib>
460
-      <OutputFile>..\..\lib\vc_lib\wxmswuniv29ud_core.lib</OutputFile>
460
+      <OutputFile>$(SolutionDir)$(PlatformName)\$(Configuration)\wxmsw29u_core.lib</OutputFile>
461 461
       <SuppressStartupBanner>true</SuppressStartupBanner>
462 462
     </Lib>
463 463
     <Bscmake>
... ...
@@ -465,81 +151,43 @@
465 465
       <SuppressStartupBanner>true</SuppressStartupBanner>
466 466
     </Bscmake>
467 467
     <PreBuildEvent>
468
-      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
468
+      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
469 469
     </PreBuildEvent>
470 470
   </ItemDefinitionGroup>
471
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">
472
-    <Midl>
473
-      <PreprocessorDefinitions>WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
474
-      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
475
-    </Midl>
476
-    <ClCompile>
477
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
478
-      <Optimization>Disabled</Optimization>
479
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
480
-      <PreprocessorDefinitions>WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
481
-      <ExceptionHandling>Sync</ExceptionHandling>
482
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
483
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
484
-      <BufferSecurityCheck>true</BufferSecurityCheck>
485
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
486
-      <PrecompiledHeader>Use</PrecompiledHeader>
487
-      <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
488
-      <PrecompiledHeaderOutputFile>vc_mswunivud\wxprec_corelib.pch</PrecompiledHeaderOutputFile>
489
-      <ObjectFileName>$(IntDir)</ObjectFileName>
490
-      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
491
-      <WarningLevel>Level4</WarningLevel>
492
-      <SuppressStartupBanner>true</SuppressStartupBanner>
493
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
494
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
495
-    </ClCompile>
496
-    <ResourceCompile>
497
-      <PreprocessorDefinitions>_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
498
-      <Culture>0x0409</Culture>
499
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
500
-    </ResourceCompile>
501
-    <Lib>
502
-      <OutputFile>..\..\lib\vc_lib\wxmswuniv29ud_core.lib</OutputFile>
503
-      <SuppressStartupBanner>true</SuppressStartupBanner>
504
-    </Lib>
505
-    <Bscmake>
506
-      <OutputFile>..\..\lib\vc_lib\wx_vc10_core.bsc</OutputFile>
507
-      <SuppressStartupBanner>true</SuppressStartupBanner>
508
-    </Bscmake>
509
-    <PreBuildEvent>
510
-      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
511
-    </PreBuildEvent>
512
-  </ItemDefinitionGroup>
513
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">
471
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
514 472
     <Midl>
515
-      <PreprocessorDefinitions>WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
516
-      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
473
+      <PreprocessorDefinitions>WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
474
+      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
517 475
     </Midl>
518 476
     <ClCompile>
519 477
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
520
-      <Optimization>MaxSpeed</Optimization>
521
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
522
-      <PreprocessorDefinitions>WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
478
+      <Optimization>MinSpace</Optimization>
479
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
480
+      <PreprocessorDefinitions>WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
523 481
       <ExceptionHandling>Sync</ExceptionHandling>
524 482
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
525
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
483
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
526 484
       <PrecompiledHeader>Use</PrecompiledHeader>
527 485
       <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
528
-      <PrecompiledHeaderOutputFile>vc_mswunivu\wxprec_corelib.pch</PrecompiledHeaderOutputFile>
529
-      <ObjectFileName>$(IntDir)</ObjectFileName>
530
-      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
486
+      <PrecompiledHeaderOutputFile>vc_mswu\wxprec_corelib.pch</PrecompiledHeaderOutputFile>
487
+      <ObjectFileName>$(IntDir)</ObjectFileName>
488
+      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
531 489
       <WarningLevel>Level4</WarningLevel>
532 490
       <SuppressStartupBanner>true</SuppressStartupBanner>
533 491
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
534 492
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
493
+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
494
+      <OmitFramePointers>true</OmitFramePointers>
495
+      <WholeProgramOptimization>false</WholeProgramOptimization>
496
+      <FunctionLevelLinking>true</FunctionLevelLinking>
535 497
     </ClCompile>
536 498
     <ResourceCompile>
537
-      <PreprocessorDefinitions>__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
499
+      <PreprocessorDefinitions>__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
538 500
       <Culture>0x0409</Culture>
539
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
501
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
540 502
     </ResourceCompile>
541 503
     <Lib>
542
-      <OutputFile>..\..\lib\vc_lib\wxmswuniv29u_core.lib</OutputFile>
504
+      <OutputFile>$(SolutionDir)$(PlatformName)\$(Configuration)\wxmsw29u_core.lib</OutputFile>
543 505
       <SuppressStartupBanner>true</SuppressStartupBanner>
544 506
     </Lib>
545 507
     <Bscmake>
... ...
@@ -547,437 +195,53 @@
547 547
       <SuppressStartupBanner>true</SuppressStartupBanner>
548 548
     </Bscmake>
549 549
     <PreBuildEvent>
550
-      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
550
+      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
551 551
     </PreBuildEvent>
552 552
   </ItemDefinitionGroup>
553
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">
554
-    <Midl>
555
-      <PreprocessorDefinitions>WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
556
-      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
557
-    </Midl>
558
-    <ClCompile>
559
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
560
-      <Optimization>MaxSpeed</Optimization>
561
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
562
-      <PreprocessorDefinitions>WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
563
-      <ExceptionHandling>Sync</ExceptionHandling>
564
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
565
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
566
-      <PrecompiledHeader>Use</PrecompiledHeader>
567
-      <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
568
-      <PrecompiledHeaderOutputFile>vc_mswunivu\wxprec_corelib.pch</PrecompiledHeaderOutputFile>
569
-      <ObjectFileName>$(IntDir)</ObjectFileName>
570
-      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
571
-      <WarningLevel>Level4</WarningLevel>
572
-      <SuppressStartupBanner>true</SuppressStartupBanner>
573
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
574
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
575
-    </ClCompile>
576
-    <ResourceCompile>
577
-      <PreprocessorDefinitions>__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
578
-      <Culture>0x0409</Culture>
579
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
580
-    </ResourceCompile>
581
-    <Lib>
582
-      <OutputFile>..\..\lib\vc_lib\wxmswuniv29u_core.lib</OutputFile>
583
-      <SuppressStartupBanner>true</SuppressStartupBanner>
584
-    </Lib>
585
-    <Bscmake>
586
-      <OutputFile>..\..\lib\vc_lib\wx_vc10_core.bsc</OutputFile>
587
-      <SuppressStartupBanner>true</SuppressStartupBanner>
588
-    </Bscmake>
589
-    <PreBuildEvent>
590
-      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
591
-    </PreBuildEvent>
592
-  </ItemDefinitionGroup>
593
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">
553
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
594 554
     <Midl>
595
-      <PreprocessorDefinitions>WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
596
-      <AdditionalIncludeDirectories>..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
597
-    </Midl>
598
-    <ClCompile>
599
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
600
-      <Optimization>Disabled</Optimization>
601
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
602
-      <PreprocessorDefinitions>WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
603
-      <ExceptionHandling>Sync</ExceptionHandling>
604
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
605
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
606
-      <BufferSecurityCheck>true</BufferSecurityCheck>
607
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
608
-      <PrecompiledHeader>Use</PrecompiledHeader>
609
-      <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
610
-      <PrecompiledHeaderOutputFile>vc_mswuddll\wxprec_coredll.pch</PrecompiledHeaderOutputFile>
611
-      <ObjectFileName>$(IntDir)</ObjectFileName>
612
-      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
613
-      <WarningLevel>Level4</WarningLevel>
614
-      <SuppressStartupBanner>true</SuppressStartupBanner>
615
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
616
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
617
-    </ClCompile>
618
-    <ResourceCompile>
619
-      <PreprocessorDefinitions>_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw291ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
620
-      <Culture>0x0409</Culture>
621
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
622
-    </ResourceCompile>
623
-    <Link>
624
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
625
-      <AdditionalDependencies>wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;..\..\lib\vc_dll\wxbase29ud.lib;%(AdditionalDependencies)</AdditionalDependencies>
626
-      <OutputFile>..\..\lib\vc_dll\wxmsw291ud_core_vc_custom.dll</OutputFile>
627
-      <ImportLibrary>..\..\lib\vc_dll\wxmsw29ud_core.lib</ImportLibrary>
628
-      <SuppressStartupBanner>true</SuppressStartupBanner>
629
-      <AdditionalLibraryDirectories>..\..\lib\vc_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
630
-      <GenerateDebugInformation>true</GenerateDebugInformation>
631
-      <ProgramDatabaseFile>..\..\lib\vc_dll\wxmsw291ud_core_vc_custom.pdb</ProgramDatabaseFile>
632
-      <TargetMachine>MachineX86</TargetMachine>
633
-    </Link>
634
-    <Bscmake>
635
-      <OutputFile>..\..\lib\vc_dll\wx_vc10_core.bsc</OutputFile>
636
-      <SuppressStartupBanner>true</SuppressStartupBanner>
637
-    </Bscmake>
638
-    <PreBuildEvent>
639
-      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
640
-    </PreBuildEvent>
641
-  </ItemDefinitionGroup>
642
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">
643
-    <Midl>
644
-      <PreprocessorDefinitions>WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
645
-      <AdditionalIncludeDirectories>..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
646
-    </Midl>
647
-    <ClCompile>
648
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
649
-      <Optimization>Disabled</Optimization>
650
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
651
-      <PreprocessorDefinitions>WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
652
-      <ExceptionHandling>Sync</ExceptionHandling>
653
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
654
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
655
-      <BufferSecurityCheck>true</BufferSecurityCheck>
656
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
657
-      <PrecompiledHeader>Use</PrecompiledHeader>
658
-      <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
659
-      <PrecompiledHeaderOutputFile>vc_mswuddll\wxprec_coredll.pch</PrecompiledHeaderOutputFile>
660
-      <ObjectFileName>$(IntDir)</ObjectFileName>
661
-      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
662
-      <WarningLevel>Level4</WarningLevel>
663
-      <SuppressStartupBanner>true</SuppressStartupBanner>
664
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
665
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
666
-    </ClCompile>
667
-    <ResourceCompile>
668
-      <PreprocessorDefinitions>_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw291ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
669
-      <Culture>0x0409</Culture>
670
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
671
-    </ResourceCompile>
672
-    <Link>
673
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
674
-      <AdditionalDependencies>wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;..\..\lib\vc_dll\wxbase29ud.lib;%(AdditionalDependencies)</AdditionalDependencies>
675
-      <OutputFile>..\..\lib\vc_dll\wxmsw291ud_core_vc_custom.dll</OutputFile>
676
-      <ImportLibrary>..\..\lib\vc_dll\wxmsw29ud_core.lib</ImportLibrary>
677
-      <SuppressStartupBanner>true</SuppressStartupBanner>
678
-      <AdditionalLibraryDirectories>..\..\lib\vc_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
679
-      <GenerateDebugInformation>true</GenerateDebugInformation>
680
-      <ProgramDatabaseFile>..\..\lib\vc_dll\wxmsw291ud_core_vc_custom.pdb</ProgramDatabaseFile>
681
-    </Link>
682
-    <Bscmake>
683
-      <OutputFile>..\..\lib\vc_dll\wx_vc10_core.bsc</OutputFile>
684
-      <SuppressStartupBanner>true</SuppressStartupBanner>
685
-    </Bscmake>
686
-    <PreBuildEvent>
687
-      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
688
-    </PreBuildEvent>
689
-  </ItemDefinitionGroup>
690
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">
691
-    <Midl>
692
-      <PreprocessorDefinitions>WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
693
-      <AdditionalIncludeDirectories>..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
694
-    </Midl>
695
-    <ClCompile>
696
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
697
-      <Optimization>MaxSpeed</Optimization>
698
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
699
-      <PreprocessorDefinitions>WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
700
-      <ExceptionHandling>Sync</ExceptionHandling>
701
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
702
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
703
-      <PrecompiledHeader>Use</PrecompiledHeader>
704
-      <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
705
-      <PrecompiledHeaderOutputFile>vc_mswudll\wxprec_coredll.pch</PrecompiledHeaderOutputFile>
706
-      <ObjectFileName>$(IntDir)</ObjectFileName>
707
-      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
708
-      <WarningLevel>Level4</WarningLevel>
709
-      <SuppressStartupBanner>true</SuppressStartupBanner>
710
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
711
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
712
-    </ClCompile>
713
-    <ResourceCompile>
714
-      <PreprocessorDefinitions>__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw291u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
715
-      <Culture>0x0409</Culture>
716
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
717
-    </ResourceCompile>
718
-    <Link>
719
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
720
-      <AdditionalDependencies>wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;..\..\lib\vc_dll\wxbase29u.lib;%(AdditionalDependencies)</AdditionalDependencies>
721
-      <OutputFile>..\..\lib\vc_dll\wxmsw291u_core_vc_custom.dll</OutputFile>
722
-      <ImportLibrary>..\..\lib\vc_dll\wxmsw29u_core.lib</ImportLibrary>
723
-      <SuppressStartupBanner>true</SuppressStartupBanner>
724
-      <AdditionalLibraryDirectories>..\..\lib\vc_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
725
-      <GenerateDebugInformation>true</GenerateDebugInformation>
726
-      <ProgramDatabaseFile>..\..\lib\vc_dll\wxmsw291u_core_vc_custom.pdb</ProgramDatabaseFile>
727
-      <TargetMachine>MachineX86</TargetMachine>
728
-      <OptimizeReferences>true</OptimizeReferences>
729
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
730
-    </Link>
731
-    <Bscmake>
732
-      <OutputFile>..\..\lib\vc_dll\wx_vc10_core.bsc</OutputFile>
733
-      <SuppressStartupBanner>true</SuppressStartupBanner>
734
-    </Bscmake>
735
-    <PreBuildEvent>
736
-      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
737
-    </PreBuildEvent>
738
-  </ItemDefinitionGroup>
739
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">
740
-    <Midl>
741
-      <PreprocessorDefinitions>WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
742
-      <AdditionalIncludeDirectories>..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
743
-    </Midl>
744
-    <ClCompile>
745
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
746
-      <Optimization>MaxSpeed</Optimization>
747
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
748
-      <PreprocessorDefinitions>WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
749
-      <ExceptionHandling>Sync</ExceptionHandling>
750
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
751
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
752
-      <PrecompiledHeader>Use</PrecompiledHeader>
753
-      <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
754
-      <PrecompiledHeaderOutputFile>vc_mswudll\wxprec_coredll.pch</PrecompiledHeaderOutputFile>
755
-      <ObjectFileName>$(IntDir)</ObjectFileName>
756
-      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
757
-      <WarningLevel>Level4</WarningLevel>
758
-      <SuppressStartupBanner>true</SuppressStartupBanner>
759
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
760
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
761
-    </ClCompile>
762
-    <ResourceCompile>
763
-      <PreprocessorDefinitions>__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw291u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
764
-      <Culture>0x0409</Culture>
765
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
766
-    </ResourceCompile>
767
-    <Link>
768
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
769
-      <AdditionalDependencies>wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;..\..\lib\vc_dll\wxbase29u.lib;%(AdditionalDependencies)</AdditionalDependencies>
770
-      <OutputFile>..\..\lib\vc_dll\wxmsw291u_core_vc_custom.dll</OutputFile>
771
-      <ImportLibrary>..\..\lib\vc_dll\wxmsw29u_core.lib</ImportLibrary>
772
-      <SuppressStartupBanner>true</SuppressStartupBanner>
773
-      <AdditionalLibraryDirectories>..\..\lib\vc_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
774
-      <GenerateDebugInformation>true</GenerateDebugInformation>
775
-      <ProgramDatabaseFile>..\..\lib\vc_dll\wxmsw291u_core_vc_custom.pdb</ProgramDatabaseFile>
776
-      <OptimizeReferences>true</OptimizeReferences>
777
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
778
-    </Link>
779
-    <Bscmake>
780
-      <OutputFile>..\..\lib\vc_dll\wx_vc10_core.bsc</OutputFile>
781
-      <SuppressStartupBanner>true</SuppressStartupBanner>
782
-    </Bscmake>
783
-    <PreBuildEvent>
784
-      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
785
-    </PreBuildEvent>
786
-  </ItemDefinitionGroup>
787
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">
788
-    <Midl>
789
-      <PreprocessorDefinitions>WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
790
-      <AdditionalIncludeDirectories>..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
791
-    </Midl>
792
-    <ClCompile>
793
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
794
-      <Optimization>Disabled</Optimization>
795
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
796
-      <PreprocessorDefinitions>WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
797
-      <ExceptionHandling>Sync</ExceptionHandling>
798
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
799
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
800
-      <BufferSecurityCheck>true</BufferSecurityCheck>
801
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
802
-      <PrecompiledHeader>Use</PrecompiledHeader>
803
-      <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
804
-      <PrecompiledHeaderOutputFile>vc_mswunivuddll\wxprec_coredll.pch</PrecompiledHeaderOutputFile>
805
-      <ObjectFileName>$(IntDir)</ObjectFileName>
806
-      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
807
-      <WarningLevel>Level4</WarningLevel>
808
-      <SuppressStartupBanner>true</SuppressStartupBanner>
809
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
810
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
811
-    </ClCompile>
812
-    <ResourceCompile>
813
-      <PreprocessorDefinitions>_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv291ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
814
-      <Culture>0x0409</Culture>
815
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
816
-    </ResourceCompile>
817
-    <Link>
818
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
819
-      <AdditionalDependencies>wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;..\..\lib\vc_dll\wxbase29ud.lib;%(AdditionalDependencies)</AdditionalDependencies>
820
-      <OutputFile>..\..\lib\vc_dll\wxmswuniv291ud_core_vc_custom.dll</OutputFile>
821
-      <ImportLibrary>..\..\lib\vc_dll\wxmswuniv29ud_core.lib</ImportLibrary>
822
-      <SuppressStartupBanner>true</SuppressStartupBanner>
823
-      <AdditionalLibraryDirectories>..\..\lib\vc_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
824
-      <GenerateDebugInformation>true</GenerateDebugInformation>
825
-      <ProgramDatabaseFile>..\..\lib\vc_dll\wxmswuniv291ud_core_vc_custom.pdb</ProgramDatabaseFile>
826
-      <TargetMachine>MachineX86</TargetMachine>
827
-    </Link>
828
-    <Bscmake>
829
-      <OutputFile>..\..\lib\vc_dll\wx_vc10_core.bsc</OutputFile>
830
-      <SuppressStartupBanner>true</SuppressStartupBanner>
831
-    </Bscmake>
832
-    <PreBuildEvent>
833
-      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
834
-    </PreBuildEvent>
835
-  </ItemDefinitionGroup>
836
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">
837
-    <Midl>
838
-      <PreprocessorDefinitions>WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
839
-      <AdditionalIncludeDirectories>..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
840
-    </Midl>
841
-    <ClCompile>
842
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
843
-      <Optimization>Disabled</Optimization>
844
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
845
-      <PreprocessorDefinitions>WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
846
-      <ExceptionHandling>Sync</ExceptionHandling>
847
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
848
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
849
-      <BufferSecurityCheck>true</BufferSecurityCheck>
850
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
851
-      <PrecompiledHeader>Use</PrecompiledHeader>
852
-      <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
853
-      <PrecompiledHeaderOutputFile>vc_mswunivuddll\wxprec_coredll.pch</PrecompiledHeaderOutputFile>
854
-      <ObjectFileName>$(IntDir)</ObjectFileName>
855
-      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
856
-      <WarningLevel>Level4</WarningLevel>
857
-      <SuppressStartupBanner>true</SuppressStartupBanner>
858
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
859
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
860
-    </ClCompile>
861
-    <ResourceCompile>
862
-      <PreprocessorDefinitions>_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv291ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
863
-      <Culture>0x0409</Culture>
864
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
865
-    </ResourceCompile>
866
-    <Link>
867
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
868
-      <AdditionalDependencies>wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;..\..\lib\vc_dll\wxbase29ud.lib;%(AdditionalDependencies)</AdditionalDependencies>
869
-      <OutputFile>..\..\lib\vc_dll\wxmswuniv291ud_core_vc_custom.dll</OutputFile>
870
-      <ImportLibrary>..\..\lib\vc_dll\wxmswuniv29ud_core.lib</ImportLibrary>
871
-      <SuppressStartupBanner>true</SuppressStartupBanner>
872
-      <AdditionalLibraryDirectories>..\..\lib\vc_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
873
-      <GenerateDebugInformation>true</GenerateDebugInformation>
874
-      <ProgramDatabaseFile>..\..\lib\vc_dll\wxmswuniv291ud_core_vc_custom.pdb</ProgramDatabaseFile>
875
-    </Link>
876
-    <Bscmake>
877
-      <OutputFile>..\..\lib\vc_dll\wx_vc10_core.bsc</OutputFile>
878
-      <SuppressStartupBanner>true</SuppressStartupBanner>
879
-    </Bscmake>
880
-    <PreBuildEvent>
881
-      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
882
-    </PreBuildEvent>
883
-  </ItemDefinitionGroup>
884
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">
885
-    <Midl>
886
-      <PreprocessorDefinitions>WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
887
-      <AdditionalIncludeDirectories>..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
555
+      <PreprocessorDefinitions>WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
556
+      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
888 557
     </Midl>
889 558
     <ClCompile>
890 559
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
891
-      <Optimization>MaxSpeed</Optimization>
892
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
893
-      <PreprocessorDefinitions>WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
560
+      <Optimization>MinSpace</Optimization>
561
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
562
+      <PreprocessorDefinitions>WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
894 563
       <ExceptionHandling>Sync</ExceptionHandling>
895 564
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
896
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
565
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
897 566
       <PrecompiledHeader>Use</PrecompiledHeader>
898 567
       <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
899
-      <PrecompiledHeaderOutputFile>vc_mswunivudll\wxprec_coredll.pch</PrecompiledHeaderOutputFile>
900
-      <ObjectFileName>$(IntDir)</ObjectFileName>
901
-      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
568
+      <PrecompiledHeaderOutputFile>vc_mswu\wxprec_corelib.pch</PrecompiledHeaderOutputFile>
569
+      <ObjectFileName>$(IntDir)</ObjectFileName>
570
+      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
902 571
       <WarningLevel>Level4</WarningLevel>
903 572
       <SuppressStartupBanner>true</SuppressStartupBanner>
904 573
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
905 574
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
575
+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
576
+      <OmitFramePointers>true</OmitFramePointers>
577
+      <WholeProgramOptimization>false</WholeProgramOptimization>
578
+      <FunctionLevelLinking>true</FunctionLevelLinking>
906 579
     </ClCompile>
907 580
     <ResourceCompile>
908
-      <PreprocessorDefinitions>__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv291u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
581
+      <PreprocessorDefinitions>__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
909 582
       <Culture>0x0409</Culture>
910
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
583
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
911 584
     </ResourceCompile>
912
-    <Link>
913
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
914
-      <AdditionalDependencies>wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;..\..\lib\vc_dll\wxbase29u.lib;%(AdditionalDependencies)</AdditionalDependencies>
915
-      <OutputFile>..\..\lib\vc_dll\wxmswuniv291u_core_vc_custom.dll</OutputFile>
916
-      <ImportLibrary>..\..\lib\vc_dll\wxmswuniv29u_core.lib</ImportLibrary>
585
+    <Lib>
586
+      <OutputFile>$(SolutionDir)$(PlatformName)\$(Configuration)\wxmsw29u_core.lib</OutputFile>
917 587
       <SuppressStartupBanner>true</SuppressStartupBanner>
918
-      <AdditionalLibraryDirectories>..\..\lib\vc_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
919
-      <GenerateDebugInformation>true</GenerateDebugInformation>
920
-      <ProgramDatabaseFile>..\..\lib\vc_dll\wxmswuniv291u_core_vc_custom.pdb</ProgramDatabaseFile>
921
-      <TargetMachine>MachineX86</TargetMachine>
922
-      <OptimizeReferences>true</OptimizeReferences>
923
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
924
-    </Link>
588
+    </Lib>
925 589
     <Bscmake>
926
-      <OutputFile>..\..\lib\vc_dll\wx_vc10_core.bsc</OutputFile>
590
+      <OutputFile>..\..\lib\vc_lib\wx_vc10_core.bsc</OutputFile>
927 591
       <SuppressStartupBanner>true</SuppressStartupBanner>
928 592
     </Bscmake>
929 593
     <PreBuildEvent>
930
-      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
594
+      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
931 595
     </PreBuildEvent>
932 596
   </ItemDefinitionGroup>
933
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">
934
-    <Midl>
935
-      <PreprocessorDefinitions>WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
936
-      <AdditionalIncludeDirectories>..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
937
-    </Midl>
938
-    <ClCompile>
939
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
940
-      <Optimization>MaxSpeed</Optimization>
941
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
942
-      <PreprocessorDefinitions>WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
943
-      <ExceptionHandling>Sync</ExceptionHandling>
944
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
945
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
946
-      <PrecompiledHeader>Use</PrecompiledHeader>
947
-      <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
948
-      <PrecompiledHeaderOutputFile>vc_mswunivudll\wxprec_coredll.pch</PrecompiledHeaderOutputFile>
949
-      <ObjectFileName>$(IntDir)</ObjectFileName>
950
-      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
951
-      <WarningLevel>Level4</WarningLevel>
952
-      <SuppressStartupBanner>true</SuppressStartupBanner>
953
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
954
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
955
-    </ClCompile>
956
-    <ResourceCompile>
957
-      <PreprocessorDefinitions>__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv291u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
958
-      <Culture>0x0409</Culture>
959
-      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
960
-    </ResourceCompile>
961
-    <Link>
962
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
963
-      <AdditionalDependencies>wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;..\..\lib\vc_dll\wxbase29u.lib;%(AdditionalDependencies)</AdditionalDependencies>
964
-      <OutputFile>..\..\lib\vc_dll\wxmswuniv291u_core_vc_custom.dll</OutputFile>
965
-      <ImportLibrary>..\..\lib\vc_dll\wxmswuniv29u_core.lib</ImportLibrary>
966
-      <SuppressStartupBanner>true</SuppressStartupBanner>
967
-      <AdditionalLibraryDirectories>..\..\lib\vc_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
968
-      <GenerateDebugInformation>true</GenerateDebugInformation>
969
-      <ProgramDatabaseFile>..\..\lib\vc_dll\wxmswuniv291u_core_vc_custom.pdb</ProgramDatabaseFile>
970
-      <OptimizeReferences>true</OptimizeReferences>
971
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
972
-    </Link>
973
-    <Bscmake>
974
-      <OutputFile>..\..\lib\vc_dll\wx_vc10_core.bsc</OutputFile>
975
-      <SuppressStartupBanner>true</SuppressStartupBanner>
976
-    </Bscmake>
977
-    <PreBuildEvent>
978
-      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
979
-    </PreBuildEvent>
980
-  </ItemDefinitionGroup>
981 597
   <ItemGroup>
982 598
     <ClCompile Include="..\..\src\common\accelcmn.cpp" />
983 599
     <ClCompile Include="..\..\src\common\accesscmn.cpp" />
... ...
@@ -1013,22 +277,10 @@
1013 1013
     <ClCompile Include="..\..\src\common\dpycmn.cpp" />
1014 1014
     <ClCompile Include="..\..\src\common\dseldlg.cpp" />
1015 1015
     <ClCompile Include="..\..\src\common\dummy.cpp">
1016
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">Create</PrecompiledHeader>
1017
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">Create</PrecompiledHeader>
1018
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">Create</PrecompiledHeader>
1019
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">Create</PrecompiledHeader>
1020
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">Create</PrecompiledHeader>
1021
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">Create</PrecompiledHeader>
1022
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">Create</PrecompiledHeader>
1023
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">Create</PrecompiledHeader>
1024 1016
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
1025
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
1017
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
1026 1018
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
1027
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
1028
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">Create</PrecompiledHeader>
1029
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">Create</PrecompiledHeader>
1030
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">Create</PrecompiledHeader>
1031
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">Create</PrecompiledHeader>
1019
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
1032 1020
     </ClCompile>
1033 1021
     <ClCompile Include="..\..\src\common\effects.cpp" />
1034 1022
     <ClCompile Include="..\..\src\common\event.cpp" />
... ...
@@ -1109,196 +361,64 @@
1109 1109
     <ClCompile Include="..\..\src\common\wrapsizer.cpp" />
1110 1110
     <ClCompile Include="..\..\src\common\xpmdecod.cpp" />
1111 1111
     <ClCompile Include="..\..\src\msw\accel.cpp">
1112
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">vc_mswuddll\core\msw_accel.obj</ObjectFileName>
1113
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">vc_mswuddll\core\msw_accel.obj</ObjectFileName>
1114
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\core\msw_accel.obj</ObjectFileName>
1115
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">vc_mswudll\core\msw_accel.obj</ObjectFileName>
1116
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1117
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1118
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1119
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1120 1112
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vc_mswud\core\msw_accel.obj</ObjectFileName>
1121
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_accel.obj</ObjectFileName>
1113
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_accel.obj</ObjectFileName>
1122 1114
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vc_mswu\core\msw_accel.obj</ObjectFileName>
1123
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_accel.obj</ObjectFileName>
1124
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1125
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1126
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1127
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1128
-    </ClCompile>
1129
-    <ClCompile Include="..\..\src\msw\ole\access.cpp">
1130
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1131
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1132
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1133
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1134
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1135
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1136
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1137
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1115
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_accel.obj</ObjectFileName>
1138 1116
     </ClCompile>
1117
+    <ClCompile Include="..\..\src\msw\ole\access.cpp" />
1139 1118
     <ClCompile Include="..\..\src\msw\ole\activex.cpp" />
1140 1119
     <ClCompile Include="..\..\src\msw\app.cpp" />
1141
-    <ClCompile Include="..\..\src\msw\artmsw.cpp">
1142
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1143
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1144
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1145
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1146
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1147
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1148
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1149
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1150
-    </ClCompile>
1120
+    <ClCompile Include="..\..\src\msw\artmsw.cpp" />
1151 1121
     <ClCompile Include="..\..\src\msw\ole\automtn.cpp" />
1152 1122
     <ClCompile Include="..\..\src\msw\bitmap.cpp" />
1153 1123
     <ClCompile Include="..\..\src\msw\bmpbuttn.cpp">
1154
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">vc_mswuddll\core\msw_bmpbuttn.obj</ObjectFileName>
1155
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">vc_mswuddll\core\msw_bmpbuttn.obj</ObjectFileName>
1156
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\core\msw_bmpbuttn.obj</ObjectFileName>
1157
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">vc_mswudll\core\msw_bmpbuttn.obj</ObjectFileName>
1158
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1159
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1160
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1161
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1162 1124
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vc_mswud\core\msw_bmpbuttn.obj</ObjectFileName>
1163
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_bmpbuttn.obj</ObjectFileName>
1125
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_bmpbuttn.obj</ObjectFileName>
1164 1126
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vc_mswu\core\msw_bmpbuttn.obj</ObjectFileName>
1165
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_bmpbuttn.obj</ObjectFileName>
1166
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1167
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1168
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1169
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1127
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_bmpbuttn.obj</ObjectFileName>
1170 1128
     </ClCompile>
1171 1129
     <ClCompile Include="..\..\src\msw\brush.cpp" />
1172 1130
     <ClCompile Include="..\..\src\msw\button.cpp">
1173
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">vc_mswuddll\core\msw_button.obj</ObjectFileName>
1174
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">vc_mswuddll\core\msw_button.obj</ObjectFileName>
1175
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\core\msw_button.obj</ObjectFileName>
1176
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">vc_mswudll\core\msw_button.obj</ObjectFileName>
1177
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1178
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1179
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1180
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1181 1131
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vc_mswud\core\msw_button.obj</ObjectFileName>
1182
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_button.obj</ObjectFileName>
1132
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_button.obj</ObjectFileName>
1183 1133
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vc_mswu\core\msw_button.obj</ObjectFileName>
1184
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_button.obj</ObjectFileName>
1185
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1186
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1187
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1188
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1134
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_button.obj</ObjectFileName>
1189 1135
     </ClCompile>
1190 1136
     <ClCompile Include="..\..\src\msw\caret.cpp" />
1191 1137
     <ClCompile Include="..\..\src\msw\checkbox.cpp">
1192
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">vc_mswuddll\core\msw_checkbox.obj</ObjectFileName>
1193
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">vc_mswuddll\core\msw_checkbox.obj</ObjectFileName>
1194
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\core\msw_checkbox.obj</ObjectFileName>
1195
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">vc_mswudll\core\msw_checkbox.obj</ObjectFileName>
1196
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1197
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1198
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1199
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1200 1138
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vc_mswud\core\msw_checkbox.obj</ObjectFileName>
1201
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_checkbox.obj</ObjectFileName>
1139
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_checkbox.obj</ObjectFileName>
1202 1140
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vc_mswu\core\msw_checkbox.obj</ObjectFileName>
1203
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_checkbox.obj</ObjectFileName>
1204
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1205
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1206
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1207
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1141
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_checkbox.obj</ObjectFileName>
1208 1142
     </ClCompile>
1209 1143
     <ClCompile Include="..\..\src\msw\checklst.cpp">
1210
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">vc_mswuddll\core\msw_checklst.obj</ObjectFileName>
1211
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">vc_mswuddll\core\msw_checklst.obj</ObjectFileName>
1212
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\core\msw_checklst.obj</ObjectFileName>
1213
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">vc_mswudll\core\msw_checklst.obj</ObjectFileName>
1214
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1215
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1216
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1217
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1218 1144
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vc_mswud\core\msw_checklst.obj</ObjectFileName>
1219
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_checklst.obj</ObjectFileName>
1145
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_checklst.obj</ObjectFileName>
1220 1146
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vc_mswu\core\msw_checklst.obj</ObjectFileName>
1221
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_checklst.obj</ObjectFileName>
1222
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1223
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1224
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1225
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1147
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_checklst.obj</ObjectFileName>
1226 1148
     </ClCompile>
1227 1149
     <ClCompile Include="..\..\src\msw\choice.cpp">
1228
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">vc_mswuddll\core\msw_choice.obj</ObjectFileName>
1229
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">vc_mswuddll\core\msw_choice.obj</ObjectFileName>
1230
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\core\msw_choice.obj</ObjectFileName>
1231
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">vc_mswudll\core\msw_choice.obj</ObjectFileName>
1232
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1233
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1234
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1235
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1236 1150
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vc_mswud\core\msw_choice.obj</ObjectFileName>
1237
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_choice.obj</ObjectFileName>
1151
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_choice.obj</ObjectFileName>
1238 1152
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vc_mswu\core\msw_choice.obj</ObjectFileName>
1239
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_choice.obj</ObjectFileName>
1240
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1241
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1242
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1243
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1153
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_choice.obj</ObjectFileName>
1244 1154
     </ClCompile>
1245 1155
     <ClCompile Include="..\..\src\msw\clipbrd.cpp" />
1246
-    <ClCompile Include="..\..\src\msw\colordlg.cpp">
1247
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1248
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1249
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1250
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1251
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1252
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1253
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1254
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1255
-    </ClCompile>
1156
+    <ClCompile Include="..\..\src\msw\colordlg.cpp" />
1256 1157
     <ClCompile Include="..\..\src\msw\colour.cpp" />
1257
-    <ClCompile Include="..\..\src\msw\combo.cpp">
1258
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1259
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1260
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1261
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1262
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1263
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1264
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1265
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1266
-    </ClCompile>
1158
+    <ClCompile Include="..\..\src\msw\combo.cpp" />
1267 1159
     <ClCompile Include="..\..\src\msw\combobox.cpp">
1268
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">vc_mswuddll\core\msw_combobox.obj</ObjectFileName>
1269
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">vc_mswuddll\core\msw_combobox.obj</ObjectFileName>
1270
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\core\msw_combobox.obj</ObjectFileName>
1271
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">vc_mswudll\core\msw_combobox.obj</ObjectFileName>
1272
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1273
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1274
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1275
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1276 1160
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vc_mswud\core\msw_combobox.obj</ObjectFileName>
1277
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_combobox.obj</ObjectFileName>
1161
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_combobox.obj</ObjectFileName>
1278 1162
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vc_mswu\core\msw_combobox.obj</ObjectFileName>
1279
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_combobox.obj</ObjectFileName>
1280
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1281
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1282
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1283
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1163
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_combobox.obj</ObjectFileName>
1284 1164
     </ClCompile>
1285 1165
     <ClCompile Include="..\..\src\msw\control.cpp">
1286
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">vc_mswuddll\core\msw_control.obj</ObjectFileName>
1287
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">vc_mswuddll\core\msw_control.obj</ObjectFileName>
1288
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\core\msw_control.obj</ObjectFileName>
1289
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">vc_mswudll\core\msw_control.obj</ObjectFileName>
1290
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1291
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1292
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1293
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1294 1166
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vc_mswud\core\msw_control.obj</ObjectFileName>
1295
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_control.obj</ObjectFileName>
1167
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_control.obj</ObjectFileName>
1296 1168
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vc_mswu\core\msw_control.obj</ObjectFileName>
1297
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_control.obj</ObjectFileName>
1298
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1299
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1300
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1301
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1169
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_control.obj</ObjectFileName>
1302 1170
     </ClCompile>
1303 1171
     <ClCompile Include="..\..\src\msw\cursor.cpp" />
1304 1172
     <ClCompile Include="..\..\src\msw\data.cpp" />
... ...
@@ -1309,591 +429,180 @@
1309 1309
     <ClCompile Include="..\..\src\msw\dcprint.cpp" />
1310 1310
     <ClCompile Include="..\..\src\msw\dcscreen.cpp" />
1311 1311
     <ClCompile Include="..\..\src\msw\dialog.cpp">
1312
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">vc_mswuddll\core\msw_dialog.obj</ObjectFileName>
1313
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">vc_mswuddll\core\msw_dialog.obj</ObjectFileName>
1314
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\core\msw_dialog.obj</ObjectFileName>
1315
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">vc_mswudll\core\msw_dialog.obj</ObjectFileName>
1316
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1317
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1318
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1319
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1320 1312
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vc_mswud\core\msw_dialog.obj</ObjectFileName>
1321
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_dialog.obj</ObjectFileName>
1313
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_dialog.obj</ObjectFileName>
1322 1314
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vc_mswu\core\msw_dialog.obj</ObjectFileName>
1323
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_dialog.obj</ObjectFileName>
1324
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1325
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1326
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1327
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1315
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_dialog.obj</ObjectFileName>
1328 1316
     </ClCompile>
1329 1317
     <ClCompile Include="..\..\src\msw\dialup.cpp" />
1330 1318
     <ClCompile Include="..\..\src\msw\dib.cpp" />
1331
-    <ClCompile Include="..\..\src\msw\dirdlg.cpp">
1332
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1333
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1334
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1335
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1336
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1337
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1338
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1339
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1340
-    </ClCompile>
1319
+    <ClCompile Include="..\..\src\msw\dirdlg.cpp" />
1341 1320
     <ClCompile Include="..\..\src\msw\display.cpp" />
1342
-    <ClCompile Include="..\..\src\msw\dragimag.cpp">
1343
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1344
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1345
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1346
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1347
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1348
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1349
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1350
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1351
-    </ClCompile>
1321
+    <ClCompile Include="..\..\src\msw\dragimag.cpp" />
1352 1322
     <ClCompile Include="..\..\src\msw\ole\dropsrc.cpp" />
1353 1323
     <ClCompile Include="..\..\src\msw\ole\droptgt.cpp" />
1354 1324
     <ClCompile Include="..\..\src\msw\enhmeta.cpp" />
1355 1325
     <ClCompile Include="..\..\src\msw\evtloop.cpp" />
1356 1326
     <ClCompile Include="..\..\src\msw\fdrepdlg.cpp">
1357
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">vc_mswuddll\core\msw_fdrepdlg.obj</ObjectFileName>
1358
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">vc_mswuddll\core\msw_fdrepdlg.obj</ObjectFileName>
1359
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\core\msw_fdrepdlg.obj</ObjectFileName>
1360
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">vc_mswudll\core\msw_fdrepdlg.obj</ObjectFileName>
1361
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1362
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1363
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1364
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1365 1327
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vc_mswud\core\msw_fdrepdlg.obj</ObjectFileName>
1366
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_fdrepdlg.obj</ObjectFileName>
1328
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_fdrepdlg.obj</ObjectFileName>
1367 1329
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vc_mswu\core\msw_fdrepdlg.obj</ObjectFileName>
1368
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_fdrepdlg.obj</ObjectFileName>
1369
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1370
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1371
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1372
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1373
-    </ClCompile>
1374
-    <ClCompile Include="..\..\src\msw\filedlg.cpp">
1375
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1376
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1377
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1378
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1379
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1380
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1381
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1382
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1330
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_fdrepdlg.obj</ObjectFileName>
1383 1331
     </ClCompile>
1332
+    <ClCompile Include="..\..\src\msw\filedlg.cpp" />
1384 1333
     <ClCompile Include="..\..\src\msw\font.cpp" />
1385
-    <ClCompile Include="..\..\src\msw\fontdlg.cpp">
1386
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1387
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1388
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1389
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1390
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1391
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1392
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1393
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1394
-    </ClCompile>
1334
+    <ClCompile Include="..\..\src\msw\fontdlg.cpp" />
1395 1335
     <ClCompile Include="..\..\src\msw\fontenum.cpp" />
1396 1336
     <ClCompile Include="..\..\src\msw\fontutil.cpp" />
1397
-    <ClCompile Include="..\..\src\msw\frame.cpp">
1398
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1399
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1400
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1401
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1402
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1403
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1404
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1405
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1406
-    </ClCompile>
1337
+    <ClCompile Include="..\..\src\msw\frame.cpp" />
1407 1338
     <ClCompile Include="..\..\src\msw\gauge.cpp">
1408
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">vc_mswuddll\core\msw_gauge.obj</ObjectFileName>
1409
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">vc_mswuddll\core\msw_gauge.obj</ObjectFileName>
1410
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\core\msw_gauge.obj</ObjectFileName>
1411
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">vc_mswudll\core\msw_gauge.obj</ObjectFileName>
1412
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1413
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1414
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1415
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1416 1339
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vc_mswud\core\msw_gauge.obj</ObjectFileName>
1417
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_gauge.obj</ObjectFileName>
1340
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_gauge.obj</ObjectFileName>
1418 1341
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vc_mswu\core\msw_gauge.obj</ObjectFileName>
1419
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_gauge.obj</ObjectFileName>
1420
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1421
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1422
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1423
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1342
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_gauge.obj</ObjectFileName>
1424 1343
     </ClCompile>
1425 1344
     <ClCompile Include="..\..\src\msw\gdiimage.cpp" />
1426 1345
     <ClCompile Include="..\..\src\msw\gdiobj.cpp" />
1427 1346
     <ClCompile Include="..\..\src\msw\gdiplus.cpp" />
1428 1347
     <ClCompile Include="..\..\src\msw\graphics.cpp" />
1429
-    <ClCompile Include="..\..\src\msw\headerctrl.cpp">
1430
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1431
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1432
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1433
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1434
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1435
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1436
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1437
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1438
-    </ClCompile>
1348
+    <ClCompile Include="..\..\src\msw\headerctrl.cpp" />
1439 1349
     <ClCompile Include="..\..\src\msw\helpchm.cpp" />
1440 1350
     <ClCompile Include="..\..\src\msw\helpwin.cpp" />
1441 1351
     <ClCompile Include="..\..\src\msw\icon.cpp" />
1442 1352
     <ClCompile Include="..\..\src\msw\imaglist.cpp" />
1443
-    <ClCompile Include="..\..\src\msw\iniconf.cpp">
1444
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1445
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1446
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1447
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1448
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1449
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1450
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1451
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1452
-    </ClCompile>
1353
+    <ClCompile Include="..\..\src\msw\iniconf.cpp" />
1453 1354
     <ClCompile Include="..\..\src\msw\listbox.cpp">
1454
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">vc_mswuddll\core\msw_listbox.obj</ObjectFileName>
1455
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">vc_mswuddll\core\msw_listbox.obj</ObjectFileName>
1456
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\core\msw_listbox.obj</ObjectFileName>
1457
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">vc_mswudll\core\msw_listbox.obj</ObjectFileName>
1458
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1459
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1460
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1461
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1462 1355
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vc_mswud\core\msw_listbox.obj</ObjectFileName>
1463
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_listbox.obj</ObjectFileName>
1356
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_listbox.obj</ObjectFileName>
1464 1357
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vc_mswu\core\msw_listbox.obj</ObjectFileName>
1465
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_listbox.obj</ObjectFileName>
1466
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1467
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1468
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1469
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1358
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_listbox.obj</ObjectFileName>
1470 1359
     </ClCompile>
1471 1360
     <ClCompile Include="..\..\src\msw\listctrl.cpp">
1472
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">vc_mswuddll\core\msw_listctrl.obj</ObjectFileName>
1473
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">vc_mswuddll\core\msw_listctrl.obj</ObjectFileName>
1474
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\core\msw_listctrl.obj</ObjectFileName>
1475
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">vc_mswudll\core\msw_listctrl.obj</ObjectFileName>
1476
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1477
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1478
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1479
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1480 1361
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vc_mswud\core\msw_listctrl.obj</ObjectFileName>
1481
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_listctrl.obj</ObjectFileName>
1362
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_listctrl.obj</ObjectFileName>
1482 1363
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vc_mswu\core\msw_listctrl.obj</ObjectFileName>
1483
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_listctrl.obj</ObjectFileName>
1484
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1485
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1486
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1487
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1364
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_listctrl.obj</ObjectFileName>
1488 1365
     </ClCompile>
1489 1366
     <ClCompile Include="..\..\src\msw\main.cpp" />
1490
-    <ClCompile Include="..\..\src\msw\mdi.cpp">
1491
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1492
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1493
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1494
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1495
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1496
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1497
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1498
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1499
-    </ClCompile>
1367
+    <ClCompile Include="..\..\src\msw\mdi.cpp" />
1500 1368
     <ClCompile Include="..\..\src\msw\menu.cpp">
1501
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">vc_mswuddll\core\msw_menu.obj</ObjectFileName>
1502
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">vc_mswuddll\core\msw_menu.obj</ObjectFileName>
1503
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\core\msw_menu.obj</ObjectFileName>
1504
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">vc_mswudll\core\msw_menu.obj</ObjectFileName>
1505
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1506
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1507
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1508
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1509 1369
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vc_mswud\core\msw_menu.obj</ObjectFileName>
1510
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_menu.obj</ObjectFileName>
1370
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_menu.obj</ObjectFileName>
1511 1371
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vc_mswu\core\msw_menu.obj</ObjectFileName>
1512
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_menu.obj</ObjectFileName>
1513
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1514
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1515
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1516
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1517
-    </ClCompile>
1518
-    <ClCompile Include="..\..\src\msw\menuitem.cpp">
1519
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1520
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1521
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1522
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1523
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1524
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1525
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1526
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1527
-    </ClCompile>
1528
-    <ClCompile Include="..\..\src\msw\metafile.cpp">
1529
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1530
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1531
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1532
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1533
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1534
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1535
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1536
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1372
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_menu.obj</ObjectFileName>
1537 1373
     </ClCompile>
1374
+    <ClCompile Include="..\..\src\msw\menuitem.cpp" />
1375
+    <ClCompile Include="..\..\src\msw\metafile.cpp" />
1538 1376
     <ClCompile Include="..\..\src\msw\minifram.cpp" />
1539
-    <ClCompile Include="..\..\src\msw\msgdlg.cpp">
1540
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1541
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1542
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1543
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1544
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1545
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1546
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1547
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1548
-    </ClCompile>
1377
+    <ClCompile Include="..\..\src\msw\msgdlg.cpp" />
1549 1378
     <ClCompile Include="..\..\src\msw\mslu.cpp" />
1550
-    <ClCompile Include="..\..\src\msw\nativdlg.cpp">
1551
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1552
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1553
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1554
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1555
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1556
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1557
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1558
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1559
-    </ClCompile>
1560
-    <ClCompile Include="..\..\src\msw\nativewin.cpp">
1561
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1562
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1563
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1564
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1565
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1566
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1567
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1568
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1569
-    </ClCompile>
1379
+    <ClCompile Include="..\..\src\msw\nativdlg.cpp" />
1380
+    <ClCompile Include="..\..\src\msw\nativewin.cpp" />
1570 1381
     <ClCompile Include="..\..\src\msw\notebook.cpp">
1571
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">vc_mswuddll\core\msw_notebook.obj</ObjectFileName>
1572
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">vc_mswuddll\core\msw_notebook.obj</ObjectFileName>
1573
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\core\msw_notebook.obj</ObjectFileName>
1574
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">vc_mswudll\core\msw_notebook.obj</ObjectFileName>
1575
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1576
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1577
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1578
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1579 1382
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vc_mswud\core\msw_notebook.obj</ObjectFileName>
1580
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_notebook.obj</ObjectFileName>
1383
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_notebook.obj</ObjectFileName>
1581 1384
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vc_mswu\core\msw_notebook.obj</ObjectFileName>
1582
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_notebook.obj</ObjectFileName>
1583
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1584
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1585
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1586
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1385
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_notebook.obj</ObjectFileName>
1587 1386
     </ClCompile>
1588 1387
     <ClCompile Include="..\..\src\msw\ole\oleutils.cpp" />
1589
-    <ClCompile Include="..\..\src\msw\ownerdrw.cpp">
1590
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1591
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1592
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1593
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1594
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1595
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1596
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1597
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1598
-    </ClCompile>
1388
+    <ClCompile Include="..\..\src\msw\ownerdrw.cpp" />
1599 1389
     <ClCompile Include="..\..\src\msw\palette.cpp" />
1600 1390
     <ClCompile Include="..\..\src\msw\pen.cpp" />
1601 1391
     <ClCompile Include="..\..\src\msw\popupwin.cpp" />
1602 1392
     <ClCompile Include="..\..\src\msw\printdlg.cpp" />
1603 1393
     <ClCompile Include="..\..\src\msw\printwin.cpp" />
1604 1394
     <ClCompile Include="..\..\src\msw\radiobox.cpp">
1605
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">vc_mswuddll\core\msw_radiobox.obj</ObjectFileName>
1606
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">vc_mswuddll\core\msw_radiobox.obj</ObjectFileName>
1607
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\core\msw_radiobox.obj</ObjectFileName>
1608
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">vc_mswudll\core\msw_radiobox.obj</ObjectFileName>
1609
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1610
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1611
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1612
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1613 1395
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vc_mswud\core\msw_radiobox.obj</ObjectFileName>
1614
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_radiobox.obj</ObjectFileName>
1396
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_radiobox.obj</ObjectFileName>
1615 1397
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vc_mswu\core\msw_radiobox.obj</ObjectFileName>
1616
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_radiobox.obj</ObjectFileName>
1617
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1618
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1619
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1620
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1398
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_radiobox.obj</ObjectFileName>
1621 1399
     </ClCompile>
1622 1400
     <ClCompile Include="..\..\src\msw\radiobut.cpp">
1623
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">vc_mswuddll\core\msw_radiobut.obj</ObjectFileName>
1624
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">vc_mswuddll\core\msw_radiobut.obj</ObjectFileName>
1625
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\core\msw_radiobut.obj</ObjectFileName>
1626
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">vc_mswudll\core\msw_radiobut.obj</ObjectFileName>
1627
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1628
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1629
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1630
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1631 1401
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vc_mswud\core\msw_radiobut.obj</ObjectFileName>
1632
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_radiobut.obj</ObjectFileName>
1402
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_radiobut.obj</ObjectFileName>
1633 1403
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vc_mswu\core\msw_radiobut.obj</ObjectFileName>
1634
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_radiobut.obj</ObjectFileName>
1635
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1636
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1637
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1638
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1404
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_radiobut.obj</ObjectFileName>
1639 1405
     </ClCompile>
1640 1406
     <ClCompile Include="..\..\src\msw\region.cpp" />
1641 1407
     <ClCompile Include="..\..\src\msw\renderer.cpp" />
1642 1408
     <ClCompile Include="..\..\src\msw\scrolbar.cpp">
1643
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">vc_mswuddll\core\msw_scrolbar.obj</ObjectFileName>
1644
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">vc_mswuddll\core\msw_scrolbar.obj</ObjectFileName>
1645
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\core\msw_scrolbar.obj</ObjectFileName>
1646
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">vc_mswudll\core\msw_scrolbar.obj</ObjectFileName>
1647
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1648
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1649
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1650
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1651 1409
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vc_mswud\core\msw_scrolbar.obj</ObjectFileName>
1652
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_scrolbar.obj</ObjectFileName>
1410
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_scrolbar.obj</ObjectFileName>
1653 1411
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vc_mswu\core\msw_scrolbar.obj</ObjectFileName>
1654
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_scrolbar.obj</ObjectFileName>
1655
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1656
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1657
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1658
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1412
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_scrolbar.obj</ObjectFileName>
1659 1413
     </ClCompile>
1660 1414
     <ClCompile Include="..\..\src\msw\settings.cpp" />
1661 1415
     <ClCompile Include="..\..\src\msw\slider.cpp">
1662
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">vc_mswuddll\core\msw_slider.obj</ObjectFileName>
1663
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">vc_mswuddll\core\msw_slider.obj</ObjectFileName>
1664
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\core\msw_slider.obj</ObjectFileName>
1665
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">vc_mswudll\core\msw_slider.obj</ObjectFileName>
1666
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1667
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1668
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1669
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1670 1416
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vc_mswud\core\msw_slider.obj</ObjectFileName>
1671
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_slider.obj</ObjectFileName>
1417
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_slider.obj</ObjectFileName>
1672 1418
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vc_mswu\core\msw_slider.obj</ObjectFileName>
1673
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_slider.obj</ObjectFileName>
1674
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1675
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1676
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1677
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1419
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_slider.obj</ObjectFileName>
1678 1420
     </ClCompile>
1679 1421
     <ClCompile Include="..\..\src\msw\spinbutt.cpp">
1680
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">vc_mswuddll\core\msw_spinbutt.obj</ObjectFileName>
1681
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">vc_mswuddll\core\msw_spinbutt.obj</ObjectFileName>
1682
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\core\msw_spinbutt.obj</ObjectFileName>
1683
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">vc_mswudll\core\msw_spinbutt.obj</ObjectFileName>
1684
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1685
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1686
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1687
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1688 1422
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vc_mswud\core\msw_spinbutt.obj</ObjectFileName>
1689
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_spinbutt.obj</ObjectFileName>
1423
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_spinbutt.obj</ObjectFileName>
1690 1424
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vc_mswu\core\msw_spinbutt.obj</ObjectFileName>
1691
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_spinbutt.obj</ObjectFileName>
1692
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1693
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1694
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1695
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1696
-    </ClCompile>
1697
-    <ClCompile Include="..\..\src\msw\spinctrl.cpp">
1698
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1699
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1700
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1701
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1702
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1703
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1704
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1705
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1425
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_spinbutt.obj</ObjectFileName>
1706 1426
     </ClCompile>
1427
+    <ClCompile Include="..\..\src\msw\spinctrl.cpp" />
1707 1428
     <ClCompile Include="..\..\src\msw\statbmp.cpp">
1708
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">vc_mswuddll\core\msw_statbmp.obj</ObjectFileName>
1709
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">vc_mswuddll\core\msw_statbmp.obj</ObjectFileName>
1710
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\core\msw_statbmp.obj</ObjectFileName>
1711
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">vc_mswudll\core\msw_statbmp.obj</ObjectFileName>
1712
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1713
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1714
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1715
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1716 1429
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vc_mswud\core\msw_statbmp.obj</ObjectFileName>
1717
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_statbmp.obj</ObjectFileName>
1430
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_statbmp.obj</ObjectFileName>
1718 1431
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vc_mswu\core\msw_statbmp.obj</ObjectFileName>
1719
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_statbmp.obj</ObjectFileName>
1720
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1721
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1722
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1723
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1432
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_statbmp.obj</ObjectFileName>
1724 1433
     </ClCompile>
1725 1434
     <ClCompile Include="..\..\src\msw\statbox.cpp">
1726
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">vc_mswuddll\core\msw_statbox.obj</ObjectFileName>
1727
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">vc_mswuddll\core\msw_statbox.obj</ObjectFileName>
1728
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\core\msw_statbox.obj</ObjectFileName>
1729
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">vc_mswudll\core\msw_statbox.obj</ObjectFileName>
1730
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1731
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1732
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1733
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1734 1435
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vc_mswud\core\msw_statbox.obj</ObjectFileName>
1735
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_statbox.obj</ObjectFileName>
1436
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_statbox.obj</ObjectFileName>
1736 1437
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vc_mswu\core\msw_statbox.obj</ObjectFileName>
1737
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_statbox.obj</ObjectFileName>
1738
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1739
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1740
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1741
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1438
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_statbox.obj</ObjectFileName>
1742 1439
     </ClCompile>
1743 1440
     <ClCompile Include="..\..\src\msw\statline.cpp">
1744
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">vc_mswuddll\core\msw_statline.obj</ObjectFileName>
1745
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">vc_mswuddll\core\msw_statline.obj</ObjectFileName>
1746
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\core\msw_statline.obj</ObjectFileName>
1747
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">vc_mswudll\core\msw_statline.obj</ObjectFileName>
1748
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1749
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1750
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1751
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1752 1441
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vc_mswud\core\msw_statline.obj</ObjectFileName>
1753
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_statline.obj</ObjectFileName>
1442
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_statline.obj</ObjectFileName>
1754 1443
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vc_mswu\core\msw_statline.obj</ObjectFileName>
1755
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_statline.obj</ObjectFileName>
1756
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1757
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1758
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1759
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1444
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_statline.obj</ObjectFileName>
1760 1445
     </ClCompile>
1761 1446
     <ClCompile Include="..\..\src\msw\stattext.cpp">
1762
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">vc_mswuddll\core\msw_stattext.obj</ObjectFileName>
1763
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">vc_mswuddll\core\msw_stattext.obj</ObjectFileName>
1764
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\core\msw_stattext.obj</ObjectFileName>
1765
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">vc_mswudll\core\msw_stattext.obj</ObjectFileName>
1766
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1767
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1768
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1769
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1770 1447
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vc_mswud\core\msw_stattext.obj</ObjectFileName>
1771
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_stattext.obj</ObjectFileName>
1448
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_stattext.obj</ObjectFileName>
1772 1449
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vc_mswu\core\msw_stattext.obj</ObjectFileName>
1773
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_stattext.obj</ObjectFileName>
1774
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1775
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1776
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1777
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1778
-    </ClCompile>
1779
-    <ClCompile Include="..\..\src\msw\statusbar.cpp">
1780
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1781
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1782
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1783
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1784
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1785
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1786
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1787
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1450
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_stattext.obj</ObjectFileName>
1788 1451
     </ClCompile>
1452
+    <ClCompile Include="..\..\src\msw\statusbar.cpp" />
1789 1453
     <ClCompile Include="..\..\src\msw\textctrl.cpp">
1790
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">vc_mswuddll\core\msw_textctrl.obj</ObjectFileName>
1791
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">vc_mswuddll\core\msw_textctrl.obj</ObjectFileName>
1792
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\core\msw_textctrl.obj</ObjectFileName>
1793
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">vc_mswudll\core\msw_textctrl.obj</ObjectFileName>
1794
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1795
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1796
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1797
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1798 1454
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vc_mswud\core\msw_textctrl.obj</ObjectFileName>
1799
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_textctrl.obj</ObjectFileName>
1455
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_textctrl.obj</ObjectFileName>
1800 1456
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vc_mswu\core\msw_textctrl.obj</ObjectFileName>
1801
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_textctrl.obj</ObjectFileName>
1802
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1803
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1804
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1805
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1806
-    </ClCompile>
1807
-    <ClCompile Include="..\..\src\msw\textentry.cpp">
1808
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1809
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1810
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1811
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1812
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1813
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1814
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1815
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1457
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_textctrl.obj</ObjectFileName>
1816 1458
     </ClCompile>
1459
+    <ClCompile Include="..\..\src\msw\textentry.cpp" />
1817 1460
     <ClCompile Include="..\..\src\msw\tglbtn.cpp">
1818
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">vc_mswuddll\core\msw_tglbtn.obj</ObjectFileName>
1819
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">vc_mswuddll\core\msw_tglbtn.obj</ObjectFileName>
1820
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\core\msw_tglbtn.obj</ObjectFileName>
1821
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">vc_mswudll\core\msw_tglbtn.obj</ObjectFileName>
1822
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1823
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1824
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1825
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1826 1461
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vc_mswud\core\msw_tglbtn.obj</ObjectFileName>
1827
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_tglbtn.obj</ObjectFileName>
1462
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_tglbtn.obj</ObjectFileName>
1828 1463
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vc_mswu\core\msw_tglbtn.obj</ObjectFileName>
1829
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_tglbtn.obj</ObjectFileName>
1830
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1831
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1832
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1833
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1464
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_tglbtn.obj</ObjectFileName>
1834 1465
     </ClCompile>
1835 1466
     <ClCompile Include="..\..\src\msw\toolbar.cpp">
1836
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">vc_mswuddll\core\msw_toolbar.obj</ObjectFileName>
1837
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">vc_mswuddll\core\msw_toolbar.obj</ObjectFileName>
1838
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\core\msw_toolbar.obj</ObjectFileName>
1839
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">vc_mswudll\core\msw_toolbar.obj</ObjectFileName>
1840
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1841
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1842
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1843
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1844 1467
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vc_mswud\core\msw_toolbar.obj</ObjectFileName>
1845
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_toolbar.obj</ObjectFileName>
1468
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\msw_toolbar.obj</ObjectFileName>
1846 1469
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vc_mswu\core\msw_toolbar.obj</ObjectFileName>
1847
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_toolbar.obj</ObjectFileName>
1848
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1849
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1850
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1851
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1470
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\msw_toolbar.obj</ObjectFileName>
1852 1471
     </ClCompile>
1853 1472
     <ClCompile Include="..\..\src\msw\tooltip.cpp" />
1854 1473
     <ClCompile Include="..\..\src\msw\toplevel.cpp" />
1855
-    <ClCompile Include="..\..\src\msw\treectrl.cpp">
1856
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1857
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1858
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1859
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1860
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1861
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1862
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1863
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1864
-    </ClCompile>
1865
-    <ClCompile Include="..\..\src\msw\uiaction.cpp">
1866
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
1867
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
1868
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
1869
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
1870
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
1871
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
1872
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
1873
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
1874
-    </ClCompile>
1474
+    <ClCompile Include="..\..\src\msw\treectrl.cpp" />
1475
+    <ClCompile Include="..\..\src\msw\uiaction.cpp" />
1875 1476
     <ClCompile Include="..\..\src\msw\utilsgui.cpp" />
1876 1477
     <ClCompile Include="..\..\src\msw\ole\uuid.cpp" />
1877 1478
     <ClCompile Include="..\..\src\msw\uxtheme.cpp" />
1878 1479
     <ClCompile Include="..\..\src\msw\volume.cpp" />
1879 1480
     <ClCompile Include="..\..\src\msw\window.cpp" />
1880 1481
     <ClCompile Include="..\..\src\generic\accel.cpp">
1881
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
1882
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
1883
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
1884
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
1885
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">vc_mswunivuddll\core\generic_accel.obj</ObjectFileName>
1886
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">vc_mswunivuddll\core\generic_accel.obj</ObjectFileName>
1887
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">vc_mswunivudll\core\generic_accel.obj</ObjectFileName>
1888
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">vc_mswunivudll\core\generic_accel.obj</ObjectFileName>
1889 1482
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
1890
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
1483
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
1891 1484
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
1892
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
1893
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">vc_mswunivud\core\generic_accel.obj</ObjectFileName>
1894
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">vc_mswunivud\core\generic_accel.obj</ObjectFileName>
1895
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">vc_mswunivu\core\generic_accel.obj</ObjectFileName>
1896
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">vc_mswunivu\core\generic_accel.obj</ObjectFileName>
1485
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
1897 1486
     </ClCompile>
1898 1487
     <ClCompile Include="..\..\src\generic\busyinfo.cpp" />
1899 1488
     <ClCompile Include="..\..\src\generic\buttonbar.cpp" />
... ...
@@ -1902,68 +611,40 @@
1902 1902
     <ClCompile Include="..\..\src\generic\clrpickerg.cpp" />
1903 1903
     <ClCompile Include="..\..\src\generic\collpaneg.cpp" />
1904 1904
     <ClCompile Include="..\..\src\generic\colrdlgg.cpp">
1905
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
1906
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
1907
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
1908
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
1909 1905
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
1910
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
1906
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
1911 1907
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
1912
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
1908
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
1913 1909
     </ClCompile>
1914 1910
     <ClCompile Include="..\..\src\generic\combog.cpp" />
1915 1911
     <ClCompile Include="..\..\src\generic\dcpsg.cpp" />
1916 1912
     <ClCompile Include="..\..\src\generic\dirctrlg.cpp" />
1917 1913
     <ClCompile Include="..\..\src\generic\dirdlgg.cpp">
1918
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
1919
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
1920
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
1921
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
1922 1914
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
1923
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
1915
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
1924 1916
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
1925
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
1917
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
1926 1918
     </ClCompile>
1927 1919
     <ClCompile Include="..\..\src\generic\dragimgg.cpp" />
1928 1920
     <ClCompile Include="..\..\src\generic\fdrepdlg.cpp">
1929
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
1930
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
1931
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
1932
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
1933
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">vc_mswunivuddll\core\generic_fdrepdlg.obj</ObjectFileName>
1934
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">vc_mswunivuddll\core\generic_fdrepdlg.obj</ObjectFileName>
1935
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">vc_mswunivudll\core\generic_fdrepdlg.obj</ObjectFileName>
1936
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">vc_mswunivudll\core\generic_fdrepdlg.obj</ObjectFileName>
1937 1921
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
1938
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
1922
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
1939 1923
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
1940
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
1941
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">vc_mswunivud\core\generic_fdrepdlg.obj</ObjectFileName>
1942
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">vc_mswunivud\core\generic_fdrepdlg.obj</ObjectFileName>
1943
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">vc_mswunivu\core\generic_fdrepdlg.obj</ObjectFileName>
1944
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">vc_mswunivu\core\generic_fdrepdlg.obj</ObjectFileName>
1924
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
1945 1925
     </ClCompile>
1946 1926
     <ClCompile Include="..\..\src\generic\filectrlg.cpp" />
1947 1927
     <ClCompile Include="..\..\src\generic\filedlgg.cpp">
1948
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
1949
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
1950
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
1951
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
1952 1928
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
1953
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
1929
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
1954 1930
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
1955
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
1931
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
1956 1932
     </ClCompile>
1957 1933
     <ClCompile Include="..\..\src\generic\filepickerg.cpp" />
1958 1934
     <ClCompile Include="..\..\src\generic\fontdlgg.cpp">
1959
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
1960
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
1961
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
1962
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
1963 1935
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
1964
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
1936
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
1965 1937
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
1966
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
1938
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
1967 1939
     </ClCompile>
1968 1940
     <ClCompile Include="..\..\src\generic\fontpickerg.cpp" />
1969 1941
     <ClCompile Include="..\..\src\generic\graphicc.cpp" />
... ...
@@ -1971,43 +652,23 @@
1971 1971
     <ClCompile Include="..\..\src\generic\infobar.cpp" />
1972 1972
     <ClCompile Include="..\..\src\generic\listbkg.cpp" />
1973 1973
     <ClCompile Include="..\..\src\generic\listctrl.cpp">
1974
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
1975
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
1976
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
1977
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
1978
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">vc_mswunivuddll\core\generic_listctrl.obj</ObjectFileName>
1979
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">vc_mswunivuddll\core\generic_listctrl.obj</ObjectFileName>
1980
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">vc_mswunivudll\core\generic_listctrl.obj</ObjectFileName>
1981
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">vc_mswunivudll\core\generic_listctrl.obj</ObjectFileName>
1982 1974
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
1983
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
1975
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
1984 1976
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
1985
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
1986
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">vc_mswunivud\core\generic_listctrl.obj</ObjectFileName>
1987
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">vc_mswunivud\core\generic_listctrl.obj</ObjectFileName>
1988
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">vc_mswunivu\core\generic_listctrl.obj</ObjectFileName>
1989
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">vc_mswunivu\core\generic_listctrl.obj</ObjectFileName>
1977
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
1990 1978
     </ClCompile>
1991 1979
     <ClCompile Include="..\..\src\generic\logg.cpp" />
1992 1980
     <ClCompile Include="..\..\src\generic\mdig.cpp">
1993
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
1994
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
1995
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
1996
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
1997 1981
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
1998
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
1982
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
1999 1983
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
2000
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
1984
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2001 1985
     </ClCompile>
2002 1986
     <ClCompile Include="..\..\src\generic\msgdlgg.cpp">
2003
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
2004
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
2005
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
2006
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
2007 1987
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
2008
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
1988
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2009 1989
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
2010
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
1990
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2011 1991
     </ClCompile>
2012 1992
     <ClCompile Include="..\..\src\generic\numdlgg.cpp" />
2013 1993
     <ClCompile Include="..\..\src\generic\panelg.cpp" />
... ...
@@ -2023,22 +684,10 @@
2023 2023
     <ClCompile Include="..\..\src\generic\statbmpg.cpp" />
2024 2024
     <ClCompile Include="..\..\src\generic\stattextg.cpp" />
2025 2025
     <ClCompile Include="..\..\src\generic\statusbr.cpp">
2026
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">vc_mswuddll\core\generic_statusbr.obj</ObjectFileName>
2027
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">vc_mswuddll\core\generic_statusbr.obj</ObjectFileName>
2028
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\core\generic_statusbr.obj</ObjectFileName>
2029
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">vc_mswudll\core\generic_statusbr.obj</ObjectFileName>
2030
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
2031
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
2032
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
2033
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
2034 2026
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vc_mswud\core\generic_statusbr.obj</ObjectFileName>
2035
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\generic_statusbr.obj</ObjectFileName>
2027
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\generic_statusbr.obj</ObjectFileName>
2036 2028
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vc_mswu\core\generic_statusbr.obj</ObjectFileName>
2037
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\generic_statusbr.obj</ObjectFileName>
2038
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
2039
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
2040
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
2041
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
2029
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\generic_statusbr.obj</ObjectFileName>
2042 2030
     </ClCompile>
2043 2031
     <ClCompile Include="..\..\src\generic\textdlgg.cpp" />
2044 2032
     <ClCompile Include="..\..\src\generic\tipwin.cpp" />
... ...
@@ -2048,714 +697,278 @@
2048 2048
     <ClCompile Include="..\..\src\generic\vlbox.cpp" />
2049 2049
     <ClCompile Include="..\..\src\generic\vscroll.cpp" />
2050 2050
     <ClCompile Include="..\..\src\univ\bmpbuttn.cpp">
2051
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
2052
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
2053
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
2054
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
2055
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">vc_mswunivuddll\core\univ_bmpbuttn.obj</ObjectFileName>
2056
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">vc_mswunivuddll\core\univ_bmpbuttn.obj</ObjectFileName>
2057
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">vc_mswunivudll\core\univ_bmpbuttn.obj</ObjectFileName>
2058
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">vc_mswunivudll\core\univ_bmpbuttn.obj</ObjectFileName>
2059 2051
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
2060
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2052
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2061 2053
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
2062
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2063
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">vc_mswunivud\core\univ_bmpbuttn.obj</ObjectFileName>
2064
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">vc_mswunivud\core\univ_bmpbuttn.obj</ObjectFileName>
2065
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">vc_mswunivu\core\univ_bmpbuttn.obj</ObjectFileName>
2066
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">vc_mswunivu\core\univ_bmpbuttn.obj</ObjectFileName>
2054
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2067 2055
     </ClCompile>
2068 2056
     <ClCompile Include="..\..\src\univ\button.cpp">
2069
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
2070
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
2071
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
2072
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
2073
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">vc_mswunivuddll\core\univ_button.obj</ObjectFileName>
2074
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">vc_mswunivuddll\core\univ_button.obj</ObjectFileName>
2075
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">vc_mswunivudll\core\univ_button.obj</ObjectFileName>
2076
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">vc_mswunivudll\core\univ_button.obj</ObjectFileName>
2077 2057
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
2078
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2058
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2079 2059
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
2080
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2081
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">vc_mswunivud\core\univ_button.obj</ObjectFileName>
2082
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">vc_mswunivud\core\univ_button.obj</ObjectFileName>
2083
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">vc_mswunivu\core\univ_button.obj</ObjectFileName>
2084
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">vc_mswunivu\core\univ_button.obj</ObjectFileName>
2060
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2085 2061
     </ClCompile>
2086 2062
     <ClCompile Include="..\..\src\univ\checkbox.cpp">
2087
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
2088
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
2089
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
2090
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
2091
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">vc_mswunivuddll\core\univ_checkbox.obj</ObjectFileName>
2092
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">vc_mswunivuddll\core\univ_checkbox.obj</ObjectFileName>
2093
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">vc_mswunivudll\core\univ_checkbox.obj</ObjectFileName>
2094
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">vc_mswunivudll\core\univ_checkbox.obj</ObjectFileName>
2095 2063
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
2096
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2064
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2097 2065
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
2098
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2099
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">vc_mswunivud\core\univ_checkbox.obj</ObjectFileName>
2100
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">vc_mswunivud\core\univ_checkbox.obj</ObjectFileName>
2101
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">vc_mswunivu\core\univ_checkbox.obj</ObjectFileName>
2102
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">vc_mswunivu\core\univ_checkbox.obj</ObjectFileName>
2066
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2103 2067
     </ClCompile>
2104 2068
     <ClCompile Include="..\..\src\univ\checklst.cpp">
2105
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
2106
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
2107
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
2108
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
2109
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">vc_mswunivuddll\core\univ_checklst.obj</ObjectFileName>
2110
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">vc_mswunivuddll\core\univ_checklst.obj</ObjectFileName>
2111
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">vc_mswunivudll\core\univ_checklst.obj</ObjectFileName>
2112
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">vc_mswunivudll\core\univ_checklst.obj</ObjectFileName>
2113 2069
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
2114
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2070
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2115 2071
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
2116
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2117
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">vc_mswunivud\core\univ_checklst.obj</ObjectFileName>
2118
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">vc_mswunivud\core\univ_checklst.obj</ObjectFileName>
2119
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">vc_mswunivu\core\univ_checklst.obj</ObjectFileName>
2120
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">vc_mswunivu\core\univ_checklst.obj</ObjectFileName>
2072
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2121 2073
     </ClCompile>
2122 2074
     <ClCompile Include="..\..\src\univ\choice.cpp">
2123
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
2124
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
2125
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
2126
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
2127
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">vc_mswunivuddll\core\univ_choice.obj</ObjectFileName>
2128
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">vc_mswunivuddll\core\univ_choice.obj</ObjectFileName>
2129
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">vc_mswunivudll\core\univ_choice.obj</ObjectFileName>
2130
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">vc_mswunivudll\core\univ_choice.obj</ObjectFileName>
2131 2075
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
2132
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2076
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2133 2077
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
2134
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2135
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">vc_mswunivud\core\univ_choice.obj</ObjectFileName>
2136
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">vc_mswunivud\core\univ_choice.obj</ObjectFileName>
2137
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">vc_mswunivu\core\univ_choice.obj</ObjectFileName>
2138
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">vc_mswunivu\core\univ_choice.obj</ObjectFileName>
2078
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2139 2079
     </ClCompile>
2140 2080
     <ClCompile Include="..\..\src\univ\combobox.cpp">
2141
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
2142
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
2143
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
2144
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
2145
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">vc_mswunivuddll\core\univ_combobox.obj</ObjectFileName>
2146
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">vc_mswunivuddll\core\univ_combobox.obj</ObjectFileName>
2147
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">vc_mswunivudll\core\univ_combobox.obj</ObjectFileName>
2148
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">vc_mswunivudll\core\univ_combobox.obj</ObjectFileName>
2149 2081
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
2150
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2082
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2151 2083
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
2152
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2153
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">vc_mswunivud\core\univ_combobox.obj</ObjectFileName>
2154
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">vc_mswunivud\core\univ_combobox.obj</ObjectFileName>
2155
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">vc_mswunivu\core\univ_combobox.obj</ObjectFileName>
2156
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">vc_mswunivu\core\univ_combobox.obj</ObjectFileName>
2084
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2157 2085
     </ClCompile>
2158 2086
     <ClCompile Include="..\..\src\univ\control.cpp">
2159
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
2160
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
2161
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
2162
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
2163
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">vc_mswunivuddll\core\univ_control.obj</ObjectFileName>
2164
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">vc_mswunivuddll\core\univ_control.obj</ObjectFileName>
2165
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">vc_mswunivudll\core\univ_control.obj</ObjectFileName>
2166
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">vc_mswunivudll\core\univ_control.obj</ObjectFileName>
2167 2087
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
2168
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2088
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2169 2089
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
2170
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2171
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">vc_mswunivud\core\univ_control.obj</ObjectFileName>
2172
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">vc_mswunivud\core\univ_control.obj</ObjectFileName>
2173
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">vc_mswunivu\core\univ_control.obj</ObjectFileName>
2174
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">vc_mswunivu\core\univ_control.obj</ObjectFileName>
2090
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2175 2091
     </ClCompile>
2176 2092
     <ClCompile Include="..\..\src\univ\ctrlrend.cpp">
2177
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
2178
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
2179
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
2180
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
2181 2093
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
2182
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2094
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2183 2095
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
2184
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2096
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2185 2097
     </ClCompile>
2186 2098
     <ClCompile Include="..\..\src\univ\dialog.cpp">
2187
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
2188
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
2189
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
2190
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
2191
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">vc_mswunivuddll\core\univ_dialog.obj</ObjectFileName>
2192
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">vc_mswunivuddll\core\univ_dialog.obj</ObjectFileName>
2193
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">vc_mswunivudll\core\univ_dialog.obj</ObjectFileName>
2194
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">vc_mswunivudll\core\univ_dialog.obj</ObjectFileName>
2195 2099
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
2196
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2100
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2197 2101
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
2198
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2199
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">vc_mswunivud\core\univ_dialog.obj</ObjectFileName>
2200
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">vc_mswunivud\core\univ_dialog.obj</ObjectFileName>
2201
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">vc_mswunivu\core\univ_dialog.obj</ObjectFileName>
2202
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">vc_mswunivu\core\univ_dialog.obj</ObjectFileName>
2102
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2203 2103
     </ClCompile>
2204 2104
     <ClCompile Include="..\..\src\univ\framuniv.cpp">
2205
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
2206
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
2207
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
2208
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
2209 2105
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
2210
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2106
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2211 2107
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
2212
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2108
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2213 2109
     </ClCompile>
2214 2110
     <ClCompile Include="..\..\src\univ\gauge.cpp">
2215
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
2216
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
2217
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
2218
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
2219
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">vc_mswunivuddll\core\univ_gauge.obj</ObjectFileName>
2220
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">vc_mswunivuddll\core\univ_gauge.obj</ObjectFileName>
2221
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">vc_mswunivudll\core\univ_gauge.obj</ObjectFileName>
2222
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">vc_mswunivudll\core\univ_gauge.obj</ObjectFileName>
2223 2111
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
2224
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2112
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2225 2113
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
2226
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2227
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">vc_mswunivud\core\univ_gauge.obj</ObjectFileName>
2228
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">vc_mswunivud\core\univ_gauge.obj</ObjectFileName>
2229
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">vc_mswunivu\core\univ_gauge.obj</ObjectFileName>
2230
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">vc_mswunivu\core\univ_gauge.obj</ObjectFileName>
2114
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2231 2115
     </ClCompile>
2232 2116
     <ClCompile Include="..\..\src\univ\themes\gtk.cpp">
2233
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
2234
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
2235
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
2236
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
2237 2117
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
2238
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2118
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2239 2119
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
2240
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2120
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2241 2121
     </ClCompile>
2242 2122
     <ClCompile Include="..\..\src\univ\inpcons.cpp">
2243
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
2244
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
2245
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
2246
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
2247 2123
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
2248
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2124
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2249 2125
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
2250
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2126
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2251 2127
     </ClCompile>
2252 2128
     <ClCompile Include="..\..\src\univ\inphand.cpp">
2253
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
2254
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
2255
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
2256
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
2257 2129
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
2258
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2130
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2259 2131
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
2260
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2132
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2261 2133
     </ClCompile>
2262 2134
     <ClCompile Include="..\..\src\univ\listbox.cpp">
2263
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
2264
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
2265
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
2266
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
2267
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">vc_mswunivuddll\core\univ_listbox.obj</ObjectFileName>
2268
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">vc_mswunivuddll\core\univ_listbox.obj</ObjectFileName>
2269
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">vc_mswunivudll\core\univ_listbox.obj</ObjectFileName>
2270
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">vc_mswunivudll\core\univ_listbox.obj</ObjectFileName>
2271 2135
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
2272
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2136
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2273 2137
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
2274
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2275
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">vc_mswunivud\core\univ_listbox.obj</ObjectFileName>
2276
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">vc_mswunivud\core\univ_listbox.obj</ObjectFileName>
2277
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">vc_mswunivu\core\univ_listbox.obj</ObjectFileName>
2278
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">vc_mswunivu\core\univ_listbox.obj</ObjectFileName>
2138
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2279 2139
     </ClCompile>
2280 2140
     <ClCompile Include="..\..\src\univ\menu.cpp">
2281
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
2282
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
2283
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
2284
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
2285
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">vc_mswunivuddll\core\univ_menu.obj</ObjectFileName>
2286
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">vc_mswunivuddll\core\univ_menu.obj</ObjectFileName>
2287
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">vc_mswunivudll\core\univ_menu.obj</ObjectFileName>
2288
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">vc_mswunivudll\core\univ_menu.obj</ObjectFileName>
2289 2141
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
2290
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2142
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2291 2143
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
2292
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2293
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">vc_mswunivud\core\univ_menu.obj</ObjectFileName>
2294
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">vc_mswunivud\core\univ_menu.obj</ObjectFileName>
2295
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">vc_mswunivu\core\univ_menu.obj</ObjectFileName>
2296
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">vc_mswunivu\core\univ_menu.obj</ObjectFileName>
2144
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2297 2145
     </ClCompile>
2298 2146
     <ClCompile Include="..\..\src\univ\themes\metal.cpp">
2299
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
2300
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
2301
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
2302
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
2303 2147
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
2304
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2148
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2305 2149
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
2306
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2150
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2307 2151
     </ClCompile>
2308 2152
     <ClCompile Include="..\..\src\univ\themes\mono.cpp">
2309
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
2310
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
2311
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
2312
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
2313 2153
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
2314
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2154
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2315 2155
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
2316
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2156
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2317 2157
     </ClCompile>
2318 2158
     <ClCompile Include="..\..\src\univ\notebook.cpp">
2319
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
2320
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
2321
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
2322
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
2323
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">vc_mswunivuddll\core\univ_notebook.obj</ObjectFileName>
2324
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">vc_mswunivuddll\core\univ_notebook.obj</ObjectFileName>
2325
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">vc_mswunivudll\core\univ_notebook.obj</ObjectFileName>
2326
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">vc_mswunivudll\core\univ_notebook.obj</ObjectFileName>
2327 2159
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
2328
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2160
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2329 2161
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
2330
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2331
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">vc_mswunivud\core\univ_notebook.obj</ObjectFileName>
2332
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">vc_mswunivud\core\univ_notebook.obj</ObjectFileName>
2333
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">vc_mswunivu\core\univ_notebook.obj</ObjectFileName>
2334
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">vc_mswunivu\core\univ_notebook.obj</ObjectFileName>
2162
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2335 2163
     </ClCompile>
2336 2164
     <ClCompile Include="..\..\src\univ\radiobox.cpp">
2337
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
2338
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
2339
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
2340
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
2341
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">vc_mswunivuddll\core\univ_radiobox.obj</ObjectFileName>
2342
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">vc_mswunivuddll\core\univ_radiobox.obj</ObjectFileName>
2343
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">vc_mswunivudll\core\univ_radiobox.obj</ObjectFileName>
2344
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">vc_mswunivudll\core\univ_radiobox.obj</ObjectFileName>
2345 2165
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
2346
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2166
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2347 2167
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
2348
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2349
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">vc_mswunivud\core\univ_radiobox.obj</ObjectFileName>
2350
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">vc_mswunivud\core\univ_radiobox.obj</ObjectFileName>
2351
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">vc_mswunivu\core\univ_radiobox.obj</ObjectFileName>
2352
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">vc_mswunivu\core\univ_radiobox.obj</ObjectFileName>
2168
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2353 2169
     </ClCompile>
2354 2170
     <ClCompile Include="..\..\src\univ\radiobut.cpp">
2355
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
2356
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
2357
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
2358
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
2359
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">vc_mswunivuddll\core\univ_radiobut.obj</ObjectFileName>
2360
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">vc_mswunivuddll\core\univ_radiobut.obj</ObjectFileName>
2361
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">vc_mswunivudll\core\univ_radiobut.obj</ObjectFileName>
2362
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">vc_mswunivudll\core\univ_radiobut.obj</ObjectFileName>
2363 2171
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
2364
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2172
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2365 2173
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
2366
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2367
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">vc_mswunivud\core\univ_radiobut.obj</ObjectFileName>
2368
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">vc_mswunivud\core\univ_radiobut.obj</ObjectFileName>
2369
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">vc_mswunivu\core\univ_radiobut.obj</ObjectFileName>
2370
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">vc_mswunivu\core\univ_radiobut.obj</ObjectFileName>
2174
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2371 2175
     </ClCompile>
2372 2176
     <ClCompile Include="..\..\src\univ\scrarrow.cpp">
2373
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
2374
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
2375
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
2376
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
2377 2177
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
2378
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2178
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2379 2179
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
2380
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2180
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2381 2181
     </ClCompile>
2382 2182
     <ClCompile Include="..\..\src\univ\scrolbar.cpp">
2383
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
2384
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
2385
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
2386
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
2387
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">vc_mswunivuddll\core\univ_scrolbar.obj</ObjectFileName>
2388
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">vc_mswunivuddll\core\univ_scrolbar.obj</ObjectFileName>
2389
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">vc_mswunivudll\core\univ_scrolbar.obj</ObjectFileName>
2390
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">vc_mswunivudll\core\univ_scrolbar.obj</ObjectFileName>
2391 2183
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
2392
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2184
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2393 2185
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
2394
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2395
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">vc_mswunivud\core\univ_scrolbar.obj</ObjectFileName>
2396
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">vc_mswunivud\core\univ_scrolbar.obj</ObjectFileName>
2397
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">vc_mswunivu\core\univ_scrolbar.obj</ObjectFileName>
2398
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">vc_mswunivu\core\univ_scrolbar.obj</ObjectFileName>
2186
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2399 2187
     </ClCompile>
2400 2188
     <ClCompile Include="..\..\src\univ\scrthumb.cpp">
2401
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
2402
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
2403
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
2404
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
2405 2189
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
2406
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2190
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2407 2191
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
2408
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2192
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2409 2193
     </ClCompile>
2410 2194
     <ClCompile Include="..\..\src\univ\settingsuniv.cpp">
2411
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
2412
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
2413
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
2414
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
2415 2195
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
2416
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2196
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2417 2197
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
2418
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2198
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2419 2199
     </ClCompile>
2420 2200
     <ClCompile Include="..\..\src\univ\slider.cpp">
2421
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
2422
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
2423
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
2424
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
2425
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">vc_mswunivuddll\core\univ_slider.obj</ObjectFileName>
2426
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">vc_mswunivuddll\core\univ_slider.obj</ObjectFileName>
2427
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">vc_mswunivudll\core\univ_slider.obj</ObjectFileName>
2428
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">vc_mswunivudll\core\univ_slider.obj</ObjectFileName>
2429 2201
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
2430
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2202
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2431 2203
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
2432
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2433
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">vc_mswunivud\core\univ_slider.obj</ObjectFileName>
2434
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">vc_mswunivud\core\univ_slider.obj</ObjectFileName>
2435
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">vc_mswunivu\core\univ_slider.obj</ObjectFileName>
2436
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">vc_mswunivu\core\univ_slider.obj</ObjectFileName>
2204
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2437 2205
     </ClCompile>
2438 2206
     <ClCompile Include="..\..\src\univ\spinbutt.cpp">
2439
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
2440
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
2441
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
2442
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
2443
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">vc_mswunivuddll\core\univ_spinbutt.obj</ObjectFileName>
2444
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">vc_mswunivuddll\core\univ_spinbutt.obj</ObjectFileName>
2445
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">vc_mswunivudll\core\univ_spinbutt.obj</ObjectFileName>
2446
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">vc_mswunivudll\core\univ_spinbutt.obj</ObjectFileName>
2447 2207
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
2448
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2208
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2449 2209
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
2450
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2451
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">vc_mswunivud\core\univ_spinbutt.obj</ObjectFileName>
2452
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">vc_mswunivud\core\univ_spinbutt.obj</ObjectFileName>
2453
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">vc_mswunivu\core\univ_spinbutt.obj</ObjectFileName>
2454
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">vc_mswunivu\core\univ_spinbutt.obj</ObjectFileName>
2210
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2455 2211
     </ClCompile>
2456 2212
     <ClCompile Include="..\..\src\univ\statbmp.cpp">
2457
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
2458
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
2459
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
2460
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
2461
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">vc_mswunivuddll\core\univ_statbmp.obj</ObjectFileName>
2462
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">vc_mswunivuddll\core\univ_statbmp.obj</ObjectFileName>
2463
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">vc_mswunivudll\core\univ_statbmp.obj</ObjectFileName>
2464
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">vc_mswunivudll\core\univ_statbmp.obj</ObjectFileName>
2465 2213
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
2466
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2214
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2467 2215
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
2468
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2469
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">vc_mswunivud\core\univ_statbmp.obj</ObjectFileName>
2470
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">vc_mswunivud\core\univ_statbmp.obj</ObjectFileName>
2471
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">vc_mswunivu\core\univ_statbmp.obj</ObjectFileName>
2472
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">vc_mswunivu\core\univ_statbmp.obj</ObjectFileName>
2216
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2473 2217
     </ClCompile>
2474 2218
     <ClCompile Include="..\..\src\univ\statbox.cpp">
2475
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
2476
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
2477
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
2478
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
2479
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">vc_mswunivuddll\core\univ_statbox.obj</ObjectFileName>
2480
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">vc_mswunivuddll\core\univ_statbox.obj</ObjectFileName>
2481
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">vc_mswunivudll\core\univ_statbox.obj</ObjectFileName>
2482
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">vc_mswunivudll\core\univ_statbox.obj</ObjectFileName>
2483 2219
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
2484
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2220
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2485 2221
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
2486
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2487
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">vc_mswunivud\core\univ_statbox.obj</ObjectFileName>
2488
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">vc_mswunivud\core\univ_statbox.obj</ObjectFileName>
2489
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">vc_mswunivu\core\univ_statbox.obj</ObjectFileName>
2490
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">vc_mswunivu\core\univ_statbox.obj</ObjectFileName>
2222
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2491 2223
     </ClCompile>
2492 2224
     <ClCompile Include="..\..\src\univ\statline.cpp">
2493
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
2494
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
2495
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
2496
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
2497
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">vc_mswunivuddll\core\univ_statline.obj</ObjectFileName>
2498
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">vc_mswunivuddll\core\univ_statline.obj</ObjectFileName>
2499
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">vc_mswunivudll\core\univ_statline.obj</ObjectFileName>
2500
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">vc_mswunivudll\core\univ_statline.obj</ObjectFileName>
2501 2225
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
2502
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2226
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2503 2227
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
2504
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2505
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">vc_mswunivud\core\univ_statline.obj</ObjectFileName>
2506
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">vc_mswunivud\core\univ_statline.obj</ObjectFileName>
2507
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">vc_mswunivu\core\univ_statline.obj</ObjectFileName>
2508
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">vc_mswunivu\core\univ_statline.obj</ObjectFileName>
2228
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2509 2229
     </ClCompile>
2510 2230
     <ClCompile Include="..\..\src\univ\stattext.cpp">
2511
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
2512
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
2513
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
2514
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
2515
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">vc_mswunivuddll\core\univ_stattext.obj</ObjectFileName>
2516
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">vc_mswunivuddll\core\univ_stattext.obj</ObjectFileName>
2517
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">vc_mswunivudll\core\univ_stattext.obj</ObjectFileName>
2518
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">vc_mswunivudll\core\univ_stattext.obj</ObjectFileName>
2519 2231
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
2520
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2232
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2521 2233
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
2522
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2523
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">vc_mswunivud\core\univ_stattext.obj</ObjectFileName>
2524
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">vc_mswunivud\core\univ_stattext.obj</ObjectFileName>
2525
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">vc_mswunivu\core\univ_stattext.obj</ObjectFileName>
2526
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">vc_mswunivu\core\univ_stattext.obj</ObjectFileName>
2234
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2527 2235
     </ClCompile>
2528 2236
     <ClCompile Include="..\..\src\univ\statusbr.cpp">
2529
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
2530
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
2531
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
2532
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
2533
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">vc_mswunivuddll\core\univ_statusbr.obj</ObjectFileName>
2534
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">vc_mswunivuddll\core\univ_statusbr.obj</ObjectFileName>
2535
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">vc_mswunivudll\core\univ_statusbr.obj</ObjectFileName>
2536
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">vc_mswunivudll\core\univ_statusbr.obj</ObjectFileName>
2537 2237
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
2538
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2238
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2539 2239
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
2540
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2541
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">vc_mswunivud\core\univ_statusbr.obj</ObjectFileName>
2542
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">vc_mswunivud\core\univ_statusbr.obj</ObjectFileName>
2543
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">vc_mswunivu\core\univ_statusbr.obj</ObjectFileName>
2544
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">vc_mswunivu\core\univ_statusbr.obj</ObjectFileName>
2240
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2545 2241
     </ClCompile>
2546 2242
     <ClCompile Include="..\..\src\univ\stdrend.cpp">
2547
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
2548
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
2549
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
2550
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
2551 2243
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
2552
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2244
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2553 2245
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
2554
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2246
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2555 2247
     </ClCompile>
2556 2248
     <ClCompile Include="..\..\src\univ\textctrl.cpp">
2557
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
2558
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
2559
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
2560
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
2561
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">vc_mswunivuddll\core\univ_textctrl.obj</ObjectFileName>
2562
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">vc_mswunivuddll\core\univ_textctrl.obj</ObjectFileName>
2563
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">vc_mswunivudll\core\univ_textctrl.obj</ObjectFileName>
2564
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">vc_mswunivudll\core\univ_textctrl.obj</ObjectFileName>
2565 2249
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
2566
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2250
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2567 2251
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
2568
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2569
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">vc_mswunivud\core\univ_textctrl.obj</ObjectFileName>
2570
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">vc_mswunivud\core\univ_textctrl.obj</ObjectFileName>
2571
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">vc_mswunivu\core\univ_textctrl.obj</ObjectFileName>
2572
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">vc_mswunivu\core\univ_textctrl.obj</ObjectFileName>
2252
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2573 2253
     </ClCompile>
2574 2254
     <ClCompile Include="..\..\src\univ\tglbtn.cpp">
2575
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
2576
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
2577
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
2578
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
2579
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">vc_mswunivuddll\core\univ_tglbtn.obj</ObjectFileName>
2580
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">vc_mswunivuddll\core\univ_tglbtn.obj</ObjectFileName>
2581
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">vc_mswunivudll\core\univ_tglbtn.obj</ObjectFileName>
2582
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">vc_mswunivudll\core\univ_tglbtn.obj</ObjectFileName>
2583 2255
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
2584
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2256
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2585 2257
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
2586
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2587
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">vc_mswunivud\core\univ_tglbtn.obj</ObjectFileName>
2588
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">vc_mswunivud\core\univ_tglbtn.obj</ObjectFileName>
2589
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">vc_mswunivu\core\univ_tglbtn.obj</ObjectFileName>
2590
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">vc_mswunivu\core\univ_tglbtn.obj</ObjectFileName>
2258
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2591 2259
     </ClCompile>
2592 2260
     <ClCompile Include="..\..\src\univ\theme.cpp">
2593
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
2594
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
2595
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
2596
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
2597 2261
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
2598
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2262
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2599 2263
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
2600
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2264
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2601 2265
     </ClCompile>
2602 2266
     <ClCompile Include="..\..\src\univ\toolbar.cpp">
2603
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
2604
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
2605
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
2606
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
2607
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">vc_mswunivuddll\core\univ_toolbar.obj</ObjectFileName>
2608
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">vc_mswunivuddll\core\univ_toolbar.obj</ObjectFileName>
2609
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">vc_mswunivudll\core\univ_toolbar.obj</ObjectFileName>
2610
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">vc_mswunivudll\core\univ_toolbar.obj</ObjectFileName>
2611 2267
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
2612
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2268
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2613 2269
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
2614
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2615
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">vc_mswunivud\core\univ_toolbar.obj</ObjectFileName>
2616
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">vc_mswunivud\core\univ_toolbar.obj</ObjectFileName>
2617
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">vc_mswunivu\core\univ_toolbar.obj</ObjectFileName>
2618
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">vc_mswunivu\core\univ_toolbar.obj</ObjectFileName>
2270
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2619 2271
     </ClCompile>
2620 2272
     <ClCompile Include="..\..\src\univ\topluniv.cpp">
2621
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
2622
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
2623
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
2624
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
2625 2273
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
2626
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2274
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2627 2275
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
2628
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2276
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2629 2277
     </ClCompile>
2630 2278
     <ClCompile Include="..\..\src\univ\themes\win32.cpp">
2631
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
2632
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
2633
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
2634
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
2635 2279
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
2636
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2280
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2637 2281
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
2638
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2282
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2639 2283
     </ClCompile>
2640 2284
     <ClCompile Include="..\..\src\univ\winuniv.cpp">
2641
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
2642
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
2643
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
2644
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
2645 2285
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
2646
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2286
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2647 2287
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
2648
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2288
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2649 2289
     </ClCompile>
2650 2290
   </ItemGroup>
2651 2291
   <ItemGroup>
2652 2292
     <ResourceCompile Include="..\..\src\msw\version.rc">
2653 2293
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
2654
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2294
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
2655 2295
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
2656
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2657
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
2658
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
2659
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
2660
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
2296
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2661 2297
     </ResourceCompile>
2662 2298
   </ItemGroup>
2663 2299
   <ItemGroup>
2664 2300
     <ClInclude Include="..\..\include\wx\msw\setup.h">
2665
-      <Message Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">Creating ..\..\lib\vc_dll\mswud\wx\setup.h</Message>
2666
-      <Message Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">Creating ..\..\lib\vc_dll\mswud\wx\setup.h</Message>
2667
-      <Command Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">copy "%(FullPath)" ..\..\lib\vc_dll\mswud\wx\setup.h</Command>
2668
-      <Command Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">copy "%(FullPath)" ..\..\lib\vc_dll\mswud\wx\setup.h</Command>
2669
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">..\..\lib\vc_dll\mswud\wx\setup.h;%(Outputs)</Outputs>
2670
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">..\..\lib\vc_dll\mswud\wx\setup.h;%(Outputs)</Outputs>
2671
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">$(INTDIR) $(OUTDIR);%(AdditionalInputs)</AdditionalInputs>
2672
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">$(INTDIR) $(OUTDIR);%(AdditionalInputs)</AdditionalInputs>
2673
-      <Message Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">Creating ..\..\lib\vc_dll\mswu\wx\setup.h</Message>
2674
-      <Message Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">Creating ..\..\lib\vc_dll\mswu\wx\setup.h</Message>
2675
-      <Command Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">copy "%(FullPath)" ..\..\lib\vc_dll\mswu\wx\setup.h</Command>
2676
-      <Command Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">copy "%(FullPath)" ..\..\lib\vc_dll\mswu\wx\setup.h</Command>
2677
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">..\..\lib\vc_dll\mswu\wx\setup.h;%(Outputs)</Outputs>
2678
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">..\..\lib\vc_dll\mswu\wx\setup.h;%(Outputs)</Outputs>
2679
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">$(INTDIR) $(OUTDIR);%(AdditionalInputs)</AdditionalInputs>
2680
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">$(INTDIR) $(OUTDIR);%(AdditionalInputs)</AdditionalInputs>
2681 2301
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Creating ..\..\lib\vc_lib\mswud\wx\setup.h</Message>
2682
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Creating ..\..\lib\vc_lib\mswud\wx\setup.h</Message>
2302
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Creating ..\..\lib\vc_lib\mswud\wx\setup.h</Message>
2683 2303
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" ..\..\lib\vc_lib\mswud\wx\setup.h</Command>
2684
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy "%(FullPath)" ..\..\lib\vc_lib\mswud\wx\setup.h</Command>
2304
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy "%(FullPath)" ..\..\lib\vc_lib\mswud\wx\setup.h</Command>
2685 2305
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\lib\vc_lib\mswud\wx\setup.h;%(Outputs)</Outputs>
2686
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\lib\vc_lib\mswud\wx\setup.h;%(Outputs)</Outputs>
2306
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\lib\vc_lib\mswud\wx\setup.h;%(Outputs)</Outputs>
2687 2307
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(INTDIR) $(OUTDIR);%(AdditionalInputs)</AdditionalInputs>
2688
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(INTDIR) $(OUTDIR);%(AdditionalInputs)</AdditionalInputs>
2308
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(INTDIR) $(OUTDIR);%(AdditionalInputs)</AdditionalInputs>
2689 2309
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Creating ..\..\lib\vc_lib\mswu\wx\setup.h</Message>
2690
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Creating ..\..\lib\vc_lib\mswu\wx\setup.h</Message>
2310
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Creating ..\..\lib\vc_lib\mswu\wx\setup.h</Message>
2691 2311
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy "%(FullPath)" ..\..\lib\vc_lib\mswu\wx\setup.h</Command>
2692
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy "%(FullPath)" ..\..\lib\vc_lib\mswu\wx\setup.h</Command>
2312
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy "%(FullPath)" ..\..\lib\vc_lib\mswu\wx\setup.h</Command>
2693 2313
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\lib\vc_lib\mswu\wx\setup.h;%(Outputs)</Outputs>
2694
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\lib\vc_lib\mswu\wx\setup.h;%(Outputs)</Outputs>
2314
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\lib\vc_lib\mswu\wx\setup.h;%(Outputs)</Outputs>
2695 2315
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(INTDIR) $(OUTDIR);%(AdditionalInputs)</AdditionalInputs>
2696
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(INTDIR) $(OUTDIR);%(AdditionalInputs)</AdditionalInputs>
2697
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
2698
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
2699
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
2700
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
2701
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
2702
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
2703
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
2704
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
2316
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(INTDIR) $(OUTDIR);%(AdditionalInputs)</AdditionalInputs>
2705 2317
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
2706
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2707
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
2708
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
2709
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
2710
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
2318
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2711 2319
     </ClInclude>
2712 2320
     <ClInclude Include="..\..\include\wx\univ\setup.h">
2713
-      <Message Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h</Message>
2714
-      <Message Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h</Message>
2715
-      <Command Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">copy "%(FullPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h</Command>
2716
-      <Command Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">copy "%(FullPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h</Command>
2717
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">..\..\lib\vc_dll\mswunivud\wx\setup.h;%(Outputs)</Outputs>
2718
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">..\..\lib\vc_dll\mswunivud\wx\setup.h;%(Outputs)</Outputs>
2719
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">$(INTDIR) $(OUTDIR);%(AdditionalInputs)</AdditionalInputs>
2720
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">$(INTDIR) $(OUTDIR);%(AdditionalInputs)</AdditionalInputs>
2721
-      <Message Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h</Message>
2722
-      <Message Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h</Message>
2723
-      <Command Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">copy "%(FullPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h</Command>
2724
-      <Command Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">copy "%(FullPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h</Command>
2725
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">..\..\lib\vc_dll\mswunivu\wx\setup.h;%(Outputs)</Outputs>
2726
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">..\..\lib\vc_dll\mswunivu\wx\setup.h;%(Outputs)</Outputs>
2727
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">$(INTDIR) $(OUTDIR);%(AdditionalInputs)</AdditionalInputs>
2728
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">$(INTDIR) $(OUTDIR);%(AdditionalInputs)</AdditionalInputs>
2729
-      <Message Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h</Message>
2730
-      <Message Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h</Message>
2731
-      <Command Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">copy "%(FullPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h</Command>
2732
-      <Command Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">copy "%(FullPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h</Command>
2733
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">..\..\lib\vc_lib\mswunivud\wx\setup.h;%(Outputs)</Outputs>
2734
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">..\..\lib\vc_lib\mswunivud\wx\setup.h;%(Outputs)</Outputs>
2735
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">$(INTDIR) $(OUTDIR);%(AdditionalInputs)</AdditionalInputs>
2736
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">$(INTDIR) $(OUTDIR);%(AdditionalInputs)</AdditionalInputs>
2737
-      <Message Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h</Message>
2738
-      <Message Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h</Message>
2739
-      <Command Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">copy "%(FullPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h</Command>
2740
-      <Command Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">copy "%(FullPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h</Command>
2741
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">..\..\lib\vc_lib\mswunivu\wx\setup.h;%(Outputs)</Outputs>
2742
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">..\..\lib\vc_lib\mswunivu\wx\setup.h;%(Outputs)</Outputs>
2743
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">$(INTDIR) $(OUTDIR);%(AdditionalInputs)</AdditionalInputs>
2744
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">$(INTDIR) $(OUTDIR);%(AdditionalInputs)</AdditionalInputs>
2745
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
2746
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
2747
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
2748
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
2749
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</ExcludedFromBuild>
2750
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</ExcludedFromBuild>
2751
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</ExcludedFromBuild>
2752
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">true</ExcludedFromBuild>
2753 2321
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
2754
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2755
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</ExcludedFromBuild>
2756
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</ExcludedFromBuild>
2757
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</ExcludedFromBuild>
2758
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</ExcludedFromBuild>
2322
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
2759 2323
     </ClInclude>
2760 2324
     <ClInclude Include="..\..\include\wx\msw\accel.h" />
2761 2325
     <ClInclude Include="..\..\include\wx\msw\ole\access.h" />
... ...
@@ -2805,70 +1018,22 @@
2805 2805
     <ClInclude Include="..\..\include\wx\msw\gauge.h" />
2806 2806
     <ClInclude Include="..\..\include\wx\msw\gdiimage.h" />
2807 2807
     <CustomBuild Include="..\..\include\wx\msw\genrcdefs.h">
2808
-      <Message Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h</Message>
2809
-      <Message Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h</Message>
2810
-      <Command Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">cl /EP /nologo "%(FullPath)" &gt; "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"</Command>
2811
-      <Command Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">cl /EP /nologo "%(FullPath)" &gt; "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"</Command>
2812
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h;%(Outputs)</Outputs>
2813
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h;%(Outputs)</Outputs>
2814
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">..\..\lib\vc_dll\mswud\wx\msw;%(AdditionalInputs)</AdditionalInputs>
2815
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">..\..\lib\vc_dll\mswud\wx\msw;%(AdditionalInputs)</AdditionalInputs>
2816
-      <Message Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h</Message>
2817
-      <Message Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h</Message>
2818
-      <Command Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">cl /EP /nologo "%(FullPath)" &gt; "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"</Command>
2819
-      <Command Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">cl /EP /nologo "%(FullPath)" &gt; "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"</Command>
2820
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h;%(Outputs)</Outputs>
2821
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h;%(Outputs)</Outputs>
2822
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">..\..\lib\vc_dll\mswu\wx\msw;%(AdditionalInputs)</AdditionalInputs>
2823
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">..\..\lib\vc_dll\mswu\wx\msw;%(AdditionalInputs)</AdditionalInputs>
2824
-      <Message Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h</Message>
2825
-      <Message Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h</Message>
2826
-      <Command Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">cl /EP /nologo "%(FullPath)" &gt; "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"</Command>
2827
-      <Command Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">cl /EP /nologo "%(FullPath)" &gt; "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"</Command>
2828
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h;%(Outputs)</Outputs>
2829
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h;%(Outputs)</Outputs>
2830
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">..\..\lib\vc_dll\mswunivud\wx\msw;%(AdditionalInputs)</AdditionalInputs>
2831
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">..\..\lib\vc_dll\mswunivud\wx\msw;%(AdditionalInputs)</AdditionalInputs>
2832
-      <Message Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h</Message>
2833
-      <Message Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h</Message>
2834
-      <Command Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">cl /EP /nologo "%(FullPath)" &gt; "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"</Command>
2835
-      <Command Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">cl /EP /nologo "%(FullPath)" &gt; "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"</Command>
2836
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h;%(Outputs)</Outputs>
2837
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h;%(Outputs)</Outputs>
2838
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">..\..\lib\vc_dll\mswunivu\wx\msw;%(AdditionalInputs)</AdditionalInputs>
2839
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">..\..\lib\vc_dll\mswunivu\wx\msw;%(AdditionalInputs)</AdditionalInputs>
2840 2808
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h</Message>
2841
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h</Message>
2809
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h</Message>
2842 2810
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cl /EP /nologo "%(FullPath)" &gt; "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"</Command>
2843
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cl /EP /nologo "%(FullPath)" &gt; "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"</Command>
2811
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cl /EP /nologo "%(FullPath)" &gt; "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"</Command>
2844 2812
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs)</Outputs>
2845
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs)</Outputs>
2813
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs)</Outputs>
2846 2814
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\lib\vc_lib\mswud\wx\msw;%(AdditionalInputs)</AdditionalInputs>
2847
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\lib\vc_lib\mswud\wx\msw;%(AdditionalInputs)</AdditionalInputs>
2815
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\lib\vc_lib\mswud\wx\msw;%(AdditionalInputs)</AdditionalInputs>
2848 2816
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h</Message>
2849
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h</Message>
2817
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h</Message>
2850 2818
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cl /EP /nologo "%(FullPath)" &gt; "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"</Command>
2851
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cl /EP /nologo "%(FullPath)" &gt; "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"</Command>
2819
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cl /EP /nologo "%(FullPath)" &gt; "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"</Command>
2852 2820
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs)</Outputs>
2853
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs)</Outputs>
2821
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs)</Outputs>
2854 2822
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\lib\vc_lib\mswu\wx\msw;%(AdditionalInputs)</AdditionalInputs>
2855
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\lib\vc_lib\mswu\wx\msw;%(AdditionalInputs)</AdditionalInputs>
2856
-      <Message Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h</Message>
2857
-      <Message Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h</Message>
2858
-      <Command Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">cl /EP /nologo "%(FullPath)" &gt; "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"</Command>
2859
-      <Command Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">cl /EP /nologo "%(FullPath)" &gt; "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"</Command>
2860
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h;%(Outputs)</Outputs>
2861
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h;%(Outputs)</Outputs>
2862
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">..\..\lib\vc_lib\mswunivud\wx\msw;%(AdditionalInputs)</AdditionalInputs>
2863
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">..\..\lib\vc_lib\mswunivud\wx\msw;%(AdditionalInputs)</AdditionalInputs>
2864
-      <Message Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h</Message>
2865
-      <Message Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h</Message>
2866
-      <Command Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">cl /EP /nologo "%(FullPath)" &gt; "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"</Command>
2867
-      <Command Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">cl /EP /nologo "%(FullPath)" &gt; "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"</Command>
2868
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h;%(Outputs)</Outputs>
2869
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h;%(Outputs)</Outputs>
2870
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">..\..\lib\vc_lib\mswunivu\wx\msw;%(AdditionalInputs)</AdditionalInputs>
2871
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">..\..\lib\vc_lib\mswunivu\wx\msw;%(AdditionalInputs)</AdditionalInputs>
2823
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\lib\vc_lib\mswu\wx\msw;%(AdditionalInputs)</AdditionalInputs>
2872 2824
     </CustomBuild>
2873 2825
     <ClInclude Include="..\..\include\wx\msw\glcanvas.h" />
2874 2826
     <ClInclude Include="..\..\include\wx\msw\headerctrl.h" />