diff options
| author | James Cowgill <james410@cowgill.org.uk> | 2014-08-29 12:01:12 +0100 |
|---|---|---|
| committer | James Cowgill <james410@cowgill.org.uk> | 2014-08-29 12:01:12 +0100 |
| commit | 517e089547f0b721a104ad2fabc6881d2fe2fff0 (patch) | |
| tree | 65e15229c45ed375b5e381c46ed016d0cc670ae2 /LiteEditor/clang_driver.cpp | |
| parent | 9535c6126d9ed34e0fdf40cc0bdd2dc01159644d (diff) | |
Imported Upstream version 6.1.1+dfsg
Diffstat (limited to 'LiteEditor/clang_driver.cpp')
| -rw-r--r-- | LiteEditor/clang_driver.cpp | 36 |
1 files changed, 26 insertions, 10 deletions
diff --git a/LiteEditor/clang_driver.cpp b/LiteEditor/clang_driver.cpp index 56dd7ffc..04f7842e 100644 --- a/LiteEditor/clang_driver.cpp +++ b/LiteEditor/clang_driver.cpp @@ -1,3 +1,28 @@ +////////////////////////////////////////////////////////////////////////////// +////////////////////////////////////////////////////////////////////////////// +// +// copyright : (C) 2014 The CodeLite Team +// file name : clang_driver.cpp +// +// ------------------------------------------------------------------------- +// A +// _____ _ _ _ _ +// / __ \ | | | | (_) | +// | / \/ ___ __| | ___| | _| |_ ___ +// | | / _ \ / _ |/ _ \ | | | __/ _ ) +// | \__/\ (_) | (_| | __/ |___| | || __/ +// \____/\___/ \__,_|\___\_____/_|\__\___| +// +// F i l e +// +// This program is free software; you can redistribute it and/or modify +// it 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. +// +////////////////////////////////////////////////////////////////////////////// +////////////////////////////////////////////////////////////////////////////// + #if HAS_LIBCLANG
#include "clang_driver.h"
@@ -782,17 +807,8 @@ void ClangDriver::GetMacros(IEditor *editor) FileTypeCmpArgs_t compileFlags = DoPrepareCompilationArgs(editor->GetProjectName(), editor->GetFileName().GetFullPath(), projectPath, pchFile);
wxString cmd;
-#ifdef __WXMAC__
- wxFileName exePath(wxStandardPaths::Get().GetDataDir(), wxT(""));
-#else
- wxFileName exePath(wxStandardPaths::Get().GetExecutablePath());
-#endif
- exePath.SetFullName(wxT("codelite-clang"));
-
-#ifdef __WXMSW__
- exePath.SetExt(wxT("exe"));
-#endif
+ wxFileName exePath( clStandardPaths::Get().GetBinaryFullPath("codelite-clang") );
wxFileName outputFolder(pchFile);
// Select the compilation args
FileExtManager::FileType type = FileExtManager::TypeSourceCpp; // Default is C++
|