diff --git a/clientgui/BOINCTaskBar.h b/clientgui/BOINCTaskBar.h index c3419b6c98..6c6d2f5331 100644 --- a/clientgui/BOINCTaskBar.h +++ b/clientgui/BOINCTaskBar.h @@ -22,6 +22,9 @@ #pragma interface "BOINCTaskBar.cpp" #endif +#ifdef __APPLE__ +#define NSInteger int +#endif #if defined(__WXMSW__) #include "msw/taskbarex.h" diff --git a/mac_build/boinc.xcodeproj/project.pbxproj b/mac_build/boinc.xcodeproj/project.pbxproj index 3dfa9a0f65..35ab010885 100644 --- a/mac_build/boinc.xcodeproj/project.pbxproj +++ b/mac_build/boinc.xcodeproj/project.pbxproj @@ -4406,13 +4406,13 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ../clientgui/mac/MacGUI.pch; HEADER_SEARCH_PATHS = ( - "../../wxWidgets-3.1.6/include", - "../../wxWidgets-3.1.6/build/osx/setup/cocoa/include", + "../../wxWidgets-3.2.2.1/include", + "../../wxWidgets-3.2.2.1/build/osx/setup/cocoa/include", ../clientgui, "../lib/**", ); INFOPLIST_FILE = Info.plist; - LIBRARY_SEARCH_PATHS = "../../wxWidgets-3.1.6/build/osx/build/Debug"; + LIBRARY_SEARCH_PATHS = "../../wxWidgets-3.2.2.1/build/osx/build/Debug"; OTHER_CFLAGS = ( "-DHAVE_CONFIG_H", "-D_FILE_OFFSET_BITS=64", @@ -4484,13 +4484,13 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ../clientgui/mac/MacGUI.pch; HEADER_SEARCH_PATHS = ( - "../../wxWidgets-3.1.6/include", - "../../wxWidgets-3.1.6/build/osx/setup/cocoa/include", + "../../wxWidgets-3.2.2.1/include", + "../../wxWidgets-3.2.2.1/build/osx/setup/cocoa/include", ../clientgui, "../lib/**", ); INFOPLIST_FILE = Info.plist; - LIBRARY_SEARCH_PATHS = "../../wxWidgets-3.1.6/build/osx/build/Release"; + LIBRARY_SEARCH_PATHS = "../../wxWidgets-3.2.2.1/build/osx/build/Release"; OTHER_CFLAGS = ( "-DHAVE_CONFIG_H", "-D_FILE_OFFSET_BITS=64", diff --git a/mac_build/dependencyNames.sh b/mac_build/dependencyNames.sh index e16c3648ff..9af5b6f799 100644 --- a/mac_build/dependencyNames.sh +++ b/mac_build/dependencyNames.sh @@ -52,10 +52,10 @@ curlBaseName="curl" curlFileName="curl-7.79.1.tar.gz" curlURL="https://curl.se/download/curl-7.79.1.tar.gz" -wxWidgetsDirName="wxWidgets-3.1.6" +wxWidgetsDirName="wxWidgets-3.2.2.1" wxWidgetsBaseName="wxWidgets" -wxWidgetsFileName="wxWidgets-3.1.6.tar.bz2" -wxWidgetsURL="https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.6/wxWidgets-3.1.6.tar.bz2" +wxWidgetsFileName="wxWidgets-3.2.2.1.tar.bz2" +wxWidgetsURL="https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.2.1/wxWidgets-3.2.2.1.tar.bz2" freetypeDirName="freetype-2.11.0" freetypeBaseName="freetype"