Skip to content

Commit acebb27

Browse files
authored
Merge pull request #60 from DLR-SC/freeimage-static-freeimage-lib-def
Rebuild freeimageplus-static and opencascade-static
2 parents f8e98d9 + 0f485e0 commit acebb27

6 files changed

Lines changed: 8 additions & 10 deletions

File tree

.github/workflows/build-conda-packages.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
fail-fast: false
1818
matrix:
1919
arch: ['x64']
20-
os: [windows-latest, ubuntu-22.04, macos-latest]
20+
os: [windows-2022, ubuntu-22.04, macos-13]
2121
python: ['3.9', '3.10', '3.11', '3.12']
2222
exclude:
2323
- arch: x86
@@ -74,10 +74,6 @@ jobs:
7474
python --version
7575
python build_recipes.py
7676
77-
- name: setup MSVC
78-
if: contains(matrix.os, 'windows')
79-
uses: ilammy/msvc-dev-cmd@v1
80-
8177
- name: build conda packages
8278
if: contains(matrix.os, 'windows')
8379
shell: cmd /C call {0}

conda_build_config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ MACOSX_SDK_VERSION:
22
- '10.14' # [osx]
33

44
c_compiler:
5-
- vs2015 # [win]
5+
- vs2019 # [win]
66

77
cxx_compiler:
8-
- vs2015 # [win]
8+
- vs2019 # [win]
99

1010
cxx_compiler_version:
1111
- 9.3.0 # [linux]

freeimageplus-static/build.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#!/bin/bash
22

3+
# The following CFFLAGS are required on macOS for FreeImage to build correctly. Note that this may not be the cleanest solution, but it works.
4+
export CFLAGS="${CFLAGS} -D_LARGEFILE64_SOURCE=1 -Wno-error=implicit-function-declaration"
35
export CXXFLAGS="$CXXFLAGS -std=gnu++98"
46

57
# Build step

freeimageplus-static/meta.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ source:
1212
- installlinux.patch [linux]
1313

1414
build:
15-
number: 3
15+
number: 4
1616

1717
requirements:
1818
build:

freetype-static/meta.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ source:
1010
md5: 6a386964e18ba28cb93370e57a19031b
1111

1212
build:
13-
number: 3
13+
number: 4
1414

1515
requirements:
1616
build:

opencascade-static/meta.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ source:
1515
- dlr-feature-coons_c2.patch
1616

1717
build:
18-
number: 3
18+
number: 4
1919
detect_binary_files_with_prefix: True
2020

2121
requirements:

0 commit comments

Comments
 (0)