Fixed assert macros, and improved error handling.

scripts/bin2c.lua

@@ -6,18 +6,12 @@
 project "bin2c"
 	kind "ConsoleApp"
 
-	includedirs {
-		"../include",
-	}
-
 	files {
 		"../tools/bin2c/**.cpp",
 		"../tools/bin2c/**.h",
 	}
 
-	links {
-		"bx",
-	}
+	using_bx()
 
 	configuration { "mingw-*" }
 		targetextension ".exe"

scripts/bx.lua

@@ -15,6 +15,28 @@ local function userdefines()
 	return defines
 end
 
+function using_bx()
+	includedirs {
+		path.join(BX_DIR, "include"),
+	}
+
+	links {
+		"bx",
+	}
+
+	configuration { "Debug" }
+		defines {
+			"BX_CONFIG_DEBUG=1",
+		}
+
+	configuration { "Release" }
+		defines {
+			"BX_CONFIG_DEBUG=0",
+		}
+
+	configuration {}
+end
+
 project "bx"
 	kind "StaticLib"
 
@@ -32,11 +54,6 @@ project "bx"
 
 	defines (userdefines())
 
-	configuration { "Debug" }
-		defines {
-			"BX_CONFIG_DEBUG=1",
-		}
-
 	configuration { "linux-*" }
 		buildoptions {
 			"-fPIC",
@@ -75,4 +92,14 @@ project "bx"
 		}
 	end
 
+	configuration { "Debug" }
+		defines {
+			"BX_CONFIG_DEBUG=1",
+		}
+
+	configuration { "Release" }
+		defines {
+			"BX_CONFIG_DEBUG=0",
+		}
+
 	configuration {}

scripts/genie.lua

@@ -51,7 +51,6 @@ project "bx.test"
 	}
 
 	includedirs {
-		path.join(BX_DIR, "include"),
 		BX_THIRD_PARTY_DIR,
 	}
 
@@ -61,9 +60,7 @@ project "bx.test"
 		path.join(BX_DIR, "tests/dbg.*"),
 	}
 
-	links {
-		"bx",
-	}
+	using_bx()
 
 	configuration { "vs* or mingw*" }
 		links {
@@ -131,6 +128,16 @@ project "bx.bench"
 			"Cocoa.framework",
 		}
 
+	configuration { "Debug" }
+		defines {
+			"BX_CONFIG_DEBUG=1",
+		}
+
+	configuration { "Release" }
+		defines {
+			"BX_CONFIG_DEBUG=0",
+		}
+
 	configuration {}
 
 	strip()