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

19
deps/buildcore/base.mk vendored
View File

@ -10,21 +10,22 @@ ifeq (${OS},Windows_NT)
SHELL := powershell.exe
.SHELLFLAGS := -NoProfile -Command
BC_VAR_OS=windows
BC_CMD_HOST_PY3=python
else
BC_VAR_OS=$(shell uname | tr [:upper:] [:lower:])
endif
ifneq ($(shell which python3 2> /dev/null),)
BC_CMD_HOST_PY3=python3
else
ifeq ($(shell python -c 'import sys; print(sys.version_info[0])'),3)
BC_CMD_HOST_PY3=python
ifneq ($(shell which python3 2> /dev/null),)
BC_CMD_HOST_PY3=python3
else
echo 'Please install Python3 on host'
exit 1
ifeq ($(shell python -c 'import sys; print(sys.version_info[0])'),3)
BC_CMD_HOST_PY3=python
else
echo 'Please install Python3 on host'
exit 1
endif
endif
endif
ifdef BC_VAR_USE_DOCKER_DEVENV
ifneq ($(shell which docker 2> /dev/null),)
BC_VAR_DEVENV=devenv$(shell pwd | sed 's/\//-/g')

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

8
deps/ox/src/ox/event/signal.hpp vendored
View File

@ -83,10 +83,10 @@ class Signal {
}
void cleanup(Signal *signal) noexcept final {
auto err = m_receiver->destruction.disconnectSignal(signal);
if (err) {
oxErrorf("Signal could not notify receiver that it is being destroyed. Destruction of receiver will cause use-after-free. ({})", toStr(err));
}
std::ignore = m_receiver->destruction.disconnectSignal(signal);
//if (err) {
// oxErrorf("Signal could not notify receiver that it is being destroyed. Destruction of receiver will cause use-after-free. ({})", toStr(err));
//}
}
[[nodiscard]]

4
deps/ox/src/ox/std/hardware.hpp vendored
View File

@ -12,9 +12,9 @@
#define OX_ARCH_x86_64
#elif defined(__i386__) || defined(_M_IX86)
#define OX_ARCH_x86_32
#elif defined(__arm64__) || defined(__aarch64__)
#elif defined(__arm64__) || defined(__aarch64__) || defined(_M_ARM64)
#define OX_ARCH_ARM64
#elif defined(__arm__)
#elif defined(__arm__) || defined(_M_ARM)
#define OX_ARCH_ARM
#endif