WIP

Author: hoffstadt

.github/workflows/deploy.yml

@@ -23,7 +23,7 @@ jobs:
     runs-on: windows-2022
     strategy:
       matrix:
-        python-version: [ 3.14 ]
+        python-version: [ 3.13, 3.14 ]
 
     steps:
 
@@ -35,11 +35,14 @@ jobs:
         python-version: ${{ matrix.python-version }}
 
     - name: Show Python build paths
+      shell: cmd
       run: |
         python -c "import sys, sysconfig; print(sys.executable); print(sys.version)"
         python -c "import sysconfig; print('include=', sysconfig.get_paths()['include'])"
         python -c "import sysconfig; print('platinclude=', sysconfig.get_paths().get('platinclude'))"
         python -c "import sysconfig; print('EXT_SUFFIX=', sysconfig.get_config_var('EXT_SUFFIX'))"
+        for /f "delims=" %%I in ('python -c "import sysconfig; print(sysconfig.get_paths()[\"include\"]) "') do echo PL_PYTHON_INCLUDES=%%I>>"%GITHUB_ENV%"
+        for /f "delims=" %%I in ('python -c "import sys, os; print(os.path.join(sys.base_prefix, 'libs'))"') do echo PL_PYTHON_LIBS=%%I>>"%GITHUB_ENV%"
 
     - name: Install Dependencies
       run: |
@@ -56,6 +59,7 @@ jobs:
       shell: cmd
       run: |
         set VULKAN_SDK=D:/a/VulkanSDK
+        echo "%PL_PYTHON_INCLUDES%"
         cd %GITHUB_WORKSPACE%
         cd scripts
         python gen_build.py
@@ -83,7 +87,7 @@ jobs:
       CXX: g++-10
     strategy:
       matrix:
-        python-version: ["3.12"]
+        python-version: ["3.13", "3.14"]
 
     steps:
 
@@ -101,14 +105,7 @@ jobs:
         python -c "import sysconfig; print('include=', sysconfig.get_paths()['include'])"
         python -c "import sysconfig; print('platinclude=', sysconfig.get_paths().get('platinclude'))"
         python -c "import sysconfig; print('EXT_SUFFIX=', sysconfig.get_config_var('EXT_SUFFIX'))"
-
-    - name: Show Python build paths 2
-      run: |
-        cd /opt/hostedtoolcache/Python/3.12.12/x64
-        ls
-        cd include
-        cd python3.12
-        ls
+        echo "PL_PYTHON_INCLUDES=$(python -c 'import sysconfig; print(sysconfig.get_paths()["include"])')" >> "$GITHUB_ENV"
 
     - name: Install Dependencies
       run: |
@@ -137,6 +134,7 @@ jobs:
     - name: Build Package
       run: |
         cd $GITHUB_WORKSPACE
+        echo "$PL_PYTHON_INCLUDES"
         cd scripts
         python3 gen_build.py
         cd ../src

scripts/gen_build.py

@@ -289,8 +289,11 @@
             with pl.platform("Windows"):
                 with pl.compiler("msvc"):
 
-                    pl.add_include_directories("C:/hostedtoolcache/windows/Python/3.14.3/x64/Include")
-                    pl.add_link_directories("C:/hostedtoolcache/windows/Python/3.14.3/x64/libs")
+                    # pl.add_include_directories("C:/hostedtoolcache/windows/Python/3.14.3/x64/Include")
+                    # pl.add_link_directories("C:/hostedtoolcache/windows/Python/3.14.3/x64/libs")
+
+                    pl.add_include_directories("%PL_PYTHON_INCLUDES%")
+                    pl.add_link_directories("%PL_PYTHON_LIBS%")
 
                     pl.add_definitions("PL_VULKAN_BACKEND")
                     pl.add_include_directories("%VULKAN_SDK%\\Include")
@@ -307,8 +310,11 @@
             with pl.platform("Linux"):
                 with pl.compiler("gcc"):
 
-                    pl.add_include_directories("/opt/hostedtoolcache/Python/3.12.12/x64/include/python3.12")
-                    pl.add_link_directories("/opt/hostedtoolcache/Python/3.12.12/x64/libs")
+                    # pl.add_include_directories("/opt/hostedtoolcache/Python/3.12.12/x64/include/python3.12")
+                    # pl.add_link_directories("/opt/hostedtoolcache/Python/3.12.12/x64/libs")
+
+                    pl.add_include_directories("$PL_PYTHON_INCLUDES")
+                    # pl.add_link_directories("/opt/hostedtoolcache/Python/3.12.12/x64/libs")
 
                     pl.add_definitions("PL_VULKAN_BACKEND")
                     pl.add_include_directories('$VULKAN_SDK/include', '/usr/include/vulkan')

