GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-11 18:09:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Compile libffi and mpdecimal statically on Windows

Browse Source 
Contributes to CURA-9365
This commit is contained in:
j.spijker@ultimaker.com 2022-06-19 19:08:24 +02:00 committed by Jelle Spijker
parent 0fb8d62825
commit a31124673b
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conandata.yml
View File

@ -8,6 +8,7 @@ requirements:
- "fdm_materials/(latest)@ultimaker/stable"
- "cura_binary_data/(latest)@ultimaker/stable"
- "cpython/3.10.4@ultimaker/testing"
- "libffi/3.2.1"
- "mpdecimal/2.5.1@ultimaker/testing"
- "tcl/8.6.10@ultimaker/testing"
- "tk/8.6.10@ultimaker/testing"
@ -20,6 +21,7 @@ requirements:
- "fdm_materials/5.1.0"
- "cura_binary_data/5.1.0"
- "cpython/3.10.4@ultimaker/testing"
- "libffi/3.2.1"
- "mpdecimal/2.5.1@ultimaker/testing"
- "tcl/8.6.10@ultimaker/testing"
- "tk/8.6.10@ultimaker/testing"
@ -32,6 +34,7 @@ requirements:
- "fdm_materials/[5.1.0-beta]@ultimaker/stable"
- "cura_binary_data/[5.1.0-beta]@ultimaker/stable"
- "cpython/3.10.4@ultimaker/testing"
- "libffi/3.2.1"
- "mpdecimal/2.5.1@ultimaker/testing"
- "tcl/8.6.10@ultimaker/testing"
- "tk/8.6.10@ultimaker/testing"
@ -44,6 +47,7 @@ requirements:
- "fdm_materials/[5.1.0-cura_9365]@ultimaker/testing"
- "cura_binary_data/[5.1.0-cura_9365]@ultimaker/testing"
- "cpython/3.10.4@ultimaker/testing"
- "libffi/3.2.1"
- "mpdecimal/2.5.1@ultimaker/testing"
- "tcl/8.6.10@ultimaker/testing"
- "tk/8.6.10@ultimaker/testing"

5
conanfile.py
View File

@ -86,7 +86,10 @@ class CuraConan(ConanFile):
def configure(self):
self.options["*"].shared = True
if self.settings.os == "Windows":
self.options["mpdecimal"].cxx = False
# Needed to compile CPython on Windows with our configuration voor Visual Studio
self.options["mpdecimal"].cxx = True
self.options["mpdecimal"].shared = False
self.options["libffi"].shared = False
def validate(self):
if self.version and tools.Version(self.version) <= tools.Version("4"):