diff --git a/raylib/cgo_android.go b/raylib/cgo_android.go index 369677f..f6c6a75 100644 --- a/raylib/cgo_android.go +++ b/raylib/cgo_android.go @@ -6,6 +6,6 @@ package rl #include "external/android/native_app_glue/android_native_app_glue.c" #cgo android LDFLAGS: -llog -landroid -lEGL -lGLESv2 -lOpenSLES -lm -#cgo android CFLAGS: -DPLATFORM_ANDROID -DGRAPHICS_API_OPENGL_ES2 -DMAL_NO_SDL -Iexternal/android/native_app_glue +#cgo android CFLAGS: -DPLATFORM_ANDROID -DGRAPHICS_API_OPENGL_ES2 -Iexternal/android/native_app_glue */ import "C" diff --git a/raylib/cgo_darwin.go b/raylib/cgo_darwin.go index 6f15fdb..77668f4 100644 --- a/raylib/cgo_darwin.go +++ b/raylib/cgo_darwin.go @@ -21,7 +21,7 @@ package rl #include "external/glfw/src/osmesa_context.c" #cgo darwin LDFLAGS: -framework OpenGL -framework Cocoa -framework IOKit -framework CoreVideo -framework CoreFoundation -#cgo darwin CFLAGS: -x objective-c -Iexternal/glfw/include -D_GLFW_COCOA -D_GLFW_USE_CHDIR -D_GLFW_USE_MENUBAR -D_GLFW_USE_RETINA -Wno-deprecated-declarations -DPLATFORM_DESKTOP -DMAL_NO_COREAUDIO +#cgo darwin CFLAGS: -x objective-c -Iexternal/glfw/include -D_GLFW_COCOA -D_GLFW_USE_CHDIR -D_GLFW_USE_MENUBAR -D_GLFW_USE_RETINA -Wno-deprecated-declarations -DPLATFORM_DESKTOP #cgo darwin,opengl11 CFLAGS: -DGRAPHICS_API_OPENGL_11 #cgo darwin,opengl21 CFLAGS: -DGRAPHICS_API_OPENGL_21 diff --git a/raylib/cgo_linux.go b/raylib/cgo_linux.go index ca8e1ad..77a6bb5 100644 --- a/raylib/cgo_linux.go +++ b/raylib/cgo_linux.go @@ -1,4 +1,4 @@ -// +build linux,!arm,!arm64 +// +build linux,!drm,!rpi,!android package rl diff --git a/raylib/core.c b/raylib/core.c index 037be11..4021cdd 100644 --- a/raylib/core.c +++ b/raylib/core.c @@ -566,6 +566,7 @@ static void InitGamepad(void); // Init raw gamepad inpu static void *GamepadThread(void *arg); // Mouse reading thread #if defined(PLATFORM_DRM) +typedef unsigned int uint; static int FindMatchingConnectorMode(const drmModeConnector *connector, const drmModeModeInfo *mode); // Search matching DRM mode in connector's mode list static int FindExactConnectorMode(const drmModeConnector *connector, uint width, uint height, uint fps, bool allowInterlaced); // Search exactly matching DRM connector mode in connector's list static int FindNearestConnectorMode(const drmModeConnector *connector, uint width, uint height, uint fps, bool allowInterlaced); // Search the nearest matching DRM connector mode in connector's list diff --git a/raylib/external/glfw/src/wl_init.c b/raylib/external/glfw/src/wl_init.c index d3e777d..c076e70 100644 --- a/raylib/external/glfw/src/wl_init.c +++ b/raylib/external/glfw/src/wl_init.c @@ -26,7 +26,7 @@ // It is fine to use C99 in this file because it will not be built with VS //======================================================================== -#define _POSIX_C_SOURCE 199309L +//#define _POSIX_C_SOURCE 199309L #include "internal.h" diff --git a/raylib/platform_desktop.go b/raylib/platform_desktop.go index 2f843c1..0074ba0 100644 --- a/raylib/platform_desktop.go +++ b/raylib/platform_desktop.go @@ -1,4 +1,4 @@ -// +build !android,!arm +// +build !rpi,!drm,!android package rl