Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

docs(README): note Homebrew is required on macOS #96

Merged
merged 5 commits into from
Jun 5, 2023
Merged

docs(README): note Homebrew is required on macOS #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e0951b8
docs(README): note Homebrew is required on macOS
strogonoff Jun 3, 2023
0577861
docs(README): fix typo
strogonoff Jun 3, 2023
f018956
Update README.md
krupkat Jun 3, 2023
66fb6b1
remove brew command from the mac build script
krupkat Jun 3, 2023
68645ce
update macports command
krupkat Jun 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,12 @@ The project can be built by running a single script from the `misc/build` direct

### MacOS

Library prerequisites: SDL2, spdlog, catch2

Install with brew: `brew install sdl2 spdlog catch2`

Install with macports: `sudo port install libsdl2 spdlog catch2` (for details: [#96](https://github.com/krupkat/xpano/pull/96#issuecomment-1575589249))

Run the install script from the root of the repository:

```
Expand Down
2 changes: 1 addition & 1 deletion misc/build/build-macos-12.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export EXIV2_VERSION='v0.28.0'
export GENERATOR='Ninja Multi-Config'

git submodule update --init
brew install sdl2 spdlog catch2
#brew install sdl2 spdlog catch2


git clone https://github.com/opencv/opencv.git --depth 1 --branch $OPENCV_VERSION
Expand Down
6 changes: 4 additions & 2 deletions misc/scripts/python/translate_github_action.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@ def ConvertStep(step):
if step.get("with", {}).get("submodules", False) == True:
return "git submodule update --init"
# comment out sudo actions
command = step.get("run", "")
return command.replace("sudo", "#sudo")
command = step.get("run", "") \
.replace("sudo", "#sudo") \
.replace("brew", "#brew")
return command


def ShellExtension(system):
Expand Down