Browse code

Add SigUI to main ClamAV sln.

Török Edvin authored on 2010/10/29 20:39:02
Showing 5 changed files
... ...
@@ -68,142 +68,662 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clamav-for-windows", "clama
68 68
 EndProject
69 69
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freshclamwrap", "freshclamwrap.vcxproj", "{366C2DCE-777A-43EE-96DC-C530E67E7B32}"
70 70
 EndProject
71
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "sigui\wxWidgets-2.9.1\build\wx291_msw_vc10\wx_vc10_core.vcxproj", "{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}"
72
+EndProject
73
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base", "sigui\wxWidgets-2.9.1\build\wx291_msw_vc10\wx_vc10_base.vcxproj", "{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}"
74
+EndProject
75
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SigUI", "sigui\SigUI\sigui_vc10.vcxproj", "{853D1FD7-20AB-586C-9699-9680F84AC985}"
76
+	ProjectSection(ProjectDependencies) = postProject
77
+		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1} = {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}
78
+		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}
79
+	EndProjectSection
80
+EndProject
71 81
 Global
72 82
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
73 83
 		Debug|Win32 = Debug|Win32
74 84
 		Debug|x64 = Debug|x64
85
+		DLL Debug|Win32 = DLL Debug|Win32
86
+		DLL Debug|x64 = DLL Debug|x64
87
+		DLL Release|Win32 = DLL Release|Win32
88
+		DLL Release|x64 = DLL Release|x64
89
+		DLL Universal Debug|Win32 = DLL Universal Debug|Win32
90
+		DLL Universal Debug|x64 = DLL Universal Debug|x64
91
+		DLL Universal Release|Win32 = DLL Universal Release|Win32
92
+		DLL Universal Release|x64 = DLL Universal Release|x64
75 93
 		Release|Win32 = Release|Win32
76 94
 		Release|x64 = Release|x64
95
+		Universal Debug|Win32 = Universal Debug|Win32
96
+		Universal Debug|x64 = Universal Debug|x64
97
+		Universal Release|Win32 = Universal Release|Win32
98
+		Universal Release|x64 = Universal Release|x64
77 99
 	EndGlobalSection
78 100
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
79 101
 		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Debug|Win32.ActiveCfg = Debug|Win32
80 102
 		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Debug|Win32.Build.0 = Debug|Win32
81 103
 		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Debug|x64.ActiveCfg = Debug|x64
82 104
 		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Debug|x64.Build.0 = Debug|x64
105
+		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.DLL Debug|Win32.ActiveCfg = Debug|Win32
106
+		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.DLL Debug|Win32.Build.0 = Debug|Win32
107
+		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.DLL Debug|x64.ActiveCfg = Debug|x64
108
+		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.DLL Debug|x64.Build.0 = Debug|x64
109
+		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.DLL Release|Win32.ActiveCfg = Release|Win32
110
+		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.DLL Release|Win32.Build.0 = Release|Win32
111
+		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.DLL Release|x64.ActiveCfg = Release|x64
112
+		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.DLL Release|x64.Build.0 = Release|x64
113
+		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.DLL Universal Debug|Win32.ActiveCfg = Debug|Win32
114
+		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.DLL Universal Debug|Win32.Build.0 = Debug|Win32
115
+		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.DLL Universal Debug|x64.ActiveCfg = Debug|x64
116
+		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.DLL Universal Debug|x64.Build.0 = Debug|x64
117
+		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.DLL Universal Release|Win32.ActiveCfg = Release|Win32
118
+		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.DLL Universal Release|Win32.Build.0 = Release|Win32
119
+		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.DLL Universal Release|x64.ActiveCfg = Release|x64
120
+		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.DLL Universal Release|x64.Build.0 = Release|x64
83 121
 		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Release|Win32.ActiveCfg = Release|Win32
84 122
 		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Release|Win32.Build.0 = Release|Win32
85 123
 		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Release|x64.ActiveCfg = Release|x64
86 124
 		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Release|x64.Build.0 = Release|x64
