Move CPack win32 generator from NSIS to WIX

CMakeLists.txt

@@ -1,4 +1,4 @@
-if(APPLE)
+if(WIN32 OR APPLE)
 	cmake_minimum_required(VERSION 2.8.12)
 else()
 	cmake_minimum_required(VERSION 2.8.11)

INSTALL

@@ -4,17 +4,17 @@ Will give better instructions later when things are in a more complete state.
 Windows:
   - Use VS2013, as obs-studio uses C99 and C++11
 
-  - Download latest FFmpeg and wxWidgets repositories
+  - Download latest FFmpeg repositories and Qt5 release
 
   - Create a windows environment variable FFmpegPath.  Set it to your FFmpeg
     repo path
 
-  - Create a windows environment variable wxWidgetsPath.  Set it to your
-    wxWidgets repo path
+  - Create a windows environment variable QTDIR.  Set it to your
+    Qt5 install path
 
-  - Compile wxWidgets and FFmpeg.  They should both be compiled with VS2013.
-    Convert the VS2010 project file for wxWidgets, and for compiling FFmpeg,
-    see http://ffmpeg.org/platform.html#Windows
+  - Compile FFmpeg and Qt5(Until they release a binary VS2013 version).
+    They should both be compiled with VS2013.
+    For compiling FFmpeg, see http://ffmpeg.org/platform.html#Windows
 
   - Create two directories in FFmpeg directory, lib32 and lib64.  Place the
     lib files generated by FFmpeg into these directories for the respective
@@ -31,24 +31,19 @@ Windows:
 
 
 Mac OSX
-  - Use macports or homebrew and get wxWidgets 3.0, FFmpeg, glew, cmake.
+  - Use macports or homebrew and get FFmpeg, glew and cmake.
 
-  - Building via autotools not yet supported
-
-  - In a terminal, go to the obs-studio/build directory, then to build, type:
-    cmake .. && make
+  - In a terminal, go to the obs-studio directory create a cmbuild subdir
+    and change to it, then to build, type: cmake .. && make
 
   - It builds in a modular structure similar to windows, where everything
-    necessary to run the program is compiled to obs-studio/build
+    necessary to run the program is compiled to cmbuild/rundir
 
   - You can also use ccmake to create an app bundle, which makes it so you
     don't have to use the terminal to execute it from the correct directory
 
 
 Linux
-  - Definitely want to use autotools, as cmake files are currently made more
-    for OSX
-
   - If using debian-based distributions, you may have to get the latest FFmpeg
     repo -- default debian packages seem to be a bit lacking, so you might have
     to either get precompiled packages from http://deb-multimedia.org/ (or

cmake/ALL_BUILD.vcxproj.user.in

@@ -1,42 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">
-    <LocalDebuggerCommand>$(SolutionDir)rundir\$(Configuration)\bin\64bit\obs.exe</LocalDebuggerCommand>
+    <LocalDebuggerCommand>$(SolutionDir)rundir\$(Configuration)\bin\64bit\obs64.exe</LocalDebuggerCommand>
     <LocalDebuggerWorkingDirectory>$(SolutionDir)rundir\$(Configuration)\bin\64bit</LocalDebuggerWorkingDirectory>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LocalDebuggerCommand>$(SolutionDir)rundir\$(Configuration)\bin\64bit\obs.exe</LocalDebuggerCommand>
+    <LocalDebuggerCommand>$(SolutionDir)rundir\$(Configuration)\bin\64bit\obs64.exe</LocalDebuggerCommand>
     <LocalDebuggerWorkingDirectory>$(SolutionDir)rundir\$(Configuration)\bin\64bit</LocalDebuggerWorkingDirectory>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LocalDebuggerCommand>$(SolutionDir)rundir\$(Configuration)\bin\64bit\obs.exe</LocalDebuggerCommand>
+    <LocalDebuggerCommand>$(SolutionDir)rundir\$(Configuration)\bin\64bit\obs64.exe</LocalDebuggerCommand>
     <LocalDebuggerWorkingDirectory>$(SolutionDir)rundir\$(Configuration)\bin\64bit</LocalDebuggerWorkingDirectory>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">
-    <LocalDebuggerCommand>$(SolutionDir)rundir\$(Configuration)\bin\64bit\obs.exe</LocalDebuggerCommand>
+    <LocalDebuggerCommand>$(SolutionDir)rundir\$(Configuration)\bin\64bit\obs64.exe</LocalDebuggerCommand>
     <LocalDebuggerWorkingDirectory>$(SolutionDir)rundir\$(Configuration)\bin\64bit</LocalDebuggerWorkingDirectory>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">
-    <LocalDebuggerCommand>$(SolutionDir)rundir\$(Configuration)\bin\32bit\obs.exe</LocalDebuggerCommand>
+    <LocalDebuggerCommand>$(SolutionDir)rundir\$(Configuration)\bin\32bit\obs32.exe</LocalDebuggerCommand>
     <LocalDebuggerWorkingDirectory>$(SolutionDir)rundir\$(Configuration)\bin\32bit</LocalDebuggerWorkingDirectory>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LocalDebuggerCommand>$(SolutionDir)rundir\$(Configuration)\bin\32bit\obs.exe</LocalDebuggerCommand>
+    <LocalDebuggerCommand>$(SolutionDir)rundir\$(Configuration)\bin\32bit\obs32.exe</LocalDebuggerCommand>
     <LocalDebuggerWorkingDirectory>$(SolutionDir)rundir\$(Configuration)\bin\32bit</LocalDebuggerWorkingDirectory>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LocalDebuggerCommand>$(SolutionDir)rundir\$(Configuration)\bin\32bit\obs.exe</LocalDebuggerCommand>
+    <LocalDebuggerCommand>$(SolutionDir)rundir\$(Configuration)\bin\32bit\obs32.exe</LocalDebuggerCommand>
     <LocalDebuggerWorkingDirectory>$(SolutionDir)rundir\$(Configuration)\bin\32bit</LocalDebuggerWorkingDirectory>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">
-    <LocalDebuggerCommand>$(SolutionDir)rundir\$(Configuration)\bin\32bit\obs.exe</LocalDebuggerCommand>
+    <LocalDebuggerCommand>$(SolutionDir)rundir\$(Configuration)\bin\32bit\obs32.exe</LocalDebuggerCommand>
     <LocalDebuggerWorkingDirectory>$(SolutionDir)rundir\$(Configuration)\bin\32bit</LocalDebuggerWorkingDirectory>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>