Skip to content

Commit

Permalink
Merge branch 'develop' into feature/add-pytest-e2e-test
Browse files Browse the repository at this point in the history
  • Loading branch information
voluntas committed Sep 16, 2024
2 parents d2484b0 + 168122d commit e2fe0b1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
MOMO_VERSION=2023.1.0
MOMO_VERSION=2024.1.0-canary.0
WEBRTC_BUILD_VERSION=m128.6613.2.0
BOOST_VERSION=1.85.0
CLI11_VERSION=v2.4.2
Expand Down
5 changes: 4 additions & 1 deletion buildbase.py
Original file line number Diff line number Diff line change
Expand Up @@ -690,6 +690,7 @@ def build_and_install_boost(
):
version_underscore = version.replace(".", "_")
archive = download(
# XXX: ここ GitHub Releases に変更するのはダメなのだろうか?
f"https://boostorg.jfrog.io/artifactory/main/release/{version}/source/boost_{version_underscore}.tar.gz",
source_dir,
)
Expand Down Expand Up @@ -1091,7 +1092,9 @@ def install_cmake(version, source_dir, install_dir, platform: str, ext):
def install_sdl2(
version, source_dir, build_dir, install_dir, debug: bool, platform: str, cmake_args: List[str]
):
url = f"http://www.libsdl.org/release/SDL2-{version}.zip"
url = (
f"https://github.com/libsdl-org/SDL/releases/download/release-{version}/SDL2-{version}.zip"
)
path = download(url, source_dir)
sdl2_source_dir = os.path.join(source_dir, "sdl2")
sdl2_build_dir = os.path.join(build_dir, "sdl2")
Expand Down

0 comments on commit e2fe0b1

Please sign in to comment.