From a2ec94639b064421439c2a1bed48cb09ea51b7fb Mon Sep 17 00:00:00 2001
From: triton <ripzonetriton@gmail.com>
Date: Sat, 19 Oct 2013 17:21:37 +0100
Subject: [PATCH] Build fixes.

---
 src/Core/premake4.lua                   | 17 +++++++++++++++++
 src/Generator.Tests/Generator.Tests.lua |  3 ++-
 src/Generator/Generator.lua             | 11 +++--------
 src/Runtime/Runtime.lua                 |  6 ++++--
 4 files changed, 26 insertions(+), 11 deletions(-)
 create mode 100644 src/Core/premake4.lua

diff --git a/src/Core/premake4.lua b/src/Core/premake4.lua
new file mode 100644
index 00000000..36ec5cd1
--- /dev/null
+++ b/src/Core/premake4.lua
@@ -0,0 +1,17 @@
+project "CppSharp"
+
+  kind "SharedLib"
+  language "C#"
+
+  files { "**.cs" }
+  links
+  {
+    "System",
+    "System.Core",
+    "CppSharp.AST",
+  }
+
+  SetupParser()
+
+  configuration "vs*"
+    location "."
\ No newline at end of file
diff --git a/src/Generator.Tests/Generator.Tests.lua b/src/Generator.Tests/Generator.Tests.lua
index 80706348..7bbc476c 100644
--- a/src/Generator.Tests/Generator.Tests.lua
+++ b/src/Generator.Tests/Generator.Tests.lua
@@ -16,9 +16,10 @@ project "CppSharp.Generator.Tests"
   {
     "System",
     "System.Core",
+    "CppSharp",
     "CppSharp.AST",
     "CppSharp.Generator",
-    "CppSharp.Parser",
+    ParserLib,
     "NUnit.Framework",
     "NSubstitute"
   }
diff --git a/src/Generator/Generator.lua b/src/Generator/Generator.lua
index 3ad74355..64796041 100644
--- a/src/Generator/Generator.lua
+++ b/src/Generator/Generator.lua
@@ -4,17 +4,12 @@ project "CppSharp.Generator"
   language "C#"
   location "."
 
-  files   { "**.cs", "**.bmp", "**.resx", "**.config", "**verbs.txt" }
+  files   { "**.cs", "**verbs.txt" }
   excludes { "Filter.cs" }
 
-  links { "System", "System.Core", "CppSharp.AST" }
+  links { "System", "System.Core", "CppSharp", "CppSharp.AST" }
 
-  configuration "vs*"
-    links { "CppSharp.Parser" }
-
-  configuration "not vs*"
-    dependson { "CppSharp.CppParser" }
-    links { "CppSharp.Parser.CSharp" }
+  SetupParser()
 
   configuration '**verbs.txt'
     buildaction "Embed"
diff --git a/src/Runtime/Runtime.lua b/src/Runtime/Runtime.lua
index 73757501..4b2a4cad 100644
--- a/src/Runtime/Runtime.lua
+++ b/src/Runtime/Runtime.lua
@@ -2,8 +2,10 @@ project "CppSharp.Runtime"
 
   kind "SharedLib"
   language "C#"
-  location "."
+  flags { "Unsafe" }
 
   files   { "**.cs" }
-  
   links { "System" }
+
+  configuration "vs*"
+  	location "."