piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-23 14:19:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #112 from bentley/master

Browse Source 
Portability fixes
This commit is contained in:
StapleButter
2017-10-11 02:56:06 +02:00
committed by GitHub
parent 73626e9f45 56bf1ecc13
commit f9d9aaec11
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -83,7 +83,9 @@ if (UNIX)
ADD_DEFINITIONS(${GTK3_CFLAGS_OTHER}) ADD_DEFINITIONS(${GTK3_CFLAGS_OTHER})
LINK_LIBRARIES("dl") if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
LINK_LIBRARIES("dl")
endif ()
endif (UNIX) endif (UNIX)
find_package(SDL2 REQUIRED) find_package(SDL2 REQUIRED)

2
src/libui_sdl/Platform.cpp
View File

@ -32,6 +32,8 @@
#else #else
#include <unistd.h> #include <unistd.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <netinet/in.h>
#include <sys/select.h>
#include <sys/socket.h> #include <sys/socket.h>
#define socket_t int #define socket_t int
#define sockaddr_t struct sockaddr #define sockaddr_t struct sockaddr

6
src/libui_sdl/main.cpp
View File

@ -579,7 +579,11 @@ int main(int argc, char** argv)
// http://stackoverflow.com/questions/14543333/joystick-wont-work-using-sdl // http://stackoverflow.com/questions/14543333/joystick-wont-work-using-sdl
SDL_SetHint(SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS, "1"); SDL_SetHint(SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS, "1");
if (SDL_Init(SDL_INIT_EVERYTHING) < 0) if (SDL_Init(SDL_INIT_HAPTIC) < 0)
{
printf("SDL couldn't init rumble\n");
}
if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_JOYSTICK) < 0)
{ {
printf("SDL shat itself :(\n"); printf("SDL shat itself :(\n");
return 1; return 1;