Merge branch 'floooh:main' into main

.github/workflows/main.yml

@@ -8,33 +8,52 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{matrix.os}}
+    # NOTE: odin macos and ubuntu releases are zipped twice, so this is bit of a hack.
+    # The examples folder also conflicts with the sokol examples, so we just remove it.
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ilammy/msvc-dev-cmd@v1
       - if: runner.os == 'Linux'
         name: prepare-linux
         run: |
           sudo apt-get update
-          sudo apt-get install libglu1-mesa-dev mesa-common-dev xorg-dev libasound-dev llvm-11
-          curl -L https://github.com/odin-lang/Odin/releases/download/dev-2023-07/odin-ubuntu-amd64-dev-2023-07.zip --output odin.zip
+          sudo apt-get install libglu1-mesa-dev mesa-common-dev xorg-dev libasound-dev
+          wget https://apt.llvm.org/llvm.sh
+          chmod +x llvm.sh
+          echo "/usr/lib/llvm-17/bin" >> $GITHUB_PATH
+          curl -L https://github.com/odin-lang/Odin/releases/download/dev-2024-04/odin-ubuntu-amd64-dev-2024-04.zip --output odin.zip
           unzip odin.zip
+          unzip dist.zip
+          rm -r ./dist/examples
+          mv ./dist/* ./
           chmod a+x ./odin
+          cd sokol
+          chmod a+x ./build_clibs_linux.sh
           ./build_clibs_linux.sh
+          cd ..
       - if: runner.os == 'macOS'
         name: prepare-macos
         run: |
-          brew install llvm@11
-          curl -L https://github.com/odin-lang/Odin/releases/download/dev-2023-07/odin-macos-amd64-dev-2023-07.zip --output odin.zip
+          brew install llvm@17
+          curl -L https://github.com/odin-lang/Odin/releases/download/dev-2024-04/odin-macos-amd64-dev-2024-04.zip --output odin.zip
           unzip odin.zip
+          unzip dist.zip
+          rm -r ./dist/examples
+          mv ./dist/* ./
           chmod a+x ./odin
+          cd sokol
+          chmod a+x ./build_clibs_macos.sh
           ./build_clibs_macos.sh
+          cd ..
       - if: runner.os == 'Windows'
         name: prepare-windows
         shell: cmd
         run: |
-          curl -L https://github.com/odin-lang/Odin/releases/download/dev-2023-07/odin-windows-amd64-dev-2023-07.zip --output odin.zip
+          curl -L https://github.com/odin-lang/Odin/releases/download/dev-2024-04/odin-windows-amd64-dev-2024-04.zip --output odin.zip
           unzip odin.zip
+          cd sokol
           build_clibs_windows.cmd
+          cd ..
       - name: build
         run: |
           ./odin build examples/clear -debug

.gitignore

@@ -6,4 +6,9 @@ build/
 *.obj
 *.pdb
 *.bin
+*.exp
+*.ilk
+*.dll
+*.dylib
+*.exe
 *.dSYM/

CHANGELOG.md

@@ -0,0 +1,12 @@
+## CHANGELOG
+
+> NOTE: this changelog is only for changes to the sokol-odin 'scaffolding'.
+For actual Sokol header changes, see the
+[sokol changelog](https://github.com/floooh/sokol/blob/master/CHANGELOG.md).
+
+### 13-Apr-2024
+
+Merged PR https://github.com/floooh/sokol-odin/pull/11, this changes the
+directory structure of the bindings repository, adds support to build
+the Windows bindings as a DLL and a couple of smaller things
+detailed here: https://github.com/floooh/sokol/pull/1023

README.md

@@ -1,6 +1,8 @@
 [![Odin](https://github.com/floooh/sokol-odin/actions/workflows/main.yml/badge.svg)](https://github.com/floooh/sokol-odin/actions/workflows/main.yml)
 
-Auto-generated Odin bindings for the [sokol headers](https://github.com/floooh/sokol).
+Auto-generated [Odin](https://github.com/odin-lang/odin) bindings for the [sokol headers](https://github.com/floooh/sokol).
+
+To include sokol in your project you can copy the [sokol](sokol/) directory.
 
 ## BUILD
 
@@ -12,12 +14,14 @@ On Linux install the following packages: libglu1-mesa-dev, mesa-common-dev, xorg
 1. First build the required static link libraries:
 
     ```
+    cd sokol
     # on macOS:
     ./build_clibs_macos.sh
     # on Linux:
     ./build_clibs_linux.sh
     # on Windows with MSVC (from a 'Visual Studio Developer Command Prompt')
     build_clibs_windows.cmd
+    cd ..
     ```
 
 2. Create a build directory and cd into it:
@@ -47,6 +51,7 @@ On Linux install the following packages: libglu1-mesa-dev, mesa-common-dev, xorg
     odin run ../examples/sgl -debug
     odin run ../examples/sgl-points -debug
     odin run ../examples/sgl-context -debug
+    odin run ../examples/vertexpull -debug
     ```
 
     By default, the backend 3D API will be selected based on the target platform:

build_shaders_macos.sh

@@ -12,7 +12,7 @@ build_shader() {
         shdc=$sokol_tools_root/bin/osx/sokol-shdc
     fi
     echo $dir
-    $shdc -i $dir/shader.glsl -o $dir/shader.odin -l glsl330:metal_macos:hlsl4 -f sokol_odin
+    $shdc -i $dir/shader.glsl -o $dir/shader.odin -l glsl430:metal_macos:hlsl5 -f sokol_odin
 }
 
 build_shader blend
@@ -26,5 +26,4 @@ build_shader quad
 build_shader shapes
 build_shader texcube
 build_shader triangle
-
-
+build_shader vertexpull

examples/blend/main.odin

@@ -5,7 +5,7 @@
 //------------------------------------------------------------------------------
 package main
 
-import "core:runtime"
+import "base:runtime"
 import slog "../../sokol/log"
 import sg "../../sokol/gfx"
 import sapp "../../sokol/app"