Simplified the Premake build files.

build/GenerateProjects.bat

@@ -7,14 +7,12 @@ echo.
 echo [0] Clean
 echo [1] Visual C++ 2010
 echo [2] Visual C++ 2012
-echo [3] CodeLite
+echo [3] GNU Make
-echo [4] GNU Make
 echo.
 
 :choice
 set /P C="Choice: "
-if "%C%"=="4" goto gmake
+if "%C%"=="3" goto gmake
-if "%C%"=="3" goto codelite
 if "%C%"=="2" goto vs2012
 if "%C%"=="1" goto vs2010
 if "%C%"=="0" goto clean
@@ -31,10 +29,6 @@ goto quit
 "premake4" --file=premake4.lua vs2012
 goto quit
 
-:codelite
-"premake4" --file=premake4.lua codelite
-goto quit
-
 :gmake
 "premake4" --file=premake4.lua gmake
 goto quit

build/Helpers.lua

@@ -0,0 +1,77 @@
+-- This module checks for the all the project dependencies.
+
+action = _ACTION or ""
+
+depsdir = path.getabsolute("../deps");
+srcdir = path.getabsolute("../src");
+incdir = path.getabsolute("../inc");
+bindir = path.getabsolute("../bin");
+examplesdir = path.getabsolute("../examples");
+testsdir = path.getabsolute("../tests");
+
+builddir = path.getabsolute("./" .. action);
+libdir = path.join(builddir, "lib");
+
+common_flags = { "Unicode", "Symbols" }
+msvc_buildflags = { } -- "/wd4190", "/wd4996", "/wd4530"
+gcc_buildflags = { "-std=gnu++11" }
+
+msvc_cpp_defines = { }
+
+function SetupNativeProject()
+  location (path.join(builddir, "projects"))
+
+  c = configuration "Debug"
+    defines { "DEBUG" }
+    targetsuffix "_d"
+    
+  configuration "Release"
+    defines { "NDEBUG" }
+    
+  -- Compiler-specific options
+  
+  configuration "vs*"
+    buildoptions { msvc_buildflags }
+    defines { msvc_cpp_defines }
+    
+  configuration "gcc"
+    buildoptions { gcc_buildflags }
+  
+  -- OS-specific options
+  
+  configuration "Windows"
+    defines { "WIN32", "_WINDOWS" }
+  
+  configuration(c)
+end
+
+function IncludeDir(dir)
+  local deps = os.matchdirs(dir .. "/*")
+  
+  for i,dep in ipairs(deps) do
+    local fp = path.join(dep, "premake4.lua")
+    fp = path.join(os.getcwd(), fp)
+    
+    if os.isfile(fp) then
+      print(string.format(" including %s", dep))
+      include(dep)
+    end
+  end
+end
+
+-- Examples helpers
+
+function SetupExampleProject()
+  SetupNativeProjects()
+  location (path.join(builddir, "deps"))
+end
+
+function IncludeExamples()
+  print("Searching for examples...")
+  IncludeDir(examplesdir)
+end
+
+function IncludeTests()
+  print("Searching for tests...")
+  IncludeDir(testsdir)
+end

build/premake4.lua

@@ -2,38 +2,38 @@
 -- It defines the common build settings that all the projects share
 -- and calls the build scripts of all the sub-projects.
 
-action = _ACTION or ""
+dofile "Helpers.lua"
-common_flags = { "Unicode", "Symbols" }
-
-common_msvc_copts = 
-{ 
-  "/wd4146", "/wd4244", "/wd4800", "/wd4345",
-  "/wd4355", "/wd4996", "/wd4624", "/wd4291"
-}
 
 solution "Cxxi"
 
-  configurations
+  configurations { "Debug", "Release" }
-  { 
-    "Debug",
-    "Release"
-  }
-  
   platforms { "x32" }
+  flags { common_flags }
   
-  objdir (  "obj/" .. action)
+  location (builddir)
+  objdir (builddir .. "/obj/")
+  targetdir (libdir)
+  libdirs { libdir }
+  debugdir (bindir)
 
-  targetdir ("../bin/")
+  -- startproject "Generator"
-  debugdir ( "../bin/")
-  
-  configuration "Debug"
-    defines { "DEBUG" }
   
   configuration "Release"
