From 726319e5a9217aaae869c077e0037546feb5b055 Mon Sep 17 00:00:00 2001
From: triton <ripzonetriton@gmail.com>
Date: Wed, 30 Jan 2013 21:46:43 +0000
Subject: [PATCH] Improved Parser.lua to point to correct files and set the
 assembly search paths.

---
 src/Parser/Parser.h   |  2 +-
 src/Parser/Parser.lua | 38 +++++++++++++++++++++++++-------------
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/Parser/Parser.h b/src/Parser/Parser.h
index 70262a2f..5f4827da 100644
--- a/src/Parser/Parser.h
+++ b/src/Parser/Parser.h
@@ -24,7 +24,7 @@
 #include <string>
 #include <cstdarg>
 
-#using <../bin/Bridge.dll>
+#using <Bridge.dll>
 #include <vcclr.h>
 
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0]))
diff --git a/src/Parser/Parser.lua b/src/Parser/Parser.lua
index 53c78651..23071213 100644
--- a/src/Parser/Parser.lua
+++ b/src/Parser/Parser.lua
@@ -1,37 +1,49 @@
 project "Parser"
   
-  kind     "SharedLib"
+  kind "SharedLib"
   language "C++"
-        location "."
-        platforms { "x32" }
+  location "."
+  platforms { "x32" }
 
   flags { common_flags, "Managed" }
 
   configuration "vs*"
-    buildoptions { common_msvc_copts, "/clr" }
+    buildoptions { common_msvc_copts }
+  
+  -- usingdirs is only supported in per-file configs in our
+  -- premake build. remove this once this support is added
+  -- at the project level.
+  
+  configuration { "Main.cpp" }
+    flags { "Managed" }
+    usingdirs { "../../bin/" }
+    
+  configuration { "Parser.cpp" }
+    flags { "Managed" }
+    usingdirs { "../../bin/" }
 
   configuration "*"
   
   files
   {
-    "../src/Parser/**.h",
-    "../src/Parser/**.cpp",
-    "./*.lua"
+    "**.h",
+    "**.cpp",
+    "**.lua"
   }
   
   includedirs
   {
-    "../../LLVM/include",
-    "../../LLVM/build/include",
-    "../../LLVM/tools/clang/include",
-    "../../LLVM/build/tools/clang/include"
+    "../../deps/LLVM/include",
+    "../../deps/LLVM/build/include",
+    "../../deps/LLVM/tools/clang/include",
+    "../../deps/LLVM/build/tools/clang/include"
   }
   
   configuration "Debug"
-    libdirs { "../../LLVM/build/lib/Debug" }
+    libdirs { "../../deps/LLVM/build/lib/Debug" }
 
   configuration "Release"
-    libdirs { "../../LLVM/build/lib/RelWithDebInfo" }    
+    libdirs { "../../deps/LLVM/build/lib/RelWithDebInfo" }
   
   configuration "*"