Compare commits
	
		
			11 Commits
		
	
	
		
			70d7c0dc02
			...
			5b2b64a9de
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 5b2b64a9de | |||
| 1c6205769f | |||
| 99d138d5e8 | |||
| 5ad078e5d6 | |||
| 573b2347f6 | |||
| fd91b5ceaa | |||
| 45f02a82a8 | |||
| 340dfa2bb7 | |||
| 8a2becdd79 | |||
| 9f23fbe948 | |||
| 63e18caa5b | 
							
								
								
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
										Normal file
									
								
							@@ -0,0 +1,2 @@
 | 
				
			|||||||
 | 
					/zig-cache
 | 
				
			||||||
 | 
					/zig-out
 | 
				
			||||||
							
								
								
									
										23
									
								
								build.zig
									
									
									
									
									
								
							
							
						
						
									
										23
									
								
								build.zig
									
									
									
									
									
								
							@@ -105,9 +105,30 @@ pub fn package(
 | 
				
			|||||||
            zgui_c_cpp.linkSystemLibraryName("dwmapi");
 | 
					            zgui_c_cpp.linkSystemLibraryName("dwmapi");
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
        .sdl2_opengl3 => {
 | 
					        .sdl2_opengl3 => {
 | 
				
			||||||
 | 
					            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 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);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                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");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                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");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            zgui_c_cpp.addCSourceFile(thisDir() ++ "/libs/imgui/backends/imgui_impl_sdl.cpp", cflags);
 | 
					            zgui_c_cpp.addCSourceFile(thisDir() ++ "/libs/imgui/backends/imgui_impl_sdl.cpp", cflags);
 | 
				
			||||||
            zgui_c_cpp.addCSourceFile(thisDir() ++ "/libs/imgui/backends/imgui_impl_opengl3.cpp", cflags);
 | 
					            zgui_c_cpp.addCSourceFile(thisDir() ++ "/libs/imgui/backends/imgui_impl_opengl3.cpp", cflags);
 | 
				
			||||||
            zgui_c_cpp.linkSystemLibrary("SDL2");
 | 
					 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
        .no_backend => {},
 | 
					        .no_backend => {},
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -67,13 +67,8 @@
 | 
				
			|||||||
#include "imgui_impl_sdl.h"
 | 
					#include "imgui_impl_sdl.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// SDL
 | 
					// SDL
 | 
				
			||||||
#if defined(__WIN32__)
 | 
					#include <SDL.h>
 | 
				
			||||||
    #include <SDL2/SDL.h>
 | 
					#include <SDL_syswm.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>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -9,9 +9,9 @@ pub const version = @import("std").SemanticVersion{ .major = 0, .minor = 9, .pat
 | 
				
			|||||||
pub usingnamespace @import("gui.zig");
 | 
					pub usingnamespace @import("gui.zig");
 | 
				
			||||||
pub const plot = @import("plot.zig");
 | 
					pub const plot = @import("plot.zig");
 | 
				
			||||||
pub const backend = switch (@import("zgui_options").backend) {
 | 
					pub const backend = switch (@import("zgui_options").backend) {
 | 
				
			||||||
 | 
					    .glfw_wgpu => @import("backend_glfw_wgpu.zig"),
 | 
				
			||||||
    .glfw_opengl3 => @import("backend_glfw_opengl3.zig"),
 | 
					    .glfw_opengl3 => @import("backend_glfw_opengl3.zig"),
 | 
				
			||||||
    .sdl2_opengl3 => @import("backend_sdl2_opengl3.zig"),
 | 
					    .sdl2_opengl3 => @import("backend_sdl2_opengl3.zig"),
 | 
				
			||||||
    .glfw_wgpu => @import("backend_glfw_wgpu.zig"),
 | 
					 | 
				
			||||||
    .win32_dx12 => .{}, // TODO:
 | 
					    .win32_dx12 => .{}, // TODO:
 | 
				
			||||||
    .no_backend => .{},
 | 
					    .no_backend => .{},
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user