X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=build-scripts%2Fbuild-windows.bat;h=2f13a60d4856ea07cbaf565688b8882f9b58070b;hb=c9a719864d0a99a3d63f454f66dc744be6567cdf;hp=fdec8d2726a57dc9412e222ebeb596a2125db6df;hpb=c2ed61bdaca2a089d1fd5153c1ca2849deb024c4;p=casparcg

diff --git a/build-scripts/build-windows.bat b/build-scripts/build-windows.bat
index fdec8d272..2f13a60d4 100644
--- a/build-scripts/build-windows.bat
+++ b/build-scripts/build-windows.bat
@@ -22,7 +22,7 @@ call "%BUILD_VCVARSALL%" amd64 || goto :error
 
 :: Run cmake
 cd build || goto :error
-cmake -G "Visual Studio 12 2013" -A x64 .. || goto :error
+cmake -G "Visual Studio 14 2015" -A x64 .. || goto :error
 
 :: Build with MSBuild
 echo Building...
@@ -36,29 +36,31 @@ mkdir "%SERVER_FOLDER%" || goto :error
 
 :: Copy media files
 echo Copying media...
-xcopy ..\deploy\general\Server "%SERVER_FOLDER%\Server" /E /I /Y || goto :error
-xcopy ..\deploy\general\Wallpapers "%SERVER_FOLDER%\Wallpapers" /E /I /Y || goto :error
+xcopy ..\deploy\general\server "%SERVER_FOLDER%\server" /E /I /Y || goto :error
+xcopy ..\deploy\general\wallpapers "%SERVER_FOLDER%\wallpapers" /E /I /Y || goto :error
+xcopy ..\deploy\general\logos "%SERVER_FOLDER%\logos" /E /I /Y || goto :error
 copy ..\deploy\general\CasparCG_Server_2.0-brochure.pdf "%SERVER_FOLDER%" || goto :error
 
 :: Copy binaries
 echo Copying binaries...
-copy shell\*.dll "%SERVER_FOLDER%\Server" || goto :error
-copy shell\RelWithDebInfo\casparcg.exe "%SERVER_FOLDER%\Server" || goto :error
-copy shell\RelWithDebInfo\casparcg.pdb "%SERVER_FOLDER%\Server" || goto :error
-copy shell\casparcg.config "%SERVER_FOLDER%\Server" || goto :error
-copy shell\*.ttf "%SERVER_FOLDER%\Server" || goto :error
-xcopy shell\locales "%SERVER_FOLDER%\Server\locales" /E /I /Y || goto :error
+copy shell\*.dll "%SERVER_FOLDER%\server" || goto :error
+copy shell\RelWithDebInfo\casparcg.exe "%SERVER_FOLDER%\server" || goto :error
+copy shell\RelWithDebInfo\casparcg.pdb "%SERVER_FOLDER%\server" || goto :error
+copy ..\shell\casparcg_auto_restart.bat "%SERVER_FOLDER%\server" || goto :error
+copy shell\casparcg.config "%SERVER_FOLDER%\server" || goto :error
+copy shell\*.ttf "%SERVER_FOLDER%\server" || goto :error
+copy shell\*.pak "%SERVER_FOLDER%\server" || goto :error
+xcopy shell\locales "%SERVER_FOLDER%\server\locales" /E /I /Y || goto :error
 
 :: Copy documentation
 echo Copying documentation...
-copy ..\CHANGES.txt "%SERVER_FOLDER%" || goto :error
-copy ..\LICENSE.txt "%SERVER_FOLDER%" || goto :error
-copy ..\README.txt "%SERVER_FOLDER%" || goto :error
+copy ..\CHANGELOG "%SERVER_FOLDER%" || goto :error
+copy ..\LICENSE "%SERVER_FOLDER%" || goto :error
+copy ..\README "%SERVER_FOLDER%" || goto :error
 
 :: Create zip file
 echo Creating zip...
-"%BUILD_7ZIP%" a -x!"%SERVER_FOLDER%\Server\casparcg.pdb" "%BUILD_ARCHIVE_NAME%.zip" "%SERVER_FOLDER%" || goto :error
-"%BUILD_7ZIP%" a "%BUILD_ARCHIVE_NAME%_debug_symbols.zip" "%SERVER_FOLDER%\Server\casparcg.pdb" || goto :error
+"%BUILD_7ZIP%" a "%BUILD_ARCHIVE_NAME%.zip" "%SERVER_FOLDER%" || goto :error
 
 :: Skip exiting with failure
 goto :EOF