From ec5b1432916770a2c3e3177a217e8a5dd4b6bb0d Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Mon, 12 Oct 2015 16:11:39 +0000
Subject: [PATCH] ide: autosetup changes

git-svn-id: svn://ultimatepp.org/upp/trunk@9011 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/Core/App.cpp      | 17 +++++++++--------
 uppsrc/Core/App.h        |  3 +++
 uppsrc/ide/AutoSetup.cpp | 18 ++++++++++++++++++
 3 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/uppsrc/Core/App.cpp b/uppsrc/Core/App.cpp
index aab8b3409..b22383746 100644
--- a/uppsrc/Core/App.cpp
+++ b/uppsrc/Core/App.cpp
@@ -533,14 +533,15 @@ String GetShellFolder(int clsid)
 	return Null;
 }
 
-String GetDesktopFolder()	{ return GetShellFolder(CSIDL_DESKTOP); }
-String GetProgramsFolder()	{ return GetShellFolder(CSIDL_PROGRAM_FILES); }
-String GetAppDataFolder()	{ return GetShellFolder(CSIDL_APPDATA);}
-String GetMusicFolder()		{ return GetShellFolder(CSIDL_MYMUSIC);}
-String GetPicturesFolder()	{ return GetShellFolder(CSIDL_MYPICTURES);}
-String GetVideoFolder()		{ return GetShellFolder(CSIDL_MYVIDEO);}
-String GetDocumentsFolder()	{ return GetShellFolder(/*CSIDL_MYDOCUMENTS*/0x0005);}
-String GetTemplatesFolder()	{ return GetShellFolder(CSIDL_TEMPLATES);}
+String GetDesktopFolder()	  { return GetShellFolder(CSIDL_DESKTOP); }
+String GetProgramsFolder()	  { return GetShellFolder(CSIDL_PROGRAM_FILES); }
+String GetProgramsFolderX86() { return GetShellFolder(0x2a); }
+String GetAppDataFolder()	  { return GetShellFolder(CSIDL_APPDATA);}
+String GetMusicFolder()		  { return GetShellFolder(CSIDL_MYMUSIC);}
+String GetPicturesFolder()	  { return GetShellFolder(CSIDL_MYPICTURES);}
+String GetVideoFolder()		  { return GetShellFolder(CSIDL_MYVIDEO);}
+String GetDocumentsFolder()	  { return GetShellFolder(/*CSIDL_MYDOCUMENTS*/0x0005);}
+String GetTemplatesFolder()	  { return GetShellFolder(CSIDL_TEMPLATES);}
 
 #define MY_DEFINE_KNOWN_FOLDER(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
 static const GUID name = { l, w1, w2, { b1, b2,  b3,  b4,  b5,  b6,  b7,  b8 } }
diff --git a/uppsrc/Core/App.h b/uppsrc/Core/App.h
index e1b8fa676..d8f0777c5 100644
--- a/uppsrc/Core/App.h
+++ b/uppsrc/Core/App.h
@@ -87,6 +87,9 @@ String GetDesktopManager();
 
 String GetDesktopFolder();
 String GetProgramsFolder();
+#ifdef PLATFORM_WIN32
+String GetProgramsFolderX86();
+#endif
 String GetAppDataFolder();
 String GetMusicFolder();
 String GetPicturesFolder();
diff --git a/uppsrc/ide/AutoSetup.cpp b/uppsrc/ide/AutoSetup.cpp
index 4ca3a1696..3868e1ab3 100644
--- a/uppsrc/ide/AutoSetup.cpp
+++ b/uppsrc/ide/AutoSetup.cpp
@@ -478,6 +478,8 @@ void AutoSetup()
 			"REMOTE_OS = \"\";\n"
 			"REMOTE_TRANSFER = \"\";\n"
 			"REMOTE_MAP = \"\";\n"
