at master 141 lines 4.7 kB view raw
1diff --git a/vendor/raylib/raygui.odin b/vendor/raylib/raygui.odin 2index 559437a60..cd31fbe43 100644 3--- a/vendor/raylib/raygui.odin 4+++ b/vendor/raylib/raygui.odin 5@@ -2,34 +2,7 @@ package raylib 6 7 import "core:c" 8 9-RAYGUI_SHARED :: #config(RAYGUI_SHARED, false) 10-RAYGUI_WASM_LIB :: #config(RAYGUI_WASM_LIB, "wasm/libraygui.a") 11- 12-when ODIN_OS == .Windows { 13- foreign import lib { 14- "windows/rayguidll.lib" when RAYGUI_SHARED else "windows/raygui.lib", 15- } 16-} else when ODIN_OS == .Linux { 17- foreign import lib { 18- "linux/libraygui.so" when RAYGUI_SHARED else "linux/libraygui.a", 19- } 20-} else when ODIN_OS == .Darwin { 21- when ODIN_ARCH == .arm64 { 22- foreign import lib { 23- "macos-arm64/libraygui.dylib" when RAYGUI_SHARED else "macos-arm64/libraygui.a", 24- } 25- } else { 26- foreign import lib { 27- "macos/libraygui.dylib" when RAYGUI_SHARED else "macos/libraygui.a", 28- } 29- } 30-} else when ODIN_ARCH == .wasm32 || ODIN_ARCH == .wasm64p32 { 31- foreign import lib { 32- RAYGUI_WASM_LIB, 33- } 34-} else { 35- foreign import lib "system:raygui" 36-} 37+foreign import lib "system:raygui" 38 39 RAYGUI_VERSION :: "4.0" 40 41diff --git a/vendor/raylib/raylib.odin b/vendor/raylib/raylib.odin 42index 02bb6deea..0df93009b 100644 43--- a/vendor/raylib/raylib.odin 44+++ b/vendor/raylib/raylib.odin 45@@ -99,42 +99,7 @@ MAX_TEXT_BUFFER_LENGTH :: #config(RAYLIB_MAX_TEXT_BUFFER_LENGTH, 1024) 46 47 #assert(size_of(rune) == size_of(c.int)) 48 49-RAYLIB_SHARED :: #config(RAYLIB_SHARED, false) 50-RAYLIB_WASM_LIB :: #config(RAYLIB_WASM_LIB, "wasm/libraylib.a") 51- 52-when ODIN_OS == .Windows { 53- @(extra_linker_flags="/NODEFAULTLIB:" + ("msvcrt" when RAYLIB_SHARED else "libcmt")) 54- foreign import lib { 55- "windows/raylibdll.lib" when RAYLIB_SHARED else "windows/raylib.lib" , 56- "system:Winmm.lib", 57- "system:Gdi32.lib", 58- "system:User32.lib", 59- "system:Shell32.lib", 60- } 61-} else when ODIN_OS == .Linux { 62- foreign import lib { 63- // Note(bumbread): I'm not sure why in `linux/` folder there are 64- // multiple copies of raylib.so, but since these bindings are for 65- // particular version of the library, I better specify it. Ideally, 66- // though, it's best specified in terms of major (.so.4) 67- "linux/libraylib.so.550" when RAYLIB_SHARED else "linux/libraylib.a", 68- "system:dl", 69- "system:pthread", 70- } 71-} else when ODIN_OS == .Darwin { 72- foreign import lib { 73- "macos/libraylib.550.dylib" when RAYLIB_SHARED else "macos/libraylib.a", 74- "system:Cocoa.framework", 75- "system:OpenGL.framework", 76- "system:IOKit.framework", 77- } 78-} else when ODIN_ARCH == .wasm32 || ODIN_ARCH == .wasm64p32 { 79- foreign import lib { 80- RAYLIB_WASM_LIB, 81- } 82-} else { 83- foreign import lib "system:raylib" 84-} 85+foreign import lib "system:raylib" 86 87 VERSION_MAJOR :: 5 88 VERSION_MINOR :: 5 89diff --git a/vendor/raylib/rlgl/rlgl.odin b/vendor/raylib/rlgl/rlgl.odin 90index 6ac19695d..78a483a59 100644 91--- a/vendor/raylib/rlgl/rlgl.odin 92+++ b/vendor/raylib/rlgl/rlgl.odin 93@@ -112,47 +112,12 @@ import rl "../." 94 95 VERSION :: "5.0" 96 97-RAYLIB_SHARED :: #config(RAYLIB_SHARED, false) 98-RAYLIB_WASM_LIB :: #config(RAYLIB_WASM_LIB, "../wasm/libraylib.a") 99- 100 // Note: We pull in the full raylib library. If you want a truly stand-alone rlgl, then: 101 // - Compile a separate rlgl library and use that in the foreign import blocks below. 102 // - Remove the `import rl "../."` line 103 // - Copy the code from raylib.odin for any types we alias from that package (see PixelFormat etc) 104 105-when ODIN_OS == .Windows { 106- @(extra_linker_flags="/NODEFAULTLIB:" + ("msvcrt" when RAYLIB_SHARED else "libcmt")) 107- foreign import lib { 108- "../windows/raylibdll.lib" when RAYLIB_SHARED else "../windows/raylib.lib" , 109- "system:Winmm.lib", 110- "system:Gdi32.lib", 111- "system:User32.lib", 112- "system:Shell32.lib", 113- } 114-} else when ODIN_OS == .Linux { 115- foreign import lib { 116- // Note(bumbread): I'm not sure why in `linux/` folder there are 117- // multiple copies of raylib.so, but since these bindings are for 118- // particular version of the library, I better specify it. Ideally, 119- // though, it's best specified in terms of major (.so.4) 120- "../linux/libraylib.so.550" when RAYLIB_SHARED else "../linux/libraylib.a", 121- "system:dl", 122- "system:pthread", 123- } 124-} else when ODIN_OS == .Darwin { 125- foreign import lib { 126- "../macos/libraylib.550.dylib" when RAYLIB_SHARED else "../macos/libraylib.a", 127- "system:Cocoa.framework", 128- "system:OpenGL.framework", 129- "system:IOKit.framework", 130- } 131-} else when ODIN_ARCH == .wasm32 || ODIN_ARCH == .wasm64p32 { 132- foreign import lib { 133- RAYLIB_WASM_LIB, 134- } 135-} else { 136- foreign import lib "system:raylib" 137-} 138+foreign import lib "system:raylib" 139 140 GRAPHICS_API_OPENGL_11 :: false 141 GRAPHICS_API_OPENGL_21 :: true