Merge branch 'main' into dev/freq

Lorys89 · Jun 27, 2023 · 316e112 · 316e112
2 parents 77eb545 + bccac58
commit 316e112
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 35 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,6 +1,8 @@
 SMCProcessorAMD Changelog
 ======================
 
+#### v1.0.2
+
 #### v1.0.1
 - Code Fix
 - Support read cpu proximity temp

diff --git a/README.md b/README.md
@@ -15,13 +15,15 @@ VirtualSMC plugin for AMD CPU temperature
 
 
 ## Supported Systems
-- macOS Sonoma
-- macOS Ventura
-- macOS Monterey
-- macOS Big Sur 
-- macOS Catalina 
-
-## Legacy systems not supported
+- macOS Sonoma 14.x.x (MinKernel 23.0.0 - MaxKernel 23.99.99)
+- macOS Ventura 13.x.x (MinKernel 22.0.0 - MaxKernel 22.99.99)
+- macOS Monterey 12.x.x (MinKernel 21.0.0 - MaxKernel 21.99.99)
+- macOS Big Sur 11.x.x (MinKernel 20.0.0 - MaxKernel 20.99.99)
+- macOS Catalina 10.15.x (MinKernel 19.0.0 - MaxKernel 19.99.99)
+- macOS Mojave 10.14.x (MinKernel 18.0.0 - MaxKernel 18.99.99)
+- macOS High Sierra 10.13.x (MinKernel 17.0.0 - MaxKernel 17.99.99) 
+
+## Old systems not supported
 
 ## Credits
 - [Apple](https://www.apple.com) for macOS

diff --git a/SMCProcessorAMD.xcodeproj/project.pbxproj b/SMCProcessorAMD.xcodeproj/project.pbxproj
@@ -17,6 +17,7 @@
 
 /* Begin PBXFileReference section */
  776129DF2A4371FE003779C0 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
+ A37CAA882A49AA4F00A3C68A /* Changelog.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = Changelog.md; sourceTree = "<group>"; };
  B57D27F423F66AE7002BC699 /* SMCProcessorAMD.kext */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SMCProcessorAMD.kext; sourceTree = BUILT_PRODUCTS_DIR; };
  B57D27FB23F66AE7002BC699 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
  B57D280123F66C8E002BC699 /* SMCProcessorAMD.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SMCProcessorAMD.cpp; sourceTree = "<group>"; };
@@ -42,6 +43,7 @@
  isa = PBXGroup;
  children = (
  776129DF2A4371FE003779C0 /* README.md */,
+ A37CAA882A49AA4F00A3C68A /* Changelog.md */,
  B57D27F623F66AE7002BC699 /* SMCProcessorAMD */,
  B57D27F523F66AE7002BC699 /* Products */,
  );
@@ -227,7 +229,7 @@
  GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
  GCC_WARN_UNUSED_FUNCTION = YES;
  GCC_WARN_UNUSED_VARIABLE = YES;
- MACOSX_DEPLOYMENT_TARGET = 10.15;
+ MACOSX_DEPLOYMENT_TARGET = 10.13;
  MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
  MTL_FAST_MATH = YES;
  ONLY_ACTIVE_ARCH = YES;
@@ -268,7 +270,7 @@
  CLANG_WARN_UNREACHABLE_CODE = YES;
  CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
  COPY_PHASE_STRIP = NO;
- DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ DEBUG_INFORMATION_FORMAT = dwarf;
  ENABLE_NS_ASSERTIONS = NO;
  ENABLE_STRICT_OBJC_MSGSEND = YES;
  GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -279,7 +281,7 @@
  GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
  GCC_WARN_UNUSED_FUNCTION = YES;
  GCC_WARN_UNUSED_VARIABLE = YES;
- MACOSX_DEPLOYMENT_TARGET = 10.15;
+ MACOSX_DEPLOYMENT_TARGET = 10.13;
  MTL_ENABLE_DEBUG_INFO = NO;
  MTL_FAST_MATH = YES;
  SDKROOT = macosx;
@@ -292,7 +294,7 @@
  ARCHS = x86_64;
  CODE_SIGN_STYLE = Manual;
  COMBINE_HIDPI_IMAGES = YES;
- CURRENT_PROJECT_VERSION = 1.0.1;
+ CURRENT_PROJECT_VERSION = 1.0.2;
  GCC_PREPROCESSOR_DEFINITIONS = (
  "DEBUG=1",
  "$(inherited)",
@@ -305,9 +307,10 @@
  );
  INFOPLIST_FILE = SMCProcessorAMD/Info.plist;
  LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/Lilu.kext/Contents/Resources/Library";
- MARKETING_VERSION = 1.0.1;
+ MACOSX_DEPLOYMENT_TARGET = 10.13;
+ MARKETING_VERSION = 1.0.2;
  MODULE_NAME = as.lorys89.SMCProcessorAMD;
- MODULE_VERSION = 1.0.1;
+ MODULE_VERSION = 1.0.2;
  OTHER_CPLUSPLUSFLAGS = "-Wno-inconsistent-missing-override";
  OTHER_LDFLAGS = "-static";
  PRODUCT_BUNDLE_IDENTIFIER = as.lorys89.SMCProcessorAMD;
@@ -322,7 +325,7 @@
  ARCHS = x86_64;
  CODE_SIGN_STYLE = Manual;
  COMBINE_HIDPI_IMAGES = YES;
- CURRENT_PROJECT_VERSION = 1.0.1;
+ CURRENT_PROJECT_VERSION = 1.0.2;
  GCC_PREPROCESSOR_DEFINITIONS = (
  "PRODUCT_NAME=$(PRODUCT_NAME)",
  "MODULE_VERSION=$(MODULE_VERSION)",
@@ -333,9 +336,10 @@
  );
  INFOPLIST_FILE = SMCProcessorAMD/Info.plist;
  LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/Lilu.kext/Contents/Resources/Library";
- MARKETING_VERSION = 1.0.1;
+ MACOSX_DEPLOYMENT_TARGET = 10.13;
+ MARKETING_VERSION = 1.0.2;
  MODULE_NAME = as.lorys89.SMCProcessorAMD;
- MODULE_VERSION = 1.0.1;
+ MODULE_VERSION = 1.0.2;
  OTHER_CPLUSPLUSFLAGS = "-Wno-inconsistent-missing-override";
  OTHER_LDFLAGS = "-static";
  PRODUCT_BUNDLE_IDENTIFIER = as.lorys89.SMCProcessorAMD;

diff --git a/SMCProcessorAMD/SMCProcessorAMD.cpp b/SMCProcessorAMD/SMCProcessorAMD.cpp
@@ -339,22 +339,3 @@ EXPORT extern "C" kern_return_t ADDPR(kern_stop)(kmod_info_t *, void *) {
  // It is not safe to unload VirtualSMC plugins!
  return KERN_FAILURE;
 }
-
-
-#ifdef __MAC_10_15
-
-// macOS 10.15 adds Dispatch function to all OSObject instances and basically
-// every header is now incompatible with 10.14 and earlier.
-// Here we add a stub to permit older macOS versions to link.
-// Note, this is done in both kern_util and plugin_start as plugins will not link
-// to Lilu weak exports from vtable.
-
-kern_return_t WEAKFUNC PRIVATE OSObject::Dispatch(const IORPC rpc) {
- PANIC("util", "OSObject::Dispatch smcproc stub called");
-}
-
-kern_return_t WEAKFUNC PRIVATE OSMetaClassBase::Dispatch(const IORPC rpc) {
- PANIC("util", "OSMetaClassBase::Dispatch smcproc stub called");
-}
-
-#endif