diff --git a/LiteEditor.workspace b/LiteEditor.workspace
index 8048f3eb7d..9b9fe7e64d 100644
--- a/LiteEditor.workspace
+++ b/LiteEditor.workspace
@@ -19,6 +19,11 @@
+
+
+
+
+
@@ -50,7 +55,7 @@
-
+
@@ -81,9 +86,4 @@
-
-
-
-
-
diff --git a/LiteEditor/fileview.cpp b/LiteEditor/fileview.cpp
index 2489cf9847..f1d8dc5774 100644
--- a/LiteEditor/fileview.cpp
+++ b/LiteEditor/fileview.cpp
@@ -249,7 +249,10 @@ void FileViewTree::BuildProjectNode( const wxString &projectName )
m_itemsToSort[parentHti.m_pItem] = true;
// Set active project with bold
- if ( parentHti == GetRootItem() && ManagerST::Get()->GetActiveProjectName() == node->GetData().GetDisplayName() ) {
+ wxString activeProjectName = ManagerST::Get()->GetActiveProjectName();
+ wxString displayName = node->GetData().GetDisplayName();
+
+ if ( parentHti == GetRootItem() && displayName == activeProjectName) {
SetItemBold( hti );
}
diff --git a/MakefileParser/MakefileImporter.project b/MakefileParser/MakefileImporter.project
index 01da0a9df7..5f3d7a1947 100644
--- a/MakefileParser/MakefileImporter.project
+++ b/MakefileParser/MakefileImporter.project
@@ -26,7 +26,7 @@
-
+
@@ -71,7 +71,7 @@ makefile_lexer.cpp: makefile_parser.l
-
+
@@ -103,11 +103,13 @@ makefile_lexer.cpp: makefile_parser.l
-
+
+
+
-
+
@@ -120,6 +122,7 @@ makefile_lexer.cpp: makefile_parser.l
+
@@ -140,7 +143,16 @@ makefile_lexer.cpp: makefile_parser.l
-
+ makefile_parser.cpp makefile_lexer.cpp
+makefile_parser.cpp: makefile_parser.y
+ yacc -dl -t -v makefile_parser.y
+ mv y.tab.c makefile_parser.cpp
+ mv y.tab.h makefile_lexer.h
+
+makefile_lexer.cpp: makefile_parser.l
+ flex -L makefile_parser.l
+ mv lex.yy.c makefile_lexer.cpp
+
diff --git a/MakefileParser/VariableLexer.cpp b/MakefileParser/VariableLexer.cpp
index 7abf43d8d2..460466de43 100644
--- a/MakefileParser/VariableLexer.cpp
+++ b/MakefileParser/VariableLexer.cpp
@@ -1,10 +1,9 @@
+#include "precompiled_header.h"
#include "makefile_lexer.h"
#include "VariableLexer.h"
-#include "precompiled_header.h"
#include
#include
#include