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

feat: prefer SDL.h instead of SDL/SDL.h on all supported platforms

This commit is contained in:
Rekai Nyangadzayi Musuka 2023-03-26 22:54:53 -05:00 committed by paoda
parent e895db97bc
commit ecc96a9c82
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
build.zig
View File

@ -124,20 +124,25 @@ pub fn package(
zgui_c_cpp.linkSystemLibraryName("dwmapi");
},
.sdl2_opengl3 => {
// if (target.isWindows()) blk: {
// // see: https://github.com/MasterQ32/SDL.zig/blob/37f4ba9e31bea895fa19ef8b90d1f51111e52e67/Sdk.zig#L182-L199
if (target.isWindows()) blk: {
// 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;
// const path = zgui_c_cpp.vcpkg_bin_path orelse break :blk;
zgui_c_cpp.addVcpkgPaths(if (args.options.shared) .dynamic else .static) catch break :blk;
// const src_path = std.fs.path.join(b.allocator, &.{ path, "SDL2.dll" }) catch @panic("out of memory");
const vcpkg_triplet = zgui_c_cpp.target.vcpkgTriplet(b.allocator, if (args.options.shared) .Dynamic else .Static) catch |e| {
std.debug.panic("failed to determing vcpkg triplet: {}", .{e});
};
defer b.allocator.free(vcpkg_triplet);
// std.fs.cwd().access(src_path, .{}) catch break :blk;
const include_path = b.pathJoin(&.{ b.vcpkg_root.found, "installed", vcpkg_triplet, "include", "SDL2" });
zgui_c_cpp.include_dirs.append(.{ .raw_path = include_path }) catch @panic("out of memory");
// std.log.info("path: {s}", .{src_path});
// // we found SDL2.dll
// b.installBinFile(src_path, "SDL2.dll");
// }
const bin_path = zgui_c_cpp.vcpkg_bin_path orelse @panic("vcpkg paths were found, so vcpkg_bin_path should be set ");
const dll_path = std.fs.path.join(b.allocator, &.{ bin_path, "SDL2.dll" }) catch @panic("out of memory");
std.fs.cwd().access(dll_path, .{}) catch break :blk;
b.installBinFile(dll_path, "SDL2.dll");
}
zgui_c_cpp.linkSystemLibrary("SDL2");

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

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