Patch #2106 2007-07-25 12:29
mariocupelli
Leave search dirs empty if they are not set- Download
- 2106-Leave_search_d.patch (1.8 KB)
Index: compiler.cpp
===================================================================
--- compiler.cpp (revision 4313)
+++ compiler.cpp (working copy)
@@ -5,8 +5,6 @@
* This program is distributed under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
*
-* $Revision$
-* $Id$
* $HeadURL$
*/
@@ -524,9 +522,13 @@
SetCompilerOptions(GetArrayFromString(cfg->Read(tmp + _T("/compiler_options"), wxEmptyString)));
SetLinkerOptions(GetArrayFromString(cfg->Read(tmp + _T("/linker_options"), wxEmptyString)));
- SetIncludeDirs(GetArrayFromString(cfg->Read(tmp + _T("/include_dirs"), m_MasterPath + sep + _T("include"))));
- SetResourceIncludeDirs(GetArrayFromString(cfg->Read(tmp + _T("/res_include_dirs"), m_MasterPath + sep + _T("include"))));
- SetLibDirs(GetArrayFromString(cfg->Read(tmp + _T("/library_dirs"), m_MasterPath + sep + _T("lib"))));
+/* Start HighTec modification */
+// IncludeDirs are set empty within the compilerGNU*.cpp and should not be modified
+// substitude m_MasterPath + sep + _T("include") and _T("lib") with wxEmptyString
+ SetIncludeDirs(GetArrayFromString(cfg->Read(tmp + _T("/include_dirs"), wxEmptyString)));
+ SetResourceIncludeDirs(GetArrayFromString(cfg->Read(tmp + _T("/res_include_dirs"), wxEmptyString)));
+ SetLibDirs(GetArrayFromString(cfg->Read(tmp + _T("/library_dirs"), wxEmptyString)));
+/* End HighTec modification*/
SetLinkLibs(GetArrayFromString(cfg->Read(tmp + _T("/libraries"), _T(""))));
SetCommandsBeforeBuild(GetArrayFromString(cfg->Read(tmp + _T("/commands_before"), wxEmptyString)));
SetCommandsAfterBuild(GetArrayFromString(cfg->Read(tmp + _T("/commands_after"), wxEmptyString)));
History
mandrav 2007-10-31 10:32
Applied.