Просмотр исходного кода

Update makefile and premake4.lua

Daniele Bartolini 11 лет назад
Родитель
Сommit
898a66824e
2 измененных файлов с 35 добавлено и 12 удалено
  1. 18 7
      makefile
  2. 17 5
      premake/premake4.lua

+ 18 - 7
makefile

@@ -31,6 +31,14 @@ bgfx-linux-release32:
 	make -R -C third/bgfx linux-release32
 bgfx-linux-release64:
 	make -R -C third/bgfx linux-release64
+bgfx-vs2008-debug32:
+	make -R -C third/bgfx && make -R -C third/bgfx vs2008-debug32
+bgfx-vs2008-release32:
+	make -R -C third/bgfx && make -R -C third/bgfx vs2008-release32
+bgfx-vs2008-debug64:
+	make -R -C third/bgfx && make -R -C third/bgfx vs2008-debug64
+bgfx-vs2008-release64:
+	make -R -C third/bgfx && make -R -C third/bgfx vs2008-release64
 bgfx-android-arm:
 	make -R -C third/bgfx android-arm-release
 bgfx-clean:
@@ -40,6 +48,10 @@ deps-linux-debug32: luajit-linux32 bgfx-linux-debug32
 deps-linux-debug64: luajit-linux64 bgfx-linux-debug64
 deps-linux-release32: luajit-linux32 bgfx-linux-release32
 deps-linux-release64: luajit-linux64 bgfx-linux-release64
+deps-windows-debug32: luajit-windows32 bgfx-vs2008-debug32
+deps-windows-debug64: luajit-windows64 bgfx-vs2008-debug64
+deps-windows-release32: luajit-windows32 bgfx-vs2008-release32
+deps-windows-release64: luajit-windows64 bgfx-vs2008-release64
 deps-android-arm: luajit-arm bgfx-android-arm
 deps-clean: luajit-clean bgfx-clean
 
@@ -71,18 +83,18 @@ android-release: deps-android-arm android-build
 android: android-debug android-development android-release
 
 windows-build:
-	$(PREMAKE) --file=premake\premake4.lua vs2008
+	$(PREMAKE) --file=premake\premake4.lua vs2012
 windows-debug32: windows-build
 	devenv .build/windows/crown.sln /Build "debug|x32"
-windows-development32: windows-build
+windows-development32: deps-windows-debug32 windows-build
 	devenv .build/windows/crown.sln /Build "development|x32"
-windows-release32: windows-build
+windows-release32: deps-windows-release32 windows-build
 	devenv .build/windows/crown.sln /Build "release|x32"
-windows-debug64: windows-build
+windows-debug64: deps-windows-debug64 windows-build
 	devenv .build/windows/crown.sln /Build "debug|x64"
-windows-development64: windows-build
+windows-development64: deps-windows-debug64 windows-build
 	devenv .build/windows/crown.sln /Build "development|x64"
-windows-release64: windows-build
+windows-release64: deps-windows-release64 windows-build
 	devenv .build/windows/crown.sln /Build "release|x64"
 
 docs:
@@ -93,7 +105,6 @@ clean: deps-clean
 	@rm -rf .build
 	@rm -rf .installation
 
-
 starter:	
 	xbuild /p:OutputPath=$(CROWN_INSTALL_DIR)/tools tools/gui/starter/starter.sln
 console:

+ 17 - 5
premake/premake4.lua

@@ -99,13 +99,16 @@ solution "crown"
 		end
 	end
 
-	if _ACTION == "vs2010" or _ACTION == "vs2008" then
+	if _ACTION == "vs2012" then
 
 		if not os.is("windows") then print("Action not valid in current OS.") end
 
 		if not os.getenv("PHYSX_SDK_WINDOWS") then
 			print("Set PHYSX_SDK_WINDOWS environment variable.")
 		end
+		if not os.getenv("DXSDK_DIR") then
+			print("Set DXSDK_DIR environment variable.")
+		end
 
 		location(CROWN_BUILD_DIR .. "windows")
 
@@ -610,6 +613,7 @@ solution "crown"
 				"$(PHYSX_SDK_WINDOWS)/Include/RepX",
 				"$(PHYSX_SDK_WINDOWS)/Include/RepXUpgrader",
 				"$(PHYSX_SDK_WINDOWS)/Include/vehicle",
+				"$(DXSDK_DIR)/Include",
 				CROWN_THIRD_DIR .. "luajit/src",
 				CROWN_THIRD_DIR .. "opengl",
 				CROWN_THIRD_DIR .. "openal/include",
@@ -617,7 +621,10 @@ solution "crown"
 				CROWN_THIRD_DIR .. "stb_image",
 				CROWN_THIRD_DIR .. "stb_vorbis",
 				CROWN_SOURCE_DIR .. "/engine/os/win",
-				CROWN_SOURCE_DIR .. "/engine/renderers/backend/gl/wgl"
+				CROWN_SOURCE_DIR .. "/engine/renderers/backend/gl/wgl",
+				CROWN_THIRD_DIR .. "bgfx/src",
+				CROWN_THIRD_DIR .. "bgfx/include",
+				CROWN_THIRD_DIR .. "bx/include"
 			}
 
 			excludes {
@@ -632,8 +639,10 @@ solution "crown"
 		configuration { "x32", "vs*" }
 			libdirs {
 				"$(PHYSX_SDK_WINDOWS)/Lib/win32",
+				"$(DXSDK_DIR)/Lib/x86",
 				CROWN_THIRD_DIR .. "luajit/src",
-				CROWN_THIRD_DIR .. "openal/lib"
+				CROWN_THIRD_DIR .. "openal/lib",
+				CROWN_THIRD_DIR .. "bgfx/.build/win32_vs2012/bin",
 			}
 
 		configuration { "x64", "vs*" }
@@ -641,8 +650,10 @@ solution "crown"
 
 			libdirs {
 				"$(PHYSX_SDK_WINDOWS)/Lib/win64",
+				"$(DXSDK_DIR)/Lib/x64",
 				CROWN_THIRD_DIR .. "luajit/src",
-				CROWN_THIRD_DIR .. "openal/lib"
+				CROWN_THIRD_DIR .. "openal/lib",
+				CROWN_THIRD_DIR .. "bgfx/.build/win64_vs2012/bin",
 			}
 
 		configuration { "debug", "x32", "vs*"}
@@ -651,7 +662,8 @@ solution "crown"
 				"PhysX3CHECKED_x86",
 				"PhysX3CommonCHECKED_x86",
 				"PhysX3CookingCHECKED_x86",
-				"PhysX3ExtensionsCHECKED"
+				"PhysX3ExtensionsCHECKED",
+				"bgfxDebug"
 			}
 
 		configuration { "debug", "x64", "vs*" }