-    defines { "NDEBUG" }
     flags { "Optimize" }
 
-  include "../src/Parser/Parser.lua"
+  configuration "vs2012"
-  include "../src/Bridge/Bridge.lua"
+    framework "4.5"
-  include "../src/Generator/Generator.lua"
+
+  configuration {}
+    
+  group "Examples"
+    IncludeExamples()
+  
+  group "Tests"
+    IncludeTests()
+  
+  group "Cxxi"
+    include (srcdir .. "/Bridge/Bridge.lua")
+    include (srcdir .. "/Generator/Generator.lua")
+    include (srcdir .. "/Parser/Parser.lua")
 

examples/Hello/premake4.lua

@@ -1,31 +1,11 @@
-common_flags = {  }         -- Otherwise /clr won't be enabled - bug ?
-
-solution "Hello"
-    platforms { "x32" }
-    configurations { "Debug", "Release" }
-	
-	objdir (  "./obj/" )
-	targetdir ("./bin/")
-	debugdir ( "./bin/")
-	
-	configuration "Debug"
-		defines { "DEBUG", "WIN32" }
-	
-	configuration "Release"
-		defines { "NDEBUG", "WIN32" }
-		flags { "Optimize" }
-
 project "Hello"
+
+  SetupNativeProject()
   kind "SharedLib"
   language "C++"
-    location "."
-    platforms { "x32" }
 
   flags { common_flags, "Managed" }
 
-	configuration "*"
-		buildoptions { common_msvc_copts, "/clr" }
-
   files { "**.h", "**.cpp", "./*.lua" }
     
   -- Autogenerated files, so not available on first build - specify them manually
@@ -41,12 +21,11 @@ project "Hello"
       outputs = { "CppCsBind\\hello_wrapper.cpp" }
   }
 
-
 project "SayHello"
+
   kind     "ConsoleApp"
   language "C#"
   location "."
-    platforms { "x32" }
 
   files { "**.cs", "./*.lua" }
 

src/Bridge/Bridge.lua

@@ -3,15 +3,9 @@ project "Bridge"
   kind  "SharedLib"
   language "C#"
   location "."
-  files    { "*.cs" }
-        platforms { "x32" }
-
-  configuration "Debug"
-    targetdir "../../bin"
-    
-  configuration "Release"
-    targetdir "../../bin"
 
+  files { "*.cs" }
+  links { "System" }
   
   if _ACTION == "clean" then
     os.rmdir("lib")

src/Generator/Generator.lua

@@ -1,15 +1,10 @@
 project "Generator"
+
   kind "ConsoleApp"
   language "C#"
   location "."
+
   files   { "**.cs", "**.bmp", "**.resx", "**.config" }
   excludes { "Filter.cs" }
-  links { "Bridge", "System", "System.Core", "Parser" }
-        platforms { "x32" }
-
-  configuration "Debug"
-    targetdir "../../bin"
-    
-  configuration "Release"
-    targetdir "../../bin"
   
+  links { "System", "System.Core", "Bridge", "Parser" }

src/Parser/Parser.lua

@@ -1,33 +1,41 @@
+clang_msvc_flags =
+{
+  "/wd4146", "/wd4244", "/wd4800", "/wd4345",
+  "/wd4355", "/wd4996", "/wd4624", "/wd4291"
+}
+
 project "Parser"
   
   kind "SharedLib"
   language "C++"
-  location "."
+  SetupNativeProject()
-  platforms { "x32" }
   
+  dependson "Bridge"
   flags { common_flags, "Managed" }
 
-  configuration "vs*"
-    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" }
+  configuration { "*Main.cpp" }
     flags { "Managed" }
-    usingdirs { "../../bin/" }
+    usingdirs { libdir }
     
-  configuration { "Parser.cpp" }
+  configuration { "*Parser.cpp" }
     flags { "Managed" }
-    usingdirs { "../../bin/" }
+    usingdirs { libdir }
+
+  configuration "vs*"
+    buildoptions { clang_msvc_flags }
+    files { "VSLookup.cpp" }
 
   configuration "*"
   
   files
   {
     "**.h",
-    "**.cpp",
+    "Main.cpp",
+    "Parser.cpp",
     "**.lua"
   }