diff options
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | res/images/logo.svg (renamed from logo.svg) | 0 | ||||
| -rw-r--r-- | res/images/logo_1024.png (renamed from logo.png) | bin | 24295 -> 24295 bytes | |||
| -rw-r--r-- | res/images/logo_256.jpg (renamed from logo_switch.jpg) | bin | 18096 -> 18096 bytes | |||
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/skel/crossplatform.h | 25 |
6 files changed, 27 insertions, 2 deletions
@@ -1,4 +1,4 @@ -<img src="https://github.com/GTAmodding/re3/blob/master/logo.png?raw=true" alt="re3 logo" width="200"> +<img src="https://github.com/GTAmodding/re3/blob/master/res/images/logo_1024.png?raw=true" alt="re3 logo" width="200"> [](https://actions-badge.atrox.dev/GTAmodding/re3/goto?ref=master) <a href="https://discord.gg/RFNbjsUMGg"><img src="https://img.shields.io/badge/discord-join-7289DA.svg?logo=discord&longCache=true&style=flat" /></a> diff --git a/logo.svg b/res/images/logo.svg index 9db8447c..9db8447c 100644 --- a/logo.svg +++ b/res/images/logo.svg diff --git a/logo.png b/res/images/logo_1024.png Binary files differindex 50ae8690..50ae8690 100644 --- a/logo.png +++ b/res/images/logo_1024.png diff --git a/logo_switch.jpg b/res/images/logo_256.jpg Binary files differindex 595d2c3b..595d2c3b 100644 --- a/logo_switch.jpg +++ b/res/images/logo_256.jpg diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1cf10d0f..425f2315 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -171,7 +171,7 @@ if(NINTENDO_SWITCH) nx_create_nro(${EXECUTABLE} NACP ${EXECUTABLE}.nacp - ICON "${PROJECT_SOURCE_DIR}/logo_switch.jpg" + ICON "${PROJECT_SOURCE_DIR}/res/images/logo_256.jpg" ) if(${PROJECT}_INSTALL) diff --git a/src/skel/crossplatform.h b/src/skel/crossplatform.h index aa90ce5a..67bb4282 100644 --- a/src/skel/crossplatform.h +++ b/src/skel/crossplatform.h @@ -157,3 +157,28 @@ bool FindNextFile(HANDLE, WIN32_FIND_DATA*); void FileTimeToSystemTime(time_t*, SYSTEMTIME*); void GetDateFormat(int, int, SYSTEMTIME*, int, char*, int); #endif + +#ifdef __SWITCH__ + +// tweak glfw values for switch to match expected pc bindings +#ifdef GLFW_GAMEPAD_BUTTON_A + #undef GLFW_GAMEPAD_BUTTON_A +#endif +#define GLFW_GAMEPAD_BUTTON_A 1 + +#ifdef GLFW_GAMEPAD_BUTTON_B + #undef GLFW_GAMEPAD_BUTTON_B +#endif +#define GLFW_GAMEPAD_BUTTON_B 0 + +#ifdef GLFW_GAMEPAD_BUTTON_X + #undef GLFW_GAMEPAD_BUTTON_X +#endif +#define GLFW_GAMEPAD_BUTTON_X 3 + +#ifdef GLFW_GAMEPAD_BUTTON_Y + #undef GLFW_GAMEPAD_BUTTON_Y +#endif +#define GLFW_GAMEPAD_BUTTON_Y 2 + +#endif |
