From 0f5dae7ef87d7eccfa2e0a44468e4284abdac526 Mon Sep 17 00:00:00 2001
From: shweet <email@shweetz.net>
Date: Tue, 11 Nov 2025 19:08:17 -0500
Subject: [PATCH] more fixes

---
 src/anm2/anm2_type.h | 32 ++++++++++++++++----------------
 src/render.cpp       |  2 +-
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/anm2/anm2_type.h b/src/anm2/anm2_type.h
index e5d15d6..b5dc72e 100644
--- a/src/anm2/anm2_type.h
+++ b/src/anm2/anm2_type.h
@@ -8,21 +8,21 @@
 
 namespace anm2ed::anm2
 {
-  constexpr auto ROOT_COLOR = glm::vec4(0.140f, 0.310f, 0.560f, 1.000f);
-  constexpr auto ROOT_COLOR_ACTIVE = glm::vec4(0.240f, 0.520f, 0.880f, 1.000f);
-  constexpr auto ROOT_COLOR_HOVERED = glm::vec4(0.320f, 0.640f, 1.000f, 1.000f);
+  inline const glm::vec4 ROOT_COLOR = glm::vec4(0.140f, 0.310f, 0.560f, 1.000f);
+  inline const glm::vec4 ROOT_COLOR_ACTIVE = glm::vec4(0.240f, 0.520f, 0.880f, 1.000f);
+  inline const glm::vec4 ROOT_COLOR_HOVERED = glm::vec4(0.320f, 0.640f, 1.000f, 1.000f);
 
-  constexpr auto LAYER_COLOR = glm::vec4(0.640f, 0.320f, 0.110f, 1.000f);
-  constexpr auto LAYER_COLOR_ACTIVE = glm::vec4(0.840f, 0.450f, 0.170f, 1.000f);
-  constexpr auto LAYER_COLOR_HOVERED = glm::vec4(0.960f, 0.560f, 0.240f, 1.000f);
+  inline const glm::vec4 LAYER_COLOR = glm::vec4(0.640f, 0.320f, 0.110f, 1.000f);
+  inline const glm::vec4 LAYER_COLOR_ACTIVE = glm::vec4(0.840f, 0.450f, 0.170f, 1.000f);
+  inline const glm::vec4 LAYER_COLOR_HOVERED = glm::vec4(0.960f, 0.560f, 0.240f, 1.000f);
 
-  constexpr auto NULL_COLOR = glm::vec4(0.140f, 0.430f, 0.200f, 1.000f);
-  constexpr auto NULL_COLOR_ACTIVE = glm::vec4(0.250f, 0.650f, 0.350f, 1.000f);
-  constexpr auto NULL_COLOR_HOVERED = glm::vec4(0.350f, 0.800f, 0.480f, 1.000f);
+  inline const glm::vec4 NULL_COLOR = glm::vec4(0.140f, 0.430f, 0.200f, 1.000f);
+  inline const glm::vec4 NULL_COLOR_ACTIVE = glm::vec4(0.250f, 0.650f, 0.350f, 1.000f);
+  inline const glm::vec4 NULL_COLOR_HOVERED = glm::vec4(0.350f, 0.800f, 0.480f, 1.000f);
 
-  constexpr auto TRIGGER_COLOR = glm::vec4(0.620f, 0.150f, 0.260f, 1.000f);
-  constexpr auto TRIGGER_COLOR_ACTIVE = glm::vec4(0.820f, 0.250f, 0.380f, 1.000f);
-  constexpr auto TRIGGER_COLOR_HOVERED = glm::vec4(0.950f, 0.330f, 0.490f, 1.000f);
+  inline const glm::vec4 TRIGGER_COLOR = glm::vec4(0.620f, 0.150f, 0.260f, 1.000f);
+  inline const glm::vec4 TRIGGER_COLOR_ACTIVE = glm::vec4(0.820f, 0.250f, 0.380f, 1.000f);
+  inline const glm::vec4 TRIGGER_COLOR_HOVERED = glm::vec4(0.950f, 0.330f, 0.490f, 1.000f);
 
 #define TYPE_LIST                                                                                                      \
   X(NONE, "", "", resource::icon::NONE, glm::vec4(), glm::vec4(), glm::vec4())                                         \
@@ -57,19 +57,19 @@ namespace anm2ed::anm2
 #undef X
   };
 
-  constexpr glm::vec4 TYPE_COLOR[] = {
+  inline const glm::vec4 TYPE_COLOR[] = {
 #define X(symbol, string, itemString, icon, color, colorActive, colorHovered) color,
       TYPE_LIST
 #undef X
   };
 
-  constexpr glm::vec4 TYPE_COLOR_ACTIVE[] = {
+  inline const glm::vec4 TYPE_COLOR_ACTIVE[] = {
 #define X(symbol, string, itemString, icon, color, colorActive, colorHovered) colorActive,
       TYPE_LIST
 #undef X
   };
 
-  constexpr glm::vec4 TYPE_COLOR_HOVERED[] = {
+  inline const glm::vec4 TYPE_COLOR_HOVERED[] = {
 #define X(symbol, string, itemString, icon, color, colorActive, colorHovered) colorHovered,
       TYPE_LIST
 #undef X
@@ -81,4 +81,4 @@ namespace anm2ed::anm2
     SUBTRACT,
     ADJUST
   };
-}
\ No newline at end of file
+}
diff --git a/src/render.cpp b/src/render.cpp
index 61098f1..d679a4b 100644
--- a/src/render.cpp
+++ b/src/render.cpp
@@ -6,6 +6,7 @@
 #include <fstream>
 
 #ifdef _WIN32
+  #include "string_.h"
   #define POPEN _popen
   #define PCLOSE _pclose
   #define PWRITE_MODE "wb"
@@ -19,7 +20,6 @@
 
 #include "log.h"
 
-
 using namespace anm2ed::resource;
 using namespace glm;