Browse Source

Update makefile and premake4.lua

Daniele Bartolini 11 years ago
parent
commit
e3bb21e683
2 changed files with 14 additions and 13 deletions
  1. 13 13
      makefile
  2. 1 0
      premake/premake4.lua

+ 13 - 13
makefile

@@ -31,14 +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-vs2012-debug32:
+	make -R -C third/bgfx && make -R -C third/bgfx .build/projects/vs2012
+bgfx-vs2012-release32:
+	make -R -C third/bgfx && make -R -C third/bgfx .build/projects/vs2012
+bgfx-vs2012-debug64:
+	make -R -C third/bgfx && make -R -C third/bgfx .build/projects/vs2012
+bgfx-vs2012-release64:
+	make -R -C third/bgfx && make -R -C third/bgfx .build/projects/vs2012
 bgfx-android-arm-debug:
 	make -R -C third/bgfx android-arm-debug
 bgfx-android-arm-release:
@@ -50,10 +50,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-windows-debug32: luajit-windows32 bgfx-vs2012-debug32
+deps-windows-debug64: luajit-windows64 bgfx-vs2012-debug64
+deps-windows-release32: luajit-windows32 bgfx-vs2012-release32
+deps-windows-release64: luajit-windows64 bgfx-vs2012-release64
 deps-android-arm-debug: luajit-arm bgfx-android-arm-debug
 deps-android-arm-release: luajit-arm bgfx-android-arm-release
 deps-clean: luajit-clean bgfx-clean
@@ -86,7 +86,7 @@ android: android-debug android-development android-release
 
 windows-build:
 	$(PREMAKE) --file=premake\premake4.lua vs2012
-windows-debug32: windows-build
+windows-debug32: deps-windows-debug32 windows-build
 	devenv .build/windows/crown.sln /Build "debug|x32"
 windows-development32: deps-windows-debug32 windows-build
 	devenv .build/windows/crown.sln /Build "development|x32"

+ 1 - 0
premake/premake4.lua

@@ -115,6 +115,7 @@ solution "crown"
 	end
 
 	flags {
+		"StaticRuntime",
 		"NoMinimalRebuild",
 		"NoPCH",
 		"NoRTTI",