diff --git a/scripts/bin2c.lua b/scripts/bin2c.lua
index b308b3e..daa7b09 100644
--- a/scripts/bin2c.lua
+++ b/scripts/bin2c.lua
@@ -4,7 +4,6 @@
 --
 
 project "bin2c"
-	uuid "60eaa654-7d06-11e4-be8e-880965202986"
 	kind "ConsoleApp"
 
 	includedirs {
@@ -23,6 +22,11 @@ project "bin2c"
 	configuration { "mingw-*" }
 		targetextension ".exe"
 
+	configuration { "linux-*" }
+		links {
+			"pthread",
+		}
+
 	configuration {}
 
 	strip()
diff --git a/scripts/bx.lua b/scripts/bx.lua
index b62ee4b..a84eec4 100644
--- a/scripts/bx.lua
+++ b/scripts/bx.lua
@@ -7,13 +7,13 @@ project "bx"
 	kind "StaticLib"
 
 	includedirs {
-		"../include",
+		path.join(BX_DIR, "include"),
 	}
 
 	files {
-		"../include/**.h",
-		"../include/**.inl",
-		"../src/**.cpp",
+		path.join(BX_DIR, "include/**.h"),
+		path.join(BX_DIR, "include/**.inl"),
+		path.join(BX_DIR, "src/**.cpp"),
 	}
 
 	configuration { "linux-*" }
@@ -22,3 +22,27 @@ project "bx"
 		}
 
 	configuration {}
+
+	if _OPTIONS["with-amalgamated"] then
+		excludes {
+			path.join(BX_DIR, "src/commandline.cpp"),
+			path.join(BX_DIR, "src/crt.cpp"),
+			path.join(BX_DIR, "src/crtimpl.cpp"),
+			path.join(BX_DIR, "src/debug.cpp"),
+			path.join(BX_DIR, "src/dtoa.cpp"),
+			path.join(BX_DIR, "src/fpumath.cpp"),
+			path.join(BX_DIR, "src/mutex.cpp"),
+			path.join(BX_DIR, "src/os.cpp"),
+			path.join(BX_DIR, "src/sem.cpp"),
+			path.join(BX_DIR, "src/sort.cpp"),
+			path.join(BX_DIR, "src/string.cpp"),
+			path.join(BX_DIR, "src/thread.cpp"),
+			path.join(BX_DIR, "src/timer.cpp"),
+		}
+	else
+		excludes {
+			path.join(BX_DIR, "src/amalgamated.**"),
+		}
+	end
+
+	configuration {}
diff --git a/scripts/genie.lua b/scripts/genie.lua
index e0e634a..af66449 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -3,6 +3,11 @@
 -- License: https://github.com/bkaradzic/bx#license-bsd-2-clause
 --
 
+newoption {
+	trigger = "with-amalgamated",
+	description = "Enable amalgamated build.",
+}
+
 solution "bx"
 	configurations {
 		"Debug",
diff --git a/src/amalgamated.cpp b/src/amalgamated.cpp
new file mode 100644
index 0000000..ba2db3b
--- /dev/null
+++ b/src/amalgamated.cpp
@@ -0,0 +1,18 @@
+/*
+ *  Copyright 2011-2017 Branimir Karadzic. All rights reserved.
+ *  License: https://github.com/bkaradzic/bgfx#license-bsd-2-clause
+ */
+
+#include "commandline.cpp"
+#include "crt.cpp"
+#include "crtimpl.cpp"
+#include "debug.cpp"
+#include "dtoa.cpp"
+#include "fpumath.cpp"
+#include "mutex.cpp"
+#include "os.cpp"
+#include "sem.cpp"
+#include "sort.cpp"
+#include "string.cpp"
+#include "thread.cpp"
+#include "timer.cpp"