diff options
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/libui_sdl/Platform.cpp | 2 | ||||
| -rw-r--r-- | src/libui_sdl/main.cpp | 6 |
3 files changed, 11 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2076d30..d824f6f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -82,8 +82,10 @@ if (UNIX) LINK_LIBRARIES(${GTK3_LIBRARIES}) ADD_DEFINITIONS(${GTK3_CFLAGS_OTHER}) - - LINK_LIBRARIES("dl") + + if (CMAKE_SYSTEM_NAME STREQUAL "Linux") + LINK_LIBRARIES("dl") + endif () endif (UNIX) find_package(SDL2 REQUIRED) diff --git a/src/libui_sdl/Platform.cpp b/src/libui_sdl/Platform.cpp index 0b1e0a2..1d7438b 100644 --- a/src/libui_sdl/Platform.cpp +++ b/src/libui_sdl/Platform.cpp @@ -32,6 +32,8 @@ #else #include <unistd.h> #include <arpa/inet.h> + #include <netinet/in.h> + #include <sys/select.h> #include <sys/socket.h> #define socket_t int #define sockaddr_t struct sockaddr diff --git a/src/libui_sdl/main.cpp b/src/libui_sdl/main.cpp index c7f6120..6797139 100644 --- a/src/libui_sdl/main.cpp +++ b/src/libui_sdl/main.cpp @@ -579,7 +579,11 @@ int main(int argc, char** argv) // http://stackoverflow.com/questions/14543333/joystick-wont-work-using-sdl 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"); return 1; |