From 08adc7f1bd93d285ac670e1ac8333edfa903f83a Mon Sep 17 00:00:00 2001 From: drmortalwombat <90205530+drmortalwombat@users.noreply.github.com> Date: Sat, 1 Jul 2023 10:06:08 +0200 Subject: [PATCH] Bump version number --- README.md | 4 +- oscar64/oscar64.cpp | 4 +- oscar64/oscar64.rc | 8 ++-- oscar64setup/oscar64setup.vdproj | 69 ++++++++++++++++++++++++++++++-- 4 files changed, 75 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index b03eeb6..84f3064 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,9 @@ Supported Features: * reference types * member functions * constructors and destructors -* operator overloading (assignment) +* operator overloading (not complete yet) +* single inheritance of class and struct +* const member functions ## Installation and Usage diff --git a/oscar64/oscar64.cpp b/oscar64/oscar64.cpp index 455f79a..18aa475 100644 --- a/oscar64/oscar64.cpp +++ b/oscar64/oscar64.cpp @@ -74,7 +74,7 @@ int main2(int argc, const char** argv) #else strcpy(strProductName, "oscar64"); - strcpy(strProductVersion, "1.20.208"); + strcpy(strProductVersion, "1.21.209"); #ifdef __APPLE__ uint32_t length = sizeof(basePath); @@ -491,7 +491,7 @@ int main2(int argc, const char** argv) } else { - printf("oscar64 {-i=includePath} [-o=output.prg] [-rt=runtime.c] [-tf=target] [-tm=machine] [-e] [-n] [-g] [-O(0|1|2|3)] {-dSYMBOL[=value]} [-v] [-d64=diskname] {-f[z]=file.xxx} {source.c}\n"); + printf("oscar64 {-i=includePath} [-o=output.prg] [-rt=runtime.c] [-tf=target] [-tm=machine] [-e] [-n] [-g] [-O(0|1|2|3)] [-pp] {-dSYMBOL[=value]} [-v] [-d64=diskname] {-f[z]=file.xxx} {source.c}\n"); return 0; } diff --git a/oscar64/oscar64.rc b/oscar64/oscar64.rc index 80cd98b..abb5828 100644 --- a/oscar64/oscar64.rc +++ b/oscar64/oscar64.rc @@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,20,208,0 - PRODUCTVERSION 1,20,208,0 + FILEVERSION 1,21,209,0 + PRODUCTVERSION 1,21,209,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -43,12 +43,12 @@ BEGIN BEGIN VALUE "CompanyName", "oscar64" VALUE "FileDescription", "oscar64 compiler" - VALUE "FileVersion", "1.20.208.0" + VALUE "FileVersion", "1.21.209.0" VALUE "InternalName", "oscar64.exe" VALUE "LegalCopyright", "Copyright (C) 2021" VALUE "OriginalFilename", "oscar64.exe" VALUE "ProductName", "oscar64" - VALUE "ProductVersion", "1.20.208.0" + VALUE "ProductVersion", "1.21.209.0" END END BLOCK "VarFileInfo" diff --git a/oscar64setup/oscar64setup.vdproj b/oscar64setup/oscar64setup.vdproj index df8af4f..9350e86 100644 --- a/oscar64setup/oscar64setup.vdproj +++ b/oscar64setup/oscar64setup.vdproj @@ -94,6 +94,12 @@ } "Entry" { + "MsmKey" = "8:_12ACD00110E34BF9A3C06E00A16449D9" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_12C998C755E643038CDF5D9F56983ECA" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -448,6 +454,12 @@ } "Entry" { + "MsmKey" = "8:_6EE9325B01F74FFF8146A6AD7FE71A31" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_7127D91089DA4162BB8DC8EAB0C107F0" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1471,6 +1483,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_12ACD00110E34BF9A3C06E00A16449D9" + { + "SourcePath" = "8:..\\include\\opp\\string.cpp" + "TargetName" = "8:string.cpp" + "Tag" = "8:" + "Folder" = "8:_D76A1802AFD04C48A519C9F8700E53CC" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_12C998C755E643038CDF5D9F56983ECA" { "SourcePath" = "8:..\\include\\fixmath.h" @@ -2651,6 +2683,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6EE9325B01F74FFF8146A6AD7FE71A31" + { + "SourcePath" = "8:..\\include\\opp\\string.h" + "TargetName" = "8:string.h" + "Tag" = "8:" + "Folder" = "8:_D76A1802AFD04C48A519C9F8700E53CC" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7127D91089DA4162BB8DC8EAB0C107F0" { "SourcePath" = "8:..\\include\\c64\\vic.c" @@ -5202,6 +5254,17 @@ { } } + "{9EF0B969-E518-4E46-987F-47570745A589}:_D76A1802AFD04C48A519C9F8700E53CC" + { + "Name" = "8:opp" + "AlwaysCreate" = "11:FALSE" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Property" = "8:_36F6D5A5C23349D190D89E25E1F78C22" + "Folders" + { + } + } "{9EF0B969-E518-4E46-987F-47570745A589}:_E0C7A8689A4144D0842BCEDA85A07B5D" { "Name" = "8:gfx" @@ -5233,15 +5296,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:oscar64" - "ProductCode" = "8:{30CBD281-E43B-4539-A830-C8EA3D9ECEEC}" - "PackageCode" = "8:{B24DA444-F39A-4974-97A1-BF31AB02202C}" + "ProductCode" = "8:{30BEED33-B5ED-4443-B82C-B365168D7780}" + "PackageCode" = "8:{46BC17E9-3B6D-4E1E-A1E7-42B0AD7512D8}" "UpgradeCode" = "8:{9AB61EFF-ACAC-4079-9950-8D96615CD4EF}" "AspNetVersion" = "8:2.0.50727.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.20.208" + "ProductVersion" = "8:1.21.209" "Manufacturer" = "8:oscar64" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:"