Reworked LLVM build in Premake to another file.

build/LLVM.lua

@@ -0,0 +1,35 @@
+-- Setup the LLVM dependency directories
+
+LLVMRootDir = "../../deps/LLVM/"
+LLVMBuildDir = "../../deps/LLVM/build/"
+
+-- TODO: Search for available system dependencies
+
+function SetupLLVMLibs()
+  local c = configuration()
+
+  includedirs
+  {
+    path.join(LLVMRootDir, "include"),
+    path.join(LLVMRootDir, "tools/clang/include"),    
+    path.join(LLVMRootDir, "tools/clang/lib"),    
+    path.join(LLVMBuildDir, "include"),
+    path.join(LLVMBuildDir, "tools/clang/include"),
+  }
+  
+  configuration { "Debug", "vs*" }
+    libdirs { path.join(LLVMBuildDir, "lib/Debug") }
+
+  configuration { "Release", "vs*" }
+    libdirs { path.join(LLVMBuildDir, "lib/RelWithDebInfo") }
+
+  configuration "not vs*"
+    buildoptions { "-fpermissive" }
+    defines { "__STDC_CONSTANT_MACROS", "__STDC_LIMIT_MACROS" }
+    libdirs { path.join(LLVMBuildDir, "lib") }
+
+  configuration "macosx"
+    links { "c++", "curses", "pthread", "z" }
+
+  configuration(c)
+end

build/premake4.lua

@@ -7,6 +7,9 @@ config = {}
 dofile "Helpers.lua"
 dofile "Tests.lua"
 
+-- Setup the LLVM dependency
+dofile "LLVM.lua"
+
 solution "CppSharp"
 
   configurations { "Debug", "Release" }

src/CppParser/premake4.lua

@@ -5,9 +5,6 @@ clang_msvc_flags =
   "/wd4251"
 }
 
-LLVMRootDir = "../../deps/LLVM/"
-LLVMBuildDir = "../../deps/LLVM/build_mingw/"
-
 project "CppSharp.CppParser"
   
   kind "SharedLib"
@@ -29,28 +26,7 @@ project "CppSharp.CppParser"
     "*.lua"
   }
   
-  includedirs
-  {
-    path.join(LLVMRootDir, "include"),
-    path.join(LLVMRootDir, "tools/clang/include"),    
-    path.join(LLVMRootDir, "tools/clang/lib"),    
-    path.join(LLVMBuildDir, "include"),
-    path.join(LLVMBuildDir, "tools/clang/include"),
-  }
-  
-  configuration { "Debug", "vs*" }
-    libdirs { path.join(LLVMBuildDir, "lib/Debug") }
-
-  configuration { "Release", "vs*" }
-    libdirs { path.join(LLVMBuildDir, "lib/RelWithDebInfo") }
-
-  configuration "not vs*"
-    buildoptions { "-fpermissive" }
-    defines { "__STDC_CONSTANT_MACROS", "__STDC_LIMIT_MACROS" }
-    libdirs { path.join(LLVMBuildDir, "lib") }
-
-  configuration "macosx"
-    links { "c++", "curses", "pthread", "z" }
+  SetupLLVMLibs()
   
   configuration "*"
   

src/Parser/Parser.lua

@@ -44,20 +44,7 @@ project "CppSharp.Parser"
     "**.lua"
   }
   
-  includedirs
-  {
-    "../../deps/LLVM/include",
-    "../../deps/LLVM/build/include",
-    "../../deps/LLVM/tools/clang/include",
-    "../../deps/LLVM/tools/clang/lib",
-    "../../deps/LLVM/build/tools/clang/include"
-  }
-  
-  configuration "Debug"
-    libdirs { "../../deps/LLVM/build/lib/Debug" }
-
-  configuration "Release"
-    libdirs { "../../deps/LLVM/build/lib/RelWithDebInfo" }
+  SetupLLVMLibs()
   
   configuration "*"