From 5f21e58b03b52a3440f1e11539c14091cbd62439 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= <branimirkaradzic@gmail.com>
Date: Wed, 26 Jul 2017 08:45:29 -0700
Subject: [PATCH] Fixed amalgamated build.

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

diff --git a/scripts/bx.lua b/scripts/bx.lua
index b0d57f9..f7021fb 100644
--- a/scripts/bx.lua
+++ b/scripts/bx.lua
@@ -25,8 +25,10 @@ project "bx"
 
 	if _OPTIONS["with-amalgamated"] then
 		excludes {
-			path.join(BX_DIR, "src/commandline.cpp"),
 			path.join(BX_DIR, "src/allocator.cpp"),
+			path.join(BX_DIR, "src/bx.cpp"),
+			path.join(BX_DIR, "src/commandline.cpp"),
+			path.join(BX_DIR, "src/crtnone.cpp"),
 			path.join(BX_DIR, "src/debug.cpp"),
 			path.join(BX_DIR, "src/dtoa.cpp"),
 			path.join(BX_DIR, "src/file.cpp"),
@@ -34,8 +36,8 @@ project "bx"
 			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/semaphore.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 af2a0fb..1af7e75 100644
--- a/src/amalgamated.cpp
+++ b/src/amalgamated.cpp
@@ -3,8 +3,8 @@
  *  License: https://github.com/bkaradzic/bgfx#license-bsd-2-clause
  */
 
-#include "bx.cpp"
 #include "allocator.cpp"
+#include "bx.cpp"
 #include "commandline.cpp"
 #include "crtnone.cpp"
 #include "debug.cpp"