瀏覽代碼

Add ability to build without tools

Daniele Bartolini 11 年之前
父節點
當前提交
5165d630a0
共有 2 個文件被更改,包括 11 次插入3 次删除
  1. 9 1
      genie/genie.lua
  2. 2 2
      makefile

+ 9 - 1
genie/genie.lua

@@ -22,6 +22,11 @@ newoption {
 	description = "Build with luajit support."
 }
 
+newoption {
+	trigger = "with-tools",
+	description = "Build with tools."
+}
+
 solution "crown"
 	configurations {
 		"debug",
@@ -47,7 +52,10 @@ toolchain(CROWN_BUILD_DIR, CROWN_THIRD_DIR)
 
 group "libs"
 bgfxProject("", "StaticLib", os.is("windows") and { "BGFX_CONFIG_RENDERER_DIRECT3D9=1" } or {})
-dofile ("shaderc.lua")
+
+if _OPTIONS["with-tools"] then
+	dofile ("shaderc.lua")
+end
 
 if _OPTIONS["with-openal"] then
 	dofile ("openal.lua")

+ 2 - 2
makefile

@@ -23,7 +23,7 @@ android-arm-release: android-build
 android-arm: android-arm-debug android-arm-development android-arm-release
 
 linux-build:
-	$(GENIE) --file=genie/genie.lua --with-luajit --with-openal --compiler=linux-gcc gmake
+	$(GENIE) --file=genie/genie.lua --with-luajit --with-openal --with-tools --compiler=linux-gcc gmake
 linux-debug32: linux-build
 	make -R -C .build/projects/linux config=debug32
 linux-development32: linux-build
@@ -39,7 +39,7 @@ linux-release64: linux-build
 linux: linux-debug32 linux-development32 linux-release32 linux-debug64 linux-development64 linux-release64
 
 windows-build:
-	$(GENIE) --file=genie\genie.lua --with-luajit --with-openal vs2013
+	$(GENIE) --file=genie\genie.lua --with-luajit --with-openal --with-tools vs2013
 windows-debug32: windows-build
 	devenv .build/projects/vs2013/crown.sln /Build "debug|Win32"
 windows-development32: windows-build