diff --git a/appveyor.yml b/appveyor.yml index ce5ff0bc..54aaaa03 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,9 +1,10 @@ image: Visual Studio 2019 -version: '4.2.6.{build}' +version: '4.2.7.{build}' platform: x64 branches: only: - master + - devel - develop configuration: @@ -12,7 +13,7 @@ configuration: - ReleaseGOG environment: - PYTHON: "C:\\Python35-x64" + PYTHON: "C:\\Python312-x64" matrix: - JC_SKSE: "64" - JC_SKSE: "VR" diff --git a/dep/skse64/skse64.7z b/dep/skse64/skse64.7z index f440f8a5..b7031506 100644 Binary files a/dep/skse64/skse64.7z and b/dep/skse64/skse64.7z differ diff --git a/src/JContainers/src/jcontainers_constants.h b/src/JContainers/src/jcontainers_constants.h index 00dcf7b3..fc36b4b8 100644 --- a/src/JContainers/src/jcontainers_constants.h +++ b/src/JContainers/src/jcontainers_constants.h @@ -6,7 +6,7 @@ namespace collections { # define JC_API_VERSION 4 # define JC_FEATURE_VERSION 2 -# define JC_PATCH_VERSION 6 +# define JC_PATCH_VERSION 7 # define JC_FILE_VERSION JC_API_VERSION, JC_FEATURE_VERSION, JC_PATCH_VERSION, 0 diff --git a/src/JContainers/src/skse/string.h b/src/JContainers/src/skse/string.h index ef635b40..0b8e7eaa 100644 --- a/src/JContainers/src/skse/string.h +++ b/src/JContainers/src/skse/string.h @@ -36,9 +36,9 @@ namespace skse { DEFINE_MEMBER_FN(Set, string_ref *, 0x00C60C50, const char * buf); DEFINE_MEMBER_FN(Release, void, 0x00C61E90); #else - DEFINE_MEMBER_FN(ctor, string_ref *, 0x00C61360, const char * buf); - DEFINE_MEMBER_FN(Set, string_ref *, 0x00C614F0, const char * buf); - DEFINE_MEMBER_FN(Release, void, 0x00C62730); + DEFINE_MEMBER_FN(ctor, string_ref *, 0x00CE7D90, const char * buf); + DEFINE_MEMBER_FN(Set, string_ref *, 0x00CE7F20, const char * buf); + DEFINE_MEMBER_FN(Release, void, 0x00CE9160); #endif public: diff --git a/tools/install.py b/tools/install.py index 96519aa3..cc9e8499 100755 --- a/tools/install.py +++ b/tools/install.py @@ -25,11 +25,10 @@ class JCLib(object): def __init__(self, location): import ctypes - from ctypes import cdll print ('Load:', os.path.relpath (location, ROOT)) self.location = location - self.lib = cdll.LoadLibrary(location); + self.lib = ctypes.CDLL (location); self.lib.JC_versionString.restype = ctypes.c_char_p self.lib.JC_produceCode.argtypes = [ctypes.c_char_p]