From 3d1b3bac40beceeedd3d8928c4e230b083a2ce0b Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Fri, 12 May 2017 12:08:17 +0100 Subject: [PATCH] [misc] update project files to VS2017 --- README.md | 2 +- appveyor.yml | 13 ++++++------- src/.msvc/rufus.vcxproj | 10 +++++----- src/bled/.msvc/bled.vcxproj | 10 +++++----- src/getopt/.msvc/getopt.vcxproj | 10 +++++----- src/libcdio/driver/.msvc/driver.vcxproj | 10 +++++----- src/libcdio/iso9660/.msvc/iso9660.vcxproj | 10 +++++----- src/libcdio/udf/.msvc/udf.vcxproj | 10 +++++----- src/ms-sys/.msvc/ms-sys.vcxproj | 10 +++++----- src/rufus.rc | 10 +++++----- src/syslinux/libfat/.msvc/libfat.vcxproj | 10 +++++----- .../libinstaller/.msvc/libinstaller.vcxproj | 10 +++++----- src/syslinux/win/.msvc/win.vcxproj | 10 +++++----- 13 files changed, 62 insertions(+), 63 deletions(-) diff --git a/README.md b/README.md index 41aa9079..b154432a 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ Features Compilation ----------- -Use either Visual Studio (2015 or later), WDK 7.1 (Windows Driver Kit) or MinGW and then +Use either Visual Studio (2017 or later), WDK 7.1 (Windows Driver Kit) or MinGW and then invoke the `.sln`, `wdk_build.cmd` or `configure`/`make` respectively. #### Visual Studio diff --git a/appveyor.yml b/appveyor.yml index a661bbc5..55b22189 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -os: Visual Studio 2015 +os: Visual Studio 2017 init: - ps: >- @@ -10,20 +10,19 @@ init: environment: global: - PLATFORMTOOLSET: v140 BITS: 32 matrix: - CONFIGURATION: Debug - COMPILER: MSVC15 + COMPILER: MSVC PLATFORM: x86_32 - CONFIGURATION: Debug - COMPILER: MSVC15 + COMPILER: MSVC PLATFORM: x86_64 - CONFIGURATION: Release - COMPILER: MSVC15 + COMPILER: MSVC PLATFORM: x86_32 - CONFIGURATION: Release - COMPILER: MSVC15 + COMPILER: MSVC PLATFORM: x86_64 - CONFIGURATION: Release COMPILER: MinGW @@ -41,5 +40,5 @@ install: - if [%PLATFORM%]==[x86_64] set BITS=64 build_script: -- if [%COMPILER%]==[MSVC15] msbuild rufus.sln /m /p:Configuration=%CONFIGURATION%,Platform=%PLATFORM% /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" +- if [%COMPILER%]==[MSVC] msbuild rufus.sln /m /p:Configuration=%CONFIGURATION%,Platform=%PLATFORM% /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" - if [%COMPILER%]==[MinGW] C:\msys64\usr\bin\bash -lc "export PATH=/mingw%BITS%/bin:$PATH; cd /c/projects/rufus; ./configure --build=%PLATFORM%-w64-mingw32 --host=%PLATFORM%-w64-mingw32 --disable-debug; make -j4" diff --git a/src/.msvc/rufus.vcxproj b/src/.msvc/rufus.vcxproj index 718707d4..f0e0c393 100644 --- a/src/.msvc/rufus.vcxproj +++ b/src/.msvc/rufus.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -29,23 +29,23 @@ Application Unicode true - v140_xp + v141_xp Application Unicode - v140_xp + v141_xp Application Unicode true - v140 + v141 Application Unicode - v140 + v141 diff --git a/src/bled/.msvc/bled.vcxproj b/src/bled/.msvc/bled.vcxproj index df66fe9a..7720bd52 100644 --- a/src/bled/.msvc/bled.vcxproj +++ b/src/bled/.msvc/bled.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -65,22 +65,22 @@ StaticLibrary Unicode - v140 + v141 StaticLibrary Unicode - v140 + v141 StaticLibrary Unicode - v140 + v141 StaticLibrary Unicode - v140 + v141 diff --git a/src/getopt/.msvc/getopt.vcxproj b/src/getopt/.msvc/getopt.vcxproj index 90b66fba..0d91edf7 100644 --- a/src/getopt/.msvc/getopt.vcxproj +++ b/src/getopt/.msvc/getopt.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,23 +27,23 @@ StaticLibrary Unicode true - v140 + v141 StaticLibrary Unicode - v140 + v141 StaticLibrary Unicode true - v140 + v141 StaticLibrary Unicode - v140 + v141 diff --git a/src/libcdio/driver/.msvc/driver.vcxproj b/src/libcdio/driver/.msvc/driver.vcxproj index 40c61f7a..b5d35884 100644 --- a/src/libcdio/driver/.msvc/driver.vcxproj +++ b/src/libcdio/driver/.msvc/driver.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -59,27 +59,27 @@ StaticLibrary true Unicode - v140 + v141 StaticLibrary false true Unicode - v140 + v141 StaticLibrary true Unicode - v140 + v141 StaticLibrary false true Unicode - v140 + v141 diff --git a/src/libcdio/iso9660/.msvc/iso9660.vcxproj b/src/libcdio/iso9660/.msvc/iso9660.vcxproj index 1d6930fa..f7422c56 100644 --- a/src/libcdio/iso9660/.msvc/iso9660.vcxproj +++ b/src/libcdio/iso9660/.msvc/iso9660.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -51,27 +51,27 @@ StaticLibrary true Unicode - v140 + v141 StaticLibrary false true Unicode - v140 + v141 StaticLibrary true Unicode - v140 + v141 StaticLibrary false true Unicode - v140 + v141 diff --git a/src/libcdio/udf/.msvc/udf.vcxproj b/src/libcdio/udf/.msvc/udf.vcxproj index 3e485a94..4892162f 100644 --- a/src/libcdio/udf/.msvc/udf.vcxproj +++ b/src/libcdio/udf/.msvc/udf.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -45,27 +45,27 @@ StaticLibrary true Unicode - v140 + v141 StaticLibrary false true Unicode - v140 + v141 StaticLibrary true Unicode - v140 + v141 StaticLibrary false true Unicode - v140 + v141 diff --git a/src/ms-sys/.msvc/ms-sys.vcxproj b/src/ms-sys/.msvc/ms-sys.vcxproj index afc21093..0cfac813 100644 --- a/src/ms-sys/.msvc/ms-sys.vcxproj +++ b/src/ms-sys/.msvc/ms-sys.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -86,27 +86,27 @@ StaticLibrary true Unicode - v140 + v141 StaticLibrary false true Unicode - v140 + v141 StaticLibrary true Unicode - v140 + v141 StaticLibrary false true Unicode - v140 + v141 diff --git a/src/rufus.rc b/src/rufus.rc index 948bb0a3..ead379be 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 242, 376 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_ACCEPTFILES -CAPTION "Rufus 2.15.1111" +CAPTION "Rufus 2.15.1112" FONT 8, "Segoe UI Symbol", 400, 0, 0x0 BEGIN LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8 @@ -334,8 +334,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,15,1111,0 - PRODUCTVERSION 2,15,1111,0 + FILEVERSION 2,15,1112,0 + PRODUCTVERSION 2,15,1112,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -352,13 +352,13 @@ BEGIN BEGIN VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "2.15.1111" + VALUE "FileVersion", "2.15.1112" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2017 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "2.15.1111" + VALUE "ProductVersion", "2.15.1112" END END BLOCK "VarFileInfo" diff --git a/src/syslinux/libfat/.msvc/libfat.vcxproj b/src/syslinux/libfat/.msvc/libfat.vcxproj index 51b736a3..085263ee 100644 --- a/src/syslinux/libfat/.msvc/libfat.vcxproj +++ b/src/syslinux/libfat/.msvc/libfat.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -41,27 +41,27 @@ StaticLibrary true Unicode - v140 + v141 StaticLibrary false true Unicode - v140 + v141 StaticLibrary true Unicode - v140 + v141 StaticLibrary false true Unicode - v140 + v141 diff --git a/src/syslinux/libinstaller/.msvc/libinstaller.vcxproj b/src/syslinux/libinstaller/.msvc/libinstaller.vcxproj index 7351f73c..42cd58c0 100644 --- a/src/syslinux/libinstaller/.msvc/libinstaller.vcxproj +++ b/src/syslinux/libinstaller/.msvc/libinstaller.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -41,27 +41,27 @@ StaticLibrary true Unicode - v140 + v141 StaticLibrary false true Unicode - v140 + v141 StaticLibrary true Unicode - v140 + v141 StaticLibrary false true Unicode - v140 + v141 diff --git a/src/syslinux/win/.msvc/win.vcxproj b/src/syslinux/win/.msvc/win.vcxproj index 3917936a..3bfe0982 100644 --- a/src/syslinux/win/.msvc/win.vcxproj +++ b/src/syslinux/win/.msvc/win.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -35,27 +35,27 @@ StaticLibrary true Unicode - v140 + v141 StaticLibrary false true Unicode - v140 + v141 StaticLibrary true Unicode - v140 + v141 StaticLibrary false true Unicode - v140 + v141