Browse Source

package/ci: explicitly add SDL DLL path for static Windows builds.

On shared builds it's not needed as it is never actually imported by any
tests, so there the autodetection alone is sufficient.
next
Vladimír Vondruš 4 months ago
parent
commit
f8a3130d73
  1. 2
      package/ci/appveyor-desktop.bat
  2. 6
      package/ci/appveyor.yml

2
package/ci/appveyor-desktop.bat

@ -119,7 +119,7 @@ cmake .. ^
-DPYBIND11_PYTHON_VERSION=3.%PYTHON% ^ -DPYBIND11_PYTHON_VERSION=3.%PYTHON% ^
-DMAGNUM_WITH_PYTHON=ON ^ -DMAGNUM_WITH_PYTHON=ON ^
-DMAGNUM_BUILD_TESTS=ON ^ -DMAGNUM_BUILD_TESTS=ON ^
%COMPILER_EXTRA% -G Ninja || exit /b %COMPILER_EXTRA% %BINDINGS_EXTRA% -G Ninja || exit /b
cmake --build . || exit /b cmake --build . || exit /b
cmake --build . --target install || exit /b cmake --build . --target install || exit /b

6
package/ci/appveyor.yml

@ -28,6 +28,9 @@ environment:
BUILD_STATIC: ON BUILD_STATIC: ON
PYTHON: 8 PYTHON: 8
PYBIND: 2.3.0 PYBIND: 2.3.0
# The static build puts everything including Sdl2Application together so it
# needs the SDL DLL directory as well
BINDINGS_EXTRA: "-DMAGNUM_PYTHON_BINDINGS_DLL_PATH=C:/projects/magnum-bindings/deps/bin;C:/projects/magnum-bindings/SDL/lib/x64"
- TARGET: desktop - TARGET: desktop
COMPILER: msvc COMPILER: msvc
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
@ -35,6 +38,9 @@ environment:
BUILD_STATIC: ON BUILD_STATIC: ON
PYTHON: 8 PYTHON: 8
PYBIND: 2.9.0 # first supporting MSVC 2022 PYBIND: 2.9.0 # first supporting MSVC 2022
# The static build puts everything including Sdl2Application together so it
# needs the SDL DLL directory as well
BINDINGS_EXTRA: "-DMAGNUM_PYTHON_BINDINGS_DLL_PATH=C:/projects/magnum-bindings/deps/bin;C:/projects/magnum-bindings/SDL/lib/x64"
# clang-cl crashes with pybind11, "Illegal instruction" and # clang-cl crashes with pybind11, "Illegal instruction" and
# lld-link: warning: ignoring unknown argument '-flto' # lld-link: warning: ignoring unknown argument '-flto'
# LLVM ERROR: Associative COMDAT symbol '??0type_error@pybind11@@QEAA@PEBD@Z' does not exist. # LLVM ERROR: Associative COMDAT symbol '??0type_error@pybind11@@QEAA@PEBD@Z' does not exist.

Loading…
Cancel
Save