Skip to content

Commit c044d28

Browse files
Totto16Totto16
committed
fix compilation
1 parent 7c7d8b1 commit c044d28

File tree

5 files changed

+24
-18
lines changed

5 files changed

+24
-18
lines changed

‎platforms/build-3ds.sh‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ export ENDIANESS="little"
4545

4646
export COMMON_FLAGS="'-march=armv6k','-mtune=mpcore','-mfloat-abi=hard','-mtp=soft','-mword-relocations','-ffunction-sections','-fdata-sections'"
4747

48+
# compat flags for some POSIX functions
49+
export EXTRA_COMPILE_FLAGS="'-D_XOPEN_SOURCE'"
50+
4851
export COMPILE_FLAGS="'-D_3DS','-D__3DS__','-D__CONSOLE__','-D__NINTENDO_CONSOLE__','-isystem','$LIBCTRU/include','-I$PORTLIBS_PATH_3DS/include'"
4952

5053
export LINK_FLAGS="'-L$PORTLIBS_LIB','-L$LIBCTRU_LIB','-fPIE','-specs=$ARCH_DEVKIT_FOLDER/$TOOL_PREFIX/lib/3dsx.specs'"
@@ -86,8 +89,8 @@ sdl2-config='$BIN_DIR/bin/sdl2-config'
8689
[built-in options]
8790
c_std = 'gnu11'
8891
cpp_std = 'c++23'
89-
c_args = [$COMMON_FLAGS, $COMPILE_FLAGS]
90-
cpp_args = [$COMMON_FLAGS, $COMPILE_FLAGS]
92+
c_args = [$COMMON_FLAGS, $COMPILE_FLAGS, $EXTRA_COMPILE_FLAGS]
93+
cpp_args = [$COMMON_FLAGS, $COMPILE_FLAGS, $EXTRA_COMPILE_FLAGS]
9194
c_link_args = [$COMMON_FLAGS, $LINK_FLAGS]
9295
cpp_link_args = [$COMMON_FLAGS, $LINK_FLAGS]
9396

‎platforms/build-switch.sh‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ export ENDIANESS="little"
4343

4444
export COMMON_FLAGS="'-ftls-model=local-exec','-march=armv8-a+crc+crypto','-mtune=cortex-a57','-mtp=soft','-ftls-model=local-exec','-fPIC','-ffunction-sections','-fdata-sections'"
4545

46+
# compat flags for some POSIX functions
47+
export EXTRA_COMPILE_FLAGS="'-D_XOPEN_SOURCE'"
48+
4649
export COMPILE_FLAGS="'-D__SWITCH__','-D__CONSOLE__','-D__NINTENDO_CONSOLE__','-isystem','$LIBNX/include','-I$PORTLIBS_PATH_SWITCH/include'"
4750

4851
export LINK_FLAGS="'-L$PORTLIBS_LIB','-L$LIBNX_LIB','-fPIE','-specs=$DEVKITPRO/libnx/switch.specs'"
@@ -84,8 +87,8 @@ sdl2-config='$BIN_DIR/sdl2-config'
8487
[built-in options]
8588
c_std = 'gnu11'
8689
cpp_std = 'c++23'
87-
c_args = [$COMMON_FLAGS, $COMPILE_FLAGS]
88-
cpp_args = [$COMMON_FLAGS, $COMPILE_FLAGS]
90+
c_args = [$COMMON_FLAGS, $COMPILE_FLAGS, $EXTRA_COMPILE_FLAGS]
91+
cpp_args = [$COMMON_FLAGS, $COMPILE_FLAGS, $EXTRA_COMPILE_FLAGS]
8992
c_link_args = [$COMMON_FLAGS, $LINK_FLAGS]
9093
cpp_link_args = [$COMMON_FLAGS, $LINK_FLAGS]
9194

‎src/platform/capabilities.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,12 @@ namespace utils {
6060
{ static_cast<u8>(CrossPlatformAction::UNPAUSE), { JOYCON_PLUS }},
6161
{ static_cast<u8>(CrossPlatformAction::EXIT), { JOYCON_MINUS }},
6262
{ static_cast<u8>(CrossPlatformAction::DOWN),
63-
{ JOYCON_CROSS_DOWN, JOYCON_LDPAD_DOWN, JOYCON_RDPAD_DOWN } },
64-
{ static_cast<u8>(CrossPlatformAction::UP), { JOYCON_CROSS_UP, JOYCON_LDPAD_UP, JOYCON_RDPAD_UP }},
63+
{ JOYCON_DPAD_DOWN, JOYCON_LDPAD_DOWN, JOYCON_RDPAD_DOWN } },
64+
{ static_cast<u8>(CrossPlatformAction::UP), { JOYCON_DPAD_UP, JOYCON_LDPAD_UP, JOYCON_RDPAD_UP }},
6565
{ static_cast<u8>(CrossPlatformAction::LEFT),
66-
{ JOYCON_CROSS_LEFT, JOYCON_LDPAD_LEFT, JOYCON_RDPAD_LEFT } },
66+
{ JOYCON_DPAD_LEFT, JOYCON_LDPAD_LEFT, JOYCON_RDPAD_LEFT } },
6767
{ static_cast<u8>(CrossPlatformAction::RIGHT),
68-
{ JOYCON_CROSS_RIGHT, JOYCON_LDPAD_RIGHT, JOYCON_RDPAD_RIGHT } },
68+
{ JOYCON_DPAD_RIGHT, JOYCON_LDPAD_RIGHT, JOYCON_RDPAD_RIGHT } },
6969
{ static_cast<u8>(CrossPlatformAction::CLOSE), { JOYCON_MINUS }},
7070
{static_cast<u8>(CrossPlatformAction::OPEN_SETTINGS), { JOYCON_Y }},
7171
{ static_cast<u8>(CrossPlatformAction::TAB), {}}, // no tab support

