Sfoglia il codice sorgente

Added vs2013 support.

Branimir Karadžić 11 anni fa
parent
commit
b2a90d8f52
3 ha cambiato i file con 6 aggiunte e 3 eliminazioni
  1. 1 2
      README.md
  2. 4 0
      makefile
  3. 1 1
      premake/bgfx.lua

+ 1 - 2
README.md

@@ -271,8 +271,7 @@ Building
 
 
 ### Prerequisites
 ### Prerequisites
 
 
-Premake 4.4 beta5 ([prebuilt binaries are part of bx](https://github.com/bkaradzic/bx/tree/master/tools/bin))  
-[http://industriousone.com/premake/download](http://industriousone.com/premake/download)
+[premake-fork](https://github.com/bkaradzic/premake-fork) ([prebuilt binaries are part of bx](https://github.com/bkaradzic/bx/tree/master/tools/bin))  
 
 
 Windows users download GnuWin32 utilities from:  
 Windows users download GnuWin32 utilities from:  
 [http://gnuwin32.sourceforge.net/packages/make.htm](http://gnuwin32.sourceforge.net/packages/make.htm)  
 [http://gnuwin32.sourceforge.net/packages/make.htm](http://gnuwin32.sourceforge.net/packages/make.htm)  

+ 4 - 0
makefile

@@ -20,6 +20,7 @@ all:
 	$(PREMAKE4) --file=premake/premake4.lua --with-tools --with-shared-lib vs2008
 	$(PREMAKE4) --file=premake/premake4.lua --with-tools --with-shared-lib vs2008
 	$(PREMAKE4) --file=premake/premake4.lua --with-tools --with-shared-lib vs2010
 	$(PREMAKE4) --file=premake/premake4.lua --with-tools --with-shared-lib vs2010
 	$(PREMAKE4) --file=premake/premake4.lua --with-tools --with-shared-lib vs2012
 	$(PREMAKE4) --file=premake/premake4.lua --with-tools --with-shared-lib vs2012
+	$(PREMAKE4) --file=premake/premake4.lua --with-tools --with-shared-lib vs2013
 	$(PREMAKE4) --file=premake/premake4.lua --with-tools --with-shared-lib --gcc=mingw gmake
 	$(PREMAKE4) --file=premake/premake4.lua --with-tools --with-shared-lib --gcc=mingw gmake
 	$(PREMAKE4) --file=premake/premake4.lua --with-tools --with-shared-lib --gcc=linux-gcc gmake
 	$(PREMAKE4) --file=premake/premake4.lua --with-tools --with-shared-lib --gcc=linux-gcc gmake
 	$(PREMAKE4) --file=premake/premake4.lua --with-tools --with-shared-lib --gcc=osx gmake
 	$(PREMAKE4) --file=premake/premake4.lua --with-tools --with-shared-lib --gcc=osx gmake
@@ -110,6 +111,9 @@ vs2008: vs2008-debug32 vs2008-release32 vs2008-debug64 vs2008-release64
 .build/projects/vs2012:
 .build/projects/vs2012:
 	$(PREMAKE4) --file=premake/premake4.lua --with-tools --with-shared-lib vs2012
 	$(PREMAKE4) --file=premake/premake4.lua --with-tools --with-shared-lib vs2012
 
 
+.build/projects/vs2013:
+	$(PREMAKE4) --file=premake/premake4.lua --with-tools --with-shared-lib vs2013
+
 .build/projects/gmake-nacl:
 .build/projects/gmake-nacl:
 	$(PREMAKE4) --file=premake/premake4.lua --gcc=nacl gmake
 	$(PREMAKE4) --file=premake/premake4.lua --gcc=nacl gmake
 nacl-debug32: .build/projects/gmake-nacl
 nacl-debug32: .build/projects/gmake-nacl

+ 1 - 1
premake/bgfx.lua

@@ -34,7 +34,7 @@ function bgfxProject(_name, _uuid, _kind, _defines)
 				"GLESv2",
 				"GLESv2",
 			}
 			}
 
 
-		configuration { "windows", "not vs2012" }
+		configuration { "windows", "not vs201*" }
 			includedirs {
 			includedirs {
 				"$(DXSDK_DIR)/include",
 				"$(DXSDK_DIR)/include",
 			}
 			}