mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #60 from sidneys/hotfix/updated-macos-build

Browse source 
FIX: Updated build instructions for macOS 10.12 and XCode 9
This commit is contained in:
Thomas Goyne 2018-04-29 13:03:31 -07:00 committed by GitHub
commit 73c5e7a4c2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
README.md
View file

@ -45,9 +45,12 @@ Nothing older than Xcode 5 has been tested recently, but it is likely that some
For personal usage, you can use homebrew to install almost all of Aegisub's dependencies: For personal usage, you can use homebrew to install almost all of Aegisub's dependencies:
brew install boost --c++11 --with-icu4c brew install autoconf ffmpeg freetype gettext ffms2 fftw fribidi libass m4
brew install autoconf ffmpeg freetype ffms2 fftw fribidi libass
brew install --devel --with-gc64 luajit brew install --devel --with-gc64 luajit
brew install --HEAD icu4c
brew link --force icu4c
brew link --force gettext
brew install --HEAD --c++11 --with-icu4c boost
wxWidgets is located in vendor/wxWidgets, and can be built like so: wxWidgets is located in vendor/wxWidgets, and can be built like so:
@ -55,7 +58,7 @@ wxWidgets is located in vendor/wxWidgets, and can be built like so:
./configure --disable-aboutdlg --disable-animatectrl --disable-aui --disable-any \ ./configure --disable-aboutdlg --disable-animatectrl --disable-aui --disable-any \
--disable-bannerwindow --disable-base64 --disable-calendar --disable-caret \ --disable-bannerwindow --disable-base64 --disable-calendar --disable-caret \
--disable-cmdline --disable-colourpicker --disable-compat28 --disable-config \ --disable-cmdline --disable-colourpicker --disable-compat28 --disable-config \
--disable-constraints --disable-datepick --disable-dctransform --disable-debureport \ --disable-constraints --disable-datepick --disable-dctransform --disable-debugreport \
--disable-dialupman --disable-docview --disable-filehistory --disable-finddlg \ --disable-dialupman --disable-docview --disable-filehistory --disable-finddlg \
--disable-fs_archive --disable-fs_inet --disable-fs_zip --disable-fsvolume \ --disable-fs_archive --disable-fs_inet --disable-fs_zip --disable-fsvolume \
--disable-fswatcher --disable-gif --disable-help --disable-html --disable-ipc \ --disable-fswatcher --disable-gif --disable-help --disable-html --disable-ipc \

6
libaegisub/common/character_count.cpp
View file

@ -36,7 +36,7 @@ icu::BreakIterator& get_break_iterator(const char *ptr, size_t len) {
static std::once_flag token; static std::once_flag token;
std::call_once(token, [&] { std::call_once(token, [&] {
UErrorCode status = U_ZERO_ERROR; UErrorCode status = U_ZERO_ERROR;
bi.reset(BreakIterator::createCharacterInstance(Locale::getDefault(), status)); bi.reset(icu::BreakIterator::createCharacterInstance(icu::Locale::getDefault(), status));
if (U_FAILURE(status)) throw agi::InternalError("Failed to create character iterator"); if (U_FAILURE(status)) throw agi::InternalError("Failed to create character iterator");
}); });
@ -58,7 +58,7 @@ size_t count_in_range(Iterator begin, Iterator end, int mask) {
size_t count = 0; size_t count = 0;
auto pos = character_bi.first(); auto pos = character_bi.first();
for (auto end = character_bi.next(); end != BreakIterator::DONE; pos = end, end = character_bi.next()) { for (auto end = character_bi.next(); end != icu::BreakIterator::DONE; pos = end, end = character_bi.next()) {
if (!mask) if (!mask)
++count; ++count;
else { else {
@ -143,7 +143,7 @@ size_t IndexOfCharacter(std::string const& str, size_t n) {
auto& bi = get_break_iterator(&str[0], str.size()); auto& bi = get_break_iterator(&str[0], str.size());
for (auto pos = bi.first(), end = bi.next(); ; --n, pos = end, end = bi.next()) { for (auto pos = bi.first(), end = bi.next(); ; --n, pos = end, end = bi.next()) {
if (end == BreakIterator::DONE) if (end == icu::BreakIterator::DONE)
return str.size(); return str.size();
if (n == 0) if (n == 0)
return pos; return pos;

4
src/utils.cpp
View file

@ -270,9 +270,9 @@ agi::fs::path SaveFileSelector(wxString const& message, std::string const& optio
} }
wxString LocalizedLanguageName(wxString const& lang) { wxString LocalizedLanguageName(wxString const& lang) {
Locale iculoc(lang.c_str()); icu::Locale iculoc(lang.c_str());
if (!iculoc.isBogus()) { if (!iculoc.isBogus()) {
UnicodeString ustr; icu::UnicodeString ustr;
iculoc.getDisplayName(iculoc, ustr); iculoc.getDisplayName(iculoc, ustr);
#ifdef _MSC_VER #ifdef _MSC_VER
return wxString(ustr.getBuffer()); return wxString(ustr.getBuffer());