-
Notifications
You must be signed in to change notification settings - Fork 459
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
12 changed files
with
323 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| { | ||
| "name": "boinc-manager", | ||
| "dependencies": | ||
| [ | ||
| "ftgl", | ||
| { | ||
| "name": "curl", | ||
| "features": ["openssl","c-ares"], | ||
| "default-features": false | ||
| }, | ||
| { | ||
| "name": "wxwidgets", | ||
| "default-features": false | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| diff --git a/include/wx/osx/choice.h b/include/wx/osx/choice.h | ||
| index 37486f8a7c..d80bf53766 100644 | ||
| --- a/include/wx/osx/choice.h | ||
| +++ b/include/wx/osx/choice.h | ||
| @@ -73,6 +73,7 @@ public: | ||
| virtual int FindString(const wxString& s, bool bCase = false) const wxOVERRIDE; | ||
| virtual wxString GetString(unsigned int n) const wxOVERRIDE; | ||
| virtual void SetString(unsigned int pos, const wxString& s) wxOVERRIDE; | ||
| + void SetItemBitmap(unsigned int n, const wxBitmap& bitmap); | ||
| // osx specific event handling common for all osx-ports | ||
|
|
||
| virtual bool OSXHandleClicked(double timestampsec) wxOVERRIDE; | ||
| diff --git a/include/wx/osx/core/private.h b/include/wx/osx/core/private.h | ||
| index 429c8f7401..cae9f9eebe 100644 | ||
| --- a/include/wx/osx/core/private.h | ||
| +++ b/include/wx/osx/core/private.h | ||
| @@ -820,6 +820,7 @@ public : | ||
| } | ||
|
|
||
| virtual void SetItem(int pos, const wxString& item) = 0; | ||
| + virtual void SetItemBitmap(unsigned int n, const wxBitmap& bitmap) = 0; | ||
| }; | ||
|
|
||
|
|
||
| diff --git a/src/osx/choice_osx.cpp b/src/osx/choice_osx.cpp | ||
| index 6df17b34e5..1fcb2a5fc4 100644 | ||
| --- a/src/osx/choice_osx.cpp | ||
| +++ b/src/osx/choice_osx.cpp | ||
| @@ -217,6 +217,13 @@ wxString wxChoice::GetString(unsigned int n) const | ||
| return m_strings[n] ; | ||
| } | ||
|
|
||
| +void wxChoice::SetItemBitmap(unsigned int n, const wxBitmap& bitmap) | ||
| +{ | ||
| + wxCHECK_RET( IsValid(n), wxT("wxChoice::SetItemBitmap(): invalid index") ); | ||
| + | ||
| + dynamic_cast<wxChoiceWidgetImpl*>(GetPeer())->SetItemBitmap(n, bitmap); | ||
| +} | ||
| + | ||
| // ---------------------------------------------------------------------------- | ||
| // client data | ||
| // ---------------------------------------------------------------------------- | ||
| diff --git a/src/osx/cocoa/choice.mm b/src/osx/cocoa/choice.mm | ||
| index 2f0eb4ba51..52eb85c17d 100644 | ||
| --- a/src/osx/cocoa/choice.mm | ||
| +++ b/src/osx/cocoa/choice.mm | ||
| @@ -93,6 +93,12 @@ public: | ||
| m_popUpMenu->FindItemByPosition( pos )->SetItemLabel( s ) ; | ||
| } | ||
|
|
||
| + void SetItemBitmap(unsigned int n, const wxBitmap& bitmap) | ||
| + { | ||
| + if ( bitmap.Ok() ) | ||
| + m_popUpMenu->FindItemByPosition( n )->SetBitmap( bitmap ); ; | ||
| + } | ||
| + | ||
| private: | ||
| wxMenu* m_popUpMenu; | ||
| }; |
14 changes: 14 additions & 0 deletions
14
3rdParty/vcpkg_ports/patches/boinc_SetVisibilityHidden.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake | ||
| index 0584ecaeb5..3e0f5feb3e 100644 | ||
| --- a/build/cmake/init.cmake | ||
| +++ b/build/cmake/init.cmake | ||
| @@ -18,6 +18,9 @@ else() | ||
| # CMAKE_CXX_STANDARD not defined. | ||
| endif() | ||
|
|
||
| +set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden") | ||
| +set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden") | ||
| + | ||
| if(MSVC) | ||
| # Determine MSVC runtime library flag | ||
| set(MSVC_LIB_USE "/MD") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| diff --git a/wxwidgets/portfile.cmake b/wxwidgets/portfile.cmake | ||
| index f812fd8c5..27e289f2b 100644 | ||
| --- a/wxwidgets/portfile.cmake | ||
| +++ b/wxwidgets/portfile.cmake | ||
| @@ -12,6 +12,8 @@ vcpkg_from_github( | ||
| fix-pcre2.patch | ||
| gtk3-link-libraries.patch | ||
| sdl2.patch | ||
| + boinc_SetItemBitmap.patch | ||
| + boinc_SetVisibilityHidden.patch | ||
| ) | ||
|
|
||
| vcpkg_check_features( | ||
| @@ -75,6 +77,10 @@ vcpkg_cmake_configure( | ||
| -DwxUSE_UIACTIONSIMULATOR=OFF | ||
| -DCMAKE_DISABLE_FIND_PACKAGE_GSPELL=ON | ||
| -DCMAKE_DISABLE_FIND_PACKAGE_MSPACK=ON | ||
| + -DwxBUILD_MONOLITHIC=ON | ||
| + -DwxUSE_DIALUP_MANAGER=ON | ||
| + -DwxUSE_UNICODE=ON | ||
| + -DwxUSE_UNICODE_UTF8=ON | ||
| ${OPTIONS} | ||
| "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" | ||
| # The minimum cmake version requirement for Cotire is 2.8.12. |
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| #!/bin/sh | ||
| set -e | ||
|
|
||
| if [ ! -d "osx" ]; then | ||
| echo "start this script in the source root directory" | ||
| exit 1 | ||
| fi | ||
|
|
||
| CACHE_DIR="$PWD/3rdParty/buildCache/mac" | ||
| BUILD_DIR="$PWD/3rdParty/osx" | ||
| VCPKG_ROOT="$BUILD_DIR/vcpkg" | ||
| VCPKG_X64="$VCPKG_ROOT/installed/x64/x64-osx" | ||
| VCPKG_ARM64="$VCPKG_ROOT/installed/arm64/arm64-osx" | ||
| MAC_VCPKG=$BUILD_DIR/mac_vcpkg | ||
|
|
||
| osx/update_vcpkg_manager_universal.sh | ||
|
|
||
| echo " " | ||
| echo "Copy includes" | ||
| mkdir -p "$MAC_VCPKG/lib" | ||
| cp -R $VCPKG_X64/include $MAC_VCPKG | ||
| find $VCPKG_X64/lib/* -type d -maxdepth 0 -not -name "pkgconfig" -exec cp -R {} "$MAC_VCPKG/lib" \; | ||
|
|
||
| echo "Create universal libs:" | ||
|
|
||
| for lib_x64 in $VCPKG_X64/lib/*.a; do | ||
| lib_full_name=$(basename $lib_x64) | ||
| lib_name=$(basename -s .a $lib_x64) | ||
| lib_arm64="" | ||
| lib_universal="$MAC_VCPKG/lib/$lib_full_name" | ||
| if [ -f "$VCPKG_ARM64/lib/$lib_full_name" ]; then | ||
| lib_arm64="$VCPKG_ARM64/lib/$lib_full_name" | ||
| elif [ -f "$VCPKG_ARM64/lib/$lib_name-Darwin.a" ]; then | ||
| lib_arm64="$VCPKG_ARM64/lib/$lib_name-Darwin.a" | ||
| fi | ||
| if [ ! -z $lib_arm64 ]; then | ||
| echo exist $lib_full_name | ||
| lipo -create "$lib_x64" "$lib_arm64" -output $lib_universal | ||
| if ! lipo "$lib_x64" -verify_arch x86_64; then | ||
| echo "Fail verify x86_64 on $lib_x64" | ||
| exit 1 | ||
| fi | ||
| if ! lipo "$lib_arm64" -verify_arch arm64; then | ||
| echo "Fail verify arm64 on $lib_arm64" | ||
| exit 1 | ||
| fi | ||
| if ! lipo "$lib_universal" -verify_arch x86_64 arm64; then | ||
| echo "Fail verify x86_64 arm64 on $lib_universal" | ||
| exit 1 | ||
| fi | ||
| else | ||
| echo Not exist $lib_full_name | ||
| exit 1 | ||
| fi | ||
| done |
Oops, something went wrong.