paoda
/
zgui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tmp: nth attempt

This commit is contained in:
Rekai Nyangadzayi Musuka 2023-03-26 22:09:09 -05:00
parent 1dfff5e0b0
commit 42b225924a
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
build.zig
View File

@ -105,19 +105,20 @@ pub fn package(
zgui_c_cpp.linkSystemLibraryName("dwmapi"); zgui_c_cpp.linkSystemLibraryName("dwmapi");
}, },
.sdl2_opengl3 => { .sdl2_opengl3 => {
if (target.isWindows()) blk: { // if (target.isWindows()) blk: {
// see: https://github.com/MasterQ32/SDL.zig/blob/37f4ba9e31bea895fa19ef8b90d1f51111e52e67/Sdk.zig#L182-L199 // // see: https://github.com/MasterQ32/SDL.zig/blob/37f4ba9e31bea895fa19ef8b90d1f51111e52e67/Sdk.zig#L182-L199
zgui_c_cpp.addVcpkgPaths(if (args.options.shared) .dynamic else .static) catch break :blk; // zgui_c_cpp.addVcpkgPaths(if (args.options.shared) .dynamic else .static) catch break :blk;
const path = zgui_c_cpp.vcpkg_bin_path orelse break :blk; // const path = zgui_c_cpp.vcpkg_bin_path orelse break :blk;
const src_path = std.fs.path.join(b.allocator, &.{ path, "SDL2.dll" }) catch @panic("out of memory"); // const src_path = std.fs.path.join(b.allocator, &.{ path, "SDL2.dll" }) catch @panic("out of memory");
std.fs.cwd().access(src_path, .{}) catch break :blk; // std.fs.cwd().access(src_path, .{}) catch break :blk;
// we found SDL2.dll // std.log.info("path: {s}", .{src_path});
b.installBinFile(src_path, "SDL2.dll"); // // we found SDL2.dll
} // b.installBinFile(src_path, "SDL2.dll");
// }
zgui_c_cpp.linkSystemLibrary("SDL2"); zgui_c_cpp.linkSystemLibrary("SDL2");

9
libs/imgui/backends/imgui_impl_sdl.cpp
View File

@ -67,8 +67,13 @@
#include "imgui_impl_sdl.h" #include "imgui_impl_sdl.h"
// SDL // SDL
#include <SDL.h> #if defined(__WIN32__)
#include <SDL_syswm.h> #include <SDL2/SDL.h>
#include <SDL2/SDL_syswm.h>
#else
#include <SDL.h>
#include <SDL_syswm.h>
#endif
#if defined(__APPLE__) #if defined(__APPLE__)
#include <TargetConditionals.h> #include <TargetConditionals.h>