125
+		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Universal Debug|Win32.ActiveCfg = Debug|Win32
126
+		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Universal Debug|Win32.Build.0 = Debug|Win32
127
+		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Universal Debug|x64.ActiveCfg = Debug|x64
128
+		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Universal Debug|x64.Build.0 = Debug|x64
129
+		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Universal Release|Win32.ActiveCfg = Release|Win32
130
+		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Universal Release|Win32.Build.0 = Release|Win32
131
+		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Universal Release|x64.ActiveCfg = Release|x64
132
+		{3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Universal Release|x64.Build.0 = Release|x64
87 133
 		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.Debug|Win32.ActiveCfg = Debug|Win32
88 134
 		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.Debug|Win32.Build.0 = Debug|Win32
89 135
 		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.Debug|x64.ActiveCfg = Debug|x64
90 136
 		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.Debug|x64.Build.0 = Debug|x64
137
+		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.DLL Debug|Win32.ActiveCfg = Debug|Win32
138
+		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.DLL Debug|Win32.Build.0 = Debug|Win32
139
+		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.DLL Debug|x64.ActiveCfg = Debug|x64
140
+		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.DLL Debug|x64.Build.0 = Debug|x64
141
+		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.DLL Release|Win32.ActiveCfg = Release|Win32
142
+		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.DLL Release|Win32.Build.0 = Release|Win32
143
+		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.DLL Release|x64.ActiveCfg = Release|x64
144
+		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.DLL Release|x64.Build.0 = Release|x64
145
+		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.DLL Universal Debug|Win32.ActiveCfg = Debug|Win32
146
+		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.DLL Universal Debug|Win32.Build.0 = Debug|Win32
147
+		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.DLL Universal Debug|x64.ActiveCfg = Debug|x64
148
+		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.DLL Universal Debug|x64.Build.0 = Debug|x64
149
+		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.DLL Universal Release|Win32.ActiveCfg = Release|Win32
150
+		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.DLL Universal Release|Win32.Build.0 = Release|Win32
151
+		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.DLL Universal Release|x64.ActiveCfg = Release|x64
152
+		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.DLL Universal Release|x64.Build.0 = Release|x64
91 153
 		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.Release|Win32.ActiveCfg = Release|Win32
92 154
 		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.Release|Win32.Build.0 = Release|Win32
93 155
 		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.Release|x64.ActiveCfg = Release|x64
94 156
 		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.Release|x64.Build.0 = Release|x64
157
+		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.Universal Debug|Win32.ActiveCfg = Debug|Win32
158
+		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.Universal Debug|Win32.Build.0 = Debug|Win32
159
+		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.Universal Debug|x64.ActiveCfg = Debug|x64
160
+		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.Universal Debug|x64.Build.0 = Debug|x64
161
+		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.Universal Release|Win32.ActiveCfg = Release|Win32
162
+		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.Universal Release|Win32.Build.0 = Release|Win32
163
+		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.Universal Release|x64.ActiveCfg = Release|x64
164
+		{40088299-8C66-4565-A3BD-9DBF5E1A1681}.Universal Release|x64.Build.0 = Release|x64
95 165
 		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Debug|Win32.ActiveCfg = Debug|Win32
96 166
 		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Debug|Win32.Build.0 = Debug|Win32
97 167
 		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Debug|x64.ActiveCfg = Debug|x64
98 168
 		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Debug|x64.Build.0 = Debug|x64
169
+		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.DLL Debug|Win32.ActiveCfg = Debug|Win32
170
+		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.DLL Debug|Win32.Build.0 = Debug|Win32
171
+		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.DLL Debug|x64.ActiveCfg = Debug|x64
172
+		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.DLL Debug|x64.Build.0 = Debug|x64
173
+		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.DLL Release|Win32.ActiveCfg = Release|Win32
174
+		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.DLL Release|Win32.Build.0 = Release|Win32
175
+		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.DLL Release|x64.ActiveCfg = Release|x64
176
+		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.DLL Release|x64.Build.0 = Release|x64
177
+		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.DLL Universal Debug|Win32.ActiveCfg = Debug|Win32
178
+		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.DLL Universal Debug|Win32.Build.0 = Debug|Win32
179
+		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.DLL Universal Debug|x64.ActiveCfg = Debug|x64
180
+		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.DLL Universal Debug|x64.Build.0 = Debug|x64
181
+		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.DLL Universal Release|Win32.ActiveCfg = Release|Win32
182
+		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.DLL Universal Release|Win32.Build.0 = Release|Win32
183
+		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.DLL Universal Release|x64.ActiveCfg = Release|x64
184
+		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.DLL Universal Release|x64.Build.0 = Release|x64
99 185
 		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Release|Win32.ActiveCfg = Release|Win32
100 186
 		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Release|Win32.Build.0 = Release|Win32
101 187
 		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Release|x64.ActiveCfg = Release|x64
102 188
 		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Release|x64.Build.0 = Release|x64
189
+		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Universal Debug|Win32.ActiveCfg = Debug|Win32
190
+		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Universal Debug|Win32.Build.0 = Debug|Win32
191
+		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Universal Debug|x64.ActiveCfg = Debug|x64
192
+		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Universal Debug|x64.Build.0 = Debug|x64
193
+		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Universal Release|Win32.ActiveCfg = Release|Win32
194
+		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Universal Release|Win32.Build.0 = Release|Win32
195
+		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Universal Release|x64.ActiveCfg = Release|x64
196
+		{C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Universal Release|x64.Build.0 = Release|x64
103 197
 		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Debug|Win32.ActiveCfg = Debug|Win32
104 198
 		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Debug|Win32.Build.0 = Debug|Win32
105 199
 		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Debug|x64.ActiveCfg = Debug|x64
106 200
 		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Debug|x64.Build.0 = Debug|x64
201
+		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.DLL Debug|Win32.ActiveCfg = Debug|Win32
202
+		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.DLL Debug|Win32.Build.0 = Debug|Win32
203
+		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.DLL Debug|x64.ActiveCfg = Debug|x64
204
+		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.DLL Debug|x64.Build.0 = Debug|x64
205
+		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.DLL Release|Win32.ActiveCfg = Release|Win32
206
+		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.DLL Release|Win32.Build.0 = Release|Win32
207
+		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.DLL Release|x64.ActiveCfg = Release|x64
208
+		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.DLL Release|x64.Build.0 = Release|x64
209
+		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.DLL Universal Debug|Win32.ActiveCfg = Debug|Win32
210
+		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.DLL Universal Debug|Win32.Build.0 = Debug|Win32
211
+		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.DLL Universal Debug|x64.ActiveCfg = Debug|x64
212
+		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.DLL Universal Debug|x64.Build.0 = Debug|x64
213
+		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.DLL Universal Release|Win32.ActiveCfg = Release|Win32
214
+		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.DLL Universal Release|Win32.Build.0 = Release|Win32
215
+		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.DLL Universal Release|x64.ActiveCfg = Release|x64
216
+		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.DLL Universal Release|x64.Build.0 = Release|x64
107 217
 		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Release|Win32.ActiveCfg = Release|Win32
108 218
 		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Release|Win32.Build.0 = Release|Win32
109 219
 		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Release|x64.ActiveCfg = Release|x64
110 220
 		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Release|x64.Build.0 = Release|x64
221
+		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Universal Debug|Win32.ActiveCfg = Debug|Win32
222
+		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Universal Debug|Win32.Build.0 = Debug|Win32
223
+		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Universal Debug|x64.ActiveCfg = Debug|x64
224
+		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Universal Debug|x64.Build.0 = Debug|x64
225
+		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Universal Release|Win32.ActiveCfg = Release|Win32
226
+		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Universal Release|Win32.Build.0 = Release|Win32
227
+		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Universal Release|x64.ActiveCfg = Release|x64
228
+		{81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Universal Release|x64.Build.0 = Release|x64
111 229
 		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Debug|Win32.ActiveCfg = Debug|Win32
112 230
 		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Debug|Win32.Build.0 = Debug|Win32
113 231
 		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Debug|x64.ActiveCfg = Debug|x64
114 232
 		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Debug|x64.Build.0 = Debug|x64
233
+		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.DLL Debug|Win32.ActiveCfg = Debug|Win32
234
+		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.DLL Debug|Win32.Build.0 = Debug|Win32
235
+		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.DLL Debug|x64.ActiveCfg = Debug|x64
236
+		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.DLL Debug|x64.Build.0 = Debug|x64
237
+		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.DLL Release|Win32.ActiveCfg = Release|Win32
238
+		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.DLL Release|Win32.Build.0 = Release|Win32
239
+		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.DLL Release|x64.ActiveCfg = Release|x64
240
+		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.DLL Release|x64.Build.0 = Release|x64
241
+		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.DLL Universal Debug|Win32.ActiveCfg = Debug|Win32
242
+		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.DLL Universal Debug|Win32.Build.0 = Debug|Win32
243
+		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.DLL Universal Debug|x64.ActiveCfg = Debug|x64
244
+		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.DLL Universal Debug|x64.Build.0 = Debug|x64
245
+		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.DLL Universal Release|Win32.ActiveCfg = Release|Win32
246
+		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.DLL Universal Release|Win32.Build.0 = Release|Win32
247
+		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.DLL Universal Release|x64.ActiveCfg = Release|x64
248
+		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.DLL Universal Release|x64.Build.0 = Release|x64
115 249
 		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Release|Win32.ActiveCfg = Release|Win32
116 250
 		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Release|Win32.Build.0 = Release|Win32
117 251
 		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Release|x64.ActiveCfg = Release|x64
118 252
 		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Release|x64.Build.0 = Release|x64
253
+		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Universal Debug|Win32.ActiveCfg = Debug|Win32
254
+		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Universal Debug|Win32.Build.0 = Debug|Win32
255
+		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Universal Debug|x64.ActiveCfg = Debug|x64
256
+		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Universal Debug|x64.Build.0 = Debug|x64
257
+		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Universal Release|Win32.ActiveCfg = Release|Win32
258
+		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Universal Release|Win32.Build.0 = Release|Win32
259
+		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Universal Release|x64.ActiveCfg = Release|x64
260
+		{47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Universal Release|x64.Build.0 = Release|x64
119 261
 		{09D341E9-7372-46E9-B0D7-CAAF77984190}.Debug|Win32.ActiveCfg = Debug|Win32
120 262
 		{09D341E9-7372-46E9-B0D7-CAAF77984190}.Debug|Win32.Build.0 = Debug|Win32
121 263
 		{09D341E9-7372-46E9-B0D7-CAAF77984190}.Debug|x64.ActiveCfg = Debug|x64
122 264
 		{09D341E9-7372-46E9-B0D7-CAAF77984190}.Debug|x64.Build.0 = Debug|x64
265
+		{09D341E9-7372-46E9-B0D7-CAAF77984190}.DLL Debug|Win32.ActiveCfg = Debug|Win32
266
+		{09D341E9-7372-46E9-B0D7-CAAF77984190}.DLL Debug|Win32.Build.0 = Debug|Win32
267
+		{09D341E9-7372-46E9-B0D7-CAAF77984190}.DLL Debug|x64.ActiveCfg = Debug|x64
268
+		{09D341E9-7372-46E9-B0D7-CAAF77984190}.DLL Debug|x64.Build.0 = Debug|x64
269
+		{09D341E9-7372-46E9-B0D7-CAAF77984190}.DLL Release|Win32.ActiveCfg = Release|Win32
270
+		{09D341E9-7372-46E9-B0D7-CAAF77984190}.DLL Release|Win32.Build.0 = Release|Win32
271
+		{09D341E9-7372-46E9-B0D7-CAAF77984190}.DLL Release|x64.ActiveCfg = Release|x64
272
+		{09D341E9-7372-46E9-B0D7-CAAF77984190}.DLL Release|x64.Build.0 = Release|x64
273
+		{09D341E9-7372-46E9-B0D7-CAAF77984190}.DLL Universal Debug|Win32.ActiveCfg = Debug|Win32
274
+		{09D341E9-7372-46E9-B0D7-CAAF77984190}.DLL Universal Debug|Win32.Build.0 = Debug|Win32
275
+		{09D341E9-7372-46E9-B0D7-CAAF77984190}.DLL Universal Debug|x64.ActiveCfg = Debug|x64
276
+		{09D341E9-7372-46E9-B0D7-CAAF77984190}.DLL Universal Debug|x64.Build.0 = Debug|x64
277
+		{09D341E9-7372-46E9-B0D7-CAAF77984190}.DLL Universal Release|Win32.ActiveCfg = Release|Win32
278
+		{09D341E9-7372-46E9-B0D7-CAAF77984190}.DLL Universal Release|Win32.Build.0 = Release|Win32
279
+		{09D341E9-7372-46E9-B0D7-CAAF77984190}.DLL Universal Release|x64.ActiveCfg = Release|x64
280
+		{09D341E9-7372-46E9-B0D7-CAAF77984190}.DLL Universal Release|x64.Build.0 = Release|x64
123 281
 		{09D341E9-7372-46E9-B0D7-CAAF77984190}.Release|Win32.ActiveCfg = Release|Win32
124 282
 		{09D341E9-7372-46E9-B0D7-CAAF77984190}.Release|Win32.Build.0 = Release|Win32
125 283
 		{09D341E9-7372-46E9-B0D7-CAAF77984190}.Release|x64.ActiveCfg = Release|x64
126 284
 		{09D341E9-7372-46E9-B0D7-CAAF77984190}.Release|x64.Build.0 = Release|x64
285
+		{09D341E9-7372-46E9-B0D7-CAAF77984190}.Universal Debug|Win32.ActiveCfg = Debug|Win32
286
+		{09D341E9-7372-46E9-B0D7-CAAF77984190}.Universal Debug|Win32.Build.0 = Debug|Win32
287
+		{09D341E9-7372-46E9-B0D7-CAAF77984190}.Universal Debug|x64.ActiveCfg = Debug|x64
288
+		{09D341E9-7372-46E9-B0D7-CAAF77984190}.Universal Debug|x64.Build.0 = Debug|x64
289
+		{09D341E9-7372-46E9-B0D7-CAAF77984190}.Universal Release|Win32.ActiveCfg = Release|Win32
290
+		{09D341E9-7372-46E9-B0D7-CAAF77984190}.Universal Release|Win32.Build.0 = Release|Win32
291
+		{09D341E9-7372-46E9-B0D7-CAAF77984190}.Universal Release|x64.ActiveCfg = Release|x64
292
+		{09D341E9-7372-46E9-B0D7-CAAF77984190}.Universal Release|x64.Build.0 = Release|x64
127 293
 		{05957B93-39F9-45EC-87BD-86B7AF571557}.Debug|Win32.ActiveCfg = Debug|Win32
128 294
 		{05957B93-39F9-45EC-87BD-86B7AF571557}.Debug|Win32.Build.0 = Debug|Win32
129 295
 		{05957B93-39F9-45EC-87BD-86B7AF571557}.Debug|x64.ActiveCfg = Debug|x64
130 296
 		{05957B93-39F9-45EC-87BD-86B7AF571557}.Debug|x64.Build.0 = Debug|x64
297
+		{05957B93-39F9-45EC-87BD-86B7AF571557}.DLL Debug|Win32.ActiveCfg = Debug|Win32
298
+		{05957B93-39F9-45EC-87BD-86B7AF571557}.DLL Debug|Win32.Build.0 = Debug|Win32
299
+		{05957B93-39F9-45EC-87BD-86B7AF571557}.DLL Debug|x64.ActiveCfg = Debug|x64
300
+		{05957B93-39F9-45EC-87BD-86B7AF571557}.DLL Debug|x64.Build.0 = Debug|x64
301
+		{05957B93-39F9-45EC-87BD-86B7AF571557}.DLL Release|Win32.ActiveCfg = Release|Win32
302
+		{05957B93-39F9-45EC-87BD-86B7AF571557}.DLL Release|Win32.Build.0 = Release|Win32
303
+		{05957B93-39F9-45EC-87BD-86B7AF571557}.DLL Release|x64.ActiveCfg = Release|x64
304
+		{05957B93-39F9-45EC-87BD-86B7AF571557}.DLL Release|x64.Build.0 = Release|x64
305
+		{05957B93-39F9-45EC-87BD-86B7AF571557}.DLL Universal Debug|Win32.ActiveCfg = Debug|Win32
306
+		{05957B93-39F9-45EC-87BD-86B7AF571557}.DLL Universal Debug|Win32.Build.0 = Debug|Win32
307
+		{05957B93-39F9-45EC-87BD-86B7AF571557}.DLL Universal Debug|x64.ActiveCfg = Debug|x64
308
+		{05957B93-39F9-45EC-87BD-86B7AF571557}.DLL Universal Debug|x64.Build.0 = Debug|x64
309
+		{05957B93-39F9-45EC-87BD-86B7AF571557}.DLL Universal Release|Win32.ActiveCfg = Release|Win32
310
+		{05957B93-39F9-45EC-87BD-86B7AF571557}.DLL Universal Release|Win32.Build.0 = Release|Win32
311
+		{05957B93-39F9-45EC-87BD-86B7AF571557}.DLL Universal Release|x64.ActiveCfg = Release|x64
312
+		{05957B93-39F9-45EC-87BD-86B7AF571557}.DLL Universal Release|x64.Build.0 = Release|x64
131 313
 		{05957B93-39F9-45EC-87BD-86B7AF571557}.Release|Win32.ActiveCfg = Release|Win32
132 314
 		{05957B93-39F9-45EC-87BD-86B7AF571557}.Release|Win32.Build.0 = Release|Win32
133 315
 		{05957B93-39F9-45EC-87BD-86B7AF571557}.Release|x64.ActiveCfg = Release|x64
134 316
 		{05957B93-39F9-45EC-87BD-86B7AF571557}.Release|x64.Build.0 = Release|x64
317
+		{05957B93-39F9-45EC-87BD-86B7AF571557}.Universal Debug|Win32.ActiveCfg = Debug|Win32
318
+		{05957B93-39F9-45EC-87BD-86B7AF571557}.Universal Debug|Win32.Build.0 = Debug|Win32
319
+		{05957B93-39F9-45EC-87BD-86B7AF571557}.Universal Debug|x64.ActiveCfg = Debug|x64
320
+		{05957B93-39F9-45EC-87BD-86B7AF571557}.Universal Debug|x64.Build.0 = Debug|x64
321
+		{05957B93-39F9-45EC-87BD-86B7AF571557}.Universal Release|Win32.ActiveCfg = Release|Win32
322
+		{05957B93-39F9-45EC-87BD-86B7AF571557}.Universal Release|Win32.Build.0 = Release|Win32
323
+		{05957B93-39F9-45EC-87BD-86B7AF571557}.Universal Release|x64.ActiveCfg = Release|x64
324
+		{05957B93-39F9-45EC-87BD-86B7AF571557}.Universal Release|x64.Build.0 = Release|x64
135 325
 		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Debug|Win32.ActiveCfg = Debug|Win32
136 326
 		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Debug|Win32.Build.0 = Debug|Win32
137 327
 		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Debug|x64.ActiveCfg = Debug|x64
138 328
 		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Debug|x64.Build.0 = Debug|x64
329
+		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.DLL Debug|Win32.ActiveCfg = Debug|Win32
330
+		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.DLL Debug|Win32.Build.0 = Debug|Win32
331
+		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.DLL Debug|x64.ActiveCfg = Debug|x64
332
+		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.DLL Debug|x64.Build.0 = Debug|x64
333
+		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.DLL Release|Win32.ActiveCfg = Release|Win32
334
+		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.DLL Release|Win32.Build.0 = Release|Win32
335
+		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.DLL Release|x64.ActiveCfg = Release|x64
336
+		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.DLL Release|x64.Build.0 = Release|x64
337
+		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.DLL Universal Debug|Win32.ActiveCfg = Debug|Win32
338
+		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.DLL Universal Debug|Win32.Build.0 = Debug|Win32
339
+		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.DLL Universal Debug|x64.ActiveCfg = Debug|x64
340
+		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.DLL Universal Debug|x64.Build.0 = Debug|x64
341
+		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.DLL Universal Release|Win32.ActiveCfg = Release|Win32
342
+		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.DLL Universal Release|Win32.Build.0 = Release|Win32
343
+		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.DLL Universal Release|x64.ActiveCfg = Release|x64
344
+		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.DLL Universal Release|x64.Build.0 = Release|x64
139 345
 		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Release|Win32.ActiveCfg = Release|Win32
140 346
 		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Release|Win32.Build.0 = Release|Win32
141 347
 		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Release|x64.ActiveCfg = Release|x64
142 348
 		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Release|x64.Build.0 = Release|x64
349
+		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Universal Debug|Win32.ActiveCfg = Debug|Win32
350
+		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Universal Debug|Win32.Build.0 = Debug|Win32
351
+		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Universal Debug|x64.ActiveCfg = Debug|x64
352
+		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Universal Debug|x64.Build.0 = Debug|x64
353
+		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Universal Release|Win32.ActiveCfg = Release|Win32
354
+		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Universal Release|Win32.Build.0 = Release|Win32
355
+		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Universal Release|x64.ActiveCfg = Release|x64
356
+		{F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Universal Release|x64.Build.0 = Release|x64
143 357
 		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Debug|Win32.ActiveCfg = Debug|Win32
144 358
 		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Debug|Win32.Build.0 = Debug|Win32
145 359
 		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Debug|x64.ActiveCfg = Debug|x64
146 360
 		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Debug|x64.Build.0 = Debug|x64
361
+		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.DLL Debug|Win32.ActiveCfg = Debug|Win32
362
+		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.DLL Debug|Win32.Build.0 = Debug|Win32
363
+		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.DLL Debug|x64.ActiveCfg = Debug|x64
364
+		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.DLL Debug|x64.Build.0 = Debug|x64
365
+		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.DLL Release|Win32.ActiveCfg = Release|Win32
366
+		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.DLL Release|Win32.Build.0 = Release|Win32
367
+		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.DLL Release|x64.ActiveCfg = Release|x64
368
+		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.DLL Release|x64.Build.0 = Release|x64
369
+		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.DLL Universal Debug|Win32.ActiveCfg = Debug|Win32
370
+		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.DLL Universal Debug|Win32.Build.0 = Debug|Win32
371
+		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.DLL Universal Debug|x64.ActiveCfg = Debug|x64
372
+		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.DLL Universal Debug|x64.Build.0 = Debug|x64
373
+		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.DLL Universal Release|Win32.ActiveCfg = Release|Win32
374
+		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.DLL Universal Release|Win32.Build.0 = Release|Win32
375
+		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.DLL Universal Release|x64.ActiveCfg = Release|x64
376
+		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.DLL Universal Release|x64.Build.0 = Release|x64
147 377
 		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Release|Win32.ActiveCfg = Release|Win32
148 378
 		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Release|Win32.Build.0 = Release|Win32
149 379
 		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Release|x64.ActiveCfg = Release|x64
150 380
 		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Release|x64.Build.0 = Release|x64
381
+		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Universal Debug|Win32.ActiveCfg = Debug|Win32
382
+		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Universal Debug|Win32.Build.0 = Debug|Win32
383
+		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Universal Debug|x64.ActiveCfg = Debug|x64
384
+		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Universal Debug|x64.Build.0 = Debug|x64
385
+		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Universal Release|Win32.ActiveCfg = Release|Win32
386
+		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Universal Release|Win32.Build.0 = Release|Win32
387
+		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Universal Release|x64.ActiveCfg = Release|x64
388
+		{C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Universal Release|x64.Build.0 = Release|x64
151 389
 		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.Debug|Win32.ActiveCfg = Debug|Win32
152 390
 		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.Debug|Win32.Build.0 = Debug|Win32
153 391
 		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.Debug|x64.ActiveCfg = Debug|x64
154 392
 		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.Debug|x64.Build.0 = Debug|x64
393
+		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.DLL Debug|Win32.ActiveCfg = Debug|Win32
394
+		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.DLL Debug|Win32.Build.0 = Debug|Win32
395
+		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.DLL Debug|x64.ActiveCfg = Debug|x64
396
+		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.DLL Debug|x64.Build.0 = Debug|x64
397
+		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.DLL Release|Win32.ActiveCfg = Release|Win32
398
+		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.DLL Release|Win32.Build.0 = Release|Win32
399
+		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.DLL Release|x64.ActiveCfg = Release|x64
400
+		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.DLL Release|x64.Build.0 = Release|x64
401
+		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.DLL Universal Debug|Win32.ActiveCfg = Debug|Win32
402
+		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.DLL Universal Debug|Win32.Build.0 = Debug|Win32
403
+		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.DLL Universal Debug|x64.ActiveCfg = Debug|x64
404
+		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.DLL Universal Debug|x64.Build.0 = Debug|x64
405
+		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.DLL Universal Release|Win32.ActiveCfg = Release|Win32
406
+		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.DLL Universal Release|Win32.Build.0 = Release|Win32
407
+		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.DLL Universal Release|x64.ActiveCfg = Release|x64
408
+		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.DLL Universal Release|x64.Build.0 = Release|x64
155 409
 		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.Release|Win32.ActiveCfg = Release|Win32
156 410
 		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.Release|Win32.Build.0 = Release|Win32
157 411
 		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.Release|x64.ActiveCfg = Release|x64
158 412
 		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.Release|x64.Build.0 = Release|x64
413
+		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.Universal Debug|Win32.ActiveCfg = Debug|Win32
414
+		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.Universal Debug|Win32.Build.0 = Debug|Win32
415
+		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.Universal Debug|x64.ActiveCfg = Debug|x64
416
+		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.Universal Debug|x64.Build.0 = Debug|x64
417
+		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.Universal Release|Win32.ActiveCfg = Release|Win32
418
+		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.Universal Release|Win32.Build.0 = Release|Win32
419
+		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.Universal Release|x64.ActiveCfg = Release|x64
420
+		{094B13E4-321B-479B-919F-FB84A0F0DA1F}.Universal Release|x64.Build.0 = Release|x64
159 421
 		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.Debug|Win32.ActiveCfg = Debug|Win32
160 422
 		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.Debug|Win32.Build.0 = Debug|Win32
161 423
 		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.Debug|x64.ActiveCfg = Debug|x64
162 424
 		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.Debug|x64.Build.0 = Debug|x64
425
+		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.DLL Debug|Win32.ActiveCfg = Debug|Win32
426
+		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.DLL Debug|Win32.Build.0 = Debug|Win32
427
+		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.DLL Debug|x64.ActiveCfg = Debug|x64
428
+		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.DLL Debug|x64.Build.0 = Debug|x64
429
+		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.DLL Release|Win32.ActiveCfg = Release|Win32
430
+		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.DLL Release|Win32.Build.0 = Release|Win32
431
+		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.DLL Release|x64.ActiveCfg = Release|x64
432
+		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.DLL Release|x64.Build.0 = Release|x64
433
+		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.DLL Universal Debug|Win32.ActiveCfg = Debug|Win32
434
+		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.DLL Universal Debug|Win32.Build.0 = Debug|Win32
435
+		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.DLL Universal Debug|x64.ActiveCfg = Debug|x64
436
+		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.DLL Universal Debug|x64.Build.0 = Debug|x64
437
+		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.DLL Universal Release|Win32.ActiveCfg = Release|Win32
438
+		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.DLL Universal Release|Win32.Build.0 = Release|Win32
439
+		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.DLL Universal Release|x64.ActiveCfg = Release|x64
440
+		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.DLL Universal Release|x64.Build.0 = Release|x64
163 441
 		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.Release|Win32.ActiveCfg = Release|Win32
164 442
 		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.Release|Win32.Build.0 = Release|Win32
165 443
 		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.Release|x64.ActiveCfg = Release|x64
166 444
 		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.Release|x64.Build.0 = Release|x64
445
+		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.Universal Debug|Win32.ActiveCfg = Debug|Win32
446
+		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.Universal Debug|Win32.Build.0 = Debug|Win32
447
+		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.Universal Debug|x64.ActiveCfg = Debug|x64
448
+		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.Universal Debug|x64.Build.0 = Debug|x64
449
+		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.Universal Release|Win32.ActiveCfg = Release|Win32
450
+		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.Universal Release|Win32.Build.0 = Release|Win32
451
+		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.Universal Release|x64.ActiveCfg = Release|x64
452
+		{128DA45B-0628-42BB-BA90-8F836CA7FF25}.Universal Release|x64.Build.0 = Release|x64
167 453
 		{390D68E1-5228-40A8-9BE4-DD19026001B7}.Debug|Win32.ActiveCfg = Debug|Win32
168 454
 		{390D68E1-5228-40A8-9BE4-DD19026001B7}.Debug|Win32.Build.0 = Debug|Win32
169 455
 		{390D68E1-5228-40A8-9BE4-DD19026001B7}.Debug|x64.ActiveCfg = Debug|x64
170 456
 		{390D68E1-5228-40A8-9BE4-DD19026001B7}.Debug|x64.Build.0 = Debug|x64
457
+		{390D68E1-5228-40A8-9BE4-DD19026001B7}.DLL Debug|Win32.ActiveCfg = Debug|Win32
458
+		{390D68E1-5228-40A8-9BE4-DD19026001B7}.DLL Debug|Win32.Build.0 = Debug|Win32
459
+		{390D68E1-5228-40A8-9BE4-DD19026001B7}.DLL Debug|x64.ActiveCfg = Debug|x64
460
+		{390D68E1-5228-40A8-9BE4-DD19026001B7}.DLL Debug|x64.Build.0 = Debug|x64
461
+		{390D68E1-5228-40A8-9BE4-DD19026001B7}.DLL Release|Win32.ActiveCfg = Release|Win32
462
+		{390D68E1-5228-40A8-9BE4-DD19026001B7}.DLL Release|Win32.Build.0 = Release|Win32
463
+		{390D68E1-5228-40A8-9BE4-DD19026001B7}.DLL Release|x64.ActiveCfg = Release|x64
464
+		{390D68E1-5228-40A8-9BE4-DD19026001B7}.DLL Release|x64.Build.0 = Release|x64
465
+		{390D68E1-5228-40A8-9BE4-DD19026001B7}.DLL Universal Debug|Win32.ActiveCfg = Debug|Win32
466
+		{390D68E1-5228-40A8-9BE4-DD19026001B7}.DLL Universal Debug|Win32.Build.0 = Debug|Win32
467
+		{390D68E1-5228-40A8-9BE4-DD19026001B7}.DLL Universal Debug|x64.ActiveCfg = Debug|x64
468
+		{390D68E1-5228-40A8-9BE4-DD19026001B7}.DLL Universal Debug|x64.Build.0 = Debug|x64
469
+		{390D68E1-5228-40A8-9BE4-DD19026001B7}.DLL Universal Release|Win32.ActiveCfg = Release|Win32
470
+		{390D68E1-5228-40A8-9BE4-DD19026001B7}.DLL Universal Release|Win32.Build.0 = Release|Win32
471
+		{390D68E1-5228-40A8-9BE4-DD19026001B7}.DLL Universal Release|x64.ActiveCfg = Release|x64
472
+		{390D68E1-5228-40A8-9BE4-DD19026001B7}.DLL Universal Release|x64.Build.0 = Release|x64
171 473
 		{390D68E1-5228-40A8-9BE4-DD19026001B7}.Release|Win32.ActiveCfg = Release|Win32
172 474
 		{390D68E1-5228-40A8-9BE4-DD19026001B7}.Release|Win32.Build.0 = Release|Win32
173 475
 		{390D68E1-5228-40A8-9BE4-DD19026001B7}.Release|x64.ActiveCfg = Release|x64
174 476
 		{390D68E1-5228-40A8-9BE4-DD19026001B7}.Release|x64.Build.0 = Release|x64
477
+		{390D68E1-5228-40A8-9BE4-DD19026001B7}.Universal Debug|Win32.ActiveCfg = Debug|Win32
478
+		{390D68E1-5228-40A8-9BE4-DD19026001B7}.Universal Debug|Win32.Build.0 = Debug|Win32
479
+		{390D68E1-5228-40A8-9BE4-DD19026001B7}.Universal Debug|x64.ActiveCfg = Debug|x64
480
+		{390D68E1-5228-40A8-9BE4-DD19026001B7}.Universal Debug|x64.Build.0 = Debug|x64
481
+		{390D68E1-5228-40A8-9BE4-DD19026001B7}.Universal Release|Win32.ActiveCfg = Release|Win32
482
+		{390D68E1-5228-40A8-9BE4-DD19026001B7}.Universal Release|Win32.Build.0 = Release|Win32
483
+		{390D68E1-5228-40A8-9BE4-DD19026001B7}.Universal Release|x64.ActiveCfg = Release|x64
484
+		{390D68E1-5228-40A8-9BE4-DD19026001B7}.Universal Release|x64.Build.0 = Release|x64
175 485
 		{30BC968B-C4F7-4598-A672-AC69375C9155}.Debug|Win32.ActiveCfg = Debug|Win32
176 486
 		{30BC968B-C4F7-4598-A672-AC69375C9155}.Debug|Win32.Build.0 = Debug|Win32
177 487
 		{30BC968B-C4F7-4598-A672-AC69375C9155}.Debug|x64.ActiveCfg = Debug|x64
178 488
 		{30BC968B-C4F7-4598-A672-AC69375C9155}.Debug|x64.Build.0 = Debug|x64
489
+		{30BC968B-C4F7-4598-A672-AC69375C9155}.DLL Debug|Win32.ActiveCfg = Debug|Win32
490
+		{30BC968B-C4F7-4598-A672-AC69375C9155}.DLL Debug|Win32.Build.0 = Debug|Win32
491
+		{30BC968B-C4F7-4598-A672-AC69375C9155}.DLL Debug|x64.ActiveCfg = Debug|x64
492
+		{30BC968B-C4F7-4598-A672-AC69375C9155}.DLL Debug|x64.Build.0 = Debug|x64
493
+		{30BC968B-C4F7-4598-A672-AC69375C9155}.DLL Release|Win32.ActiveCfg = Release|Win32
494
+		{30BC968B-C4F7-4598-A672-AC69375C9155}.DLL Release|Win32.Build.0 = Release|Win32
495
+		{30BC968B-C4F7-4598-A672-AC69375C9155}.DLL Release|x64.ActiveCfg = Release|x64
496
+		{30BC968B-C4F7-4598-A672-AC69375C9155}.DLL Release|x64.Build.0 = Release|x64
497
+		{30BC968B-C4F7-4598-A672-AC69375C9155}.DLL Universal Debug|Win32.ActiveCfg = Debug|Win32
498
+		{30BC968B-C4F7-4598-A672-AC69375C9155}.DLL Universal Debug|Win32.Build.0 = Debug|Win32
499
+		{30BC968B-C4F7-4598-A672-AC69375C9155}.DLL Universal Debug|x64.ActiveCfg = Debug|x64
500
+		{30BC968B-C4F7-4598-A672-AC69375C9155}.DLL Universal Debug|x64.Build.0 = Debug|x64
501
+		{30BC968B-C4F7-4598-A672-AC69375C9155}.DLL Universal Release|Win32.ActiveCfg = Release|Win32
502
+		{30BC968B-C4F7-4598-A672-AC69375C9155}.DLL Universal Release|Win32.Build.0 = Release|Win32
503
+		{30BC968B-C4F7-4598-A672-AC69375C9155}.DLL Universal Release|x64.ActiveCfg = Release|x64
504
+		{30BC968B-C4F7-4598-A672-AC69375C9155}.DLL Universal Release|x64.Build.0 = Release|x64
179 505
 		{30BC968B-C4F7-4598-A672-AC69375C9155}.Release|Win32.ActiveCfg = Release|Win32
180 506
 		{30BC968B-C4F7-4598-A672-AC69375C9155}.Release|Win32.Build.0 = Release|Win32
181 507
 		{30BC968B-C4F7-4598-A672-AC69375C9155}.Release|x64.ActiveCfg = Release|x64
182 508
 		{30BC968B-C4F7-4598-A672-AC69375C9155}.Release|x64.Build.0 = Release|x64
509
+		{30BC968B-C4F7-4598-A672-AC69375C9155}.Universal Debug|Win32.ActiveCfg = Debug|Win32
510
+		{30BC968B-C4F7-4598-A672-AC69375C9155}.Universal Debug|Win32.Build.0 = Debug|Win32
511
+		{30BC968B-C4F7-4598-A672-AC69375C9155}.Universal Debug|x64.ActiveCfg = Debug|x64
512
+		{30BC968B-C4F7-4598-A672-AC69375C9155}.Universal Debug|x64.Build.0 = Debug|x64
513
+		{30BC968B-C4F7-4598-A672-AC69375C9155}.Universal Release|Win32.ActiveCfg = Release|Win32
514
+		{30BC968B-C4F7-4598-A672-AC69375C9155}.Universal Release|Win32.Build.0 = Release|Win32
515
+		{30BC968B-C4F7-4598-A672-AC69375C9155}.Universal Release|x64.ActiveCfg = Release|x64
516
+		{30BC968B-C4F7-4598-A672-AC69375C9155}.Universal Release|x64.Build.0 = Release|x64
183 517
 		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Debug|Win32.ActiveCfg = Debug|Win32
184 518
 		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Debug|Win32.Build.0 = Debug|Win32
185 519
 		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Debug|x64.ActiveCfg = Debug|x64
186 520
 		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Debug|x64.Build.0 = Debug|x64
521
+		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.DLL Debug|Win32.ActiveCfg = Debug|Win32
522
+		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.DLL Debug|Win32.Build.0 = Debug|Win32
523
+		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.DLL Debug|x64.ActiveCfg = Debug|x64
524
+		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.DLL Debug|x64.Build.0 = Debug|x64
525
+		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.DLL Release|Win32.ActiveCfg = Release|Win32
526
+		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.DLL Release|Win32.Build.0 = Release|Win32
527
+		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.DLL Release|x64.ActiveCfg = Release|x64
528
+		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.DLL Release|x64.Build.0 = Release|x64
529
+		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.DLL Universal Debug|Win32.ActiveCfg = Debug|Win32
530
+		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.DLL Universal Debug|Win32.Build.0 = Debug|Win32
531
+		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.DLL Universal Debug|x64.ActiveCfg = Debug|x64
532
+		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.DLL Universal Debug|x64.Build.0 = Debug|x64
533
+		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.DLL Universal Release|Win32.ActiveCfg = Release|Win32
534
+		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.DLL Universal Release|Win32.Build.0 = Release|Win32
535
+		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.DLL Universal Release|x64.ActiveCfg = Release|x64
536
+		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.DLL Universal Release|x64.Build.0 = Release|x64
187 537
 		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Release|Win32.ActiveCfg = Release|Win32
188 538
 		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Release|Win32.Build.0 = Release|Win32
189 539
 		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Release|x64.ActiveCfg = Release|x64
190 540
 		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Release|x64.Build.0 = Release|x64
541
+		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Universal Debug|Win32.ActiveCfg = Debug|Win32
542
+		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Universal Debug|Win32.Build.0 = Debug|Win32
543
+		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Universal Debug|x64.ActiveCfg = Debug|x64
544
+		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Universal Debug|x64.Build.0 = Debug|x64
545
+		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Universal Release|Win32.ActiveCfg = Release|Win32
546
+		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Universal Release|Win32.Build.0 = Release|Win32
547
+		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Universal Release|x64.ActiveCfg = Release|x64
548
+		{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Universal Release|x64.Build.0 = Release|x64
191 549
 		{2E93DF6C-3C8A-4768-9539-12FB67417224}.Debug|Win32.ActiveCfg = Debug|Win32
192 550
 		{2E93DF6C-3C8A-4768-9539-12FB67417224}.Debug|Win32.Build.0 = Debug|Win32
193 551
 		{2E93DF6C-3C8A-4768-9539-12FB67417224}.Debug|x64.ActiveCfg = Debug|x64
194 552
 		{2E93DF6C-3C8A-4768-9539-12FB67417224}.Debug|x64.Build.0 = Debug|x64
553
+		{2E93DF6C-3C8A-4768-9539-12FB67417224}.DLL Debug|Win32.ActiveCfg = Debug|Win32
554
+		{2E93DF6C-3C8A-4768-9539-12FB67417224}.DLL Debug|Win32.Build.0 = Debug|Win32
555
+		{2E93DF6C-3C8A-4768-9539-12FB67417224}.DLL Debug|x64.ActiveCfg = Debug|x64
556
+		{2E93DF6C-3C8A-4768-9539-12FB67417224}.DLL Debug|x64.Build.0 = Debug|x64
557
+		{2E93DF6C-3C8A-4768-9539-12FB67417224}.DLL Release|Win32.ActiveCfg = Release|Win32
558
+		{2E93DF6C-3C8A-4768-9539-12FB67417224}.DLL Release|Win32.Build.0 = Release|Win32
559
+		{2E93DF6C-3C8A-4768-9539-12FB67417224}.DLL Release|x64.ActiveCfg = Release|x64
560
+		{2E93DF6C-3C8A-4768-9539-12FB67417224}.DLL Release|x64.Build.0 = Release|x64
561
+		{2E93DF6C-3C8A-4768-9539-12FB67417224}.DLL Universal Debug|Win32.ActiveCfg = Debug|Win32
562
+		{2E93DF6C-3C8A-4768-9539-12FB67417224}.DLL Universal Debug|Win32.Build.0 = Debug|Win32
563
+		{2E93DF6C-3C8A-4768-9539-12FB67417224}.DLL Universal Debug|x64.ActiveCfg = Debug|x64
564
+		{2E93DF6C-3C8A-4768-9539-12FB67417224}.DLL Universal Debug|x64.Build.0 = Debug|x64
565
+		{2E93DF6C-3C8A-4768-9539-12FB67417224}.DLL Universal Release|Win32.ActiveCfg = Release|Win32
566
+		{2E93DF6C-3C8A-4768-9539-12FB67417224}.DLL Universal Release|Win32.Build.0 = Release|Win32
567
+		{2E93DF6C-3C8A-4768-9539-12FB67417224}.DLL Universal Release|x64.ActiveCfg = Release|x64
568
+		{2E93DF6C-3C8A-4768-9539-12FB67417224}.DLL Universal Release|x64.Build.0 = Release|x64
195 569
 		{2E93DF6C-3C8A-4768-9539-12FB67417224}.Release|Win32.ActiveCfg = Release|Win32
196 570
 		{2E93DF6C-3C8A-4768-9539-12FB67417224}.Release|Win32.Build.0 = Release|Win32
197 571
 		{2E93DF6C-3C8A-4768-9539-12FB67417224}.Release|x64.ActiveCfg = Release|x64
198 572
 		{2E93DF6C-3C8A-4768-9539-12FB67417224}.Release|x64.Build.0 = Release|x64
573
+		{2E93DF6C-3C8A-4768-9539-12FB67417224}.Universal Debug|Win32.ActiveCfg = Debug|Win32
574
+		{2E93DF6C-3C8A-4768-9539-12FB67417224}.Universal Debug|Win32.Build.0 = Debug|Win32
575
+		{2E93DF6C-3C8A-4768-9539-12FB67417224}.Universal Debug|x64.ActiveCfg = Debug|x64
576
+		{2E93DF6C-3C8A-4768-9539-12FB67417224}.Universal Debug|x64.Build.0 = Debug|x64
577
+		{2E93DF6C-3C8A-4768-9539-12FB67417224}.Universal Release|Win32.ActiveCfg = Release|Win32
578
+		{2E93DF6C-3C8A-4768-9539-12FB67417224}.Universal Release|Win32.Build.0 = Release|Win32
579
+		{2E93DF6C-3C8A-4768-9539-12FB67417224}.Universal Release|x64.ActiveCfg = Release|x64
580
+		{2E93DF6C-3C8A-4768-9539-12FB67417224}.Universal Release|x64.Build.0 = Release|x64
199 581
 		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.Debug|Win32.ActiveCfg = Debug|Win32
200 582
 		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.Debug|x64.ActiveCfg = Debug|x64
583
+		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.DLL Debug|Win32.ActiveCfg = Debug|Win32
584
+		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.DLL Debug|Win32.Build.0 = Debug|Win32
585
+		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.DLL Debug|x64.ActiveCfg = Debug|x64
586
+		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.DLL Debug|x64.Build.0 = Debug|x64
587
+		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.DLL Release|Win32.ActiveCfg = Release|Win32
588
+		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.DLL Release|Win32.Build.0 = Release|Win32
589
+		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.DLL Release|x64.ActiveCfg = Release|x64
590
+		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.DLL Release|x64.Build.0 = Release|x64
591
+		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.DLL Universal Debug|Win32.ActiveCfg = Debug|Win32
592
+		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.DLL Universal Debug|Win32.Build.0 = Debug|Win32
593
+		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.DLL Universal Debug|x64.ActiveCfg = Debug|x64
594
+		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.DLL Universal Debug|x64.Build.0 = Debug|x64
595
+		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.DLL Universal Release|Win32.ActiveCfg = Release|Win32
596
+		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.DLL Universal Release|Win32.Build.0 = Release|Win32
597
+		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.DLL Universal Release|x64.ActiveCfg = Release|x64
598
+		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.DLL Universal Release|x64.Build.0 = Release|x64
201 599
 		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.Release|Win32.ActiveCfg = Release|Win32
202 600
 		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.Release|x64.ActiveCfg = Release|x64
601
+		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.Universal Debug|Win32.ActiveCfg = Debug|Win32
602
+		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.Universal Debug|Win32.Build.0 = Debug|Win32
603
+		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.Universal Debug|x64.ActiveCfg = Debug|x64
604
+		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.Universal Debug|x64.Build.0 = Debug|x64
605
+		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.Universal Release|Win32.ActiveCfg = Release|Win32
606
+		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.Universal Release|Win32.Build.0 = Release|Win32
607
+		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.Universal Release|x64.ActiveCfg = Release|x64
608
+		{127CBFE6-B8AE-4422-AFFB-61F80A7C8D18}.Universal Release|x64.Build.0 = Release|x64
203 609
 		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.Debug|Win32.ActiveCfg = Debug|Win32
204 610
 		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.Debug|x64.ActiveCfg = Debug|Win32
611
+		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.DLL Debug|Win32.ActiveCfg = Debug|Win32
612
+		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.DLL Debug|Win32.Build.0 = Debug|Win32
613
+		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.DLL Debug|x64.ActiveCfg = Debug|Win32
614
+		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.DLL Release|Win32.ActiveCfg = Release|Win32
615
+		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.DLL Release|Win32.Build.0 = Release|Win32
616
+		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.DLL Release|x64.ActiveCfg = Release|Win32
617
+		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.DLL Universal Debug|Win32.ActiveCfg = Debug|Win32
618
+		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.DLL Universal Debug|Win32.Build.0 = Debug|Win32
619
+		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.DLL Universal Debug|x64.ActiveCfg = Debug|Win32
620
+		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.DLL Universal Release|Win32.ActiveCfg = Release|Win32
621
+		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.DLL Universal Release|Win32.Build.0 = Release|Win32
622
+		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.DLL Universal Release|x64.ActiveCfg = Release|Win32
205 623
 		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.Release|Win32.ActiveCfg = Release|Win32
206 624
 		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.Release|x64.ActiveCfg = Release|Win32
625
+		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.Universal Debug|Win32.ActiveCfg = Debug|Win32
626
+		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.Universal Debug|Win32.Build.0 = Debug|Win32
627
+		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.Universal Debug|x64.ActiveCfg = Debug|Win32
628
+		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.Universal Release|Win32.ActiveCfg = Release|Win32
629
+		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.Universal Release|Win32.Build.0 = Release|Win32
630
+		{366C2DCE-777A-43EE-96DC-C530E67E7B32}.Universal Release|x64.ActiveCfg = Release|Win32
631
+		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.ActiveCfg = Debug|Win32
632
+		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.Build.0 = Debug|Win32
633
+		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|x64.ActiveCfg = Debug|x64
634
+		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|x64.Build.0 = Debug|x64
635
+		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
636
+		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
637
+		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
638
+		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Debug|x64.Build.0 = DLL Debug|x64
639
+		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
640
+		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|Win32.Build.0 = DLL Release|Win32
641
+		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|x64.ActiveCfg = DLL Release|x64
642
+		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|x64.Build.0 = DLL Release|x64
643
+		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
644
+		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
645
+		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Universal Debug|x64.ActiveCfg = DLL Universal Debug|x64
646
+		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Universal Debug|x64.Build.0 = DLL Universal Debug|x64
647
+		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
648
+		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
649
+		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Universal Release|x64.ActiveCfg = DLL Universal Release|x64
650
+		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Universal Release|x64.Build.0 = DLL Universal Release|x64
651
+		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.ActiveCfg = Release|Win32
652
+		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.Build.0 = Release|Win32
653
+		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|x64.ActiveCfg = Release|x64
654
+		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|x64.Build.0 = Release|x64
655
+		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
656
+		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
657
+		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Universal Debug|x64.ActiveCfg = Universal Debug|x64
658
+		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Universal Debug|x64.Build.0 = Universal Debug|x64
659
+		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
660
+		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Universal Release|Win32.Build.0 = Universal Release|Win32
661
+		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Universal Release|x64.ActiveCfg = Universal Release|x64
662
+		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Universal Release|x64.Build.0 = Universal Release|x64
663
+		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.ActiveCfg = Debug|Win32
664
+		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.Build.0 = Debug|Win32
665
+		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|x64.ActiveCfg = Debug|x64
666
+		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|x64.Build.0 = Debug|x64
667
+		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
668
+		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
669
+		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
670
+		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Debug|x64.Build.0 = DLL Debug|x64
671
+		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
672
+		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|Win32.Build.0 = DLL Release|Win32
673
+		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|x64.ActiveCfg = DLL Release|x64
674
+		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|x64.Build.0 = DLL Release|x64
675
+		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
676
+		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
677
+		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Universal Debug|x64.ActiveCfg = DLL Universal Debug|x64
678
+		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Universal Debug|x64.Build.0 = DLL Universal Debug|x64
679
+		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
680
+		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
681
+		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Universal Release|x64.ActiveCfg = DLL Universal Release|x64
682
+		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Universal Release|x64.Build.0 = DLL Universal Release|x64
683
+		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.ActiveCfg = Release|Win32
684
+		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.Build.0 = Release|Win32
685
+		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|x64.ActiveCfg = Release|x64
686
+		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|x64.Build.0 = Release|x64
687
+		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
688
+		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
689
+		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Universal Debug|x64.ActiveCfg = Universal Debug|x64
690
+		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Universal Debug|x64.Build.0 = Universal Debug|x64
691
+		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
692
+		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Universal Release|Win32.Build.0 = Universal Release|Win32
693
+		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Universal Release|x64.ActiveCfg = Universal Release|x64
694
+		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Universal Release|x64.Build.0 = Universal Release|x64
695
+		{853D1FD7-20AB-586C-9699-9680F84AC985}.Debug|Win32.ActiveCfg = Debug|Win32
696
+		{853D1FD7-20AB-586C-9699-9680F84AC985}.Debug|Win32.Build.0 = Debug|Win32
697
+		{853D1FD7-20AB-586C-9699-9680F84AC985}.Debug|x64.ActiveCfg = Debug|x64
698
+		{853D1FD7-20AB-586C-9699-9680F84AC985}.Debug|x64.Build.0 = Debug|x64
699
+		{853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
700
+		{853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
701
+		{853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
702
+		{853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Debug|x64.Build.0 = DLL Debug|x64
703
+		{853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
704
+		{853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Release|Win32.Build.0 = DLL Release|Win32
705
+		{853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Release|x64.ActiveCfg = DLL Release|x64
706
+		{853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Release|x64.Build.0 = DLL Release|x64
707
+		{853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
708
+		{853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
709
+		{853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Universal Debug|x64.ActiveCfg = DLL Universal Debug|x64
710
+		{853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Universal Debug|x64.Build.0 = DLL Universal Debug|x64
711
+		{853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
712
+		{853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
713
+		{853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Universal Release|x64.ActiveCfg = DLL Universal Release|x64
714
+		{853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Universal Release|x64.Build.0 = DLL Universal Release|x64
715
+		{853D1FD7-20AB-586C-9699-9680F84AC985}.Release|Win32.ActiveCfg = Release|Win32
716
+		{853D1FD7-20AB-586C-9699-9680F84AC985}.Release|Win32.Build.0 = Release|Win32
717
+		{853D1FD7-20AB-586C-9699-9680F84AC985}.Release|x64.ActiveCfg = Release|x64
718
+		{853D1FD7-20AB-586C-9699-9680F84AC985}.Release|x64.Build.0 = Release|x64
719
+		{853D1FD7-20AB-586C-9699-9680F84AC985}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
720
+		{853D1FD7-20AB-586C-9699-9680F84AC985}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
721
+		{853D1FD7-20AB-586C-9699-9680F84AC985}.Universal Debug|x64.ActiveCfg = Universal Debug|x64
722
+		{853D1FD7-20AB-586C-9699-9680F84AC985}.Universal Debug|x64.Build.0 = Universal Debug|x64
723
+		{853D1FD7-20AB-586C-9699-9680F84AC985}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
724
+		{853D1FD7-20AB-586C-9699-9680F84AC985}.Universal Release|Win32.Build.0 = Universal Release|Win32
725
+		{853D1FD7-20AB-586C-9699-9680F84AC985}.Universal Release|x64.ActiveCfg = Universal Release|x64
726
+		{853D1FD7-20AB-586C-9699-9680F84AC985}.Universal Release|x64.Build.0 = Universal Release|x64
207 727
 	EndGlobalSection
208 728
 	GlobalSection(SolutionProperties) = preSolution
209 729
 		HideSolutionNode = FALSE
210 730
deleted file mode 100644
... ...
@@ -1,134 +0,0 @@
1
-
2
-Microsoft Visual Studio Solution File, Format Version 11.00
3
-# Visual Studio 2010
4
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SigUI", "sigui_vc10.vcxproj", "{853D1FD7-20AB-586C-9699-9680F84AC985}"
5
-	ProjectSection(ProjectDependencies) = postProject
6
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1} = {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}
7
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}
8
-	EndProjectSection
9
-EndProject
10
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base", "..\wxWidgets-2.9.1\build\wx291_msw_vc10\wx_vc10_base.vcxproj", "{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}"
11
-EndProject
12
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "..\wxWidgets-2.9.1\build\wx291_msw_vc10\wx_vc10_core.vcxproj", "{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}"
13
-EndProject
14
-Global
15
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
16
-		Debug|Win32 = Debug|Win32
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
-		Release|Win32 = Release|Win32
27
-		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
-	EndGlobalSection
33
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
34
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.Debug|Win32.ActiveCfg = Debug|Win32
35
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.Debug|Win32.Build.0 = Debug|Win32
36
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.Debug|x64.ActiveCfg = Debug|x64
37
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.Debug|x64.Build.0 = Debug|x64
38
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
39
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
40
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
41
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Debug|x64.Build.0 = DLL Debug|x64
42
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
43
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Release|Win32.Build.0 = DLL Release|Win32
44
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Release|x64.ActiveCfg = DLL Release|x64
45
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Release|x64.Build.0 = DLL Release|x64
46
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
47
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
48
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Universal Debug|x64.ActiveCfg = DLL Universal Debug|x64
49
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Universal Debug|x64.Build.0 = DLL Universal Debug|x64
50
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
51
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
52
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Universal Release|x64.ActiveCfg = DLL Universal Release|x64
53
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.DLL Universal Release|x64.Build.0 = DLL Universal Release|x64
54
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.Release|Win32.ActiveCfg = Release|Win32
55
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.Release|Win32.Build.0 = Release|Win32
56
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.Release|x64.ActiveCfg = Release|x64
57
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.Release|x64.Build.0 = Release|x64
58
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
59
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
60
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.Universal Debug|x64.ActiveCfg = Universal Debug|x64
61
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.Universal Debug|x64.Build.0 = Universal Debug|x64
62
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
63
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.Universal Release|Win32.Build.0 = Universal Release|Win32
64
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.Universal Release|x64.ActiveCfg = Universal Release|x64
65
-		{853D1FD7-20AB-586C-9699-9680F84AC985}.Universal Release|x64.Build.0 = Universal Release|x64
66
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.ActiveCfg = Debug|Win32
67
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.Build.0 = Debug|Win32
68
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|x64.ActiveCfg = Debug|x64
69
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|x64.Build.0 = Debug|x64
70
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
71
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
72
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
73
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Debug|x64.Build.0 = DLL Debug|x64
74
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
75
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|Win32.Build.0 = DLL Release|Win32
76
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|x64.ActiveCfg = DLL Release|x64
77
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|x64.Build.0 = DLL Release|x64
78
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
79
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
80
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Universal Debug|x64.ActiveCfg = DLL Universal Debug|x64
81
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Universal Debug|x64.Build.0 = DLL Universal Debug|x64
82
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
83
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
84
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Universal Release|x64.ActiveCfg = DLL Universal Release|x64
85
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Universal Release|x64.Build.0 = DLL Universal Release|x64
86
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.ActiveCfg = Release|Win32
87
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.Build.0 = Release|Win32
88
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|x64.ActiveCfg = Release|x64
89
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|x64.Build.0 = Release|x64
90
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
91
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
92
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Universal Debug|x64.ActiveCfg = Universal Debug|x64
93
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Universal Debug|x64.Build.0 = Universal Debug|x64
94
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
95
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Universal Release|Win32.Build.0 = Universal Release|Win32
96
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Universal Release|x64.ActiveCfg = Universal Release|x64
97
-		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Universal Release|x64.Build.0 = Universal Release|x64
98
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.ActiveCfg = Debug|Win32
99
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.Build.0 = Debug|Win32
100
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|x64.ActiveCfg = Debug|x64
101
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|x64.Build.0 = Debug|x64
102
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
103
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
104
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
105
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Debug|x64.Build.0 = DLL Debug|x64
106
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
107
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|Win32.Build.0 = DLL Release|Win32
108
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|x64.ActiveCfg = DLL Release|x64
109
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|x64.Build.0 = DLL Release|x64
110
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
111
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
112
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Universal Debug|x64.ActiveCfg = DLL Universal Debug|x64
113
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Universal Debug|x64.Build.0 = DLL Universal Debug|x64
114
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
115
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
116
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Universal Release|x64.ActiveCfg = DLL Universal Release|x64
117
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Universal Release|x64.Build.0 = DLL Universal Release|x64
118
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.ActiveCfg = Release|Win32
119
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.Build.0 = Release|Win32
120
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|x64.ActiveCfg = Release|x64
121
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|x64.Build.0 = Release|x64
122
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
123
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
124
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Universal Debug|x64.ActiveCfg = Universal Debug|x64
125
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Universal Debug|x64.Build.0 = Universal Debug|x64
126
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
127
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Universal Release|Win32.Build.0 = Universal Release|Win32
128
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Universal Release|x64.ActiveCfg = Universal Release|x64
129
-		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Universal Release|x64.Build.0 = Universal Release|x64
130
-	EndGlobalSection
131
-	GlobalSection(SolutionProperties) = preSolution
132
-		HideSolutionNode = FALSE
133
-	EndGlobalSection
134
-EndGlobal
... ...
@@ -205,66 +205,66 @@
205 205
   <PropertyGroup Label="UserMacros" />
206 206
   <PropertyGroup>
207 207
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
208
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vc_mswud\</OutDir>
209
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\</OutDir>
210
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vc_mswud\minimal\</IntDir>
211
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\minimal\</IntDir>
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)\$(Configuration)</IntDir>
211
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\$(PlatformName)\$(Configuration)</IntDir>
212 212
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
213 213
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
214 214
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
215 215
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
216
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vc_mswu\</OutDir>
217
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\</OutDir>
218
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vc_mswu\minimal\</IntDir>
219
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\minimal\</IntDir>
216
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
217
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
218
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)build\$(PlatformName)\$(Configuration)</IntDir>
219
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\$(PlatformName)\$(Configuration)</IntDir>
220 220
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
221 221
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
222 222
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
223 223
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
224
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">vc_mswunivud\</OutDir>
225
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">vc_mswunivud\</OutDir>
226
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">vc_mswunivud\minimal\</IntDir>
227
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">vc_mswunivud\minimal\</IntDir>
224
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
225
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
226
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">$(SolutionDir)build\$(PlatformName)\$(Configuration)</IntDir>
227
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">$(SolutionDir)build\$(PlatformName)\$(Configuration)</IntDir>
228 228
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</LinkIncremental>
229 229
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</LinkIncremental>
230 230
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">true</GenerateManifest>
231 231
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">true</GenerateManifest>
232
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">vc_mswunivu\</OutDir>
233
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">vc_mswunivu\</OutDir>
234
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">vc_mswunivu\minimal\</IntDir>
235
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">vc_mswunivu\minimal\</IntDir>
232
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
233
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
234
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">$(SolutionDir)build\$(PlatformName)\$(Configuration)</IntDir>
235
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">$(SolutionDir)build\$(PlatformName)\$(Configuration)</IntDir>
236 236
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">false</LinkIncremental>
237 237
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">false</LinkIncremental>
238 238
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">true</GenerateManifest>
239 239
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">true</GenerateManifest>
240
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">vc_mswuddll\</OutDir>
241
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">vc_mswuddll\</OutDir>
242
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">vc_mswuddll\minimal\</IntDir>
243
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">vc_mswuddll\minimal\</IntDir>
240
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
241
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
242
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">$(SolutionDir)build\$(PlatformName)\$(Configuration)</IntDir>
243
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">$(SolutionDir)build\$(PlatformName)\$(Configuration)</IntDir>
244 244
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</LinkIncremental>
245 245
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</LinkIncremental>
246 246
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</GenerateManifest>
247 247
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</GenerateManifest>
248
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\</OutDir>
249
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">vc_mswudll\</OutDir>
250
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\minimal\</IntDir>
251
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">vc_mswudll\minimal\</IntDir>
248
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
249
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
250
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">$(SolutionDir)build\$(PlatformName)\$(Configuration)</IntDir>
251
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">$(SolutionDir)build\$(PlatformName)\$(Configuration)</IntDir>
252 252
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">false</LinkIncremental>
253 253
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">false</LinkIncremental>
254 254
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</GenerateManifest>
255 255
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</GenerateManifest>
256
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">vc_mswunivuddll\</OutDir>
257
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">vc_mswunivuddll\</OutDir>
258
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">vc_mswunivuddll\minimal\</IntDir>
259
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">vc_mswunivuddll\minimal\</IntDir>
256
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
257
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
258
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">$(SolutionDir)build\$(PlatformName)\$(Configuration)</IntDir>
259
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">$(SolutionDir)build\$(PlatformName)\$(Configuration)</IntDir>
260 260
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</LinkIncremental>
261 261
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</LinkIncremental>
262 262
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</GenerateManifest>
263 263
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</GenerateManifest>
264
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">vc_mswunivudll\</OutDir>
265
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">vc_mswunivudll\</OutDir>
266
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">vc_mswunivudll\minimal\</IntDir>
267
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">vc_mswunivudll\minimal\</IntDir>
264
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
265
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">$(SolutionDir)$(PlatformName)\$(Configuration)</OutDir>
266
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">$(SolutionDir)build\$(PlatformName)\$(Configuration)</IntDir>
267
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">$(SolutionDir)build\$(PlatformName)\$(Configuration)</IntDir>
268 268
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">false</LinkIncremental>
269 269
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">false</LinkIncremental>
270 270
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</GenerateManifest>
... ...
@@ -278,7 +278,7 @@
278 278
     <ClCompile>
279 279
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
280 280
       <Optimization>Disabled</Optimization>
281
-      <AdditionalIncludeDirectories>.\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
281
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
282 282
       <PreprocessorDefinitions>WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
283 283
       <ExceptionHandling>Sync</ExceptionHandling>
284 284
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
... ...
@@ -294,18 +294,19 @@
294 294
     <ResourceCompile>
295 295
       <PreprocessorDefinitions>_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
296 296
       <Culture>0x0409</Culture>
297
-      <AdditionalIncludeDirectories>.\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
297
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
298 298
     </ResourceCompile>
299 299
     <Link>
300 300
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
301
-      <AdditionalDependencies>wxmsw29ud_core.lib;wxbase29ud.lib;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;%(AdditionalDependencies)</AdditionalDependencies>
302
-      <OutputFile>vc_mswud\minimal.exe</OutputFile>
301
+      <AdditionalDependencies>wxmsw29u_core.lib;wxbase29u.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>
302
+      <OutputFile>$(SolutionDir)$(PlatformName)\$(Configuration)\sigui.exe</OutputFile>
303 303
       <SuppressStartupBanner>true</SuppressStartupBanner>
304
-      <AdditionalLibraryDirectories>.\..\..\lib\vc_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
304
+      <AdditionalLibraryDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
305 305
       <GenerateDebugInformation>true</GenerateDebugInformation>
306 306
       <ProgramDatabaseFile>vc_mswud\minimal.pdb</ProgramDatabaseFile>
307 307
       <SubSystem>Windows</SubSystem>
308 308
       <TargetMachine>MachineX86</TargetMachine>
309
+      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
309 310
     </Link>
310 311
     <Bscmake>
311 312
       <OutputFile>vc_mswud\minimal_vc9.bsc</OutputFile>
... ...
@@ -320,7 +321,7 @@
320 320
     <ClCompile>
321 321
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
322 322
       <Optimization>Disabled</Optimization>
323
-      <AdditionalIncludeDirectories>.\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
323
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
324 324
       <PreprocessorDefinitions>WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
325 325
       <ExceptionHandling>Sync</ExceptionHandling>
326 326
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
... ...
@@ -336,17 +337,18 @@
336 336
     <ResourceCompile>
337 337
       <PreprocessorDefinitions>_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
338 338
       <Culture>0x0409</Culture>
339
-      <AdditionalIncludeDirectories>.\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
339
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
340 340
     </ResourceCompile>
341 341
     <Link>
342 342
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
343
-      <AdditionalDependencies>wxmsw29ud_core.lib;wxbase29ud.lib;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;%(AdditionalDependencies)</AdditionalDependencies>
344
-      <OutputFile>vc_mswud\minimal.exe</OutputFile>
343
+      <AdditionalDependencies>wxmsw29u_core.lib;wxbase29u.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>
344
+      <OutputFile>$(SolutionDir)$(PlatformName)\$(Configuration)\sigui.exe</OutputFile>
345 345
       <SuppressStartupBanner>true</SuppressStartupBanner>
346
-      <AdditionalLibraryDirectories>.\..\..\lib\vc_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
346
+      <AdditionalLibraryDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
347 347
       <GenerateDebugInformation>true</GenerateDebugInformation>
348 348
       <ProgramDatabaseFile>vc_mswud\minimal.pdb</ProgramDatabaseFile>
349 349
       <SubSystem>Windows</SubSystem>
350
+      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
350 351
     </Link>
351 352
     <Bscmake>
352 353
       <OutputFile>vc_mswud\minimal_vc9.bsc</OutputFile>
... ...
@@ -361,7 +363,7 @@
361 361
     <ClCompile>
362 362
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
363 363
       <Optimization>MinSpace</Optimization>
364
-      <AdditionalIncludeDirectories>.\..\wxWidgets-2.9.1\lib\vc_lib\mswu;.\..\wxWidgets-2.9.1\include;.;(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
364
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
365 365
       <PreprocessorDefinitions>WIN32;__WXMSW__;NDEBUG;_UNICODE;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
366 366
       <ExceptionHandling>Sync</ExceptionHandling>
367 367
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
... ...
@@ -382,14 +384,14 @@
382 382
     <ResourceCompile>
383 383
       <PreprocessorDefinitions>__WXMSW__;NDEBUG;_UNICODE;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
384 384
       <Culture>0x0409</Culture>
385
-      <AdditionalIncludeDirectories>.\..\wxWidgets-2.9.1\lib\vc_lib\mswu;.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
385
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
386 386
     </ResourceCompile>
387 387
     <Link>
388 388
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
389 389
       <AdditionalDependencies>wxmsw29u_core.lib;wxbase29u.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>
390
-      <OutputFile>vc_mswu\SigUI.exe</OutputFile>
390
+      <OutputFile>$(SolutionDir)$(PlatformName)\$(Configuration)\sigui.exe</OutputFile>
391 391
       <SuppressStartupBanner>true</SuppressStartupBanner>
392
-      <AdditionalLibraryDirectories>.\..\wxWidgets-2.9.1\lib\vc_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
392
+      <AdditionalLibraryDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
393 393
       <GenerateDebugInformation>true</GenerateDebugInformation>
394 394
       <ProgramDatabaseFile>vc_mswu\minimal.pdb</ProgramDatabaseFile>
395 395
       <SubSystem>Windows</SubSystem>
... ...
@@ -412,7 +414,7 @@
412 412
     <ClCompile>
413 413
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
414 414
       <Optimization>MinSpace</Optimization>
415
-      <AdditionalIncludeDirectories>.\..\wxWidgets-2.9.1\lib\vc_lib\mswu;.\..\wxWidgets-2.9.1\include;.;(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
415
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
416 416
       <PreprocessorDefinitions>WIN32;__WXMSW__;NDEBUG;_UNICODE;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
417 417
       <ExceptionHandling>Sync</ExceptionHandling>
418 418
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
... ...
@@ -433,14 +435,14 @@
433 433
     <ResourceCompile>
434 434
       <PreprocessorDefinitions>__WXMSW__;NDEBUG;_UNICODE;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
435 435
       <Culture>0x0409</Culture>
436
-      <AdditionalIncludeDirectories>.\..\wxWidgets-2.9.1\lib\vc_lib\mswu;.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
436
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
437 437
     </ResourceCompile>
438 438
     <Link>
439 439
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
440 440
       <AdditionalDependencies>wxmsw29u_core.lib;wxbase29u.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>
441
-      <OutputFile>vc_mswu\SigUI.exe</OutputFile>
441
+      <OutputFile>$(SolutionDir)$(PlatformName)\$(Configuration)\sigui.exe</OutputFile>
442 442
       <SuppressStartupBanner>true</SuppressStartupBanner>
443
-      <AdditionalLibraryDirectories>.\..\wxWidgets-2.9.1\lib\vc_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
443
+      <AdditionalLibraryDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
444 444
       <GenerateDebugInformation>true</GenerateDebugInformation>
445 445
       <ProgramDatabaseFile>vc_mswu\minimal.pdb</ProgramDatabaseFile>
446 446
       <SubSystem>Windows</SubSystem>
... ...
@@ -462,7 +464,7 @@
462 462
     <ClCompile>
463 463
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
464 464
       <Optimization>Disabled</Optimization>
465
-      <AdditionalIncludeDirectories>.\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
465
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
466 466
       <PreprocessorDefinitions>WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
467 467
       <ExceptionHandling>Sync</ExceptionHandling>
468 468
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
... ...
@@ -478,18 +480,19 @@
478 478
     <ResourceCompile>
479 479
       <PreprocessorDefinitions>_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
480 480
       <Culture>0x0409</Culture>
481
-      <AdditionalIncludeDirectories>.\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
481
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
482 482
     </ResourceCompile>
483 483
     <Link>
484 484
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
485
-      <AdditionalDependencies>wxmswuniv29ud_core.lib;wxbase29ud.lib;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;%(AdditionalDependencies)</AdditionalDependencies>
486
-      <OutputFile>vc_mswunivud\minimal.exe</OutputFile>
485
+      <AdditionalDependencies>wxmsw29u_core.lib;wxbase29u.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>
486
+      <OutputFile>$(SolutionDir)$(PlatformName)\$(Configuration)\sigui.exe</OutputFile>
487 487
       <SuppressStartupBanner>true</SuppressStartupBanner>
488
-      <AdditionalLibraryDirectories>.\..\..\lib\vc_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
488
+      <AdditionalLibraryDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
489 489
       <GenerateDebugInformation>true</GenerateDebugInformation>
490 490
       <ProgramDatabaseFile>vc_mswunivud\minimal.pdb</ProgramDatabaseFile>
491 491
       <SubSystem>Windows</SubSystem>
492 492
       <TargetMachine>MachineX86</TargetMachine>
493
+      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
493 494
     </Link>
494 495
     <Bscmake>
495 496
       <OutputFile>vc_mswunivud\minimal_vc9.bsc</OutputFile>
... ...
@@ -504,7 +507,7 @@
504 504
     <ClCompile>
505 505
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
506 506
       <Optimization>Disabled</Optimization>
507
-      <AdditionalIncludeDirectories>.\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
507
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
508 508
       <PreprocessorDefinitions>WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
509 509
       <ExceptionHandling>Sync</ExceptionHandling>
510 510
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
... ...
@@ -520,17 +523,18 @@
520 520
     <ResourceCompile>
521 521
       <PreprocessorDefinitions>_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
522 522
       <Culture>0x0409</Culture>
523
-      <AdditionalIncludeDirectories>.\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
523
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
524 524
     </ResourceCompile>
525 525
     <Link>
526 526
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
527
-      <AdditionalDependencies>wxmswuniv29ud_core.lib;wxbase29ud.lib;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;%(AdditionalDependencies)</AdditionalDependencies>
528
-      <OutputFile>vc_mswunivud\minimal.exe</OutputFile>
527
+      <AdditionalDependencies>wxmsw29u_core.lib;wxbase29u.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>
528
+      <OutputFile>$(SolutionDir)$(PlatformName)\$(Configuration)\sigui.exe</OutputFile>
529 529
       <SuppressStartupBanner>true</SuppressStartupBanner>
530
-      <AdditionalLibraryDirectories>.\..\..\lib\vc_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
530
+      <AdditionalLibraryDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
531 531
       <GenerateDebugInformation>true</GenerateDebugInformation>
532 532
       <ProgramDatabaseFile>vc_mswunivud\minimal.pdb</ProgramDatabaseFile>
533 533
       <SubSystem>Windows</SubSystem>
534
+      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
534 535
     </Link>
535 536
     <Bscmake>
536 537
       <OutputFile>vc_mswunivud\minimal_vc9.bsc</OutputFile>
... ...
@@ -545,7 +549,7 @@
545 545
     <ClCompile>
546 546
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
547 547
       <Optimization>MaxSpeed</Optimization>
548
-      <AdditionalIncludeDirectories>.\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
548
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
549 549
       <PreprocessorDefinitions>WIN32;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
550 550
       <ExceptionHandling>Sync</ExceptionHandling>
551 551
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
... ...
@@ -559,20 +563,21 @@
559 559
     <ResourceCompile>
560 560
       <PreprocessorDefinitions>__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
561 561
       <Culture>0x0409</Culture>
562
-      <AdditionalIncludeDirectories>.\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
562
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
563 563
     </ResourceCompile>
564 564
     <Link>
565 565
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
566
-      <AdditionalDependencies>wxmswuniv29u_core.lib;wxbase29u.lib;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;%(AdditionalDependencies)</AdditionalDependencies>
567
-      <OutputFile>vc_mswunivu\minimal.exe</OutputFile>
566
+      <AdditionalDependencies>wxmsw29u_core.lib;wxbase29u.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>
567
+      <OutputFile>$(SolutionDir)$(PlatformName)\$(Configuration)\sigui.exe</OutputFile>
568 568
       <SuppressStartupBanner>true</SuppressStartupBanner>
569
-      <AdditionalLibraryDirectories>.\..\..\lib\vc_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
569
+      <AdditionalLibraryDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
570 570
       <GenerateDebugInformation>true</GenerateDebugInformation>
571 571
       <ProgramDatabaseFile>vc_mswunivu\minimal.pdb</ProgramDatabaseFile>
572 572
       <SubSystem>Windows</SubSystem>
573 573
       <TargetMachine>MachineX86</TargetMachine>
574 574
       <OptimizeReferences>true</OptimizeReferences>
575 575
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
576
+      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
576 577
     </Link>
577 578
     <Bscmake>
578 579
       <OutputFile>vc_mswunivu\minimal_vc9.bsc</OutputFile>
... ...
@@ -587,7 +592,7 @@
587 587
     <ClCompile>
588 588
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
589 589
       <Optimization>MaxSpeed</Optimization>
590
-      <AdditionalIncludeDirectories>.\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
590
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
591 591
       <PreprocessorDefinitions>WIN32;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
592 592
       <ExceptionHandling>Sync</ExceptionHandling>
593 593
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
... ...
@@ -601,19 +606,20 @@
601 601
     <ResourceCompile>
602 602
       <PreprocessorDefinitions>__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
603 603
       <Culture>0x0409</Culture>
604
-      <AdditionalIncludeDirectories>.\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
604
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
605 605
     </ResourceCompile>
606 606
     <Link>
607 607
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
608
-      <AdditionalDependencies>wxmswuniv29u_core.lib;wxbase29u.lib;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;%(AdditionalDependencies)</AdditionalDependencies>
609
-      <OutputFile>vc_mswunivu\minimal.exe</OutputFile>
608
+      <AdditionalDependencies>wxmsw29u_core.lib;wxbase29u.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>
609
+      <OutputFile>$(SolutionDir)$(PlatformName)\$(Configuration)\sigui.exe</OutputFile>
610 610
       <SuppressStartupBanner>true</SuppressStartupBanner>
611
-      <AdditionalLibraryDirectories>.\..\..\lib\vc_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
611
+      <AdditionalLibraryDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
612 612
       <GenerateDebugInformation>true</GenerateDebugInformation>
613 613
       <ProgramDatabaseFile>vc_mswunivu\minimal.pdb</ProgramDatabaseFile>
614 614
       <SubSystem>Windows</SubSystem>
615 615
       <OptimizeReferences>true</OptimizeReferences>
616 616
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
617
+      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
617 618
     </Link>
618 619
     <Bscmake>
619 620
       <OutputFile>vc_mswunivu\minimal_vc9.bsc</OutputFile>
... ...
@@ -628,7 +634,7 @@
628 628
     <ClCompile>
629 629
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
630 630
       <Optimization>Disabled</Optimization>
631
-      <AdditionalIncludeDirectories>.\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
631
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
632 632
       <PreprocessorDefinitions>WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
633 633
       <ExceptionHandling>Sync</ExceptionHandling>
634 634
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
... ...
@@ -644,18 +650,19 @@
644 644
     <ResourceCompile>
645 645
       <PreprocessorDefinitions>_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
646 646
       <Culture>0x0409</Culture>
647
-      <AdditionalIncludeDirectories>.\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
647
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
648 648
     </ResourceCompile>
649 649
     <Link>
650 650
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
651
-      <AdditionalDependencies>wxmsw29ud_core.lib;wxbase29ud.lib;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;%(AdditionalDependencies)</AdditionalDependencies>
652
-      <OutputFile>vc_mswuddll\minimal.exe</OutputFile>
651
+      <AdditionalDependencies>wxmsw29u_core.lib;wxbase29u.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>
652
+      <OutputFile>$(SolutionDir)$(PlatformName)\$(Configuration)\sigui.exe</OutputFile>
653 653
       <SuppressStartupBanner>true</SuppressStartupBanner>
654
-      <AdditionalLibraryDirectories>.\..\..\lib\vc_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
654
+      <AdditionalLibraryDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
655 655
       <GenerateDebugInformation>true</GenerateDebugInformation>
656 656
       <ProgramDatabaseFile>vc_mswuddll\minimal.pdb</ProgramDatabaseFile>
657 657
       <SubSystem>Windows</SubSystem>
658 658
       <TargetMachine>MachineX86</TargetMachine>
659
+      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
659 660
     </Link>
660 661
     <Bscmake>
661 662
       <OutputFile>vc_mswuddll\minimal_vc9.bsc</OutputFile>
... ...
@@ -670,7 +677,7 @@
670 670
     <ClCompile>
671 671
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
672 672
       <Optimization>Disabled</Optimization>
673
-      <AdditionalIncludeDirectories>.\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
673
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
674 674
       <PreprocessorDefinitions>WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
675 675
       <ExceptionHandling>Sync</ExceptionHandling>
676 676
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
... ...
@@ -686,17 +693,18 @@
686 686
     <ResourceCompile>
687 687
       <PreprocessorDefinitions>_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
688 688
       <Culture>0x0409</Culture>
689
-      <AdditionalIncludeDirectories>.\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
689
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
690 690
     </ResourceCompile>
691 691
     <Link>
692 692
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
693
-      <AdditionalDependencies>wxmsw29ud_core.lib;wxbase29ud.lib;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;%(AdditionalDependencies)</AdditionalDependencies>
694
-      <OutputFile>vc_mswuddll\minimal.exe</OutputFile>
693
+      <AdditionalDependencies>wxmsw29u_core.lib;wxbase29u.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>
694
+      <OutputFile>$(SolutionDir)$(PlatformName)\$(Configuration)\sigui.exe</OutputFile>
695 695
       <SuppressStartupBanner>true</SuppressStartupBanner>
696
-      <AdditionalLibraryDirectories>.\..\..\lib\vc_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
696
+      <AdditionalLibraryDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
697 697
       <GenerateDebugInformation>true</GenerateDebugInformation>
698 698
       <ProgramDatabaseFile>vc_mswuddll\minimal.pdb</ProgramDatabaseFile>
699 699
       <SubSystem>Windows</SubSystem>
700
+      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
700 701
     </Link>
701 702
     <Bscmake>
702 703
       <OutputFile>vc_mswuddll\minimal_vc9.bsc</OutputFile>
... ...
@@ -711,7 +719,7 @@
711 711
     <ClCompile>
712 712
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
713 713
       <Optimization>MaxSpeed</Optimization>
714
-      <AdditionalIncludeDirectories>.\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
714
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
715 715
       <PreprocessorDefinitions>WIN32;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
716 716
       <ExceptionHandling>Sync</ExceptionHandling>
717 717
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
... ...
@@ -725,20 +733,21 @@
725 725
     <ResourceCompile>
726 726
       <PreprocessorDefinitions>__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
727 727
       <Culture>0x0409</Culture>
728
-      <AdditionalIncludeDirectories>.\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
728
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
729 729
     </ResourceCompile>
730 730
     <Link>
731 731
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
732
-      <AdditionalDependencies>wxmsw29u_core.lib;wxbase29u.lib;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;%(AdditionalDependencies)</AdditionalDependencies>
733
-      <OutputFile>vc_mswudll\minimal.exe</OutputFile>
732
+      <AdditionalDependencies>wxmsw29u_core.lib;wxbase29u.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>
733
+      <OutputFile>$(SolutionDir)$(PlatformName)\$(Configuration)\sigui.exe</OutputFile>
734 734
       <SuppressStartupBanner>true</SuppressStartupBanner>
735
-      <AdditionalLibraryDirectories>.\..\..\lib\vc_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
735
+      <AdditionalLibraryDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
736 736
       <GenerateDebugInformation>true</GenerateDebugInformation>
737 737
       <ProgramDatabaseFile>vc_mswudll\minimal.pdb</ProgramDatabaseFile>
738 738
       <SubSystem>Windows</SubSystem>
739 739
       <TargetMachine>MachineX86</TargetMachine>
740 740
       <OptimizeReferences>true</OptimizeReferences>
741 741
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
742
+      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
742 743
     </Link>
743 744
     <Bscmake>
744 745
       <OutputFile>vc_mswudll\minimal_vc9.bsc</OutputFile>
... ...
@@ -753,7 +762,7 @@
753 753
     <ClCompile>
754 754
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
755 755
       <Optimization>MaxSpeed</Optimization>
756
-      <AdditionalIncludeDirectories>.\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
756
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
757 757
       <PreprocessorDefinitions>WIN32;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
758 758
       <ExceptionHandling>Sync</ExceptionHandling>
759 759
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
... ...
@@ -767,19 +776,20 @@
767 767
     <ResourceCompile>
768 768
       <PreprocessorDefinitions>__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
769 769
       <Culture>0x0409</Culture>
770
-      <AdditionalIncludeDirectories>.\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
770
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
771 771
     </ResourceCompile>
772 772
     <Link>
773 773
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
774
-      <AdditionalDependencies>wxmsw29u_core.lib;wxbase29u.lib;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;%(AdditionalDependencies)</AdditionalDependencies>
775
-      <OutputFile>vc_mswudll\minimal.exe</OutputFile>
774
+      <AdditionalDependencies>wxmsw29u_core.lib;wxbase29u.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>
775
+      <OutputFile>$(SolutionDir)$(PlatformName)\$(Configuration)\sigui.exe</OutputFile>
776 776
       <SuppressStartupBanner>true</SuppressStartupBanner>
777
-      <AdditionalLibraryDirectories>.\..\..\lib\vc_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
777
+      <AdditionalLibraryDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
778 778
       <GenerateDebugInformation>true</GenerateDebugInformation>
779 779
       <ProgramDatabaseFile>vc_mswudll\minimal.pdb</ProgramDatabaseFile>
780 780
       <SubSystem>Windows</SubSystem>
781 781
       <OptimizeReferences>true</OptimizeReferences>
782 782
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
783
+      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
783 784
     </Link>
784 785
     <Bscmake>
785 786
       <OutputFile>vc_mswudll\minimal_vc9.bsc</OutputFile>
... ...
@@ -794,7 +804,7 @@
794 794
     <ClCompile>
795 795
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
796 796
       <Optimization>Disabled</Optimization>
797
-      <AdditionalIncludeDirectories>.\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
797
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
798 798
       <PreprocessorDefinitions>WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
799 799
       <ExceptionHandling>Sync</ExceptionHandling>
800 800
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
... ...
@@ -810,18 +820,19 @@
810 810
     <ResourceCompile>
811 811
       <PreprocessorDefinitions>_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
812 812
       <Culture>0x0409</Culture>
813
-      <AdditionalIncludeDirectories>.\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
813
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
814 814
     </ResourceCompile>
815 815
     <Link>
816 816
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
817
-      <AdditionalDependencies>wxmswuniv29ud_core.lib;wxbase29ud.lib;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;%(AdditionalDependencies)</AdditionalDependencies>
818
-      <OutputFile>vc_mswunivuddll\minimal.exe</OutputFile>
817
+      <AdditionalDependencies>wxmsw29u_core.lib;wxbase29u.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>
818
+      <OutputFile>$(SolutionDir)$(PlatformName)\$(Configuration)\sigui.exe</OutputFile>
819 819
       <SuppressStartupBanner>true</SuppressStartupBanner>
820
-      <AdditionalLibraryDirectories>.\..\..\lib\vc_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
820
+      <AdditionalLibraryDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
821 821
       <GenerateDebugInformation>true</GenerateDebugInformation>
822 822
       <ProgramDatabaseFile>vc_mswunivuddll\minimal.pdb</ProgramDatabaseFile>
823 823
       <SubSystem>Windows</SubSystem>
824 824
       <TargetMachine>MachineX86</TargetMachine>
825
+      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
825 826
     </Link>
826 827
     <Bscmake>
827 828
       <OutputFile>vc_mswunivuddll\minimal_vc9.bsc</OutputFile>
... ...
@@ -836,7 +847,7 @@
836 836
     <ClCompile>
837 837
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
838 838
       <Optimization>Disabled</Optimization>
839
-      <AdditionalIncludeDirectories>.\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
839
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
840 840
       <PreprocessorDefinitions>WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
841 841
       <ExceptionHandling>Sync</ExceptionHandling>
842 842
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
... ...
@@ -852,17 +863,18 @@
852 852
     <ResourceCompile>
853 853
       <PreprocessorDefinitions>_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
854 854
       <Culture>0x0409</Culture>
855
-      <AdditionalIncludeDirectories>.\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
855
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
856 856
     </ResourceCompile>
857 857
     <Link>
858 858
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
859
-      <AdditionalDependencies>wxmswuniv29ud_core.lib;wxbase29ud.lib;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;%(AdditionalDependencies)</AdditionalDependencies>
860
-      <OutputFile>vc_mswunivuddll\minimal.exe</OutputFile>
859
+      <AdditionalDependencies>wxmsw29u_core.lib;wxbase29u.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>
860
+      <OutputFile>$(SolutionDir)$(PlatformName)\$(Configuration)\sigui.exe</OutputFile>
861 861
       <SuppressStartupBanner>true</SuppressStartupBanner>
862
-      <AdditionalLibraryDirectories>.\..\..\lib\vc_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
862
+      <AdditionalLibraryDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
863 863
       <GenerateDebugInformation>true</GenerateDebugInformation>
864 864
       <ProgramDatabaseFile>vc_mswunivuddll\minimal.pdb</ProgramDatabaseFile>
865 865
       <SubSystem>Windows</SubSystem>
866
+      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
866 867
     </Link>
867 868
     <Bscmake>
868 869
       <OutputFile>vc_mswunivuddll\minimal_vc9.bsc</OutputFile>
... ...
@@ -877,7 +889,7 @@
877 877
     <ClCompile>
878 878
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
879 879
       <Optimization>MaxSpeed</Optimization>
880
-      <AdditionalIncludeDirectories>.\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
880
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
881 881
       <PreprocessorDefinitions>WIN32;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
882 882
       <ExceptionHandling>Sync</ExceptionHandling>
883 883
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
... ...
@@ -891,20 +903,21 @@
891 891
     <ResourceCompile>
892 892
       <PreprocessorDefinitions>__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
893 893
       <Culture>0x0409</Culture>
894
-      <AdditionalIncludeDirectories>.\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
894
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
895 895
     </ResourceCompile>
896 896
     <Link>
897 897
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
898
-      <AdditionalDependencies>wxmswuniv29u_core.lib;wxbase29u.lib;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;%(AdditionalDependencies)</AdditionalDependencies>
899
-      <OutputFile>vc_mswunivudll\minimal.exe</OutputFile>
898
+      <AdditionalDependencies>wxmsw29u_core.lib;wxbase29u.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>
899
+      <OutputFile>$(SolutionDir)$(PlatformName)\$(Configuration)\sigui.exe</OutputFile>
900 900
       <SuppressStartupBanner>true</SuppressStartupBanner>
901
-      <AdditionalLibraryDirectories>.\..\..\lib\vc_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
901
+      <AdditionalLibraryDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
902 902
       <GenerateDebugInformation>true</GenerateDebugInformation>
903 903
       <ProgramDatabaseFile>vc_mswunivudll\minimal.pdb</ProgramDatabaseFile>
904 904
       <SubSystem>Windows</SubSystem>
905 905
       <TargetMachine>MachineX86</TargetMachine>
906 906
       <OptimizeReferences>true</OptimizeReferences>
907 907
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
908
+      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
908 909
     </Link>
909 910
     <Bscmake>
910 911
       <OutputFile>vc_mswunivudll\minimal_vc9.bsc</OutputFile>
... ...
@@ -919,7 +932,7 @@
919 919
     <ClCompile>
920 920
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
921 921
       <Optimization>MaxSpeed</Optimization>
922
-      <AdditionalIncludeDirectories>.\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
922
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
923 923
       <PreprocessorDefinitions>WIN32;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
924 924
       <ExceptionHandling>Sync</ExceptionHandling>
925 925
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
... ...
@@ -933,19 +946,20 @@
933 933
     <ResourceCompile>
934 934
       <PreprocessorDefinitions>__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
935 935
       <Culture>0x0409</Culture>
936
-      <AdditionalIncludeDirectories>.\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
936
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
937 937
     </ResourceCompile>
938 938
     <Link>
939 939
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
940
-      <AdditionalDependencies>wxmswuniv29u_core.lib;wxbase29u.lib;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;%(AdditionalDependencies)</AdditionalDependencies>
941
-      <OutputFile>vc_mswunivudll\minimal.exe</OutputFile>
940
+      <AdditionalDependencies>wxmsw29u_core.lib;wxbase29u.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>
941
+      <OutputFile>$(SolutionDir)$(PlatformName)\$(Configuration)\sigui.exe</OutputFile>
942 942
       <SuppressStartupBanner>true</SuppressStartupBanner>
943
-      <AdditionalLibraryDirectories>.\..\..\lib\vc_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
943
+      <AdditionalLibraryDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
944 944
       <GenerateDebugInformation>true</GenerateDebugInformation>
945 945
       <ProgramDatabaseFile>vc_mswunivudll\minimal.pdb</ProgramDatabaseFile>
946 946
       <SubSystem>Windows</SubSystem>
947 947
       <OptimizeReferences>true</OptimizeReferences>
948 948
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
949
+      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
949 950
     </Link>
950 951
     <Bscmake>
951 952
       <OutputFile>vc_mswunivudll\minimal_vc9.bsc</OutputFile>
... ...
@@ -205,50 +205,50 @@
205 205
   <PropertyGroup Label="UserMacros" />
206 206
   <PropertyGroup>
207 207
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
208
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\lib\vc_lib\</OutDir>
209
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\lib\vc_lib\</OutDir>
210
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vc_mswud\base\</IntDir>
211
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\base\</IntDir>
212
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\lib\vc_lib\</OutDir>
213
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\lib\vc_lib\</OutDir>
214
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vc_mswu\base\</IntDir>
215
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\base\</IntDir>
216
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">..\..\lib\vc_lib\</OutDir>
217
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">..\..\lib\vc_lib\</OutDir>
218
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">vc_mswunivud\base\</IntDir>
219
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">vc_mswunivud\base\</IntDir>
220
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">..\..\lib\vc_lib\</OutDir>
221
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">..\..\lib\vc_lib\</OutDir>
222
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">vc_mswunivu\base\</IntDir>
223
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">vc_mswunivu\base\</IntDir>
224
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">..\..\lib\vc_dll\</OutDir>
225
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">..\..\lib\vc_dll\</OutDir>
226
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">vc_mswuddll\base\</IntDir>
227
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">vc_mswuddll\base\</IntDir>
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)\$(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 228
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</LinkIncremental>
229 229
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</LinkIncremental>
230 230
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</GenerateManifest>
231 231
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</GenerateManifest>
232
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">..\..\lib\vc_dll\</OutDir>
233
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">..\..\lib\vc_dll\</OutDir>
234
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\base\</IntDir>
235
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">vc_mswudll\base\</IntDir>
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 236
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">false</LinkIncremental>
237 237
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">false</LinkIncremental>
238 238
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</GenerateManifest>
239 239
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</GenerateManifest>
240
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">..\..\lib\vc_dll\</OutDir>
241
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">..\..\lib\vc_dll\</OutDir>
242
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">vc_mswunivuddll\base\</IntDir>
243
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">vc_mswunivuddll\base\</IntDir>
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 244
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</LinkIncremental>
245 245
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</LinkIncremental>
246 246
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</GenerateManifest>
247 247
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</GenerateManifest>
248
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">..\..\lib\vc_dll\</OutDir>
249
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">..\..\lib\vc_dll\</OutDir>
250
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">vc_mswunivudll\base\</IntDir>
251
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">vc_mswunivudll\base\</IntDir>
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 252
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">false</LinkIncremental>
253 253
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">false</LinkIncremental>
254 254
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</GenerateManifest>
... ...
@@ -262,7 +262,7 @@
262 262
     <ClCompile>
263 263
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
264 264
       <Optimization>Disabled</Optimization>
265
-      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(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>
... ...
@@ -282,10 +282,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>..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
285
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
286 286
     </ResourceCompile>
287 287
     <Lib>
288
-      <OutputFile>..\..\lib\vc_lib\wxbase29ud.lib</OutputFile>
288
+      <OutputFile>$(SolutionDir)$(PlatformName)\$(Configuration)\wxbase29u.lib</OutputFile>
289 289
       <SuppressStartupBanner>true</SuppressStartupBanner>
290 290
     </Lib>
291 291
     <Bscmake>
... ...
@@ -293,7 +293,7 @@
293 293
       <SuppressStartupBanner>true</SuppressStartupBanner>
294 294
     </Bscmake>
295 295
     <PreBuildEvent>
296
-      <Command>xcopy ..\..\include\wx\msw\setup.h ..\..\lib\vc_lib\mswud\wx\ /Y</Command>
296
+      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
297 297
     </PreBuildEvent>
298 298
   </ItemDefinitionGroup>
299 299
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
... ...
@@ -304,7 +304,7 @@
304 304
     <ClCompile>
305 305
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
306 306
       <Optimization>Disabled</Optimization>
307
-      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
307
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
308 308
       <PreprocessorDefinitions>WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
309 309
       <ExceptionHandling>Sync</ExceptionHandling>
310 310
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
... ...
@@ -324,10 +324,10 @@
324 324
     <ResourceCompile>
325 325
       <PreprocessorDefinitions>_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
326 326
       <Culture>0x0409</Culture>
327
-      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
327
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
328 328
     </ResourceCompile>
329 329
     <Lib>
330
-      <OutputFile>..\..\lib\vc_lib\wxbase29ud.lib</OutputFile>
330
+      <OutputFile>$(SolutionDir)$(PlatformName)\$(Configuration)\wxbase29u.lib</OutputFile>
331 331
       <SuppressStartupBanner>true</SuppressStartupBanner>
332 332
     </Lib>
333 333
     <Bscmake>
... ...
@@ -335,7 +335,7 @@
335 335
       <SuppressStartupBanner>true</SuppressStartupBanner>
336 336
     </Bscmake>
337 337
     <PreBuildEvent>
338
-      <Command>xcopy ..\..\include\wx\msw\setup.h ..\..\lib\vc_lib\mswud\wx\ /Y</Command>
338
+      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
339 339
     </PreBuildEvent>
340 340
   </ItemDefinitionGroup>
341 341
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
... ...
@@ -346,7 +346,7 @@
346 346
     <ClCompile>
347 347
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
348 348
       <Optimization>MinSpace</Optimization>
349
-      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
349
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
350 350
       <PreprocessorDefinitions>WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
351 351
       <ExceptionHandling>Sync</ExceptionHandling>
352 352
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
... ...
@@ -368,10 +368,10 @@
368 368
     <ResourceCompile>
369 369
       <PreprocessorDefinitions>__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
370 370
       <Culture>0x0409</Culture>
371
-      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
371
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
372 372
     </ResourceCompile>
373 373
     <Lib>
374
-      <OutputFile>..\..\lib\vc_lib\wxbase29u.lib</OutputFile>
374
+      <OutputFile>$(SolutionDir)$(PlatformName)\$(Configuration)\wxbase29u.lib</OutputFile>
375 375
       <SuppressStartupBanner>true</SuppressStartupBanner>
376 376
     </Lib>
377 377
     <Bscmake>
... ...
@@ -379,7 +379,7 @@
379 379
       <SuppressStartupBanner>true</SuppressStartupBanner>
380 380
     </Bscmake>
381 381
     <PreBuildEvent>
382
-      <Command>xcopy ..\..\include\wx\msw\setup.h ..\..\lib\vc_lib\mswu\wx\ /Y</Command>
382
+      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
383 383
     </PreBuildEvent>
384 384
   </ItemDefinitionGroup>
385 385
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
... ...
@@ -390,7 +390,7 @@
390 390
     <ClCompile>
391 391
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
392 392
       <Optimization>MinSpace</Optimization>
393
-      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
393
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
394 394
       <PreprocessorDefinitions>WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
395 395
       <ExceptionHandling>Sync</ExceptionHandling>
396 396
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
... ...
@@ -412,10 +412,10 @@
412 412
     <ResourceCompile>
413 413
       <PreprocessorDefinitions>__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
414 414
       <Culture>0x0409</Culture>
415
-      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
415
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
416 416
     </ResourceCompile>
417 417
     <Lib>
418
-      <OutputFile>..\..\lib\vc_lib\wxbase29u.lib</OutputFile>
418
+      <OutputFile>$(SolutionDir)$(PlatformName)\$(Configuration)\wxbase29u.lib</OutputFile>
419 419
       <SuppressStartupBanner>true</SuppressStartupBanner>
420 420
     </Lib>
421 421
     <Bscmake>
... ...
@@ -423,7 +423,7 @@
423 423
       <SuppressStartupBanner>true</SuppressStartupBanner>
424 424
     </Bscmake>
425 425
     <PreBuildEvent>
426
-      <Command>xcopy ..\..\include\wx\msw\setup.h ..\..\lib\vc_lib\mswu\wx\ /Y</Command>
426
+      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
427 427
     </PreBuildEvent>
428 428
   </ItemDefinitionGroup>
429 429
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">
... ...
@@ -434,7 +434,7 @@
434 434
     <ClCompile>
435 435
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
436 436
       <Optimization>Disabled</Optimization>
437
-      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
437
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
438 438
       <PreprocessorDefinitions>WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
439 439
       <ExceptionHandling>Sync</ExceptionHandling>
440 440
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
... ...
@@ -454,7 +454,7 @@
454 454
     <ResourceCompile>
455 455
       <PreprocessorDefinitions>_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
456 456
       <Culture>0x0409</Culture>
457
-      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
457
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
458 458
     </ResourceCompile>
459 459
     <Lib>
460 460
       <OutputFile>..\..\lib\vc_lib\wxbase29ud.lib</OutputFile>
... ...
@@ -465,7 +465,7 @@
465 465
       <SuppressStartupBanner>true</SuppressStartupBanner>
466 466
     </Bscmake>
467 467
     <PreBuildEvent>
468
-      <Command>xcopy ..\..\include\wx\univ\setup.h ..\..\lib\vc_lib\mswunivud\wx\ /Y</Command>
468
+      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
469 469
     </PreBuildEvent>
470 470
   </ItemDefinitionGroup>
471 471
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">
... ...
@@ -476,7 +476,7 @@
476 476
     <ClCompile>
477 477
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
478 478
       <Optimization>Disabled</Optimization>
479
-      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
479
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
480 480
       <PreprocessorDefinitions>WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
481 481
       <ExceptionHandling>Sync</ExceptionHandling>
482 482
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
... ...
@@ -496,7 +496,7 @@
496 496
     <ResourceCompile>
497 497
       <PreprocessorDefinitions>_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
498 498
       <Culture>0x0409</Culture>
499
-      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
499
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
500 500
     </ResourceCompile>
501 501
     <Lib>
502 502
       <OutputFile>..\..\lib\vc_lib\wxbase29ud.lib</OutputFile>
... ...
@@ -507,7 +507,7 @@
507 507
       <SuppressStartupBanner>true</SuppressStartupBanner>
508 508
     </Bscmake>
509 509
     <PreBuildEvent>
510
-      <Command>xcopy ..\..\include\wx\univ\setup.h ..\..\lib\vc_lib\mswunivud\wx\ /Y</Command>
510
+      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
511 511
     </PreBuildEvent>
512 512
   </ItemDefinitionGroup>
513 513
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">
... ...
@@ -518,7 +518,7 @@
518 518
     <ClCompile>
519 519
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
520 520
       <Optimization>MaxSpeed</Optimization>
521
-      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
521
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
522 522
       <PreprocessorDefinitions>WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
523 523
       <ExceptionHandling>Sync</ExceptionHandling>
524 524
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
... ...
@@ -536,7 +536,7 @@
536 536
     <ResourceCompile>
537 537
       <PreprocessorDefinitions>__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
538 538
       <Culture>0x0409</Culture>
539
-      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
539
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
540 540
     </ResourceCompile>
541 541
     <Lib>
542 542
       <OutputFile>..\..\lib\vc_lib\wxbase29u.lib</OutputFile>
... ...
@@ -547,7 +547,7 @@
547 547
       <SuppressStartupBanner>true</SuppressStartupBanner>
548 548
     </Bscmake>
549 549
     <PreBuildEvent>
550
-      <Command>xcopy ..\..\include\wx\univ\setup.h ..\..\lib\vc_lib\mswunivu\wx\ /Y</Command>
550
+      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
551 551
     </PreBuildEvent>
552 552
   </ItemDefinitionGroup>
553 553
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">
... ...
@@ -558,7 +558,7 @@
558 558
     <ClCompile>
559 559
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
560 560
       <Optimization>MaxSpeed</Optimization>
561
-      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
561
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
562 562
       <PreprocessorDefinitions>WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
563 563
       <ExceptionHandling>Sync</ExceptionHandling>
564 564
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
... ...
@@ -576,7 +576,7 @@
576 576
     <ResourceCompile>
577 577
       <PreprocessorDefinitions>__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
578 578
       <Culture>0x0409</Culture>
579
-      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
579
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
580 580
     </ResourceCompile>
581 581
     <Lib>
582 582
       <OutputFile>..\..\lib\vc_lib\wxbase29u.lib</OutputFile>
... ...
@@ -587,7 +587,7 @@
587 587
       <SuppressStartupBanner>true</SuppressStartupBanner>
588 588
     </Bscmake>
589 589
     <PreBuildEvent>
590
-      <Command>xcopy ..\..\include\wx\univ\setup.h ..\..\lib\vc_lib\mswunivu\wx\ /Y</Command>
590
+      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
591 591
     </PreBuildEvent>
592 592
   </ItemDefinitionGroup>
593 593
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">
... ...
@@ -598,7 +598,7 @@
598 598
     <ClCompile>
599 599
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
600 600
       <Optimization>Disabled</Optimization>
601
-      <AdditionalIncludeDirectories>..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
601
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
602 602
       <PreprocessorDefinitions>WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
603 603
       <ExceptionHandling>Sync</ExceptionHandling>
604 604
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
... ...
@@ -618,7 +618,7 @@
618 618
     <ResourceCompile>
619 619
       <PreprocessorDefinitions>_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase291ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
620 620
       <Culture>0x0409</Culture>
621
-      <AdditionalIncludeDirectories>..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
621
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
622 622
     </ResourceCompile>
623 623
     <Link>
624 624
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
... ...
@@ -636,7 +636,7 @@
636 636
       <SuppressStartupBanner>true</SuppressStartupBanner>
637 637
     </Bscmake>
638 638
     <PreBuildEvent>
639
-      <Command>xcopy ..\..\include\wx\msw\setup.h ..\..\lib\vc_dll\mswud\wx\ /Y</Command>
639
+      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
640 640
     </PreBuildEvent>
641 641
   </ItemDefinitionGroup>
642 642
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">
... ...
@@ -647,7 +647,7 @@
647 647
     <ClCompile>
648 648
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
649 649
       <Optimization>Disabled</Optimization>
650
-      <AdditionalIncludeDirectories>..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
650
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
651 651
       <PreprocessorDefinitions>WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
652 652
       <ExceptionHandling>Sync</ExceptionHandling>
653 653
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
... ...
@@ -667,7 +667,7 @@
667 667
     <ResourceCompile>
668 668
       <PreprocessorDefinitions>_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase291ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
669 669
       <Culture>0x0409</Culture>
670
-      <AdditionalIncludeDirectories>..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
670
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
671 671
     </ResourceCompile>
672 672
     <Link>
673 673
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
... ...
@@ -684,7 +684,7 @@
684 684
       <SuppressStartupBanner>true</SuppressStartupBanner>
685 685
     </Bscmake>
686 686
     <PreBuildEvent>
687
-      <Command>xcopy ..\..\include\wx\msw\setup.h ..\..\lib\vc_dll\mswud\wx\ /Y</Command>
687
+      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
688 688
     </PreBuildEvent>
689 689
   </ItemDefinitionGroup>
690 690
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">
... ...
@@ -695,7 +695,7 @@
695 695
     <ClCompile>
696 696
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
697 697
       <Optimization>MaxSpeed</Optimization>
698
-      <AdditionalIncludeDirectories>..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
698
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
699 699
       <PreprocessorDefinitions>WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
700 700
       <ExceptionHandling>Sync</ExceptionHandling>
701 701
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
... ...
@@ -713,7 +713,7 @@
713 713
     <ResourceCompile>
714 714
       <PreprocessorDefinitions>__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase291u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
715 715
       <Culture>0x0409</Culture>
716
-      <AdditionalIncludeDirectories>..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
716
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
717 717
     </ResourceCompile>
718 718
     <Link>
719 719
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
... ...
@@ -733,7 +733,7 @@
733 733
       <SuppressStartupBanner>true</SuppressStartupBanner>
734 734
     </Bscmake>
735 735
     <PreBuildEvent>
736
-      <Command>xcopy ..\..\include\wx\msw\setup.h ..\..\lib\vc_dll\mswu\wx\ /Y</Command>
736
+      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
737 737
     </PreBuildEvent>
738 738
   </ItemDefinitionGroup>
739 739
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">
... ...
@@ -744,7 +744,7 @@
744 744
     <ClCompile>
745 745
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
746 746
       <Optimization>MaxSpeed</Optimization>
747
-      <AdditionalIncludeDirectories>..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
747
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
748 748
       <PreprocessorDefinitions>WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
749 749
       <ExceptionHandling>Sync</ExceptionHandling>
750 750
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
... ...
@@ -762,7 +762,7 @@
762 762
     <ResourceCompile>
763 763
       <PreprocessorDefinitions>__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase291u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
764 764
       <Culture>0x0409</Culture>
765
-      <AdditionalIncludeDirectories>..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
765
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
766 766
     </ResourceCompile>
767 767
     <Link>
768 768
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
... ...
@@ -781,7 +781,7 @@
781 781
       <SuppressStartupBanner>true</SuppressStartupBanner>
782 782
     </Bscmake>
783 783
     <PreBuildEvent>
784
-      <Command>xcopy ..\..\include\wx\msw\setup.h ..\..\lib\vc_dll\mswu\wx\ /Y</Command>
784
+      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
785 785
     </PreBuildEvent>
786 786
   </ItemDefinitionGroup>
787 787
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">
... ...
@@ -792,7 +792,7 @@
792 792
     <ClCompile>
793 793
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
794 794
       <Optimization>Disabled</Optimization>
795
-      <AdditionalIncludeDirectories>..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
795
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
796 796
       <PreprocessorDefinitions>WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
797 797
       <ExceptionHandling>Sync</ExceptionHandling>
798 798
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
... ...
@@ -812,7 +812,7 @@
812 812
     <ResourceCompile>
813 813
       <PreprocessorDefinitions>_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase291ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
814 814
       <Culture>0x0409</Culture>
815
-      <AdditionalIncludeDirectories>..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
815
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
816 816
     </ResourceCompile>
817 817
     <Link>
818 818
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
... ...
@@ -830,7 +830,7 @@
830 830
       <SuppressStartupBanner>true</SuppressStartupBanner>
831 831
     </Bscmake>
832 832
     <PreBuildEvent>
833
-      <Command>xcopy ..\..\include\wx\univ\setup.h ..\..\lib\vc_dll\mswunivud\wx\ /Y</Command>
833
+      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
834 834
     </PreBuildEvent>
835 835
   </ItemDefinitionGroup>
836 836
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">
... ...
@@ -841,7 +841,7 @@
841 841
     <ClCompile>
842 842
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
843 843
       <Optimization>Disabled</Optimization>
844
-      <AdditionalIncludeDirectories>..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
844
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
845 845
       <PreprocessorDefinitions>WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
846 846
       <ExceptionHandling>Sync</ExceptionHandling>
847 847
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
... ...
@@ -861,7 +861,7 @@
861 861
     <ResourceCompile>
862 862
       <PreprocessorDefinitions>_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase291ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
863 863
       <Culture>0x0409</Culture>
864
-      <AdditionalIncludeDirectories>..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
864
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
865 865
     </ResourceCompile>
866 866
     <Link>
867 867
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
... ...
@@ -878,7 +878,7 @@
878 878
       <SuppressStartupBanner>true</SuppressStartupBanner>
879 879
     </Bscmake>
880 880
     <PreBuildEvent>
881
-      <Command>xcopy ..\..\include\wx\univ\setup.h ..\..\lib\vc_dll\mswunivud\wx\ /Y</Command>
881
+      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
882 882
     </PreBuildEvent>
883 883
   </ItemDefinitionGroup>
884 884
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">
... ...
@@ -889,7 +889,7 @@
889 889
     <ClCompile>
890 890
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
891 891
       <Optimization>MaxSpeed</Optimization>
892
-      <AdditionalIncludeDirectories>..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
892
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
893 893
       <PreprocessorDefinitions>WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
894 894
       <ExceptionHandling>Sync</ExceptionHandling>
895 895
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
... ...
@@ -907,7 +907,7 @@
907 907
     <ResourceCompile>
908 908
       <PreprocessorDefinitions>__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase291u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
909 909
       <Culture>0x0409</Culture>
910
-      <AdditionalIncludeDirectories>..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
910
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
911 911
     </ResourceCompile>
912 912
     <Link>
913 913
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
... ...
@@ -927,7 +927,7 @@
927 927
       <SuppressStartupBanner>true</SuppressStartupBanner>
928 928
     </Bscmake>
929 929
     <PreBuildEvent>
930
-      <Command>xcopy ..\..\include\wx\univ\setup.h ..\..\lib\vc_dll\mswunivu\wx\ /Y</Command>
930
+      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
931 931
     </PreBuildEvent>
932 932
   </ItemDefinitionGroup>
933 933
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">
... ...
@@ -938,7 +938,7 @@
938 938
     <ClCompile>
939 939
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
940 940
       <Optimization>MaxSpeed</Optimization>
941
-      <AdditionalIncludeDirectories>..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
941
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
942 942
       <PreprocessorDefinitions>WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
943 943
       <ExceptionHandling>Sync</ExceptionHandling>
944 944
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
... ...
@@ -956,7 +956,7 @@
956 956
     <ResourceCompile>
957 957
       <PreprocessorDefinitions>__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase291u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
958 958
       <Culture>0x0409</Culture>
959
-      <AdditionalIncludeDirectories>..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
959
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
960 960
     </ResourceCompile>
961 961
     <Link>
962 962
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
... ...
@@ -975,7 +975,7 @@
975 975
       <SuppressStartupBanner>true</SuppressStartupBanner>
976 976
     </Bscmake>
977 977
     <PreBuildEvent>
978
-      <Command>xcopy ..\..\include\wx\univ\setup.h ..\..\lib\vc_dll\mswunivu\wx\ /Y</Command>
978
+      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
979 979
     </PreBuildEvent>
980 980
   </ItemDefinitionGroup>
981 981
   <ItemGroup>
... ...
@@ -205,50 +205,50 @@
205 205
   <PropertyGroup Label="UserMacros" />
206 206
   <PropertyGroup>
207 207
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
208
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\lib\vc_lib\</OutDir>
209
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\lib\vc_lib\</OutDir>
210
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vc_mswud\core\</IntDir>
211
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vc_mswud\core\</IntDir>
212
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\lib\vc_lib\</OutDir>
213
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\lib\vc_lib\</OutDir>
214
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vc_mswu\core\</IntDir>
215
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vc_mswu\core\</IntDir>
216
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">..\..\lib\vc_lib\</OutDir>
217
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">..\..\lib\vc_lib\</OutDir>
218
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">vc_mswunivud\core\</IntDir>
219
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">vc_mswunivud\core\</IntDir>
220
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">..\..\lib\vc_lib\</OutDir>
221
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">..\..\lib\vc_lib\</OutDir>
222
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">vc_mswunivu\core\</IntDir>
223
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">vc_mswunivu\core\</IntDir>
224
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">..\..\lib\vc_dll\</OutDir>
225
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">..\..\lib\vc_dll\</OutDir>
226
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">vc_mswuddll\core\</IntDir>
227
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">vc_mswuddll\core\</IntDir>
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)\$(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 228
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</LinkIncremental>
229 229
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</LinkIncremental>
230 230
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</GenerateManifest>
231 231
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</GenerateManifest>
232
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">..\..\lib\vc_dll\</OutDir>
233
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">..\..\lib\vc_dll\</OutDir>
234
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">vc_mswudll\core\</IntDir>
235
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">vc_mswudll\core\</IntDir>
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 236
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">false</LinkIncremental>
237 237
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">false</LinkIncremental>
238 238
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</GenerateManifest>
239 239
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</GenerateManifest>
240
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">..\..\lib\vc_dll\</OutDir>
241
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">..\..\lib\vc_dll\</OutDir>
242
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">vc_mswunivuddll\core\</IntDir>
243
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">vc_mswunivuddll\core\</IntDir>
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 244
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</LinkIncremental>
245 245
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</LinkIncremental>
246 246
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">true</GenerateManifest>
247 247
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">true</GenerateManifest>
248
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">..\..\lib\vc_dll\</OutDir>
249
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">..\..\lib\vc_dll\</OutDir>
250
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">vc_mswunivudll\core\</IntDir>
251
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">vc_mswunivudll\core\</IntDir>
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 252
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">false</LinkIncremental>
253 253
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">false</LinkIncremental>
254 254
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">true</GenerateManifest>
... ...
@@ -262,7 +262,7 @@
262 262
     <ClCompile>
263 263
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
264 264
       <Optimization>Disabled</Optimization>
265
-      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(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>
... ...
@@ -282,10 +282,10 @@
282 282
     <ResourceCompile>
283 283
       <PreprocessorDefinitions>_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
284 284
       <Culture>0x0409</Culture>
285
-      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
285
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
286 286
     </ResourceCompile>
287 287
     <Lib>
288
-      <OutputFile>..\..\lib\vc_lib\wxmsw29ud_core.lib</OutputFile>
288
+      <OutputFile>$(SolutionDir)$(PlatformName)\$(Configuration)\wxmsw29u_core.lib</OutputFile>
289 289
       <SuppressStartupBanner>true</SuppressStartupBanner>
290 290
     </Lib>
291 291
     <Bscmake>
... ...
@@ -293,7 +293,7 @@
293 293
       <SuppressStartupBanner>true</SuppressStartupBanner>
294 294
     </Bscmake>
295 295
     <PreBuildEvent>
296
-      <Command>xcopy ..\..\include\wx\msw\setup.h ..\..\lib\vc_lib\mswud\wx\ /Y</Command>
296
+      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
297 297
     </PreBuildEvent>
298 298
   </ItemDefinitionGroup>
299 299
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
... ...
@@ -304,7 +304,7 @@
304 304
     <ClCompile>
305 305
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
306 306
       <Optimization>Disabled</Optimization>
307
-      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
307
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
308 308
       <PreprocessorDefinitions>WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
309 309
       <ExceptionHandling>Sync</ExceptionHandling>
310 310
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
... ...
@@ -324,10 +324,10 @@
324 324
     <ResourceCompile>
325 325
       <PreprocessorDefinitions>_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
326 326
       <Culture>0x0409</Culture>
327
-      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
327
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
328 328
     </ResourceCompile>
329 329
     <Lib>
330
-      <OutputFile>..\..\lib\vc_lib\wxmsw29ud_core.lib</OutputFile>
330
+      <OutputFile>$(SolutionDir)$(PlatformName)\$(Configuration)\wxmsw29u_core.lib</OutputFile>
331 331
       <SuppressStartupBanner>true</SuppressStartupBanner>
332 332
     </Lib>
333 333
     <Bscmake>
... ...
@@ -335,7 +335,7 @@
335 335
       <SuppressStartupBanner>true</SuppressStartupBanner>
336 336
     </Bscmake>
337 337
     <PreBuildEvent>
338
-      <Command>xcopy ..\..\include\wx\msw\setup.h ..\..\lib\vc_lib\mswud\wx\ /Y</Command>
338
+      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
339 339
     </PreBuildEvent>
340 340
   </ItemDefinitionGroup>
341 341
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
... ...
@@ -346,7 +346,7 @@
346 346
     <ClCompile>
347 347
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
348 348
       <Optimization>MinSpace</Optimization>
349
-      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
349
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
350 350
       <PreprocessorDefinitions>WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
351 351
       <ExceptionHandling>Sync</ExceptionHandling>
352 352
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
... ...
@@ -368,10 +368,10 @@
368 368
     <ResourceCompile>
369 369
       <PreprocessorDefinitions>__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
370 370
       <Culture>0x0409</Culture>
371
-      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
371
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
372 372
     </ResourceCompile>
373 373
     <Lib>
374
-      <OutputFile>..\..\lib\vc_lib\wxmsw29u_core.lib</OutputFile>
374
+      <OutputFile>$(SolutionDir)$(PlatformName)\$(Configuration)\wxmsw29u_core.lib</OutputFile>
375 375
       <SuppressStartupBanner>true</SuppressStartupBanner>
376 376
     </Lib>
377 377
     <Bscmake>
... ...
@@ -379,7 +379,7 @@
379 379
       <SuppressStartupBanner>true</SuppressStartupBanner>
380 380
     </Bscmake>
381 381
     <PreBuildEvent>
382
-      <Command>xcopy ..\..\include\wx\msw\setup.h ..\..\lib\vc_lib\mswu\wx\ /Y</Command>
382
+      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
383 383
     </PreBuildEvent>
384 384
   </ItemDefinitionGroup>
385 385
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
... ...
@@ -390,7 +390,7 @@
390 390
     <ClCompile>
391 391
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
392 392
       <Optimization>MinSpace</Optimization>
393
-      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
393
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
394 394
       <PreprocessorDefinitions>WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
395 395
       <ExceptionHandling>Sync</ExceptionHandling>
396 396
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
... ...
@@ -412,10 +412,10 @@
412 412
     <ResourceCompile>
413 413
       <PreprocessorDefinitions>__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
414 414
       <Culture>0x0409</Culture>
415
-      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
415
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
416 416
     </ResourceCompile>
417 417
     <Lib>
418
-      <OutputFile>..\..\lib\vc_lib\wxmsw29u_core.lib</OutputFile>
418
+      <OutputFile>$(SolutionDir)$(PlatformName)\$(Configuration)\wxmsw29u_core.lib</OutputFile>
419 419
       <SuppressStartupBanner>true</SuppressStartupBanner>
420 420
     </Lib>
421 421
     <Bscmake>
... ...
@@ -423,7 +423,7 @@
423 423
       <SuppressStartupBanner>true</SuppressStartupBanner>
424 424
     </Bscmake>
425 425
     <PreBuildEvent>
426
-      <Command>xcopy ..\..\include\wx\msw\setup.h ..\..\lib\vc_lib\mswu\wx\ /Y</Command>
426
+      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
427 427
     </PreBuildEvent>
428 428
   </ItemDefinitionGroup>
429 429
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Universal Debug|Win32'">
... ...
@@ -434,7 +434,7 @@
434 434
     <ClCompile>
435 435
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
436 436
       <Optimization>Disabled</Optimization>
437
-      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
437
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
438 438
       <PreprocessorDefinitions>WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
439 439
       <ExceptionHandling>Sync</ExceptionHandling>
440 440
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
... ...
@@ -454,7 +454,7 @@
454 454
     <ResourceCompile>
455 455
       <PreprocessorDefinitions>_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
456 456
       <Culture>0x0409</Culture>
457
-      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
457
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
458 458
     </ResourceCompile>
459 459
     <Lib>
460 460
       <OutputFile>..\..\lib\vc_lib\wxmswuniv29ud_core.lib</OutputFile>
... ...
@@ -465,7 +465,7 @@
465 465
       <SuppressStartupBanner>true</SuppressStartupBanner>
466 466
     </Bscmake>
467 467
     <PreBuildEvent>
468
-      <Command>xcopy ..\..\include\wx\univ\setup.h ..\..\lib\vc_lib\mswunivud\wx\ /Y</Command>
468
+      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
469 469
     </PreBuildEvent>
470 470
   </ItemDefinitionGroup>
471 471
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Universal Debug|x64'">
... ...
@@ -476,7 +476,7 @@
476 476
     <ClCompile>
477 477
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
478 478
       <Optimization>Disabled</Optimization>
479
-      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
479
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
480 480
       <PreprocessorDefinitions>WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
481 481
       <ExceptionHandling>Sync</ExceptionHandling>
482 482
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
... ...
@@ -496,7 +496,7 @@
496 496
     <ResourceCompile>
497 497
       <PreprocessorDefinitions>_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
498 498
       <Culture>0x0409</Culture>
499
-      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
499
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
500 500
     </ResourceCompile>
501 501
     <Lib>
502 502
       <OutputFile>..\..\lib\vc_lib\wxmswuniv29ud_core.lib</OutputFile>
... ...
@@ -507,7 +507,7 @@
507 507
       <SuppressStartupBanner>true</SuppressStartupBanner>
508 508
     </Bscmake>
509 509
     <PreBuildEvent>
510
-      <Command>xcopy ..\..\include\wx\univ\setup.h ..\..\lib\vc_lib\mswunivud\wx\ /Y</Command>
510
+      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
511 511
     </PreBuildEvent>
512 512
   </ItemDefinitionGroup>
513 513
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Universal Release|Win32'">
... ...
@@ -518,7 +518,7 @@
518 518
     <ClCompile>
519 519
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
520 520
       <Optimization>MaxSpeed</Optimization>
521
-      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
521
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
522 522
       <PreprocessorDefinitions>WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
523 523
       <ExceptionHandling>Sync</ExceptionHandling>
524 524
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
... ...
@@ -536,7 +536,7 @@
536 536
     <ResourceCompile>
537 537
       <PreprocessorDefinitions>__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
538 538
       <Culture>0x0409</Culture>
539
-      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
539
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
540 540
     </ResourceCompile>
541 541
     <Lib>
542 542
       <OutputFile>..\..\lib\vc_lib\wxmswuniv29u_core.lib</OutputFile>
... ...
@@ -547,7 +547,7 @@
547 547
       <SuppressStartupBanner>true</SuppressStartupBanner>
548 548
     </Bscmake>
549 549
     <PreBuildEvent>
550
-      <Command>xcopy ..\..\include\wx\univ\setup.h ..\..\lib\vc_lib\mswunivu\wx\ /Y</Command>
550
+      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
551 551
     </PreBuildEvent>
552 552
   </ItemDefinitionGroup>
553 553
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Universal Release|x64'">
... ...
@@ -558,7 +558,7 @@
558 558
     <ClCompile>
559 559
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
560 560
       <Optimization>MaxSpeed</Optimization>
561
-      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
561
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
562 562
       <PreprocessorDefinitions>WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
563 563
       <ExceptionHandling>Sync</ExceptionHandling>
564 564
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
... ...
@@ -576,7 +576,7 @@
576 576
     <ResourceCompile>
577 577
       <PreprocessorDefinitions>__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
578 578
       <Culture>0x0409</Culture>
579
-      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
579
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
580 580
     </ResourceCompile>
581 581
     <Lib>
582 582
       <OutputFile>..\..\lib\vc_lib\wxmswuniv29u_core.lib</OutputFile>
... ...
@@ -587,7 +587,7 @@
587 587
       <SuppressStartupBanner>true</SuppressStartupBanner>
588 588
     </Bscmake>
589 589
     <PreBuildEvent>
590
-      <Command>xcopy ..\..\include\wx\univ\setup.h ..\..\lib\vc_lib\mswunivu\wx\ /Y</Command>
590
+      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
591 591
     </PreBuildEvent>
592 592
   </ItemDefinitionGroup>
593 593
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">
... ...
@@ -598,7 +598,7 @@
598 598
     <ClCompile>
599 599
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
600 600
       <Optimization>Disabled</Optimization>
601
-      <AdditionalIncludeDirectories>..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
601
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
602 602
       <PreprocessorDefinitions>WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
603 603
       <ExceptionHandling>Sync</ExceptionHandling>
604 604
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
... ...
@@ -618,7 +618,7 @@
618 618
     <ResourceCompile>
619 619
       <PreprocessorDefinitions>_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw291ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
620 620
       <Culture>0x0409</Culture>
621
-      <AdditionalIncludeDirectories>..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
621
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
622 622
     </ResourceCompile>
623 623
     <Link>
624 624
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
... ...
@@ -636,7 +636,7 @@
636 636
       <SuppressStartupBanner>true</SuppressStartupBanner>
637 637
     </Bscmake>
638 638
     <PreBuildEvent>
639
-      <Command>xcopy ..\..\include\wx\msw\setup.h ..\..\lib\vc_dll\mswud\wx\ /Y</Command>
639
+      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
640 640
     </PreBuildEvent>
641 641
   </ItemDefinitionGroup>
642 642
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">
... ...
@@ -647,7 +647,7 @@
647 647
     <ClCompile>
648 648
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
649 649
       <Optimization>Disabled</Optimization>
650
-      <AdditionalIncludeDirectories>..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
650
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
651 651
       <PreprocessorDefinitions>WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
652 652
       <ExceptionHandling>Sync</ExceptionHandling>
653 653
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
... ...
@@ -667,7 +667,7 @@
667 667
     <ResourceCompile>
668 668
       <PreprocessorDefinitions>_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw291ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
669 669
       <Culture>0x0409</Culture>
670
-      <AdditionalIncludeDirectories>..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
670
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
671 671
     </ResourceCompile>
672 672
     <Link>
673 673
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
... ...
@@ -684,7 +684,7 @@
684 684
       <SuppressStartupBanner>true</SuppressStartupBanner>
685 685
     </Bscmake>
686 686
     <PreBuildEvent>
687
-      <Command>xcopy ..\..\include\wx\msw\setup.h ..\..\lib\vc_dll\mswud\wx\ /Y</Command>
687
+      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
688 688
     </PreBuildEvent>
689 689
   </ItemDefinitionGroup>
690 690
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">
... ...
@@ -695,7 +695,7 @@
695 695
     <ClCompile>
696 696
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
697 697
       <Optimization>MaxSpeed</Optimization>
698
-      <AdditionalIncludeDirectories>..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
698
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
699 699
       <PreprocessorDefinitions>WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
700 700
       <ExceptionHandling>Sync</ExceptionHandling>
701 701
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
... ...
@@ -713,7 +713,7 @@
713 713
     <ResourceCompile>
714 714
       <PreprocessorDefinitions>__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw291u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
715 715
       <Culture>0x0409</Culture>
716
-      <AdditionalIncludeDirectories>..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
716
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
717 717
     </ResourceCompile>
718 718
     <Link>
719 719
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
... ...
@@ -733,7 +733,7 @@
733 733
       <SuppressStartupBanner>true</SuppressStartupBanner>
734 734
     </Bscmake>
735 735
     <PreBuildEvent>
736
-      <Command>xcopy ..\..\include\wx\msw\setup.h ..\..\lib\vc_dll\mswu\wx\ /Y</Command>
736
+      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
737 737
     </PreBuildEvent>
738 738
   </ItemDefinitionGroup>
739 739
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">
... ...
@@ -744,7 +744,7 @@
744 744
     <ClCompile>
745 745
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
746 746
       <Optimization>MaxSpeed</Optimization>
747
-      <AdditionalIncludeDirectories>..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
747
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
748 748
       <PreprocessorDefinitions>WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
749 749
       <ExceptionHandling>Sync</ExceptionHandling>
750 750
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
... ...
@@ -762,7 +762,7 @@
762 762
     <ResourceCompile>
763 763
       <PreprocessorDefinitions>__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw291u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
764 764
       <Culture>0x0409</Culture>
765
-      <AdditionalIncludeDirectories>..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
765
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
766 766
     </ResourceCompile>
767 767
     <Link>
768 768
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
... ...
@@ -781,7 +781,7 @@
781 781
       <SuppressStartupBanner>true</SuppressStartupBanner>
782 782
     </Bscmake>
783 783
     <PreBuildEvent>
784
-      <Command>xcopy ..\..\include\wx\msw\setup.h ..\..\lib\vc_dll\mswu\wx\ /Y</Command>
784
+      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
785 785
     </PreBuildEvent>
786 786
   </ItemDefinitionGroup>
787 787
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|Win32'">
... ...
@@ -792,7 +792,7 @@
792 792
     <ClCompile>
793 793
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
794 794
       <Optimization>Disabled</Optimization>
795
-      <AdditionalIncludeDirectories>..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
795
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
796 796
       <PreprocessorDefinitions>WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
797 797
       <ExceptionHandling>Sync</ExceptionHandling>
798 798
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
... ...
@@ -812,7 +812,7 @@
812 812
     <ResourceCompile>
813 813
       <PreprocessorDefinitions>_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv291ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
814 814
       <Culture>0x0409</Culture>
815
-      <AdditionalIncludeDirectories>..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
815
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
816 816
     </ResourceCompile>
817 817
     <Link>
818 818
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
... ...
@@ -830,7 +830,7 @@
830 830
       <SuppressStartupBanner>true</SuppressStartupBanner>
831 831
     </Bscmake>
832 832
     <PreBuildEvent>
833
-      <Command>xcopy ..\..\include\wx\univ\setup.h ..\..\lib\vc_dll\mswunivud\wx\ /Y</Command>
833
+      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
834 834
     </PreBuildEvent>
835 835
   </ItemDefinitionGroup>
836 836
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Universal Debug|x64'">
... ...
@@ -841,7 +841,7 @@
841 841
     <ClCompile>
842 842
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
843 843
       <Optimization>Disabled</Optimization>
844
-      <AdditionalIncludeDirectories>..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
844
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
845 845
       <PreprocessorDefinitions>WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
846 846
       <ExceptionHandling>Sync</ExceptionHandling>
847 847
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
... ...
@@ -861,7 +861,7 @@
861 861
     <ResourceCompile>
862 862
       <PreprocessorDefinitions>_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv291ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
863 863
       <Culture>0x0409</Culture>
864
-      <AdditionalIncludeDirectories>..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
864
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
865 865
     </ResourceCompile>
866 866
     <Link>
867 867
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
... ...
@@ -878,7 +878,7 @@
878 878
       <SuppressStartupBanner>true</SuppressStartupBanner>
879 879
     </Bscmake>
880 880
     <PreBuildEvent>
881
-      <Command>xcopy ..\..\include\wx\univ\setup.h ..\..\lib\vc_dll\mswunivud\wx\ /Y</Command>
881
+      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
882 882
     </PreBuildEvent>
883 883
   </ItemDefinitionGroup>
884 884
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|Win32'">
... ...
@@ -889,7 +889,7 @@
889 889
     <ClCompile>
890 890
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
891 891
       <Optimization>MaxSpeed</Optimization>
892
-      <AdditionalIncludeDirectories>..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
892
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
893 893
       <PreprocessorDefinitions>WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
894 894
       <ExceptionHandling>Sync</ExceptionHandling>
895 895
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
... ...
@@ -907,7 +907,7 @@
907 907
     <ResourceCompile>
908 908
       <PreprocessorDefinitions>__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv291u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
909 909
       <Culture>0x0409</Culture>
910
-      <AdditionalIncludeDirectories>..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
910
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
911 911
     </ResourceCompile>
912 912
     <Link>
913 913
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
... ...
@@ -927,7 +927,7 @@
927 927
       <SuppressStartupBanner>true</SuppressStartupBanner>
928 928
     </Bscmake>
929 929
     <PreBuildEvent>
930
-      <Command>xcopy ..\..\include\wx\univ\setup.h ..\..\lib\vc_dll\mswunivu\wx\ /Y</Command>
930
+      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
931 931
     </PreBuildEvent>
932 932
   </ItemDefinitionGroup>
933 933
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Universal Release|x64'">
... ...
@@ -938,7 +938,7 @@
938 938
     <ClCompile>
939 939
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
940 940
       <Optimization>MaxSpeed</Optimization>
941
-      <AdditionalIncludeDirectories>..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
941
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);..\..\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
942 942
       <PreprocessorDefinitions>WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
943 943
       <ExceptionHandling>Sync</ExceptionHandling>
944 944
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
... ...
@@ -956,7 +956,7 @@
956 956
     <ResourceCompile>
957 957
       <PreprocessorDefinitions>__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv291u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
958 958
       <Culture>0x0409</Culture>
959
-      <AdditionalIncludeDirectories>..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
959
+      <AdditionalIncludeDirectories>$(SolutionDir)$(PlatformName)\$(Configuration);.\..\wxWidgets-2.9.1\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
960 960
     </ResourceCompile>
961 961
     <Link>
962 962
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
... ...
@@ -975,7 +975,7 @@
975 975
       <SuppressStartupBanner>true</SuppressStartupBanner>
976 976
     </Bscmake>
977 977
     <PreBuildEvent>
978
-      <Command>xcopy ..\..\include\wx\univ\setup.h ..\..\lib\vc_dll\mswunivu\wx\ /Y</Command>
978
+      <Command>xcopy ..\..\include\wx\msw\setup.h $(SolutionDir)$(PlatformName)\$(Configuration)\wx\ /Y</Command>
979 979
     </PreBuildEvent>
980 980
   </ItemDefinitionGroup>
981 981
   <ItemGroup>