drinkingtea/jasper
2
0
Fork 0
Code Issues 2 Pull Requests Actions Releases Activity

Squashed 'deps/nostalgia/' changes from 3b874c6e..c501fc04

Browse Source 
c501fc04 [nostalgia/core/gba] Fix TileSheetSet loading
531d9309 [ox/event] Comment out error logging for a long ignored error
094d1598 [nostalgia] Replace default make command with build instead of install
0017ac27 [nostalgia] Add gba-dev to README
be920e49 [nostalgia] Move to C++23
3c483649 [ox/std] Fix Windows ARM build
f1ee645a [buildcore] Windows fixes

git-subtree-dir: deps/nostalgia
git-subtree-split: c501fc048f8c32f46bcdfdfee9fbaa6eafef1357
This commit is contained in:
Gary Talent
2024-07-09 22:31:20 -05:00
parent 2da3579818
commit 88617af409
8 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
deps/buildcore/scripts/setup-build.py vendored
View File

@ -96,7 +96,7 @@ def main() -> int:
cmake_cmd.append(build_tool)
if qt_path != '':
cmake_cmd.append(qt_path)
if platform.system() == 'Windows':
if platform.system() == 'Windows' and platform.system() == 'AMD64':
cmake_cmd.append('-A x64')
cmake_err = subprocess.run(cmake_cmd).returncode

4
deps/buildcore/scripts/util.py vendored
View File

@ -32,7 +32,7 @@ def get_os() -> str:
def get_arch() -> str:
arch = platform.machine()
if arch.lower() == 'amd64':
arch = platform.machine().lower()
if arch == 'amd64':
arch = 'x86_64'
return arch