diff --git a/DIST/mfc120u.dll b/DIST/mfc120u.dll deleted file mode 100644 index 3e5c2be..0000000 Binary files a/DIST/mfc120u.dll and /dev/null differ diff --git a/DIST/mfc140u.dll b/DIST/mfc140u.dll new file mode 100644 index 0000000..cd6255f Binary files /dev/null and b/DIST/mfc140u.dll differ diff --git a/DIST/msvcr120.dll b/DIST/msvcr120.dll deleted file mode 100644 index 8c36149..0000000 Binary files a/DIST/msvcr120.dll and /dev/null differ diff --git a/DIST/vcruntime140.dll b/DIST/vcruntime140.dll new file mode 100644 index 0000000..79729e2 Binary files /dev/null and b/DIST/vcruntime140.dll differ diff --git a/DIST/with-mdc.deploy b/DIST/with-mdc.deploy index d15da29..c0ab5ce 100644 --- a/DIST/with-mdc.deploy +++ b/DIST/with-mdc.deploy @@ -4,7 +4,7 @@ faddenSoft http://www.faddensoft.com/ CiderPress http://a2ciderpress.com/ -4.0.5 +4.1.0-d1 TRUE 44310 C:\DATA\faddenSoft\fs.ico @@ -185,16 +185,16 @@ FALSE 1 FALSE + -C:\Src\ciderpress\DIST\mfc120u.dll +C:\Src\ciderpress\DIST\mfc140u.dll 3 -0 +1 TRUE TRUE FALSE FALSE -C:\Src\ciderpress\DIST\msvcr120.dll +C:\Src\ciderpress\DIST\vcruntime140.dll 3 -0 +1 TRUE TRUE FALSE @@ -396,7 +396,7 @@ FALSE 4095 -Setup405.exe +Setup410d1.exe FALSE diff --git a/app/MyApp.h b/app/MyApp.h index a421c06..7617e73 100644 --- a/app/MyApp.h +++ b/app/MyApp.h @@ -13,9 +13,9 @@ /* CiderPress version numbers */ #define kAppMajorVersion 4 -#define kAppMinorVersion 0 -#define kAppBugVersion 5 -#define kAppDevString L"" +#define kAppMinorVersion 1 +#define kAppBugVersion 0 +#define kAppDevString L"-d1" /* * Windows application object. diff --git a/app/app.vcxproj b/app/app.vcxproj index bb54ec3..0ce7326 100644 --- a/app/app.vcxproj +++ b/app/app.vcxproj @@ -15,18 +15,17 @@ MFCProj {B023611B-7086-46E1-847B-3B21C4732384} - 8.1 Application - v120_xp - Dynamic Unicode + v142 + Dynamic Application - v120_xp + v142 Dynamic Unicode diff --git a/diskimg/diskimg.vcxproj b/diskimg/diskimg.vcxproj index 05780c5..df5137c 100644 --- a/diskimg/diskimg.vcxproj +++ b/diskimg/diskimg.vcxproj @@ -14,18 +14,17 @@ {0CFE6FAD-0126-4E99-8625-C807D1D2AAF4} - 8.1 DynamicLibrary - v120_xp - false + v142 Unicode + Dynamic DynamicLibrary - v120_xp + v142 false Unicode diff --git a/diskimg/libhfs/libhfs.vcxproj b/diskimg/libhfs/libhfs.vcxproj index 4616815..a4140a3 100644 --- a/diskimg/libhfs/libhfs.vcxproj +++ b/diskimg/libhfs/libhfs.vcxproj @@ -14,20 +14,19 @@ {0FA742E9-8C07-43DD-AFF8-CE31FAF70821} - 8.1 StaticLibrary - v120_xp + v142 false Unicode StaticLibrary - v120_xp - false + v142 Unicode + Dynamic diff --git a/mdc/mdc.vcxproj b/mdc/mdc.vcxproj index 3724c8e..9c893bd 100644 --- a/mdc/mdc.vcxproj +++ b/mdc/mdc.vcxproj @@ -15,18 +15,17 @@ MFCProj {7DF41D71-C8DC-48AA-B372-4613210310A4} - 8.1 Application - v120_xp - Dynamic + v142 Unicode + Dynamic Application - v120_xp + v142 Dynamic Unicode diff --git a/nufxlib/nufxlib.vcxproj b/nufxlib/nufxlib.vcxproj index 4564868..f895613 100644 --- a/nufxlib/nufxlib.vcxproj +++ b/nufxlib/nufxlib.vcxproj @@ -14,19 +14,19 @@ {C48AE53B-3DCB-43B1-9207-B7C5B6BB78AF} Win32Proj nufxlib - 8.1 DynamicLibrary true - v120_xp + v142 Unicode + Dynamic DynamicLibrary false - v120_xp + v142 true Unicode diff --git a/reformat/reformat.vcxproj b/reformat/reformat.vcxproj index 2bf81a2..c6da20b 100644 --- a/reformat/reformat.vcxproj +++ b/reformat/reformat.vcxproj @@ -15,18 +15,17 @@ MFCProj - 8.1 StaticLibrary - v120_xp - Dynamic + v142 Unicode + Dynamic StaticLibrary - v120_xp + v142 Dynamic Unicode diff --git a/util/util.vcxproj b/util/util.vcxproj index 0a9167a..b864ef3 100644 --- a/util/util.vcxproj +++ b/util/util.vcxproj @@ -15,18 +15,17 @@ MFCProj {04BFAE2A-7AB3-4B63-B4AB-42FF1D6AD3C5} - 8.1 StaticLibrary - v120_xp - Dynamic + v142 Unicode + Dynamic StaticLibrary - v120_xp + v142 Dynamic Unicode diff --git a/zlib/zlib.vcxproj b/zlib/zlib.vcxproj index dc5d907..60e64c8 100644 --- a/zlib/zlib.vcxproj +++ b/zlib/zlib.vcxproj @@ -14,19 +14,19 @@ {B66109F4-217B-43C0-86AA-EB55657E5AC0} Win32Proj zlib - 8.1 DynamicLibrary true - v120_xp + v142 Unicode + Dynamic DynamicLibrary false - v120_xp + v142 true Unicode