修复编译错误

Author: Arkueid

Wrapper/Live2D.cpp

@@ -12,10 +12,6 @@
 #include "PyLAppModel.hpp"
 #include "PyModel.hpp"
 
-#ifndef Py_IsNone
-#define Py_IsNone(o) (o == Py_None)
-#endif
-
 static LAppAllocator _cubismAllocator;
 static Csm::CubismFramework::Option _cubismOption;
 

Wrapper/PyLAppModel.hpp

@@ -1,8 +1,7 @@
 #pragma once
 #include <LAppModel.hpp>
 
-#define Py_LIMITED_API
-#include <Python.h>
+#include "Python.hpp"
 
 struct PyLAppModelObject
 {

Wrapper/PyModel.cpp

@@ -736,10 +736,10 @@ static PyObject *PyModel_New(PyTypeObject *type, PyObject *args, PyObject *kwarg
 }
 
 static PyType_Slot PyModel_slots[] = {
-	{Py_tp_new, PyModel_New},
-	{Py_tp_init, PyModel_Init},
-	{Py_tp_dealloc, PyModel_Dealloc},
-	{Py_tp_methods, PyModel_Methods},
+	{Py_tp_new, (void*)PyModel_New},
+	{Py_tp_init, (void*)PyModel_Init},
+	{Py_tp_dealloc, (void*)PyModel_Dealloc},
+	{Py_tp_methods, (void*)PyModel_Methods},
 	{0, 0},
 };
 

Wrapper/PyModel.hpp

@@ -2,8 +2,7 @@
 
 #include <fine-grained/Model.hpp>
 
-#define Py_LIMITED_API
-#include <Python.h>
+#include "Python.hpp"
 
 struct PyModelObject {
     PyObject_HEAD

Wrapper/Python.hpp

@@ -0,0 +1,7 @@
+#pragma once
+#define Py_LIMITED_API
+#include <Python.h>
+
+#ifndef Py_IsNone
+#define Py_IsNone(o) (o == Py_None)
+#endif

cmake/Wrapper.cmake

@@ -1,6 +1,7 @@
 # Create Wrapper 
 set(Wrapper Live2DWrapper)
 add_library(${Wrapper} SHARED 
+  ${PROJECT_ROOT}/Wrapper/Python.hpp
   ${PROJECT_ROOT}/Wrapper/Live2D.cpp
   ${PROJECT_ROOT}/Wrapper/PyLAppModel.hpp
   ${PROJECT_ROOT}/Wrapper/PyLAppModel.cpp

setup.py

@@ -10,7 +10,7 @@
 from setuptools.command.bdist_wheel import bdist_wheel
 
 NAME = "live2d-py"
-VERSION = "0.4.6"  # TODO: edit before push
+VERSION = "0.5.0"  # TODO: edit before push
 DESCRIPTION = "Live2D Python SDK"
 LONG_DESCRIPTION = open("README.md", "r", encoding="utf-8").read().replace("./", "https://raw.githubusercontent.com/Arkueid/live2d-py/refs/heads/main/")
 AUTHOR = "Arkueid"