From 64b057c8b876573a56cf2ad3fab9be2ae02a3a79 Mon Sep 17 00:00:00 2001 From: aliaspider Date: Tue, 11 Apr 2017 15:43:51 +0100 Subject: [PATCH] update msvc batch files. --- retroarch-build-msvc2010-x64.bat | 12 +----------- retroarch-build-msvc2010-x86.bat | 13 ++----------- retroarch-debug-build-msvc2010-x64.bat | 7 ++++--- retroarch-debug-build-msvc2010-x86.bat | 8 +++++--- 4 files changed, 12 insertions(+), 28 deletions(-) diff --git a/retroarch-build-msvc2010-x64.bat b/retroarch-build-msvc2010-x64.bat index 945dfb67..fa73c8ba 100644 --- a/retroarch-build-msvc2010-x64.bat +++ b/retroarch-build-msvc2010-x64.bat @@ -1,11 +1,4 @@ @echo off -echo tskill vcexpress -tskill vcexpress >nul 2>nul -rem this is a hack for sleep() -ping 192.0.2.1 -n 1 -w 2000 >nul -echo taskkill /t /f /im vcexpress.exe -taskkill /t /f /im vcexpress.exe >nul 2>nul -ping 192.0.2.1 -n 1 -w 2000 >nul cd pkg\msvc echo Setting MSVC Environment... rem call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86 @@ -18,11 +11,8 @@ set PLATFORM= set tmp= set TMP= echo Building RetroArch... -echo Calling vcexpress to build project... -vcexpress RetroArch-msvc2010.sln /Out buildlog.txt /Rebuild "Release|x64" /Project RetroArch-msvc2010 /ProjectConfig "Release|x64" +call msbuild RetroArch-msvc2010.sln /p:configuration=Release;platform=x64 /flp:LogFile=buildlog.txt;verbosity=normal;Append echo Moving dist files... move x64\Release\RetroArch-msvc2010.exe ../../retroarch.exe move x64\Release\RetroArch-msvc2010.exe.intermediate.manifest ../../retroarch.exe.manifest -echo Contents of build log: -cat buildlog.txt echo Build finished. diff --git a/retroarch-build-msvc2010-x86.bat b/retroarch-build-msvc2010-x86.bat index 379e13b7..fe873a86 100644 --- a/retroarch-build-msvc2010-x86.bat +++ b/retroarch-build-msvc2010-x86.bat @@ -1,14 +1,8 @@ @echo off -echo tskill vcexpress -tskill vcexpress >nul 2>nul -rem this is a hack for sleep() -ping 192.0.2.1 -n 1 -w 2000 >nul -echo taskkill /t /f /im vcexpress.exe -taskkill /t /f /im vcexpress.exe >nul 2>nul -ping 192.0.2.1 -n 1 -w 2000 >nul cd pkg\msvc echo Setting MSVC Environment... call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86 + rem del Release\RetroArch-msvc2010.exe 2>nul echo Appending build log... echo %date% %time% >buildlog.txt @@ -17,11 +11,8 @@ set PLATFORM= set tmp= set TMP= echo Building RetroArch... -echo Calling vcexpress to build project... -vcexpress RetroArch-msvc2010.sln /Out buildlog.txt /Rebuild Release +call msbuild RetroArch-msvc2010.sln /p:configuration=Release;platform=win32 /flp:LogFile=buildlog.txt;verbosity=normal;Append echo Moving dist files... move Release\RetroArch-msvc2010.exe ../../retroarch.exe move Release\RetroArch-msvc2010.exe.intermediate.manifest ../../retroarch.exe.manifest -echo Contents of build log: -cat buildlog.txt echo Build finished. diff --git a/retroarch-debug-build-msvc2010-x64.bat b/retroarch-debug-build-msvc2010-x64.bat index 95a0c386..97eef3a3 100644 --- a/retroarch-debug-build-msvc2010-x64.bat +++ b/retroarch-debug-build-msvc2010-x64.bat @@ -1,17 +1,18 @@ @echo off cd pkg\msvc +echo Setting MSVC Environment... rem call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86 call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 rem del x64\Debug\RetroArch-msvc2010.exe 2>nul +echo Appending build log... echo %date% %time% >buildlog.txt -tskill vcexpress 2>nul set platform= set PLATFORM= set tmp= set TMP= echo Building RetroArch... -vcexpress RetroArch-msvc2010.sln /Out buildlog.txt /Rebuild "Debug|x64" /Project RetroArch-msvc2010 /ProjectConfig "Debug|x64" +call msbuild RetroArch-msvc2010.sln /p:configuration=Debug;platform=x64 /flp:LogFile=buildlog.txt;verbosity=normal;Append +echo Moving dist files... move x64\Debug\RetroArch-msvc2010.exe ../../retroarch.exe move x64\Debug\RetroArch-msvc2010.exe.intermediate.manifest ../../retroarch.exe.manifest -cat buildlog.txt echo Build finished. diff --git a/retroarch-debug-build-msvc2010-x86.bat b/retroarch-debug-build-msvc2010-x86.bat index ea2b3e2f..c31f795f 100644 --- a/retroarch-debug-build-msvc2010-x86.bat +++ b/retroarch-debug-build-msvc2010-x86.bat @@ -1,16 +1,18 @@ @echo off cd pkg\msvc +echo Setting MSVC Environment... call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86 + rem del Debug\RetroArch-msvc2010.exe 2>nul +echo Appending build log... echo %date% %time% >buildlog.txt -tskill vcexpress 2>nul set platform= set PLATFORM= set tmp= set TMP= echo Building RetroArch... -vcexpress RetroArch-msvc2010.sln /Out buildlog.txt /Rebuild Debug +call msbuild RetroArch-msvc2010.sln /p:configuration=Debug;platform=win32 /flp:LogFile=buildlog.txt;verbosity=normal;Append +echo Moving dist files... move Debug\RetroArch-msvc2010.exe ../../retroarch.exe move Debug\RetroArch-msvc2010.exe.intermediate.manifest ../../retroarch.exe.manifest -cat buildlog.txt echo Build finished.