diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2014-02-26 10:13:35 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2014-02-26 10:13:35 -0300 |
| commit | fbcc81362c20647f272d61fb5968bf1524706028 (patch) | |
| tree | 083c1a40e005a368834046bc593d92fa06e6c2f5 /platform | |
| parent | ed6d9463d264d0983f75c2dc93191c8526e9115b (diff) | |
| parent | b7386de590871a82bb576951176c0a00210ae761 (diff) | |
Merge branch 'freebsd-cleanup' of https://github.com/robmessick/godot into robmessick-freebsd-cleanup
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/x11/os_x11.cpp | 9 | ||||
| -rw-r--r-- | platform/x11/platform_config.h | 6 |
2 files changed, 13 insertions, 2 deletions
diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index d95818b4a1..a09575bad5 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -45,7 +45,10 @@ #include <sys/stat.h> #include <fcntl.h> #include <unistd.h> + +#ifdef __linux__ #include <linux/joystick.h> +#endif //stupid linux.h #ifdef KEY_TAB @@ -1031,7 +1034,7 @@ void OS_X11::close_joystick(int p_id) { }; void OS_X11::probe_joystick(int p_id) { - + #ifndef __FreeBSD__ if (p_id == -1) { for (int i=0; i<JOYSTICKS_MAX; i++) { @@ -1065,6 +1068,7 @@ void OS_X11::probe_joystick(int p_id) { ++i; }; + #endif }; void OS_X11::move_window_to_foreground() { @@ -1073,7 +1077,7 @@ void OS_X11::move_window_to_foreground() { } void OS_X11::process_joysticks() { - + #ifndef __FreeBSD__ int bytes; js_event events[32]; InputEvent ievent; @@ -1172,6 +1176,7 @@ void OS_X11::process_joysticks() { }; }; }; + #endif }; void OS_X11::set_cursor_shape(CursorShape p_shape) { diff --git a/platform/x11/platform_config.h b/platform/x11/platform_config.h index d14f3e3f9a..21703969cc 100644 --- a/platform/x11/platform_config.h +++ b/platform/x11/platform_config.h @@ -26,7 +26,13 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ +#ifdef __linux__ #include <alloca.h> +#endif +#ifdef __FreeBSD__ +#include <stdlib.h> +#endif + #define GLES2_INCLUDE_H "gl_context/glew.h" #define GLES1_INCLUDE_H "gl_context/glew.h" |