Skip to content

Attempt to fix MSVC build errors #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
inactive123 merged 2 commits into from
Jan 8, 2022
Merged

Attempt to fix MSVC build errors #71

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19286dd
Attempt to fix MSVC build errors
msheehan79 Jan 7, 2022
1dd07ba
Merge branch 'libretro:master' into master
msheehan79 Jan 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/libretro.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,6 @@ void retro_init(void)
char gromPath[PATH_MAX_LENGTH];
struct retro_keyboard_callback kb = { Keyboard };

// init buffers, structs
memset(frame, 0, frameSize);
OSD_setDisplay(frame, MaxWidth, MaxHeight);

// setup controller swap
controllerInit();

// controller descriptors
struct retro_input_descriptor desc[] = {
{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT, "Disc Left" },
Expand Down Expand Up @@ -167,6 +160,13 @@ void retro_init(void)
{ 0 },
};

// init buffers, structs
memset(frame, 0, frameSize);
OSD_setDisplay(frame, MaxWidth, MaxHeight);

// setup controller swap
controllerInit();

Environ(RETRO_ENVIRONMENT_SET_INPUT_DESCRIPTORS, desc);

// reset console
Expand Down