Merge branch 'xd_dev' of github.com:Xottab-DUTY/xray-16 into linux

Author: eagleivg

README.md

@@ -1,4 +1,4 @@
-X-Ray Engine 1.6 expansion
+X-Ray Engine 1.6 expansion [![Build status](https://ci.appveyor.com/api/projects/status/16mp39v0d7fts6yf?svg=true)](https://ci.appveyor.com/project/OpenXRay/xray-16)
 ==========================
 
 ### Build Status:
@@ -28,5 +28,5 @@ Pull requests appreciated! However, the following things should be taken into co
 * Major changes should be discussed before implementation
 * Follow the [procedures](doc/procedure)
 
-Be advised that this project is not sanctioned by GSC Game World in any way ? and they remain the copyright holders
+Be advised that this project is not sanctioned by GSC Game World in any way – and they remain the copyright holders
 of all the original source code.

appveyor.yml

@@ -1,62 +1,41 @@
 version: '{build}'
+
 pull_requests:
   do_not_increment_build_number: true
+
 skip_tags: true
-image: Visual Studio 2017
+
+image:
+- Visual Studio 2017
+
 configuration:
 - Debug
 - Mixed
 - Release
+
 platform:
 - x64
 - x86
-environment:
-  matrix:
-#  - BUILDSYSTEM: MinGW
-  - BUILDSYSTEM: MSVC
-#install:
-#- SET LUAENV=lua51
-#- cmd: .appveyor\install-lua.cmd
-before_build:
-  nuget restore src\engine.sln
-cache:
-  - packages -> **\packages.config
 
-build_script:
-- if [%BUILDSYSTEM%]==[MSVC] git submodule update --init --recursive
-- if [%BUILDSYSTEM%]==[MinGW] if [%PLATFORM%]==[x86] if [%CONFIGURATION%]==[Debug] (
-    git submodule update --init --recursive
-  )
+cache:
+- packages -> **\packages.config
 
-# Remove sh.exe from the path otherwise CMake will complain:
-# "sh.exe was found in your PATH, here: C:/Program Files/Git/usr/bin/sh.exe"
-# and the MinGW build will not work (the Visual Studio build does not care).
-- if [%BUILDSYSTEM%]==[MinGW] SET "PATH=%PATH:C:\Program Files\Git\usr\bin=%"
+before_build:
+- cmd: >-
+    nuget restore src\engine.sln
 
-# Add MinGW-w64 to PATH
-- if [%BUILDSYSTEM%]==[MinGW] SET "PATH=C:\MinGW-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\MinGW64\bin;%PATH%"
+    git submodule update --init --recursive
 
-- ECHO %PATH%
-- if [%BUILDSYSTEM%]==[MinGW] if [%PLATFORM%]==[x86] if [%CONFIGURATION%]==[Debug] (
-    MinGW32-make --version &&
-    g++ --version &&
-    MKDIR bin &&
-    CD bin &&
-    cmake .. -G "MinGW Makefiles" &&
-    MinGW32-make
-  )
-- if [%BUILDSYSTEM%]==[MSVC] (
-    msbuild "src\engine.sln" /m /verbosity:minimal /property:PlatformToolset=v141 /t:Clean,Build /p:Platform=%PLATFORM% /p:Configuration=%CONFIGURATION% /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
-  )
+build:
+  project: src/engine.sln
+  parallel: true
+  verbosity: minimal
 
-#create artifacts
 after_build:
-- if [%BUILDSYSTEM%]==[MSVC] xr_pack_build.cmd
-- if [%BUILDSYSTEM%]==[MinGW] if [%PLATFORM%]==[x86] if [%CONFIGURATION%]==[Debug] (
-    xr_pack_build.cmd
-  )
+- cmd: xr_pack_build.cmd
 
 test: off
+
 artifacts:
 - path: res/OpenXRay.Dx86.7z
   name: OpenXRay.Dx86.7z