353_uppsrc2.diff

The diff file to apply for uppsrc directory (second patch) - Sender Ghost, 06/04/2013 12:17 AM

Download (3.52 KB)

View differences:

uppsrc/ide/AutoSetup.cpp 2013-06-04 01:49:21 +0400
197 197
		                                       "SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v8.0",
198 198
		                                       HKEY_LOCAL_MACHINE));
199 199
	String bin11;
200
	if(!IsNull(sdk11) && FileExists(AppendFileName(sdk11, "VC\\Bin\\cl.exe")))
200
	if(!IsNull(sdk11) && FileExists(AppendFileName(sdk11, "VC\\bin\\cl.exe")))
201 201
		bin11 = sdk11;
202 202
	else
203
		ExistProgram(bin11, "Program Files (x86)\\Microsoft Visual Studio 11.0", "VC\\Bin\\cl.exe")
204
		|| ExistProgram(bin11, "Program Files\\Microsoft Visual Studio 11.0", "VC\\Bin\\cl.exe");
203
		ExistProgram(bin11, "Program Files (x86)\\Microsoft Visual Studio 11.0", "VC\\bin\\cl.exe")
204
		|| ExistProgram(bin11, "Program Files\\Microsoft Visual Studio 11.0", "VC\\bin\\cl.exe");
205 205
	msc11.sdk <<= sdk11;
206 206
	msc11.dir <<= bin11;
207 207
	msc11.method <<= "MSC11";
208 208
	msc11.create <<= !IsNull(msc11.dir);
209
	String vc11_64 = AppendFileName(bin11, "VC\\Bin\\x64");
209
	String vc11_64 = AppendFileName(bin11, "VC\\bin\\x64");
210 210
	if(!FileExists(AppendFileName(vc11_64, "cl.exe")))
211
		vc11_64 = AppendFileName(bin11, "VC\\Bin\\x86_amd64");
211
		vc11_64 = AppendFileName(bin11, "VC\\bin\\x86_amd64");
212 212
	if(bin11.GetLength() && FileExists(AppendFileName(vc11_64, "cl.exe")))
213 213
		msc11.create64 = true;
214 214
	msc11.method64 <<= "MSC11x64";
......
324 324

  
325 325
	String vs11 = ~msc11.dir;
326 326
	if(!IsNull(vs11) && msc11.create64) {
327
		String vc = AppendFileName(vs11, "Vc");
327
		String vc = AppendFileName(vs11, "VC");
328 328
		String m = ~msc11.method64;
329 329
		String sdk = ~msc11.sdk;
330 330
		if(IsNull(sdk))
......
351 351
			"PATH = " + AsCString(
352 352
			                AppendFileName(vs11, "Common7\\Ide") + ';' +
353 353
							vc11_64 + ';' +
354
							AppendFileName(sdk, "Bin") +
354
							AppendFileName(sdk, "bin\\x64") +
355 355
							exe
356 356
						) + ";\n"
357 357
			"INCLUDE = " + AsCString(
358 358
							AppendFileName(vc, "Include") + ';' +
359
							AppendFileName(sdk, "Include") +
359
							AppendFileName(sdk, "Include\\um") + ';' +
360
							AppendFileName(sdk, "Include\\shared") + ';' +
361
							AppendFileName(sdk, "Include\\winrt") +
360 362
							include
361 363
						   ) + ";\n"
362 364
			"LIB = " + AsCString(
363 365
							vc_lib + ';' +
364
							AppendFileName(sdk, "Lib\\x64") +
366
							AppendFileName(sdk, "Lib\\win8\\um\\x64") +
365 367
							lib
366 368
			           ) + ";\n"
367 369
		);
......
369 371
	}
370 372

  
371 373
	if(!IsNull(vs11) && msc11.create) {
372
		String vc = AppendFileName(vs11, "Vc");
374
		String vc = AppendFileName(vs11, "VC");
373 375
		String m = ~msc11.method;
374 376
		String sdk = ~msc11.sdk;
375 377
		if(IsNull(sdk))
......
392 394
			"REMOTE_MAP = \"\";\n"
393 395
			"PATH = " + AsCString(
394 396
			                AppendFileName(vs11, "Common7\\Ide") + ';' +
395
							AppendFileName(vc, "Bin") + ';' +
396
							AppendFileName(sdk, "Bin") +
397
							AppendFileName(vc, "bin") + ';' +
398
							AppendFileName(sdk, "bin\\x86") +
397 399
							exe
398 400
						) + ";\n"
399 401
			"INCLUDE = " + AsCString(
400 402
							AppendFileName(vc, "Include") + ';' +
401
							AppendFileName(sdk, "Include") +
403
							AppendFileName(sdk, "Include\\um") + ';' +
404
							AppendFileName(sdk, "Include\\shared") + ';' +
405
							AppendFileName(sdk, "Include\\winrt") +
402 406
							include
403 407
						   ) + ";\n"
404 408
			"LIB = " + AsCString(
405 409
							AppendFileName(vc, "Lib") + ';' +
406
							AppendFileName(sdk, "Lib") +
410
							AppendFileName(sdk, "Lib\\win8\\um\\x86") +
407 411
							lib
408 412
			           ) + ";\n"
409 413
		);