Make Sparkle framework optional
This commit is contained in:
parent
77f49ac671
commit
70d6a1ac39
|
@ -844,7 +844,7 @@ if(APPLE AND ENABLE_ONLINEUPDATES)
|
|||
COMMAND ${CCS8}
|
||||
)
|
||||
|
||||
TARGET_LINK_LIBRARIES(visualboyadvance-m ${SPARKLE_FRAMEWORK})
|
||||
TARGET_LINK_LIBRARIES(visualboyadvance-m $<LINK_LIBRARY:WEAK_FRAMEWORK,${SPARKLE_FRAMEWORK}>)
|
||||
endif()
|
||||
|
||||
if(NOT WIN32 AND NOT APPLE)
|
||||
|
|
|
@ -2,17 +2,21 @@
|
|||
|
||||
#include "wx/autoupdater/macos/sparkle-wrapper.h"
|
||||
|
||||
extern bool is_macosx_1013_or_newer();
|
||||
|
||||
SparkleWrapper autoupdater;
|
||||
|
||||
void initAutoupdater()
|
||||
{
|
||||
autoupdater.addAppcastURL("https://data.visualboyadvance-m.org/appcast.xml");
|
||||
if (is_macosx_1013_or_newer())
|
||||
autoupdater.addAppcastURL("https://data.visualboyadvance-m.org/appcast.xml");
|
||||
}
|
||||
|
||||
|
||||
void checkUpdatesUi()
|
||||
{
|
||||
autoupdater.checkForUpdatesUi();
|
||||
if (is_macosx_1013_or_newer())
|
||||
autoupdater.checkForUpdatesUi();
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -11,6 +11,16 @@
|
|||
#include "wx/wxvbam.h"
|
||||
|
||||
#ifndef NO_METAL
|
||||
bool is_macosx_1013_or_newer()
|
||||
{
|
||||
// Mac OS X 10.12 version check
|
||||
if (NSAppKitVersionNumber >= 1561) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
bool is_macosx_1012_or_newer()
|
||||
{
|
||||
// Mac OS X 10.12 version check
|
||||
|
|
|
@ -202,7 +202,7 @@ FFMPEG_DISTS='
|
|||
libvpx libx264 libx265 libxavs libzmq libzvbi ffmpeg
|
||||
'
|
||||
|
||||
PROJECT_ARGS="-DDISABLE_MACOS_PACKAGE_MANAGERS=TRUE -DENABLE_ONLINEUPDATES=OFF -DwxWidgets_CONFIG_EXECUTABLE='$BUILD_ROOT/root/bin/wx-config' -DwxWidgets_CONFIG_OPTIONS='--prefix=$BUILD_ROOT/root' -DBUILD_TESTING=NO"
|
||||
PROJECT_ARGS="-DDISABLE_MACOS_PACKAGE_MANAGERS=TRUE -DENABLE_ONLINEUPDATES=ON -DwxWidgets_CONFIG_EXECUTABLE='$BUILD_ROOT/root/bin/wx-config' -DwxWidgets_CONFIG_OPTIONS='--prefix=$BUILD_ROOT/root' -DBUILD_TESTING=NO"
|
||||
|
||||
: ${PATH_SEP:=':'}
|
||||
|
||||
|
|
Loading…
Reference in New Issue