Skip to content

Commit

Permalink
bump v0.1.1 - examples fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
kassane committed May 12, 2024
1 parent 9198de3 commit beff18b
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 16 deletions.
1 change: 0 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions build.zig
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,8 @@ pub fn buildLibSokol(b: *Build, options: LibSokolOptions) !*CompileStep {
.flags = cflags,
});
}
if (sharedlib)
b.installArtifact(lib);

b.installArtifact(lib);
return lib;
}

Expand Down
2 changes: 1 addition & 1 deletion build.zig.zon
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.{
.name = "sokol-d",
.version = "0.1.0",
.version = "0.1.1",
.min_zig_version = "0.12.0",
.paths = .{
"src",
Expand Down
54 changes: 42 additions & 12 deletions dub.sdl
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>"
authors "Matheus Catarino França" "Andre Weissflog"
copyright "Copyright 2023-2024 - Matheus Catarino França"
license "Zlib"
buildType "debug" {
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
}

0 comments on commit beff18b

Please sign in to comment.