src/m_core.c

@@ -13,7 +13,7 @@ plIOI_is_key_pressed(PyObject* self, PyObject* args, PyObject* kwargs)
 
     int iKey = 0;
 
-	if (!pl_parse("i|", (char**)apcKeywords, args, kwargs, __FUNCTION__, &iKey))
+	if (!pl_parse("i|", (const char**)apcKeywords, args, kwargs, __FUNCTION__, &iKey))
 		return NULL;
 
     bool bResult = gptIOI->is_key_pressed(iKey, true);

src/m_draw.c

@@ -69,7 +69,7 @@ plDrawI_add_triangle_filled(PyObject* self, PyObject* args, PyObject* kwargs)
         NULL,
     };
 
-	if (!pl_parse("OOOO|$I", (char**)apcKeywords, args, kwargs, __FUNCTION__,
+	if (!pl_parse("OOOO|$I", (const char**)apcKeywords, args, kwargs, __FUNCTION__,
         &ptPythonLayer, &ptPythonP0, &ptPythonP1, &ptPythonP2, &uColor))
 		return NULL;
 

src/m_starter.c

@@ -11,7 +11,7 @@ plStarterI_initialize(PyObject* self, PyObject* args, PyObject* kwargs)
         NULL,
     };
 
-	if (!pl_parse("O|", (char**)apcKeywords, args, kwargs, __FUNCTION__, &ptWindow))
+	if (!pl_parse("O|", (const char**)apcKeywords, args, kwargs, __FUNCTION__, &ptWindow))
 		return NULL;
 
     plWindow* ptWindowPtr = PyCapsule_GetPointer(ptWindow, "plWindow");

src/m_ui.c

@@ -12,7 +12,7 @@ plUiI_begin_window(PyObject* self, PyObject* args, PyObject* kwargs)
         NULL,
     };
 
-	if (!pl_parse("s|", (char**)apcKeywords, args, kwargs, __FUNCTION__, &pcText))
+	if (!pl_parse("s|", (const char**)apcKeywords, args, kwargs, __FUNCTION__, &pcText))
 		return NULL;
     return PyBool_FromLong(gptUI->begin_window(pcText, NULL, 0));
 }
@@ -36,7 +36,7 @@ plUiI_button(PyObject* self, PyObject* args, PyObject* kwargs)
         NULL,
     };
 
-	if (!pl_parse("s|", (char**)apcKeywords,
+	if (!pl_parse("s|", (const char**)apcKeywords,
         args, kwargs, __FUNCTION__, &pcText))
 		return NULL;
 

src/m_unity.h

@@ -7,6 +7,6 @@
 #define PL_UNITY_BUILD
 #include "pl_unity_ext.c"
 
-bool pl_parse(char* formatstring, char* const* keywords, PyObject* args, PyObject* kwargs, const char* message, ...);
+bool pl_parse(char* formatstring, const char** keywords, PyObject* args, PyObject* kwargs, const char* message, ...);
 
 #endif // M_UNITY_H

src/m_vfs.c

@@ -13,7 +13,7 @@ plVfsI_mount_directory(PyObject* self, PyObject* args, PyObject* kwargs)
     const char* pcDirectory = NULL;
     const char* pcPhysicalDirectory = NULL;
 
-	if (!pl_parse("ss|", (char**)apcKeywords, args, kwargs, __FUNCTION__, &pcDirectory, &pcPhysicalDirectory))
+	if (!pl_parse("ss|", (const char**)apcKeywords, args, kwargs, __FUNCTION__, &pcDirectory, &pcPhysicalDirectory))
 		return NULL;
 
     gptVfs->mount_directory(pcDirectory, pcPhysicalDirectory, PL_VFS_MOUNT_FLAGS_NONE);

src/pilotlight.c

@@ -289,14 +289,14 @@ PyInit_pilotlight(void)
 }
 
 bool
-pl_parse(char* formatstring, char* const* keywords, PyObject* args, PyObject* kwargs, const char* message, ...)
+pl_parse(char* formatstring, const char** keywords, PyObject* args, PyObject* kwargs, const char* message, ...)
 {
 
     bool check = true;
 
     va_list arguments;
     va_start(arguments, message);
-    if (!PyArg_VaParseTupleAndKeywords(args, kwargs, formatstring, keywords, arguments))
+    if (!PyArg_VaParseTupleAndKeywords(args, kwargs, formatstring, (char * const *)keywords, arguments))
     {
         check = false;
     }