mirror of
https://github.com/GTAmodding/re3.git
synced 2024-11-14 23:29:00 +00:00
Move assets to dedicated folder and redefine GLFW mappings for Switch
This commit is contained in:
parent
a99a04ed49
commit
3bde84f6c8
6 changed files with 27 additions and 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">
|
||||||
|
|
||||||
[![Build Status](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Factions-badge.atrox.dev%2FGTAmodding%2Fre3%2Fbadge%3Fref%3Dmaster&style=flat)](https://actions-badge.atrox.dev/GTAmodding/re3/goto?ref=master)
|
[![Build Status](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Factions-badge.atrox.dev%2FGTAmodding%2Fre3%2Fbadge%3Fref%3Dmaster&style=flat)](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>
|
<a href="https://discord.gg/RFNbjsUMGg"><img src="https://img.shields.io/badge/discord-join-7289DA.svg?logo=discord&longCache=true&style=flat" /></a>
|
||||||
|
|
Before Width: | Height: | Size: 9.2 KiB After Width: | Height: | Size: 9.2 KiB |
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 24 KiB |
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
|
@ -171,7 +171,7 @@ if(NINTENDO_SWITCH)
|
||||||
|
|
||||||
nx_create_nro(${EXECUTABLE}
|
nx_create_nro(${EXECUTABLE}
|
||||||
NACP ${EXECUTABLE}.nacp
|
NACP ${EXECUTABLE}.nacp
|
||||||
ICON "${PROJECT_SOURCE_DIR}/logo_switch.jpg"
|
ICON "${PROJECT_SOURCE_DIR}/res/images/logo_256.jpg"
|
||||||
)
|
)
|
||||||
|
|
||||||
if(${PROJECT}_INSTALL)
|
if(${PROJECT}_INSTALL)
|
||||||
|
|
|
@ -157,3 +157,28 @@ bool FindNextFile(HANDLE, WIN32_FIND_DATA*);
|
||||||
void FileTimeToSystemTime(time_t*, SYSTEMTIME*);
|
void FileTimeToSystemTime(time_t*, SYSTEMTIME*);
|
||||||
void GetDateFormat(int, int, SYSTEMTIME*, int, char*, int);
|
void GetDateFormat(int, int, SYSTEMTIME*, int, char*, int);
|
||||||
#endif
|
#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
|
||||||
|
|
Loading…
Reference in a new issue