Migrate to latest J3ML

2024-02-20 03:52:24 -05:00
parent 227ecdb64c
commit 426b02b3ea
3 changed files with 4 additions and 4 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,7 +22,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")

 CPMAddPackage(
        NAME J3ML
-        URL https://git.redacted.cc/josh/j3ml/archive/Prerelease-14.zip
+        URL https://git.redacted.cc/josh/j3ml/archive/Prerelease-18.zip
 )

 find_package(OpenGL REQUIRED)
--- a/include/rewindow/types/key.h
+++ b/include/rewindow/types/key.h
@@ -16,7 +16,7 @@
 #include "rewindow/data/X11Scancodes.h"
 #include "rewindow/data/WindowsScancodes.h"

-using Vector2 = LinearAlgebra::Vector2;
+using J3ML::LinearAlgebra::Vector2;

 class Key
 {
@@ -137,7 +137,7 @@ namespace Keys {
 class GamepadButton {};
 class MouseButton {};

-using LinearAlgebra::Vector2;
+using J3ML::LinearAlgebra::Vector2;

 class InputService {
 public:
--- a/include/rewindow/types/window.h
+++ b/include/rewindow/types/window.h
@@ -55,7 +55,7 @@ enum class KeyState { Pressed, Released };

 namespace ReWindow
 {
-    using LinearAlgebra::Vector2;
+    using J3ML::LinearAlgebra::Vector2;

    class TimestampedEvent {
    private: