Merge pull request #39 from centaurean/dev

Updated premake5 script
g1mv · May 20, 2015 · acda00c · acda00c
2 parents f6f4460 + b2e848e
commit acda00c
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/build/premake5.lua b/build/premake5.lua
@@ -36,11 +36,9 @@
 
 -- Check for tools
 if os.execute("clang -v") == 0 then
-	premake.cc  = 'clang'
-	premake.cxx = 'clang++'
+	toolset "clang"
 elseif os.execute("gcc -v") == 0 then
-	premake.cc  = 'gcc'
-	premake.cxx = 'g++'
+	toolset "gcc"
 else
 	io.write("No supported compiler found on the command line. Please install Clang/LLVM or GCC.\n")
     os.exit(0)
@@ -83,4 +81,4 @@ solution "Density"
 			"../benchmark/src/**.h",
 			"../benchmark/src/**.c"
 		}
-		links { "spookyhash", "density" }
+		links { "density", "spookyhash" }