diff --git a/src/resource/font.h b/src/resource/font.h
index c6f2771..3080b1c 100644
--- a/src/resource/font.h
+++ b/src/resource/font.h
@@ -119,7 +119,7 @@ namespace anm2ed::resource::font
unsigned int length;
};
- constexpr unsigned char REGULAR_DATA[] =
+ inline constexpr unsigned char REGULAR_DATA[] =
{
0x00, 0x01, 0x00, 0x00, 0x00, 0x11, 0x01, 0x00, 0x00, 0x04, 0x00, 0x10,
0x47, 0x44, 0x45, 0x46, 0x22, 0xaa, 0x24, 0x3c, 0x00, 0x01, 0x40, 0x18,
@@ -17439,7 +17439,7 @@ constexpr unsigned char ITALICS_DATA[] =
0x00, 0x02, 0x00, 0x47, 0x02, 0x30, 0x00, 0x00
};
-constexpr unsigned char BOLD_DATA[] =
+inline constexpr unsigned char BOLD_DATA[] =
{
0x00, 0x01, 0x00, 0x00, 0x00, 0x11, 0x01, 0x00, 0x00, 0x04, 0x00, 0x10,
0x47, 0x44, 0x45, 0x46, 0x28, 0xaa, 0x24, 0xc9, 0x00, 0x01, 0x44, 0x18,
@@ -25853,7 +25853,7 @@ constexpr unsigned char BOLD_DATA[] =
0x00, 0x47, 0x00, 0x00
};
-constexpr unsigned char BOLD_ITALICS_DATA[] =
+inline constexpr unsigned char BOLD_ITALICS_DATA[] =
{
0x00, 0x01, 0x00, 0x00, 0x00, 0x11, 0x01, 0x00, 0x00, 0x04, 0x00, 0x10,
0x47, 0x44, 0x45, 0x46, 0x24, 0xa0, 0x27, 0x7c, 0x00, 0x01, 0x66, 0xac,
@@ -35036,7 +35036,7 @@ constexpr unsigned char BOLD_ITALICS_DATA[] =
0x00, 0x02, 0x00, 0x47, 0x02, 0x30, 0x00, 0x00
};
-constexpr unsigned char CJK_DATA[] =
+inline constexpr unsigned char CJK_DATA[] =
{
0x4f, 0x54, 0x54, 0x4f, 0x00, 0x0f, 0x00, 0x80, 0x00, 0x03, 0x00, 0x70,
0x42, 0x41, 0x53, 0x45, 0x42, 0xe3, 0x4f, 0xee, 0x00, 0xde, 0x3a, 0xdc,
diff --git a/src/resource/icon.h b/src/resource/icon.h
index b98d604..2bb51d8 100644
--- a/src/resource/icon.h
+++ b/src/resource/icon.h
@@ -9,147 +9,147 @@ namespace anm2ed::resource::icon
constexpr auto SIZE_LARGE = glm::ivec2(256, 256);
constexpr auto SIZE_HUGE = glm::ivec2(512, 512);
- constexpr auto NONE_DATA = R"(
+ inline constexpr auto NONE_DATA = R"(
)";
- constexpr auto FILE_DATA = R"(
+ inline constexpr auto FILE_DATA = R"(
)";
- constexpr auto FOLDER_DATA = R"(
+ inline constexpr auto FOLDER_DATA = R"(
)";
- constexpr auto CLOSE_DATA = R"(
+ inline constexpr auto CLOSE_DATA = R"(
)";
- constexpr auto ROOT_DATA = R"(
+ inline constexpr auto ROOT_DATA = R"(
)";
- constexpr auto LAYER_DATA = R"(
+ inline constexpr auto LAYER_DATA = R"(
)";
- constexpr auto NULL_DATA = R"(
+ inline constexpr auto NULL_DATA = R"(
)";
- constexpr auto TRIGGERS_DATA = R"(
+ inline constexpr auto TRIGGERS_DATA = R"(
)";
- constexpr auto VISIBLE_DATA = R"(
+ inline constexpr auto VISIBLE_DATA = R"(
)";
- constexpr auto INVISIBLE_DATA = R"(
+ inline constexpr auto INVISIBLE_DATA = R"(
)";
- constexpr auto SHOW_UNUSED_DATA = R"(
+ inline constexpr auto SHOW_UNUSED_DATA = R"(
)";
- constexpr auto HIDE_UNUSED_DATA = R"(
+ inline constexpr auto HIDE_UNUSED_DATA = R"(
)";
- constexpr auto SHOW_LAYERS_DATA = R"(
+ inline constexpr auto SHOW_LAYERS_DATA = R"(
)";
- constexpr auto HIDE_LAYERS_DATA = R"(
+ inline constexpr auto HIDE_LAYERS_DATA = R"(
)";
- constexpr auto SHOW_RECT_DATA = R"(
+ inline constexpr auto SHOW_RECT_DATA = R"(
)";
- constexpr auto HIDE_RECT_DATA = R"(
+ inline constexpr auto HIDE_RECT_DATA = R"(
)";
- constexpr auto ANIMATION_DATA = R"(
+ inline constexpr auto ANIMATION_DATA = R"(
)";
- constexpr auto SPRITESHEET_DATA = R"(
+ inline constexpr auto SPRITESHEET_DATA = R"(
)";
- constexpr auto EVENT_DATA = R"(
+ inline constexpr auto EVENT_DATA = R"(
)";
- constexpr auto PAN_DATA = R"(
+ inline constexpr auto PAN_DATA = R"(
)";
- constexpr auto MOVE_DATA = R"(
+ inline constexpr auto MOVE_DATA = R"(
)";
- constexpr auto ROTATE_DATA = R"(
+ inline constexpr auto ROTATE_DATA = R"(
)";
- constexpr auto SCALE_DATA = R"(
+ inline constexpr auto SCALE_DATA = R"(
)";
- constexpr auto CROP_DATA = R"(
+ inline constexpr auto CROP_DATA = R"(
)";
- constexpr auto DRAW_DATA = R"(
+ inline constexpr auto DRAW_DATA = R"(
)";
- constexpr auto ERASE_DATA = R"(
+ inline constexpr auto ERASE_DATA = R"(
)";
- constexpr auto COLOR_PICKER_DATA = R"(
+ inline constexpr auto COLOR_PICKER_DATA = R"(
)";
- constexpr auto UNDO_DATA = R"(
+ inline constexpr auto UNDO_DATA = R"(
)";
- constexpr auto REDO_DATA = R"(
+ inline constexpr auto REDO_DATA = R"(
)";
- constexpr auto TARGET_DATA = R"(
+ inline constexpr auto TARGET_DATA = R"(
)";
- constexpr auto TARGET_ALT_DATA = R"(
+ inline constexpr auto TARGET_ALT_DATA = R"(
)";
- constexpr auto INTERPOLATED_DATA = R"(
+ inline constexpr auto INTERPOLATED_DATA = R"(
)";
- constexpr auto UNINTERPOLATED_DATA = R"(
+ inline constexpr auto UNINTERPOLATED_DATA = R"(
)";
- constexpr auto PIVOT_DATA = R"(
+ inline constexpr auto PIVOT_DATA = R"(
)";
- constexpr auto TRIGGER_DATA = R"(
+ inline constexpr auto TRIGGER_DATA = R"(
)";
- constexpr auto PLAYHEAD_DATA = R"(
+ inline constexpr auto PLAYHEAD_DATA = R"(
)";
diff --git a/src/resource/music.h b/src/resource/music.h
index ecb3456..3fb4d40 100644
--- a/src/resource/music.h
+++ b/src/resource/music.h
@@ -16,7 +16,7 @@ namespace anm2ed::resource::music
// Drozerix_gmail.com
// -- NOTE --
// I wanted this to be in its native XM, but unfortunately Windows was being a bitch about compiling libxm so here's an OBESE .opus version. Cringe!
- constexpr unsigned char ABOUT[] = {
+ inline constexpr unsigned char ABOUT[] = {
0x4f, 0x67, 0x67, 0x53, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0xbe, 0xec, 0x2f, 0x00,
0x00, 0x00, 0x00, 0x7a, 0x98, 0x59, 0xf4, 0x01, 0x13, 0x4f, 0x70, 0x75, 0x73, 0x48, 0x65, 0x61, 0x64, 0x01, 0x02,
0x38, 0x01, 0x80, 0xbb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4f, 0x67, 0x67, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
diff --git a/src/resource/shader.h b/src/resource/shader.h
index 9794080..5509882 100644
--- a/src/resource/shader.h
+++ b/src/resource/shader.h
@@ -10,7 +10,7 @@ namespace anm2ed::resource::shader
const char* fragment;
};
- constexpr auto VERTEX = R"(
+ inline constexpr auto VERTEX = R"(
#version 330 core
layout (location = 0) in vec2 i_position;
layout (location = 1) in vec2 i_uv;
@@ -23,7 +23,7 @@ namespace anm2ed::resource::shader
}
)";
- constexpr auto AXIS_VERTEX = R"(
+ inline constexpr auto AXIS_VERTEX = R"(
#version 330 core
layout (location = 0) in vec2 i_position; // full screen line segment: -1..1
uniform vec2 u_origin_ndc; // world origin in NDC
@@ -39,7 +39,7 @@ namespace anm2ed::resource::shader
}
)";
- constexpr auto FRAGMENT = R"(
+ inline constexpr auto FRAGMENT = R"(
#version 330 core
out vec4 o_fragColor;
uniform vec4 u_color;
@@ -49,7 +49,7 @@ namespace anm2ed::resource::shader
}
)";
- constexpr auto TEXTURE_FRAGMENT = R"(
+ inline constexpr auto TEXTURE_FRAGMENT = R"(
#version 330 core
in vec2 i_uv_out;
uniform sampler2D u_texture;
@@ -65,7 +65,7 @@ namespace anm2ed::resource::shader
}
)";
- constexpr auto GRID_VERTEX = R"(
+ inline constexpr auto GRID_VERTEX = R"(
#version 330 core
layout (location = 0) in vec2 i_position;
layout (location = 1) in vec2 i_uv;
@@ -79,7 +79,7 @@ namespace anm2ed::resource::shader
}
)";
- constexpr auto GRID_FRAGMENT = R"(
+ inline constexpr auto GRID_FRAGMENT = R"(
#version 330 core
in vec2 i_uv_out;
@@ -112,7 +112,7 @@ namespace anm2ed::resource::shader
}
)";
- constexpr auto DASHED_VERTEX = R"(
+ inline constexpr auto DASHED_VERTEX = R"(
#version 330 core
layout (location = 0) in vec2 i_position;
@@ -127,7 +127,7 @@ namespace anm2ed::resource::shader
}
)";
- constexpr auto DASHED_FRAGMENT = R"(
+ inline constexpr auto DASHED_FRAGMENT = R"(
#version 330 core
in vec2 v_local;