Skip to content

Commit 218bab4

Browse files
committed
Create custom ports for mac with script
1 parent 38a9e1e commit 218bab4

29 files changed

+61
-802
lines changed

.github/workflows/osx.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ jobs:
131131
strategy:
132132
matrix:
133133
type: [manager-vcpkg, libs-cmake]
134-
fail-fast: false
134+
fail-fast: false
135135
steps:
136136
- uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd
137137
with:

3rdParty/vcpkg_ports/ports/mac/wxwidgets/boinc_SetVisibilityHidden.patch renamed to 3rdParty/vcpkg_ports/patches/boinc_SetVisibilityHidden.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake
2-
index 0bc4f934b9..ec703ad19b 100644
2+
index 0584ecaeb5..3e0f5feb3e 100644
33
--- a/build/cmake/init.cmake
44
+++ b/build/cmake/init.cmake
5-
@@ -12,6 +12,9 @@ if(DEFINED wxBUILD_CXX_STANDARD AND NOT wxBUILD_CXX_STANDARD STREQUAL COMPILER_D
6-
set(CMAKE_CXX_STANDARD ${wxBUILD_CXX_STANDARD})
5+
@@ -18,6 +18,9 @@ else()
6+
# CMAKE_CXX_STANDARD not defined.
77
endif()
88

99
+set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden")
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
diff --git a/pcre2/vcpkg.json b/pcre2/vcpkg.json
2+
--- a/pcre2/vcpkg.json
3+
+++ b/pcre2/vcpkg.json
4+
@@ -14,11 +14,8 @@
5+
"name": "vcpkg-cmake-config",
6+
"host": true
7+
}
8+
],
9+
- "default-features": [
10+
- "platform-default-features"
11+
- ],
12+
"features": {
13+
"jit": {
14+
"description": "Enable support for Just-In-Time compiling regex matchers",
15+
"supports": "!emscripten"
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
diff --git a/wxwidgets/portfile.cmake b/wxwidgets/portfile.cmake
2+
index f812fd8c5..27e289f2b 100644
3+
--- a/wxwidgets/portfile.cmake
4+
+++ b/wxwidgets/portfile.cmake
5+
@@ -12,6 +12,8 @@ vcpkg_from_github(
6+
fix-pcre2.patch
7+
gtk3-link-libraries.patch
8+
sdl2.patch
9+
+ boinc_SetItemBitmap.patch
10+
+ boinc_SetVisibilityHidden.patch
11+
)
12+
13+
vcpkg_check_features(
14+
@@ -75,6 +77,10 @@ vcpkg_cmake_configure(
15+
-DwxUSE_UIACTIONSIMULATOR=OFF
16+
-DCMAKE_DISABLE_FIND_PACKAGE_GSPELL=ON
17+
-DCMAKE_DISABLE_FIND_PACKAGE_MSPACK=ON
18+
+ -DwxBUILD_MONOLITHIC=ON
19+
+ -DwxUSE_DIALUP_MANAGER=ON
20+
+ -DwxUSE_UNICODE=ON
21+
+ -DwxUSE_UNICODE_UTF8=ON
22+
${OPTIONS}
23+
"-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}"
24+
# The minimum cmake version requirement for Cotire is 2.8.12.

3rdParty/vcpkg_ports/ports/mac/.gitkeep

Whitespace-only changes.

3rdParty/vcpkg_ports/ports/mac/pcre2/no-static-suffix.patch

Lines changed: 0 additions & 33 deletions
This file was deleted.

3rdParty/vcpkg_ports/ports/mac/pcre2/pcre2-10.35_fix-uwp.patch

Lines changed: 0 additions & 10 deletions
This file was deleted.

3rdParty/vcpkg_ports/ports/mac/pcre2/portfile.cmake

Lines changed: 0 additions & 76 deletions
This file was deleted.

3rdParty/vcpkg_ports/ports/mac/pcre2/vcpkg.json

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)