Update: to SDL3-3.1.6, SDL2-2.30.9

dinau · Dec 5, 2024 · b5e0f3c · b5e0f3c
1 parent dcadd6e
commit b5e0f3c
Show file tree

Hide file tree

Showing 294 changed files with 4,119 additions and 16,304 deletions.
diff --git a/examples/makefile.common.mk b/examples/makefile.common.mk
@@ -12,7 +12,7 @@ all:
 	zig build $(OPT)
 	@-$(AFTER_BUILD_CMD)
 
-.PHONY: run gen cleanall cleanexe trans
+.PHONY: run gen cleanall cleanexe trans clean
 
 run: all
 	(cd $(ZIG_BIN_DIR); ./$(TARGET)$(EXE))
@@ -21,6 +21,8 @@ run: all
 gen:
 	nim ../utils/genImPlotFuncs.nims
 
+clean: cleanall
+
 cleanall:
 	@-rm -fr zig-out
 	@-rm -fr zig-cache

diff --git a/examples/sdl2_opengl3/build.zig b/examples/sdl2_opengl3/build.zig
@@ -44,7 +44,7 @@ pub fn build(b: *std.Build) void {
     //----------------------------------
     // Detect 32bit or 64bit Winddws OS
     //----------------------------------
-    const sdl2_Base = "../../libs/sdl/SDL2-2.30.8";
+    const sdl2_Base = "../../libs/sdl/SDL2-2.30.9";
     var sArc:[]const u8 = "x86_64";
     if(builtin.cpu.arch == .x86){
       sArc = "i686";

diff --git a/examples/sdl3_opengl3/build.zig b/examples/sdl3_opengl3/build.zig
@@ -44,7 +44,7 @@ pub fn build(b: *std.Build) void {
     //----------------------------------
     // 64bit Winddws OS
     //----------------------------------
-    const SDL3_VER = "3.1.3";
+    const SDL3_VER = "3.1.6";
     const sdlBase = "../../libs/sdl";
     const sdlPath = b.fmt("{s}/SDL3-{s}/x86_64-w64-mingw32", .{sdlBase, SDL3_VER});
     //---------------
@@ -154,7 +154,7 @@ pub fn build(b: *std.Build) void {
       exe.linkSystemLibrary("shell32");
       exe.linkSystemLibrary("user32");
       // Static link
-      exe.addObjectFile(b.path(b.pathJoin(&.{sdlPath, "lib","libSDL3.a"})));
+      exe.addObjectFile(b.path(b.pathJoin(&.{sdlPath, "lib","libSDL3.dll.a"})));
     }else if (builtin.target.os.tag == .linux){
       exe.linkSystemLibrary("glfw3");
       exe.linkSystemLibrary("GL");
@@ -197,7 +197,7 @@ pub fn build(b: *std.Build) void {
     }
     const res = b.addInstallFile(b.path(resIcon), "bin/z.png");
     b.getInstallStep().dependOn(&res.step);
-    if(false){// Enable if use SDL3.dll with dynamic linking.
+    if(true){// Enable if use SDL3.dll with dynamic linking.
       const resSdlDll = b.pathJoin(&.{sdlPath, "bin", "SDL3.dll"});
       const resSdl = b.addInstallFile(b.path(resSdlDll), "bin/SDL3.dll");
       b.getInstallStep().dependOn(&resSdl.step);

diff --git a/libs/sdl/SDL2-2.30.8/.git-hash b/libs/sdl/SDL2-2.30.8/.git-hash
diff --git a/libs/sdl/SDL2-2.30.8/cmake/sdl2-config-version.cmake b/libs/sdl/SDL2-2.30.8/cmake/sdl2-config-version.cmake
diff --git a/libs/sdl/SDL2-2.30.8/cmake/sdl2-config.cmake b/libs/sdl/SDL2-2.30.8/cmake/sdl2-config.cmake
diff --git a/libs/sdl/SDL2-2.30.8/docs/CONTRIBUTING.md b/libs/sdl/SDL2-2.30.8/docs/CONTRIBUTING.md