Try again.

MeshInspector · Sep 20, 2024 · 3cf9f7e · 3cf9f7e
1 parent ddd463b
commit 3cf9f7e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/.github/workflows/pip-build.yml b/.github/workflows/pip-build.yml
@@ -277,7 +277,9 @@ jobs:
         shell: cmd
         run: |
           call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=amd64
-          ./scripts/mrbind/generate_win.bat -B PACKAGE_NAME=meshlib PYTHON_PKGCONF_NAME=python-${{matrix.py-version}}-embed
+          ./scripts/mrbind/generate_win.bat -B PACKAGE_NAME=meshlib \
+              PYTHON_CFLAGS=-IC:/hostedtoolcache/windows/python/${{steps.setup-python.outputs.python-version}}/x64/include \
+              PYTHON_LDFLAGS=-LC:/hostedtoolcache/windows/python/${{steps.setup-python.outputs.python-version}}/x64/libs -l${{matrix.py-file}}
 
       - name: Run Test
         working-directory: source\x64\Release

diff --git a/scripts/mrbind/generate.mk b/scripts/mrbind/generate.mk
@@ -161,17 +161,16 @@ endif
 DEPS_INCLUDE_DIR := $(DEPS_BASE_DIR)/include
 
 # Pkg-config name for Python.
+ifneq ($(and $(value PYTHON_CFLAGS),$(value PYTHON_LDFLAGS)),)
+$(info Using custom Python flags.)
+else
 ifneq ($(IS_WINDOWS),)
-$(info Following Python pkg-config files are available: $(wildcard $(DEPS_BASE_DIR)/lib/pkgconfig/python*))
 PYTHON_PKGCONF_NAME := $(basename $(notdir $(lastword $(sort $(wildcard $(DEPS_BASE_DIR)/lib/pkgconfig/python-*-embed.pc)))))
 else
 PYTHON_PKGCONF_NAME := python3-embed
 endif
 $(if $(PYTHON_PKGCONF_NAME),$(info Using Python version: $(PYTHON_PKGCONF_NAME:-embed=)),$(error Can't find the Python package in vcpkg))
-
-# Python-config executable. Currently not used on Windows.
-# Returns `python3-config`, or `python-3.XX-config`.
-PYTHON_CONFIG := $(subst -,,$(PYTHON_PKGCONF_NAME:-embed=))-config
+endif
 
 # Python compilation flags.
 ifneq ($(IS_WINDOWS),)
@@ -188,6 +187,8 @@ ifneq ($(IS_WINDOWS),)
 PYTHON_MODULE_SUFFIX := .pyd
 else
 PYTHON_MODULE_SUFFIX := .so
+# # Python-config executable. Returns `python3-config`, or `python-3.XX-config`.
+# PYTHON_CONFIG := $(subst -,,$(PYTHON_PKGCONF_NAME:-embed=))-config
 # PYTHON_MODULE_SUFFIX := $(call safe_shell,$(PYTHON_CONFIG) --extension-suffix)
 endif
 $(info Using Python module suffix: $(PYTHON_MODULE_SUFFIX))

diff --git a/scripts/mrbind/install_mrbind_windows_msys2.bat b/scripts/mrbind/install_mrbind_windows_msys2.bat
@@ -1,5 +1,4 @@
-@echo on
-rem TODO: ^ change that back to off
+@echo off
 
 rem Downloads the source code for MRBind and builds it, at `C:\msys64_meshlib_mrbind\home\username\mrbind\build`.
 rem Before running this, run `install_deps_windows_msys2.bat`.