UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-18 16:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix 3DS simulator (#243)

Browse Source 
* [CI] Fix 3DS try 1

* [CI] Fix 3DS try 2

* [CI] Fix 3DS try 3

* [CI] Fix 3DS try 4

* [CI] Fix 3DS try 5

* [CI] Fix 3DS try 6

* [CI] Fix 3DS try 7

* [CI] Fix 3DS try 8

* [CI] Fix 3DS try 9

* [CI] Fix 3DS try 10

* [CI] Fix 3DS try 11

* [CI] Fix 3DS try 12

* [CI] Fix 3DS try 13

* [CI] Fix 3DS try 14

* [CI] Fix 3DS try 15

* [CI] Fix 3DS try 16

* [CI] Fix 3DS try 17

* [CI] Fix 3DS try 18

* [CI] Fix 3DS try 19

* [CI] Make other simulators than 3DS working

* [CI] Fix 3DS without breaking others simulators try 1

* Apply suggestions from code review

* Improve SDL assert

* Fix SDL assert

* Fix SDL assert 2

* [CI] Enable iOS, macOS and 3DS tests by default

* [CI] Change epsilon-sdk tap url

* Revert "[CI] Change epsilon-sdk tap url"

This reverts commit 9516607aba.
This commit is contained in:
Yaya-Cout
2023-04-13 16:24:38 +02:00
committed by GitHub
parent 0916996121
commit aadcd37f31
7 changed files with 39 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ion/src/simulator/3ds/Makefile
View File

@@ -19,22 +19,29 @@ ion_src += $(addprefix ion/src/simulator/3ds/, \
ion_src += ion/src/shared/collect_registers.cpp
sdl_simu_needs_to_be_removed += $(addprefix ion/src/simulator/shared/, \
sdl_simu_needs_to_be_removed += $(addprefix ion/src/shared/, \
dummy/display.cpp \
dummy/led.cpp \
dummy/usb.cpp \
dummy/battery.cpp \
dummy/store_script.cpp \
)
sdl_simu_needs_to_be_removed += $(addprefix ion/src/simulator/shared/, \
clipboard.cpp \
display.cpp:-headless \
events_keyboard.cpp:-headless \
events.cpp \
events_platform.cpp \
framebuffer_base.cpp \
framebuffer.cpp \
keyboard_sdl.cpp:-headless \
keyboard.cpp \
main_sdl.cpp:-headless \
main.cpp \
layout.cpp:-headless \
dummy/store_script.cpp \
timing.cpp \
)
# Remove the dummy display (re-implemented) and the SDL simulator stuff.
ion_src := $(filter-out $(sdl_simu_needs_to_be_removed),$(ion_src))

4
ion/src/simulator/3ds/main.cpp
View File

@@ -19,6 +19,10 @@ void Ion::Timing::msleep(uint32_t ms) {
svcSleepThread((s64) ms * 1000);
}
uint64_t Ion::Timing::millis() {
return svcGetSystemTick() / (1000 * 1000);
}
int main(int argc, char * argv[]) {
Ion::Simulator::Main::init();

7
ion/src/simulator/external/sdl/include/SDL_stdinc.h vendored
View File

@@ -309,8 +309,13 @@ typedef uint64_t Uint64;
#endif
#endif /* SDL_DISABLE_ANALYZE_MACROS */
#ifndef __3DS__
#define SDL_COMPILE_TIME_ASSERT(name, x) \
typedef int SDL_compile_time_assert_ ## name[(x) * 2 - 1]
typedef int SDL_dummy_ ## name[(x) * 2 - 1]
#else
#define SDL_COMPILE_TIME_ASSERT(name, x) \
typedef int SDL_dummy_ ## name[0]
#endif
/** \cond */
#ifndef DOXYGEN_SHOULD_IGNORE_THIS
SDL_COMPILE_TIME_ASSERT(uint8, sizeof(Uint8) == 1);