Skip to content

Commit

Permalink
[macOS] prerequisite version of macOS is now 10.13 or higher (#300)
Browse files Browse the repository at this point in the history
* [macOS] prerequisite version of macOS is now 10.13 or higher

The commit fixes build failure due to change of Xcode 14.3
https://developer.apple.com/forums/thread/725300

* [docs] updates changelog and prerequsite note
  • Loading branch information
hkrn authored Apr 1, 2023
1 parent d669051 commit b4e616c
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 11 deletions.
18 changes: 17 additions & 1 deletion docs/change_log.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,23 @@
.. note::
31.5.0 以前の変更履歴は :doc:`change_log_past` を参照してください

34.8.0 (未リリース)
34.9.0 (未リリース)
******************************************

.. important::
macOS 版の場合は macOS 10.13 以上が動作必須となりました

不具合修正
==========================================

* 以下の条件のモデルを読み込むとテクスチャが一部読み込まれない

* 参照先が同一のテクスチャファイルだがパスが異なる場合
* 具体例として `texture.png` と `./texture.png` がそれぞれ設定されている

* plugin_ffmpeg が利用できない

34.8.0 (2023/1/29)
******************************************

仕様変更
Expand Down
6 changes: 4 additions & 2 deletions docs/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@ macOS 版
.. important::
35.0 以降から Apple Silicon 版のみとし Intel Mac 版は廃止予定です

- macOS 10.13 以上かつ 64bit 環境 (31.0 から Apple Silicon 対応) [#f1]_
- macOS 11.0 以上かつ 64bit 環境 (31.0 から Apple Silicon 対応) [#f1]_

- `Metal が動作する環境 <https://support.apple.com/ja-jp/HT205073>`_ を確認してください
- `macOS 10.13.4 から外付け GPU に対応 <https://support.apple.com/ja-jp/HT208544>`_ していますが nanoem では動作未確認です
- 10.12 以下であっても 10.9 以上であれば動かせますが主にハードウェア的な問題で満足に動かせない可能性が高いためサポート対象外とさせていただきます
- macOS 11.0 未満であっても macOS 10.13 以上であれば動作しますが、その場合はサポート対象外です

- 34.8.1 以前の場合は 10.9 以上であれば動かせますが主にハードウェア的な問題で満足に動かせない可能性が高いため同様にサポート対象外です

- 1280x800 以上の画面

Expand Down
2 changes: 1 addition & 1 deletion emapp/resources/credits.md
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ fi
### ICU build configuration

```
FLAGS="-DUCONFIG_NO_BREAK_ITERATION -DUCONFIG_NO_COLLATION -DUCONFIG_NO_FORMATTING -DUCONFIG_NO_TRANSLITERATION -DUCONFIG_NO_REGULAR_EXPRESSIONS -mmacosx-version-min=10.9"
FLAGS="-DUCONFIG_NO_BREAK_ITERATION -DUCONFIG_NO_COLLATION -DUCONFIG_NO_FORMATTING -DUCONFIG_NO_TRANSLITERATION -DUCONFIG_NO_REGULAR_EXPRESSIONS -mmacosx-version-min=10.13"
CFLAGS="$FLAGS -std=c99" CXXFLAGS="$FLAGS -std=c++11" ./configure \
--prefix=$PWD/../install-root \
--with-data-packaging=static \
Expand Down
2 changes: 1 addition & 1 deletion emapp/resources/credits.md.in
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ fi
### ICU build configuration

```
FLAGS="-DUCONFIG_NO_BREAK_ITERATION -DUCONFIG_NO_COLLATION -DUCONFIG_NO_FORMATTING -DUCONFIG_NO_TRANSLITERATION -DUCONFIG_NO_REGULAR_EXPRESSIONS -mmacosx-version-min=10.9"
FLAGS="-DUCONFIG_NO_BREAK_ITERATION -DUCONFIG_NO_COLLATION -DUCONFIG_NO_FORMATTING -DUCONFIG_NO_TRANSLITERATION -DUCONFIG_NO_REGULAR_EXPRESSIONS -mmacosx-version-min=10.13"
CFLAGS="$FLAGS -std=c99" CXXFLAGS="$FLAGS -std=c++11" ./configure \
--prefix=$PWD/../install-root \
--with-data-packaging=static \
Expand Down
2 changes: 1 addition & 1 deletion macos/Info.plist.in
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<key>NSHumanReadableCopyright</key>
<string>${MACOSX_BUNDLE_COPYRIGHT}</string>
<key>LSMinimumSystemVersion</key>
<string>10.9.0</string>
<string>10.13.0</string>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
Expand Down
2 changes: 1 addition & 1 deletion macos/Resources/English.lproj/Credits.rtf
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ if [[ "$OSTYPE" == "linux-gnu"* ]]; then\line
rm -f libavcodec.so.* libavformat.so.* libavutil.so.* libswresample.so.* libswscale.so.*\line
fi\par}
{\pard \ql \f0 \sa180 \li0 \fi0 \outlinelevel2 \b \fs28 ICU build configuration\par}
{\pard \ql \f0 \sa180 \li0 \fi0 \f1 FLAGS="-DUCONFIG_NO_BREAK_ITERATION -DUCONFIG_NO_COLLATION -DUCONFIG_NO_FORMATTING -DUCONFIG_NO_TRANSLITERATION -DUCONFIG_NO_REGULAR_EXPRESSIONS -mmacosx-version-min=10.9"\line
{\pard \ql \f0 \sa180 \li0 \fi0 \f1 FLAGS="-DUCONFIG_NO_BREAK_ITERATION -DUCONFIG_NO_COLLATION -DUCONFIG_NO_FORMATTING -DUCONFIG_NO_TRANSLITERATION -DUCONFIG_NO_REGULAR_EXPRESSIONS -mmacosx-version-min=10.13"\line
CFLAGS="$FLAGS -std=c99" CXXFLAGS="$FLAGS -std=c++11" ./configure \\\line
--prefix=$PWD/../install-root \\\line
--with-data-packaging=static \\\line
Expand Down
6 changes: 3 additions & 3 deletions scripts/build.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ function(compile_icu4c _cmake_build_type _generator _toolset_option _arch_option
execute_process(COMMAND ${GIT_EXECUTABLE} checkout ${_branch_name} WORKING_DIRECTORY ${_source_path})
set(_build_flags "-DUCONFIG_NO_BREAK_ITERATION=1 -DUCONFIG_NO_COLLATION=1 -DUCONFIG_NO_FORMATTING=1 -DUCONFIG_NO_TRANSLITERATION=1 -DUCONFIG_NO_REGULAR_EXPRESSIONS=1")
if(APPLE)
set(_macos_ver_min_flags "-mmacosx-version-min=10.9")
set(_macos_ver_min_flags "-mmacosx-version-min=10.13")
set(_macos_arch_flags "-arch ${_arch}")
if("${_arch}" STREQUAL "ub")
set(_macos_arch_flags "-arch arm64 -arch x86_64")
Expand Down Expand Up @@ -474,7 +474,7 @@ function(compile_ffmpeg _cmake_build_type _generator _toolset_option _arch_optio
set(_macos_archs "${_arch}")
endif()
foreach(_item ${_macos_archs})
set(_build_flags "-arch ${_item} -mmacosx-version-min=10.9")
set(_build_flags "-arch ${_item} -mmacosx-version-min=10.13")
if(DEFINED ENV{NANOEM_MACOS_SYSROOT})
set(_macos_sysroot $ENV{NANOEM_MACOS_SYSROOT})
set(_build_flags "-isysroot ${_macos_sysroot}")
Expand Down Expand Up @@ -637,7 +637,7 @@ if(NOT CONFIG_LIST)
endif()
set(OSX_TARGET $ENV{NANOEM_TARGET_MACOS_VERSION})
if(NOT OSX_TARGET)
set(OSX_TARGET "10.9")
set(OSX_TARGET "10.13")
endif()
set(CMAKE_FIND_LIBRARY_PREFIXES "lib;")
set(CMAKE_FIND_LIBRARY_SUFFIXES ".so;.a;.lib")
Expand Down
2 changes: 1 addition & 1 deletion scripts/run/common.rc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ export NANOEM_TARGET_GENERATOR=${NANOEM_TARGET_GENERATOR:=Ninja}
export NANOEM_TARGET_ARCHITECTURE=${NANOEM_TARGET_ARCHITECTURE:=ub}

CMAKE_OSX_ARCHITECTURES=$([ "$NANOEM_TARGET_ARCHITECTURE" = "ub" ] && echo "arm64;x86_64" || echo $NANOEM_TARGET_ARCHITECTURE)
CMAKE_OSX_DEPLOYMENT_TARGET=$([ "$NANOEM_TARGET_ARCHITECTURE" = "arm64" ] && echo "11.0" || echo "10.9")
CMAKE_OSX_DEPLOYMENT_TARGET=$([ "$NANOEM_TARGET_ARCHITECTURE" = "arm64" ] && echo "11.0" || echo "10.13")
nanoem_path=${nanoem_path:-$HOME/src/nanoem/development}

cmake_common_options="-DCMAKE_INSTALL_PREFIX=$PWD/install-root \
Expand Down

0 comments on commit b4e616c

Please sign in to comment.