Skip to content

Commit ed4863f

Browse files
committed
build: update Makefile and install instructions
1 parent 84f5d00 commit ed4863f

File tree

2 files changed

+12
-15
lines changed

2 files changed

+12
-15
lines changed

INSTALL.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ Choose one of the following options.
6161
``` sh
6262
export BUILD_UNIVERSAL=1
6363

64-
make -C librime xcode/deps/boost
64+
bash librime/install-boost.sh
6565

66-
export BOOST_ROOT="$(pwd)/librime/deps/boost_1_78_0"
66+
export BOOST_ROOT="$(pwd)/librime/deps/boost-1.84.0"
6767
```
6868

6969
Let's set `BUILD_UNIVERSAL` to tell `make` that we are building Boost as
@@ -106,14 +106,14 @@ git submodule update --init --recursive
106106
make
107107
```
108108

109-
To build only for the native architecture, and/or specify the lowest supported macOS version, pass variable `ARCHS`/`MACOSX_DEPLOYMENT_TARGET` to `make`:
109+
To build only for the native architecture, and/or specify the lowest supported macOS version, pass variable `ARCHS` and/or `MACOSX_DEPLOYMENT_TARGET` to `make`:
110110

111111
``` sh
112-
# for Universal macOS App, targetting Ventura
113-
make ARCHS='arm64 x86_64' MACOSX_DEPLOYMENT_TARGET='13.0'
112+
# for Universal macOS App
113+
make ARCHS='arm64 x86_64'
114114

115-
# for ARM macOS App, targetting Ventura
116-
make ARCHS='arm64' MACOSX_DEPLOYMENT_TARGET='13.0'
115+
# for ARM macOS App
116+
make ARCHS='arm64'
117117
```
118118

119119
## Install it on your Mac
@@ -123,7 +123,7 @@ make ARCHS='arm64' MACOSX_DEPLOYMENT_TARGET='13.0'
123123
Just add `package` after `make`
124124

125125
```
126-
make package ARCHS='arm64' MACOSX_DEPLOYMENT_TARGET='13.0'
126+
make package ARCHS='arm64'
127127
```
128128

129129
Define or echo `DEV_ID` to automatically handle code signing and [notarization](https://developer.apple.com/documentation/security/notarizing_macos_software_before_distribution) (Apple Developer ID needed)

Makefile

+4-7
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
all: release
44
install: install-release
55

6-
# Change to `xcode/dist-with-icu` if boost is linked to icu libraries.
7-
RIME_DIST_TARGET = xcode/dist
8-
96
RIME_BIN_DIR = librime/dist/bin
107
RIME_LIB_DIR = librime/dist/lib
118

@@ -39,10 +36,10 @@ $(RIME_LIBRARY):
3936
$(MAKE) librime
4037

4138
$(RIME_DEPS):
42-
$(MAKE) -C librime xcode/deps
39+
$(MAKE) -C librime deps
4340

4441
librime: $(RIME_DEPS)
45-
$(MAKE) -C librime $(RIME_DIST_TARGET)
42+
$(MAKE) -C librime install
4643
$(MAKE) copy-rime-binaries
4744

4845
copy-rime-binaries:
@@ -67,7 +64,7 @@ plum-data:
6764
$(MAKE) copy-plum-data
6865

6966
opencc-data:
70-
$(MAKE) -C librime xcode/deps/opencc
67+
$(MAKE) -C librime deps/opencc
7168
$(MAKE) copy-opencc-data
7269

7370
copy-plum-data:
@@ -170,5 +167,5 @@ clean:
170167

171168
clean-deps:
172169
$(MAKE) -C plum clean
173-
$(MAKE) -C librime xcode/clean
170+
$(MAKE) -C librime clean
174171
$(MAKE) clean-sparkle

0 commit comments

Comments
 (0)