Fix small audio mistake and fix examples

sol-vin · May 10, 2024 · a5a87e9 · a5a87e9
1 parent 56537f9
commit a5a87e9
Show file tree

Hide file tree

Showing 18 changed files with 24 additions and 23 deletions.
diff --git a/examples/collisionarea/shard.lock b/examples/collisionarea/shard.lock
@@ -2,5 +2,5 @@ version: 2.0
 shards:
   raylib-cr:
     path: ../../
-    version: 0.9
+    version: 5.0
 
diff --git a/examples/fogshader/shard.lock b/examples/fogshader/shard.lock
@@ -2,5 +2,5 @@ version: 2.0
 shards:
   raylib-cr:
     path: ../../
-    version: 0.9+git.commit.68f9e5489547eb992e2394b4e5391890617a2ae6
+    version: 5.0
 
diff --git a/examples/raygui_button/bin/raygui_button b/examples/raygui_button/bin/raygui_button
diff --git a/examples/raygui_button/shard.lock b/examples/raygui_button/shard.lock
@@ -2,5 +2,5 @@ version: 2.0
 shards:
   raylib-cr:
     path: ../../
-    version: 4.6
+    version: 5.0
 
diff --git a/examples/raygui_button/src/raygui_button.cr b/examples/raygui_button/src/raygui_button.cr
@@ -26,7 +26,7 @@ until Raylib.close_window?
          height: button_height
        ),
        "Click This Button"
-     )
+     ) == 1
     show_text = !show_text
   end
 

diff --git a/examples/rlgl_solar_system/shard.lock b/examples/rlgl_solar_system/shard.lock
@@ -2,5 +2,5 @@ version: 2.0
 shards:
   raylib-cr:
     path: ../../
-    version: 0.9
+    version: 5.0
 
diff --git a/examples/rlgl_solar_system/src/rlgl_solar_system.cr b/examples/rlgl_solar_system/src/rlgl_solar_system.cr
@@ -65,7 +65,7 @@ moon_orbit_rotation = 0.0_f32
 Rl.set_target_fps(60)
 
 until Rl.close_window?
-  Rl.update_camera(pointerof(camera), Rl::CameraMode::Free)
+  # Rl.update_camera(pointerof(camera), Rl::CameraMode::Free)
   earth_rotation += (5.0_f32 * rotation_speed)
   earth_orbit_rotation += (365/360.0_f32*(5.0_f32*rotation_speed)*rotation_speed)
   moon_rotation += (2.0_f32*rotation_speed)

diff --git a/examples/shapes/shard.lock b/examples/shapes/shard.lock
@@ -2,5 +2,5 @@ version: 2.0
 shards:
   raylib-cr:
     path: ../../
-    version: 0.9
+    version: 5.0
 
diff --git a/examples/shapes_top_down_lights/shard.lock b/examples/shapes_top_down_lights/shard.lock
@@ -2,5 +2,5 @@ version: 2.0
 shards:
   raylib-cr:
     path: ../../
-    version: 0.9
+    version: 5.0
 
diff --git a/examples/smooth_pixel_perfect_camera/shard.lock b/examples/smooth_pixel_perfect_camera/shard.lock
@@ -2,5 +2,5 @@ version: 2.0
 shards:
   raylib-cr:
     path: ../../
-    version: 0.9
+    version: 5.0
 
diff --git a/examples/sound_test/shard.lock b/examples/sound_test/shard.lock
@@ -2,5 +2,5 @@ version: 2.0
 shards:
   raylib-cr:
     path: ../../
-    version: 0.9
+    version: 5.0
 
diff --git a/examples/three_d_camera_mode/shard.lock b/examples/three_d_camera_mode/shard.lock
@@ -2,5 +2,5 @@ version: 2.0
 shards:
   raylib-cr:
     path: ../../
-    version: 0.9
+    version: 5.0
 
diff --git a/rsrc/build-examples/build.cr b/rsrc/build-examples/build.cr
@@ -23,6 +23,8 @@ FileUtils.cd("examples") do
       file = "../_build/#{name}"
       {% if flag?(:windows) %}
         file = "../_build/#{name}.exe"
+        FileUtils.cp("../../rsrc/native/windows/raylib.dll", "../_build/raylib.dll")
+        FileUtils.cp("../../rsrc/native/windows/raygui.dll", "../_build/raygui.dll")
       {% end %}
 
       unless File.exists?(file)
@@ -37,7 +39,7 @@ FileUtils.cd("examples") do
       end
 
       begin
-        FileUtils.cp_r("./rsrc", "../_build/rsrc")
+        FileUtils.cp_r("./rsrc", "../_build/")
       rescue
       end
     end

diff --git a/rsrc/miniaudiohelpers/miniaudiohelpers.h b/rsrc/miniaudiohelpers/miniaudiohelpers.h
@@ -1,5 +1,3 @@
-#define MINIAUDIO_IMPLEMENTATION
-
 #include "miniaudio.h"
 
 size_t MADataConverterSize();

diff --git a/rsrc/native/windows/raygui.dll b/rsrc/native/windows/raygui.dll
diff --git a/rsrc/native/windows/raylib.dll b/rsrc/native/windows/raylib.dll
diff --git a/src/raylib-cr/audio.cr b/src/raylib-cr/audio.cr
@@ -93,6 +93,16 @@ lib RAudio
     ctx_type : LibC::Int
     ctx_data : Void*
   end
+
+  enum MusicContextType
+    AudioNone = 0
+    AudioWav  = 1
+    AudioOGG  = 2
+    AudioFLAC = 3
+    AudioMP3  = 4
+    ModuleXM  = 5
+    ModuleMod = 6
+  end
 
   fun init_audio_device = InitAudioDevice
   fun close_audio_device = CloseAudioDevice

diff --git a/src/raylib-cr/raylib.cr b/src/raylib-cr/raylib.cr
@@ -374,15 +374,6 @@ lib Raylib
     ThreePatchHorizontal = 2
   end
 
-  enum MusicContextType
-    AudioNone = 0
-    AudioWav  = 1
-    AudioOGG  = 2
-    AudioFLAC = 3
-    AudioMP3  = 4
-    ModuleXM  = 5
-    ModuleMod = 6
-  end
 
   LIGHTGRAY  = Color.new r: 200, g: 200, b: 200, a: 255
   GRAY       = Color.new r: 130, g: 130, b: 130, a: 255