+			"DEBUG_LINK = \"/STACK:20000000\";\n"
+			"RELEASE_LINK = \"/STACK:20000000\";\n"
 			"PATH = " + AsCString(
 			                AppendFileName(vs11, "Common7\\Ide") + ';' +
 							vc11_64 + ';' +
@@ -524,6 +526,8 @@ void AutoSetup()
 			"REMOTE_OS = \"\";\n"
 			"REMOTE_TRANSFER = \"\";\n"
 			"REMOTE_MAP = \"\";\n"
+			"DEBUG_LINK = \"/STACK:20000000\";\n"
+			"RELEASE_LINK = \"/STACK:20000000\";\n"
 			"PATH = " + AsCString(
 			                AppendFileName(vs11, "Common7\\Ide") + ';' +
 							AppendFileName(vc, "bin") + ';' +
@@ -574,6 +578,8 @@ void AutoSetup()
 			"REMOTE_OS = \"\";\n"
 			"REMOTE_TRANSFER = \"\";\n"
 			"REMOTE_MAP = \"\";\n"
+			"DEBUG_LINK = \"/STACK:20000000\";\n"
+			"RELEASE_LINK = \"/STACK:20000000\";\n"
 			"PATH = " + AsCString(
 			                AppendFileName(vs10, "Common7\\Ide") + ';' +
 							vc10_64 + ';' +
@@ -618,6 +624,8 @@ void AutoSetup()
 			"REMOTE_OS = \"\";\n"
 			"REMOTE_TRANSFER = \"\";\n"
 			"REMOTE_MAP = \"\";\n"
+			"DEBUG_LINK = \"/STACK:20000000\";\n"
+			"RELEASE_LINK = \"/STACK:20000000\";\n"
 			"PATH = " + AsCString(
 			                AppendFileName(vs10, "Common7\\Ide") + ';' +
 							AppendFileName(vc, "Bin") + ';' +
@@ -666,6 +674,8 @@ void AutoSetup()
 			"REMOTE_OS = \"\";\n"
 			"REMOTE_TRANSFER = \"\";\n"
 			"REMOTE_MAP = \"\";\n"
+			"DEBUG_LINK = \"/STACK:20000000\";\n"
+			"RELEASE_LINK = \"/STACK:20000000\";\n"
 			"PATH = " + AsCString(
 			                AppendFileName(vs9, "Common7\\Ide") + ';' +
 							vc9_64 + ';' +
@@ -710,6 +720,8 @@ void AutoSetup()
 			"REMOTE_OS = \"\";\n"
 			"REMOTE_TRANSFER = \"\";\n"
 			"REMOTE_MAP = \"\";\n"
+			"DEBUG_LINK = \"/STACK:20000000\";\n"
+			"RELEASE_LINK = \"/STACK:20000000\";\n"
 			"PATH = " + AsCString(
 			                AppendFileName(vs9, "Common7\\Ide") + ';' +
 							AppendFileName(vc, "Bin") + ';' +
@@ -755,6 +767,8 @@ void AutoSetup()
 			"REMOTE_OS = \"\";\n"
 			"REMOTE_TRANSFER = \"\";\n"
 			"REMOTE_MAP = \"\";\n"
+			"DEBUG_LINK = \"/STACK:20000000\";\n"
+			"RELEASE_LINK = \"/STACK:20000000\";\n"
 			"PATH = " + AsCString(
 			                AppendFileName(vs8, "Common7\\Ide") + ';' +
 							AppendFileName(vc, "Bin\\x64") + ';' +
@@ -797,6 +811,8 @@ void AutoSetup()
 			"REMOTE_OS = \"\";\n"
 			"REMOTE_TRANSFER = \"\";\n"
 			"REMOTE_MAP = \"\";\n"
+			"DEBUG_LINK = \"/STACK:20000000\";\n"
+			"RELEASE_LINK = \"/STACK:20000000\";\n"
 			"PATH = " + AsCString(
 			                AppendFileName(vs8, "Common7\\Ide") + ';' +
 							AppendFileName(vc, "Bin") + ';' +
@@ -844,6 +860,8 @@ void AutoSetup()
 			"REMOTE_OS = \"\";\n"
 			"REMOTE_TRANSFER = \"\";\n"
 			"REMOTE_MAP = \"\";\n"
+			"DEBUG_LINK = \"/STACK:20000000\";\n"
+			"RELEASE_LINK = \"/STACK:20000000\";\n"
 			"PATH = " + AsCString(
 			                vs +
 							AppendFileName(vc7, "Bin") + ';' +