ソースを参照

Switch to vs2017

Daniele Bartolini 8 年 前
コミット
785474dfbf
3 ファイル変更17 行追加17 行削除
  1. 2 2
      .appveyor.yml
  2. 14 14
      makefile
  3. 1 1
      scripts/toolchain.lua

+ 2 - 2
.appveyor.yml

@@ -2,7 +2,7 @@ os:
   - Visual Studio 2013
 
 install:
-  - 3rdparty\bx\tools\bin\windows\genie --file=scripts\genie.lua --with-luajit --with-openal --with-bullet --with-tools --no-level-editor vs2013
+  - 3rdparty\bx\tools\bin\windows\genie --file=scripts\genie.lua --with-luajit --with-openal --with-bullet --with-tools --no-level-editor vs2017
 
 platform:
   - Win32
@@ -14,4 +14,4 @@ configuration:
   - release
 
 build:
-  project: build/projects/vs2013/crown.sln
+  project: build/projects/vs2017/crown.sln

+ 14 - 14
makefile

@@ -88,20 +88,20 @@ mingw-release64: build/projects/mingw build/mingw64/bin/luajit.exe
 	make -j$(MAKE_JOBS) -R -C build/projects/mingw config=release64
 mingw: mingw-debug32 mingw-development32 mingw-release32 mingw-debug64 mingw-development64 mingw-release64
 
-build/projects/vs2013:
-	$(GENIE) --file=scripts\genie.lua --with-luajit --with-openal --with-bullet --with-tools --no-level-editor vs2013
-windows-debug32: build/projects/vs2013
-	devenv build/projects/vs2013/crown.sln /Build "debug|Win32"
-windows-development32: build/projects/vs2013
-	devenv build/projects/vs2013/crown.sln /Build "development|Win32"
-windows-release32: build/projects/vs2013
-	devenv build/projects/vs2013/crown.sln /Build "release|Win32"
-windows-debug64: build/projects/vs2013
-	devenv build/projects/vs2013/crown.sln /Build "debug|x64"
-windows-development64: build/projects/vs2013
-	devenv build/projects/vs2013/crown.sln /Build "development|x64"
-windows-release64: build/projects/vs2013
-	devenv build/projects/vs2013/crown.sln /Build "release|x64"
+build/projects/vs2017:
+	$(GENIE) --file=scripts\genie.lua --with-luajit --with-openal --with-bullet --with-tools --no-level-editor vs2017
+windows-debug32: build/projects/vs2017
+	devenv build/projects/vs2017/crown.sln /Build "debug|Win32"
+windows-development32: build/projects/vs2017
+	devenv build/projects/vs2017/crown.sln /Build "development|Win32"
+windows-release32: build/projects/vs2017
+	devenv build/projects/vs2017/crown.sln /Build "release|Win32"
+windows-debug64: build/projects/vs2017
+	devenv build/projects/vs2017/crown.sln /Build "debug|x64"
+windows-development64: build/projects/vs2017
+	devenv build/projects/vs2017/crown.sln /Build "development|x64"
+windows-release64: build/projects/vs2017
+	devenv build/projects/vs2017/crown.sln /Build "release|x64"
 
 .PHONY: rebuild-glib-resources
 rebuild-glib-resources:

+ 1 - 1
scripts/toolchain.lua

@@ -69,7 +69,7 @@ function toolchain(build_dir, lib_dir)
 			location(build_dir .. "projects/" .. "mingw")
 
 		end
-	elseif _ACTION == "vs2013" then
+	elseif _ACTION == "vs2017" then
 
 		if not os.is("windows") then
 			print("Action not valid in current OS.")