From 29888dc2f77a2207e3ca3867b37fb264103b7d45 Mon Sep 17 00:00:00 2001
From: Gol-D-Ace <Gol-D-Ace@users.noreply.github.com>
Date: Mon, 23 Jan 2017 23:19:46 +0100
Subject: [PATCH] CI: Build Windows version and upload artifacts

Currently this build is still missing the following plugins:
enc-amf
obs-browser
win-ivcam
---
 CI/before-deploy-win.cmd |  3 +++
 appveyor.yml             | 37 +++++++++++++++++++++++++------------
 2 files changed, 28 insertions(+), 12 deletions(-)
 create mode 100644 CI/before-deploy-win.cmd

diff --git a/CI/before-deploy-win.cmd b/CI/before-deploy-win.cmd
new file mode 100644
index 000000000..2be9c5ff1
--- /dev/null
+++ b/CI/before-deploy-win.cmd
@@ -0,0 +1,3 @@
+xcopy /e C:\projects\obs-studio\build32\rundir\RelWithDebInfo C:\projects\obs-studio\build\
+robocopy C:\projects\obs-studio\build64\rundir\RelWithDebInfo C:\projects\obs-studio\build\ /E /XC /XN /XO
+7z a build.zip C:\projects\obs-studio\build\*
\ No newline at end of file
diff --git a/appveyor.yml b/appveyor.yml
index 5ead60944..2347ad75f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,21 +1,34 @@
 environment:
-  FFMPEG_VERSION: 3.0.1
   CURL_VERSION: 7.39.0
-  matrix:
-    - VSVER: Visual Studio 14 2015 Win64  
-
-platform: x64
-configuration: Debug
 
 install:
   - git submodule update --init --recursive
+  - git clone https://github.com/videolan/vlc.git
   - curl -kLO https://obsproject.com/downloads/dependencies2015.zip
   - 7z x dependencies2015.zip -odependencies2015
-  - set DepsPath=%CD%\dependencies2015\win64
-  - set QTDIR=C:\Qt\5.7\msvc2015_64
+  - set DepsPath32=%CD%\dependencies2015\win32
+  - set DepsPath64=%CD%\dependencies2015\win64
+  - set VLCPath=%CD%\vlc
+  - set QTDIR32=C:\Qt\5.7\msvc2015
+  - set QTDIR64=C:\Qt\5.7\msvc2015_64
+  - set build_config=RelWithDebInfo
+  - move "C:\Program Files (x86)\Windows Kits\10\Include\10.0.14393.0\um\d3d11on12*" "C:\Program Files (x86)\Windows Kits\8.1\Include\um"
+  - move "C:\Program Files (x86)\Windows Kits\10\Include\10.0.14393.0\um\d3d12*" "C:\Program Files (x86)\Windows Kits\8.1\Include\um"
+  - move "C:\Program Files (x86)\Windows Kits\10\Include\10.0.14393.0\shared\dxgi*" "C:\Program Files (x86)\Windows Kits\8.1\Include\shared"
   - mkdir build
-  - cd ./build
-  - cmake -G "Visual Studio 14 2015 Win64" ..
+  - mkdir build32
+  - mkdir build64
+  - cd ./build32
+  - cmake -G "Visual Studio 14 2015" -DCOPIED_DEPENDENCIES=false -DCOPY_DEPENDENCIES=true -DBUILD_CAPTIONS=true -DCOMPILE_D3D12_HOOK=true ..
+  - cd ../build64
+  - cmake -G "Visual Studio 14 2015 Win64" -DCOPIED_DEPENDENCIES=false -DCOPY_DEPENDENCIES=true -DBUILD_CAPTIONS=true -DCOMPILE_D3D12_HOOK=true ..
 
-build:
-  project: C:\projects\obs-studio\build\obs-studio.sln
\ No newline at end of file
+build_script:
+  - call msbuild /p:Configuration=%build_config% C:\projects\obs-studio\build32\obs-studio.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+  - call msbuild /p:Configuration=%build_config% C:\projects\obs-studio\build64\obs-studio.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+
+before_deploy:
+  - C:\projects\obs-studio\CI\before-deploy-win.cmd
+
+deploy_script:
+  - ps: Push-AppveyorArtifact "build.zip" -FileName "$(git describe).zip"
\ No newline at end of file