diff --git a/rufus_2010.sln b/rufus_2010.sln index 113d9672..0a5a957a 100644 --- a/rufus_2010.sln +++ b/rufus_2010.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rufus", ".msvc\rufus_2010.vcxproj", "{731858A7-0303-4988-877B-9C0DD6471864}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rufus", "src\.msvc\rufus_2010.vcxproj", "{731858A7-0303-4988-877B-9C0DD6471864}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/.msvc/rufus_2010.vcxproj b/src/.msvc/rufus_2010.vcxproj similarity index 100% rename from .msvc/rufus_2010.vcxproj rename to src/.msvc/rufus_2010.vcxproj diff --git a/.msvc/rufus_2010.vcxproj.filters b/src/.msvc/rufus_2010.vcxproj.filters similarity index 100% rename from .msvc/rufus_2010.vcxproj.filters rename to src/.msvc/rufus_2010.vcxproj.filters diff --git a/.msvc/rufus_sources b/src/.msvc/rufus_sources similarity index 100% rename from .msvc/rufus_sources rename to src/.msvc/rufus_sources diff --git a/src/rufus.rc b/src/rufus.rc index 77620dc7..34f92302 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -30,7 +30,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 206, 263 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_APPWINDOW -CAPTION "Rufus v1.0.1.73" +CAPTION "Rufus v1.0.1.74" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,94,223,50,14 @@ -63,7 +63,7 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,231,175,50,14,WS_GROUP CONTROL "https://github.com/pbatard/rufus",IDC_ABOUT_RUFUS_URL, "SysLink",WS_TABSTOP,46,47,114,9 - LTEXT "Version 1.0.1 (Build 73)",IDC_STATIC,46,19,78,8 + LTEXT "Version 1.0.1 (Build 74)",IDC_STATIC,46,19,78,8 PUSHBUTTON "License...",IDC_ABOUT_LICENSE,46,175,50,14,WS_GROUP EDITTEXT IDC_ABOUT_COPYRIGHTS,46,107,235,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL LTEXT "Report bugs or request enhancements at:",IDC_STATIC,46,66,187,8 @@ -162,8 +162,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,1,73 - PRODUCTVERSION 1,0,1,73 + FILEVERSION 1,0,1,74 + PRODUCTVERSION 1,0,1,74 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -180,13 +180,13 @@ BEGIN BEGIN VALUE "CompanyName", "akeo.ie" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "1.0.1.73" + VALUE "FileVersion", "1.0.1.74" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "1.0.1.73" + VALUE "ProductVersion", "1.0.1.74" END END BLOCK "VarFileInfo" diff --git a/wdk_build.cmd b/wdk_build.cmd index acca2fb9..5a1b1ef2 100644 --- a/wdk_build.cmd +++ b/wdk_build.cmd @@ -10,14 +10,16 @@ set PWD=%~dp0 set ARCH_DIR=%_BUILDARCH% if /I Test%_BUILDARCH%==Testx86 set ARCH_DIR=i386 +cd src if EXIST Makefile ren Makefile Makefile.hide copy .msvc\rufus_sources sources >NUL 2>&1 + @echo on %BUILD_CMD% @echo off if errorlevel 1 goto builderror -copy obj%BUILD_ALT_DIR%\%ARCH_DIR%\rufus.exe . >NUL 2>&1 +copy obj%BUILD_ALT_DIR%\%ARCH_DIR%\rufus.exe .. >NUL 2>&1 if EXIST Makefile.hide ren Makefile.hide Makefile if EXIST sources del sources >NUL 2>&1