‎src/platform/console_buttons.hpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ enum JOYCON {
3030
JOYCON_Y = BITL_REVERSE(HidNpadButton_Y), ///< Y button / Left face button
3131

3232
//NOTE: stick buttons are not key events, but can be moved, these need separate handling
33-
JOYCON_STICK_L = BITL(HidNpadButton_StickL), ///< Left Stick button
34-
JOYCON_STICK_R = BITL(HidNpadButton_StickR), ///< Right Stick button
33+
JOYCON_STICK_L = BITL_REVERSE(HidNpadButton_StickL), ///< Left Stick button
34+
JOYCON_STICK_R = BITL_REVERSE(HidNpadButton_StickR), ///< Right Stick button
3535

3636
JOYCON_L = BITL_REVERSE(HidNpadButton_L), ///< L button
37-
JOYCON_R = BITL(HidNpadButton_R), ///< R button
38-
JOYCON_ZL = BITL(HidNpadButton_ZL), ///< ZL button
39-
JOYCON_ZR = BITL(HidNpadButton_ZR), ///< ZR button
37+
JOYCON_R = BITL_REVERSE(HidNpadButton_R), ///< R button
38+
JOYCON_ZL = BITL_REVERSE(HidNpadButton_ZL), ///< ZL button
39+
JOYCON_ZR = BITL_REVERSE(HidNpadButton_ZR), ///< ZR button
4040

4141

4242
JOYCON_PLUS = BITL_REVERSE(HidNpadButton_Plus), ///< Plus button
@@ -63,7 +63,7 @@ enum JOYCON {
6363
JOYCON_JOYCONL_SR = BITL_REVERSE(HidNpadButton_LeftSR), ///< SR button on Left Joy-Con
6464

6565
JOYCON_JOYCONR_SL = BITL_REVERSE(HidNpadButton_RightSL), ///< SL button on Right Joy-Con
66-
JOYCON_JOYCONR_SL = BITL_REVERSE(HidNpadButton_RightSR), ///< SR button on Right Joy-Con
66+
JOYCON_JOYCONR_SR = BITL_REVERSE(HidNpadButton_RightSR), ///< SR button on Right Joy-Con
6767

6868
JOYCON_VERIFICATION = BITL_REVERSE(HidNpadButton_Verification), ///< Verification
6969

‎src/platform/console_input.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ void JoystickInput::update(SimulationStep simulation_step_index) {
2525
helper::optional<InputEvent> JoystickInput::sdl_event_to_input_event(const SDL_Event& event) const {
2626
if (event.type == SDL_JOYBUTTONDOWN) {
2727
const auto button = event.jbutton.button;
28-
if (button == JOYCON_CROSS_LEFT) {
28+
if (button == JOYCON_DPAD_LEFT) {
2929
return InputEvent::RotateLeftPressed;
3030
}
31-
if (button == JOYCON_CROSS_RIGHT) {
31+
if (button == JOYCON_DPAD_RIGHT) {
3232
return InputEvent::RotateRightPressed;
3333
}
3434
if (button == JOYCON_LDPAD_DOWN or button == JOYCON_RDPAD_DOWN) {
@@ -48,10 +48,10 @@ helper::optional<InputEvent> JoystickInput::sdl_event_to_input_event(const SDL_E
4848
}
4949
} else if (event.type == SDL_JOYBUTTONUP) {
5050
const auto button = event.jbutton.button;
51-
if (button == JOYCON_CROSS_LEFT) {
51+
if (button == JOYCON_DPAD_LEFT) {
5252
return InputEvent::RotateLeftReleased;
5353
}
54-
if (button == JOYCON_CROSS_RIGHT) {
54+
if (button == JOYCON_DPAD_RIGHT) {
5555
return InputEvent::RotateRightReleased;
5656
}
5757
if (button == JOYCON_LDPAD_DOWN or button == JOYCON_RDPAD_DOWN) {

0 commit comments

Comments
 (0)