diff --git a/vendor/raylib/raygui.odin b/vendor/raylib/raygui.odin index b02fa4438..23e8704ed 100644 --- a/vendor/raylib/raygui.odin +++ b/vendor/raylib/raygui.odin @@ -5,31 +5,7 @@ import "core:c" RAYGUI_SHARED :: #config(RAYGUI_SHARED, false) RAYGUI_WASM_LIB :: #config(RAYGUI_WASM_LIB, "wasm/libraygui.a") -when ODIN_OS == .Windows { - foreign import lib { - "windows/rayguidll.lib" when RAYGUI_SHARED else "windows/raygui.lib", - } -} else when ODIN_OS == .Linux { - foreign import lib { - "linux/libraygui.so" when RAYGUI_SHARED else "linux/libraygui.a", - } -} else when ODIN_OS == .Darwin { - when ODIN_ARCH == .arm64 { - foreign import lib { - "macos/libraygui-arm64.dylib" when RAYGUI_SHARED else "macos/libraygui-arm64.a", - } - } else { - foreign import lib { - "macos/libraygui.dylib" when RAYGUI_SHARED else "macos/libraygui.a", - } - } -} else when ODIN_ARCH == .wasm32 || ODIN_ARCH == .wasm64p32 { - foreign import lib { - RAYGUI_WASM_LIB, - } -} else { - foreign import lib "system:raygui" -} +foreign import lib "system:raygui" RAYGUI_VERSION :: "4.0" diff --git a/vendor/raylib/raylib.odin b/vendor/raylib/raylib.odin index 0a30fd72b..91a2b8bac 100644 --- a/vendor/raylib/raylib.odin +++ b/vendor/raylib/raylib.odin @@ -99,53 +99,7 @@ MAX_MATERIAL_MAPS :: #config(RAYLIB_MAX_MATERIAL_MAPS, 12) RAYLIB_SHARED :: #config(RAYLIB_SHARED, false) RAYLIB_WASM_LIB :: #config(RAYLIB_WASM_LIB, "wasm/libraylib.web.a") -when ODIN_OS == .Windows { - @(extra_linker_flags="/NODEFAULTLIB:" + ("msvcrt" when RAYLIB_SHARED else "libcmt")) - foreign import lib { - "windows/raylibdll.lib" when RAYLIB_SHARED else "windows/raylib.lib" , - "system:Winmm.lib", - "system:Gdi32.lib", - "system:User32.lib", - "system:Shell32.lib", - } -} else when ODIN_OS == .Linux { - when ODIN_ARCH == .arm64 { - foreign import lib { - // Note(bumbread): I'm not sure why in `linux/` folder there are - // multiple copies of raylib.so, but since these bindings are for - // particular version of the library, I better specify it. Ideally, - // though, it's best specified in terms of major (.so.4) - "linux-arm64/libraylib.so.600" when RAYLIB_SHARED else "linux-arm/libraylib.a", - "system:dl", - "system:pthread", - "system:X11", - } - } else { - foreign import lib { - // Note(bumbread): I'm not sure why in `linux/` folder there are - // multiple copies of raylib.so, but since these bindings are for - // particular version of the library, I better specify it. Ideally, - // though, it's best specified in terms of major (.so.4) - "linux/libraylib.so.600" when RAYLIB_SHARED else "linux/libraylib.a", - "system:dl", - "system:pthread", - "system:X11", - } - } -} else when ODIN_OS == .Darwin { - foreign import lib { - "macos/libraylib.600.dylib" when RAYLIB_SHARED else "macos/libraylib.a", - "system:Cocoa.framework", - "system:OpenGL.framework", - "system:IOKit.framework", - } -} else when ODIN_ARCH == .wasm32 || ODIN_ARCH == .wasm64p32 { - foreign import lib { - RAYLIB_WASM_LIB, - } -} else { - foreign import lib "system:raylib" -} +foreign import lib "system:raylib" VERSION_MAJOR :: 6 VERSION_MINOR :: 0