From 9124d8b37fad4001e9632ff2d4b2256e718f9680 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= <branimirkaradzic@gmail.com>
Date: Sat, 15 Jul 2017 22:07:14 -0700
Subject: [PATCH] Fixed amalgamated build.

---
 scripts/bx.lua      | 8 +++++---
 src/amalgamated.cpp | 5 ++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/scripts/bx.lua b/scripts/bx.lua
index a84eec4..b0d57f9 100644
--- a/scripts/bx.lua
+++ b/scripts/bx.lua
@@ -26,14 +26,16 @@ project "bx"
 	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/allocator.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/file.cpp"),
+			path.join(BX_DIR, "src/filepath.cpp"),
+			path.join(BX_DIR, "src/math.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/process.cpp"),
 			path.join(BX_DIR, "src/sort.cpp"),
 			path.join(BX_DIR, "src/string.cpp"),
 			path.join(BX_DIR, "src/thread.cpp"),
diff --git a/src/amalgamated.cpp b/src/amalgamated.cpp
index c70b605..af2a0fb 100644
--- a/src/amalgamated.cpp
+++ b/src/amalgamated.cpp
@@ -4,14 +4,17 @@
  */
 
 #include "bx.cpp"
+#include "allocator.cpp"
 #include "commandline.cpp"
-#include "crtimpl.cpp"
 #include "crtnone.cpp"
 #include "debug.cpp"
 #include "dtoa.cpp"
+#include "file.cpp"
+#include "filepath.cpp"
 #include "math.cpp"
 #include "mutex.cpp"
 #include "os.cpp"
+#include "process.cpp"
 #include "semaphore.cpp"
 #include "sort.cpp"
 #include "string.cpp"