From ca5a9dde5f726834c986f65406d99fdfc2806c49 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Thu, 13 Nov 2014 01:01:27 +0000 Subject: [PATCH] [misc] upgrade solution files for Visual Studio 2013 Community Edition * Visual Studio 2013 is now free for Open Source developers, so make it our default. * See http://www.visualstudio.com/news/vs2013-community-vs --- rufus.sln | 5 ++++- src/.msvc/rufus.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.h | 1 + src/rufus.rc | 16 ++++++++-------- src/syslinux/libfat/.msvc/libfat.vcxproj | 10 +++++----- .../libinstaller/.msvc/libinstaller.vcxproj | 10 +++++----- 11 files changed, 53 insertions(+), 49 deletions(-) diff --git a/rufus.sln b/rufus.sln index 57c38756..22b7b80c 100644 --- a/rufus.sln +++ b/rufus.sln @@ -1,5 +1,8 @@ + Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 +# Visual Studio 2013 +VisualStudioVersion = 12.0.31101.0 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rufus", "src\.msvc\rufus.vcxproj", "{731858A7-0303-4988-877B-9C0DD6471864}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ms-sys", "src\ms-sys\.msvc\ms-sys.vcxproj", "{2B1D078D-8EB4-4398-9CA4-23457265A7F6}" diff --git a/src/.msvc/rufus.vcxproj b/src/.msvc/rufus.vcxproj index 6bd9f016..387814de 100644 --- a/src/.msvc/rufus.vcxproj +++ b/src/.msvc/rufus.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -29,23 +29,23 @@ Application Unicode true - v110_xp + v120_xp Application Unicode - v110_xp + v120_xp Application Unicode true - v110 + v120 Application Unicode - v110 + v120 diff --git a/src/getopt/.msvc/getopt.vcxproj b/src/getopt/.msvc/getopt.vcxproj index 54d56c86..bd5a315a 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 - v110 + v120 StaticLibrary Unicode - v110 + v120 StaticLibrary Unicode true - v110 + v120 StaticLibrary Unicode - v110 + v120 diff --git a/src/libcdio/driver/.msvc/driver.vcxproj b/src/libcdio/driver/.msvc/driver.vcxproj index 1fe3fa25..0daaebaf 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 - v110 + v120 StaticLibrary false true Unicode - v110 + v120 StaticLibrary true Unicode - v110 + v120 StaticLibrary false true Unicode - v110 + v120 diff --git a/src/libcdio/iso9660/.msvc/iso9660.vcxproj b/src/libcdio/iso9660/.msvc/iso9660.vcxproj index 3a08a9af..ec308fa1 100644 --- a/src/libcdio/iso9660/.msvc/iso9660.vcxproj +++ b/src/libcdio/iso9660/.msvc/iso9660.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -50,27 +50,27 @@ StaticLibrary true Unicode - v110 + v120 StaticLibrary false true Unicode - v110 + v120 StaticLibrary true Unicode - v110 + v120 StaticLibrary false true Unicode - v110 + v120 diff --git a/src/libcdio/udf/.msvc/udf.vcxproj b/src/libcdio/udf/.msvc/udf.vcxproj index 9c6b5f54..6be96843 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 - v110 + v120 StaticLibrary false true Unicode - v110 + v120 StaticLibrary true Unicode - v110 + v120 StaticLibrary false true Unicode - v110 + v120 diff --git a/src/ms-sys/.msvc/ms-sys.vcxproj b/src/ms-sys/.msvc/ms-sys.vcxproj index b61cd713..cf3ed0dc 100644 --- a/src/ms-sys/.msvc/ms-sys.vcxproj +++ b/src/ms-sys/.msvc/ms-sys.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -79,27 +79,27 @@ StaticLibrary true Unicode - v110 + v120 StaticLibrary false true Unicode - v110 + v120 StaticLibrary true Unicode - v110 + v120 StaticLibrary false true Unicode - v110 + v120 diff --git a/src/rufus.h b/src/rufus.h index 76685deb..7d8ebc64 100644 --- a/src/rufus.h +++ b/src/rufus.h @@ -22,6 +22,7 @@ #if defined(_MSC_VER) // Disable some VS2012 Code Analysis warnings +#pragma warning(disable: 4996) // Ignore deprecated (eg. GetVersionEx()), as we have to contend with XP #pragma warning(disable: 28159) // VS2012 wants us to use GetTickCount64(), but it's not available on XP #endif diff --git a/src/rufus.rc b/src/rufus.rc index f3a17d46..c43afac9 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -32,7 +32,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 227, 329 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Rufus 1.5.0.540" +CAPTION "Rufus 1.5.0.541" FONT 8, "Segoe UI", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,113,291,50,14 @@ -164,7 +164,7 @@ END IDD_DIALOG_XP DIALOGEX 12, 12, 227, 329 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Rufus 1.5.0.540" +CAPTION "Rufus 1.5.0.541" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,113,291,50,14 @@ -297,7 +297,7 @@ END IDD_DIALOG_RTL DIALOGEX 12, 12, 227, 329 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL -CAPTION "Rufus 1.5.0.540" +CAPTION "Rufus 1.5.0.541" FONT 8, "Segoe UI", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,113,291,50,14 @@ -437,7 +437,7 @@ END IDD_DIALOG_RTL_XP DIALOGEX 12, 12, 227, 329 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL -CAPTION "Rufus 1.5.0.540" +CAPTION "Rufus 1.5.0.541" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,113,291,50,14 @@ -699,8 +699,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,5,0,540 - PRODUCTVERSION 1,5,0,540 + FILEVERSION 1,5,0,541 + PRODUCTVERSION 1,5,0,541 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -717,13 +717,13 @@ BEGIN BEGIN VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "1.5.0.540" + VALUE "FileVersion", "1.5.0.541" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2014 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "1.5.0.540" + VALUE "ProductVersion", "1.5.0.541" END END BLOCK "VarFileInfo" diff --git a/src/syslinux/libfat/.msvc/libfat.vcxproj b/src/syslinux/libfat/.msvc/libfat.vcxproj index 38056f26..fca0aabd 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 - v110 + v120 StaticLibrary false true Unicode - v110 + v120 StaticLibrary true Unicode - v110 + v120 StaticLibrary false true Unicode - v110 + v120 diff --git a/src/syslinux/libinstaller/.msvc/libinstaller.vcxproj b/src/syslinux/libinstaller/.msvc/libinstaller.vcxproj index fda8ad36..9fcb1be6 100644 --- a/src/syslinux/libinstaller/.msvc/libinstaller.vcxproj +++ b/src/syslinux/libinstaller/.msvc/libinstaller.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -43,27 +43,27 @@ StaticLibrary true Unicode - v110 + v120 StaticLibrary false true Unicode - v110 + v120 StaticLibrary true Unicode - v110 + v120 StaticLibrary false true Unicode - v110 + v120