From beff18b4273765d996536eb95f06be159671bc20 Mon Sep 17 00:00:00 2001 From: Matheus Catarino Date: Sun, 12 May 2024 15:37:06 -0300 Subject: [PATCH] bump v0.1.1 - examples fixed --- .github/workflows/build.yml | 1 - build.zig | 4 +-- build.zig.zon | 2 +- dub.sdl | 54 ++++++++++++++++++++++++++++--------- 4 files changed, 45 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b4394cf..ce8a8e7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,7 +25,6 @@ jobs: sudo apt-get install libglu1-mesa-dev mesa-common-dev xorg-dev libasound-dev - name: (Dub) Build Native - if: runner.os != 'Windows' run: | dub build :clear dub build :sgl_context diff --git a/build.zig b/build.zig index 3fbeee1..1a29dd5 100644 --- a/build.zig +++ b/build.zig @@ -176,8 +176,8 @@ pub fn buildLibSokol(b: *Build, options: LibSokolOptions) !*CompileStep { .flags = cflags, }); } - if (sharedlib) - b.installArtifact(lib); + + b.installArtifact(lib); return lib; } diff --git a/build.zig.zon b/build.zig.zon index 37bf7cf..cb324d6 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -1,6 +1,6 @@ .{ .name = "sokol-d", - .version = "0.1.0", + .version = "0.1.1", .min_zig_version = "0.12.0", .paths = .{ "src", diff --git a/dub.sdl b/dub.sdl index 66cb6a2..3169ec3 100644 --- a/dub.sdl +++ b/dub.sdl @@ -1,7 +1,7 @@ name "sokol-d" -version "0.1.0" +version "0.1.1" description "D bindings for sokol" -authors "Matheus Catarino França " +authors "Matheus Catarino França" "Andre Weissflog" copyright "Copyright 2023-2024 - Matheus Catarino França" license "Zlib" buildType "debug" { @@ -35,10 +35,13 @@ subPackage { sourceFiles "src/examples/clear.d" libs "sokol" dflags "-preview=all" "-i" + libs "X11" "Xcursor" "Xi" "GL" "asound" platform="linux" + lflags "-lObjC" "-all_load" "-framework" "Cocoa" "-framework" "QuartzCore" "-framework" "Foundation" "-framework" "MetalKit" "-framework" "Metal" "-framework" "AudioToolbox" platform="osx" + libs "user32" "gdi32" "kernel32" "dxgi" "d3d11" "ole32" platform="windows" lflags "-Lzig-out/lib" platform="posix" lflags "/LIBPATH:zig-out/lib" platform="windows" excludedSourceFiles "src/examples/sgl_context.d" "src/examples/triangle.d" "src/examples/sgl_points.d" "src/examples/saudio.d" "src/examples/debugtext.d" "src/examples/mrt.d" "src/examples/user_data.d" "src/examples/cube.d" "src/examples/blend.d" "src/shaders/*.d" - preBuildCommands "zig build -Dshared -Doptimize=ReleaseFast" + preBuildCommands "zig build -Doptimize=ReleaseFast" } subPackage { name "sgl_context" @@ -47,10 +50,13 @@ subPackage { sourceFiles "src/examples/sgl_context.d" libs "sokol" dflags "-preview=all" "-i" + libs "X11" "Xcursor" "Xi" "GL" "asound" platform="linux" + lflags "-lObjC" "-all_load" "-framework" "Cocoa" "-framework" "QuartzCore" "-framework" "Foundation" "-framework" "MetalKit" "-framework" "Metal" "-framework" "AudioToolbox" platform="osx" + libs "user32" "gdi32" "kernel32" "dxgi" "d3d11" "ole32" platform="windows" lflags "-Lzig-out/lib" platform="posix" lflags "/LIBPATH:zig-out/lib" platform="windows" excludedSourceFiles "src/examples/clear.d" "src/examples/triangle.d" "src/examples/sgl_points.d" "src/examples/saudio.d" "src/examples/debugtext.d" "src/examples/mrt.d" "src/examples/user_data.d" "src/examples/cube.d" "src/examples/blend.d" "src/shaders/*.d" - preBuildCommands "zig build -Dshared -Doptimize=ReleaseFast" + preBuildCommands "zig build -Doptimize=ReleaseFast" } subPackage { name "sgl_points" @@ -59,10 +65,13 @@ subPackage { sourceFiles "src/examples/sgl_points.d" libs "sokol" dflags "-preview=all" "-i" + libs "X11" "Xcursor" "Xi" "GL" "asound" platform="linux" + lflags "-lObjC" "-all_load" "-framework" "Cocoa" "-framework" "QuartzCore" "-framework" "Foundation" "-framework" "MetalKit" "-framework" "Metal" "-framework" "AudioToolbox" platform="osx" + libs "user32" "gdi32" "kernel32" "dxgi" "d3d11" "ole32" platform="windows" lflags "-Lzig-out/lib" platform="posix" lflags "/LIBPATH:zig-out/lib" platform="windows" excludedSourceFiles "src/examples/clear.d" "src/examples/triangle.d" "src/examples/sgl_context.d" "src/examples/saudio.d" "src/examples/debugtext.d" "src/examples/mrt.d" "src/examples/user_data.d" "src/examples/cube.d" "src/examples/blend.d" "src/shaders/*.d" - preBuildCommands "zig build -Dshared -Doptimize=ReleaseFast" + preBuildCommands "zig build -Doptimize=ReleaseFast" } subPackage { name "debugtext" @@ -71,10 +80,13 @@ subPackage { sourceFiles "src/examples/debugtext.d" libs "sokol" dflags "-preview=all" "-i" + libs "X11" "Xcursor" "Xi" "GL" "asound" platform="linux" + lflags "-lObjC" "-all_load" "-framework" "Cocoa" "-framework" "QuartzCore" "-framework" "Foundation" "-framework" "MetalKit" "-framework" "Metal" "-framework" "AudioToolbox" platform="osx" + libs "user32" "gdi32" "kernel32" "dxgi" "d3d11" "ole32" platform="windows" lflags "-Lzig-out/lib" platform="posix" lflags "/LIBPATH:zig-out/lib" platform="windows" excludedSourceFiles "src/examples/sgl_context.d" "src/examples/triangle.d" "src/examples/sgl_points.d" "src/examples/saudio.d" "src/examples/clear.d" "src/examples/mrt.d" "src/examples/user_data.d" "src/examples/cube.d" "src/examples/blend.d" "src/shaders/*.d" - preBuildCommands "zig build -Dshared -Doptimize=ReleaseFast" + preBuildCommands "zig build -Doptimize=ReleaseFast" } subPackage { name "triangle" @@ -83,10 +95,13 @@ subPackage { sourceFiles "src/examples/triangle.d" libs "sokol" dflags "-preview=all" "-i" + libs "X11" "Xcursor" "Xi" "GL" "asound" platform="linux" + lflags "-lObjC" "-all_load" "-framework" "Cocoa" "-framework" "QuartzCore" "-framework" "Foundation" "-framework" "MetalKit" "-framework" "Metal" "-framework" "AudioToolbox" platform="osx" + libs "user32" "gdi32" "kernel32" "dxgi" "d3d11" "ole32" platform="windows" lflags "-Lzig-out/lib" platform="posix" lflags "/LIBPATH:zig-out/lib" platform="windows" excludedSourceFiles "src/examples/sgl_context.d" "src/examples/clear.d" "src/examples/sgl_points.d" "src/examples/saudio.d" "src/examples/debugtext.d" "src/examples/mrt.d" "src/examples/user_data.d" "src/examples/cube.d" "src/examples/blend.d" "src/shaders/*.d" - preBuildCommands "zig build -Dshared -Doptimize=ReleaseFast" + preBuildCommands "zig build -Doptimize=ReleaseFast" } subPackage { name "blend" @@ -95,10 +110,13 @@ subPackage { sourceFiles "src/examples/blend.d" libs "sokol" dflags "-preview=all" "-i" + libs "X11" "Xcursor" "Xi" "GL" "asound" platform="linux" + lflags "-lObjC" "-all_load" "-framework" "Cocoa" "-framework" "QuartzCore" "-framework" "Foundation" "-framework" "MetalKit" "-framework" "Metal" "-framework" "AudioToolbox" platform="osx" + libs "user32" "gdi32" "kernel32" "dxgi" "d3d11" "ole32" platform="windows" lflags "-Lzig-out/lib" platform="posix" lflags "/LIBPATH:zig-out/lib" platform="windows" excludedSourceFiles "src/examples/sgl_context.d" "src/examples/clear.d" "src/examples/saudio.d" "src/examples/debugtext.d" "src/examples/mrt.d" "src/examples/user_data.d" "src/examples/cube.d" "src/examples/triangle.d" "src/examples/sgl_points.d" "src/shaders/*.d" - preBuildCommands "zig build -Dshared -Doptimize=ReleaseFast" + preBuildCommands "zig build -Doptimize=ReleaseFast" } subPackage { name "saudio" @@ -107,10 +125,13 @@ subPackage { sourceFiles "src/examples/saudio.d" libs "sokol" dflags "-preview=all" "-i" + libs "X11" "Xcursor" "Xi" "GL" "asound" platform="linux" + lflags "-lObjC" "-all_load" "-framework" "Cocoa" "-framework" "QuartzCore" "-framework" "Foundation" "-framework" "MetalKit" "-framework" "Metal" "-framework" "AudioToolbox" platform="osx" + libs "user32" "gdi32" "kernel32" "dxgi" "d3d11" "ole32" platform="windows" lflags "-Lzig-out/lib" platform="posix" lflags "/LIBPATH:zig-out/lib" platform="windows" excludedSourceFiles "src/examples/sgl_context.d" "src/examples/clear.d" "src/examples/triangle.d" "src/examples/sgl_points.d" "src/examples/debugtext.d" "src/examples/mrt.d" "src/examples/user_data.d" "src/examples/cube.d" "src/examples/blend.d" "src/shaders/*.d" - preBuildCommands "zig build -Dshared -Doptimize=ReleaseFast" + preBuildCommands "zig build -Doptimize=ReleaseFast" } subPackage { name "mrt" @@ -119,10 +140,13 @@ subPackage { sourceFiles "src/examples/mrt.d" libs "sokol" dflags "-preview=all" "-i" + libs "X11" "Xcursor" "Xi" "GL" "asound" platform="linux" + lflags "-lObjC" "-all_load" "-framework" "Cocoa" "-framework" "QuartzCore" "-framework" "Foundation" "-framework" "MetalKit" "-framework" "Metal" "-framework" "AudioToolbox" platform="osx" + libs "user32" "gdi32" "kernel32" "dxgi" "d3d11" "ole32" platform="windows" lflags "-Lzig-out/lib" platform="posix" lflags "/LIBPATH:zig-out/lib" platform="windows" excludedSourceFiles "src/examples/sgl_context.d" "src/examples/clear.d" "src/examples/saudio.d" "src/examples/debugtext.d" "src/examples/triangle.d" "src/examples/sgl_points.d" "src/examples/user_data.d" "src/examples/cube.d" "src/examples/blend.d" "src/shaders/*.d" - preBuildCommands "zig build -Dshared -Doptimize=ReleaseFast" + preBuildCommands "zig build -Doptimize=ReleaseFast" } subPackage { name "cube" @@ -131,10 +155,13 @@ subPackage { sourceFiles "src/examples/cube.d" libs "sokol" dflags "-preview=all" "-i" + libs "X11" "Xcursor" "Xi" "GL" "asound" platform="linux" + lflags "-lObjC" "-all_load" "-framework" "Cocoa" "-framework" "QuartzCore" "-framework" "Foundation" "-framework" "MetalKit" "-framework" "Metal" "-framework" "AudioToolbox" platform="osx" + libs "user32" "gdi32" "kernel32" "dxgi" "d3d11" "ole32" platform="windows" lflags "-Lzig-out/lib" platform="posix" lflags "/LIBPATH:zig-out/lib" platform="windows" excludedSourceFiles "src/examples/sgl_context.d" "src/examples/clear.d" "src/examples/saudio.d" "src/examples/debugtext.d" "src/examples/triangle.d" "src/examples/sgl_points.d" "src/examples/user_data.d" "src/examples/mrt.d" "src/examples/blend.d" "src/shaders/*.d" - preBuildCommands "zig build -Dshared -Doptimize=ReleaseFast" + preBuildCommands "zig build -Doptimize=ReleaseFast" } subPackage { name "user_data" @@ -143,8 +170,11 @@ subPackage { sourceFiles "src/examples/user_data.d" libs "sokol" dflags "-preview=all" "-i" + libs "X11" "Xcursor" "Xi" "GL" "asound" platform="linux" + lflags "-lObjC" "-all_load" "-framework" "Cocoa" "-framework" "QuartzCore" "-framework" "Foundation" "-framework" "MetalKit" "-framework" "Metal" "-framework" "AudioToolbox" platform="osx" + libs "user32" "gdi32" "kernel32" "dxgi" "d3d11" "ole32" platform="windows" lflags "-Lzig-out/lib" platform="posix" lflags "/LIBPATH:zig-out/lib" platform="windows" excludedSourceFiles "src/examples/sgl_context.d" "src/examples/clear.d" "src/examples/saudio.d" "src/examples/debugtext.d" "src/examples/triangle.d" "src/examples/sgl_points.d" "src/examples/cube.d" "src/examples/mrt.d" "src/examples/blend.d" "src/shaders/*.d" - preBuildCommands "zig build -Dshared -Doptimize=ReleaseFast" + preBuildCommands "zig build -Doptimize=ReleaseFast" }