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

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