Fixed amalgamated build.

mcmc2010 · Jul 16, 2017 · 9124d8b · 9124d8b
1 parent a29a296
commit 9124d8b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git 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
@@ -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"