diff --git a/glfw/CONTRIBUTORS.md b/glfw/CONTRIBUTORS.md index 1371aedb..77295baa 100644 --- a/glfw/CONTRIBUTORS.md +++ b/glfw/CONTRIBUTORS.md @@ -294,6 +294,7 @@ video tutorials. - Jonas Ådahl - Lasse Öörni - Leonard König + - Grzesiek11 - All the unmentioned and anonymous contributors in the GLFW community, for bug reports, patches, feedback, testing and encouragement diff --git a/glfw/deps/getopt.c b/glfw/deps/getopt.c index 9743046f..9464f790 100644 --- a/glfw/deps/getopt.c +++ b/glfw/deps/getopt.c @@ -24,6 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#ifndef BUILD_MONOLITHIC + #include "getopt.h" #include @@ -228,3 +230,5 @@ int getopt_long(int argc, char* const argv[], const char* optstring, ++optind; return retval; } + +#endif // BUILD_MONOLITHIC diff --git a/glfw/deps/getopt.h b/glfw/deps/getopt.h index e1eb540f..7d178918 100644 --- a/glfw/deps/getopt.h +++ b/glfw/deps/getopt.h @@ -27,6 +27,12 @@ #ifndef INCLUDED_GETOPT_PORT_H #define INCLUDED_GETOPT_PORT_H + +#ifdef BUILD_MONOLITHIC +#error "Error: make sure to point an include search path to the libgetopt library BEFORE including the glfw/deps/ search path, for otherwise you'll include the DISABLED alternative getopt implementation in glfw/depts/ !" +#endif + + #if defined(__cplusplus) extern "C" { #endif diff --git a/glfw/deps/nuklear.h b/glfw/deps/nuklear.h index f2eb9dfa..419b129d 100644 --- a/glfw/deps/nuklear.h +++ b/glfw/deps/nuklear.h @@ -5682,7 +5682,7 @@ template struct nk_alignof{struct Big {T x; char c;}; enum { #endif /* NK_NUKLEAR_H_ */ -#ifdef NK_IMPLEMENTATION +//#ifdef NK_IMPLEMENTATION #ifndef NK_INTERNAL_H #define NK_INTERNAL_H @@ -6018,7 +6018,7 @@ NK_LIB void nk_property(struct nk_context *ctx, const char *name, struct nk_prop - +#ifdef NK_IMPLEMENTATION /* =============================================================== * diff --git a/glfw/examples/boing.c b/glfw/examples/boing.c index ec118a3a..8a3f601d 100644 --- a/glfw/examples/boing.c +++ b/glfw/examples/boing.c @@ -29,14 +29,18 @@ #if defined(_MSC_VER) // Make MS math.h define M_PI - #define _USE_MATH_DEFINES +#if !defined(_USE_MATH_DEFINES) +#define _USE_MATH_DEFINES +#endif #endif #include #include #include +#ifndef BUILD_MONOLITHIC #define GLAD_GL_IMPLEMENTATION +#endif #include #define GLFW_INCLUDE_NONE #include @@ -49,16 +53,16 @@ *****************************************************************************/ /* Prototypes */ -void init( void ); -void display( void ); -void reshape( GLFWwindow* window, int w, int h ); -void key_callback( GLFWwindow* window, int key, int scancode, int action, int mods ); -void mouse_button_callback( GLFWwindow* window, int button, int action, int mods ); -void cursor_position_callback( GLFWwindow* window, double x, double y ); -void DrawBoingBall( void ); -void BounceBall( double dt ); -void DrawBoingBallBand( GLfloat long_lo, GLfloat long_hi ); -void DrawGrid( void ); +static void init( void ); +static void display( void ); +static void reshape( GLFWwindow* window, int w, int h ); +static void key_callback( GLFWwindow* window, int key, int scancode, int action, int mods ); +static void mouse_button_callback( GLFWwindow* window, int button, int action, int mods ); +static void cursor_position_callback( GLFWwindow* window, double x, double y ); +static void DrawBoingBall( void ); +static void BounceBall( double dt ); +static void DrawBoingBallBand( GLfloat long_lo, GLfloat long_hi ); +static void DrawGrid( void ); #define RADIUS 70.f #define STEP_LONGITUDE 22.5f /* 22.5 makes 8 bands like original Boing */ @@ -91,21 +95,21 @@ typedef enum { DRAW_BALL, DRAW_BALL_SHADOW } DRAW_BALL_ENUM; typedef struct {float x; float y; float z;} vertex_t; /* Global vars */ -int windowed_xpos, windowed_ypos, windowed_width, windowed_height; -int width, height; -GLfloat deg_rot_y = 0.f; -GLfloat deg_rot_y_inc = 2.f; -int override_pos = GLFW_FALSE; -GLfloat cursor_x = 0.f; -GLfloat cursor_y = 0.f; -GLfloat ball_x = -RADIUS; -GLfloat ball_y = -RADIUS; -GLfloat ball_x_inc = 1.f; -GLfloat ball_y_inc = 2.f; -DRAW_BALL_ENUM drawBallHow; -double t; -double t_old = 0.f; -double dt; +static int windowed_xpos, windowed_ypos, windowed_width, windowed_height; +static int width, height; +static GLfloat deg_rot_y = 0.f; +static GLfloat deg_rot_y_inc = 2.f; +static int override_pos = GLFW_FALSE; +static GLfloat cursor_x = 0.f; +static GLfloat cursor_y = 0.f; +static GLfloat ball_x = -RADIUS; +static GLfloat ball_y = -RADIUS; +static GLfloat ball_x_inc = 1.f; +static GLfloat ball_y_inc = 2.f; +static DRAW_BALL_ENUM drawBallHow; +static double t; +static double t_old = 0.f; +static double dt; /* Random number generator */ #ifndef RAND_MAX @@ -116,7 +120,7 @@ double dt; /***************************************************************************** * Truncate a degree. *****************************************************************************/ -GLfloat TruncateDeg( GLfloat deg ) +static GLfloat TruncateDeg( GLfloat deg ) { if ( deg >= 360.f ) return (deg - 360.f); @@ -128,7 +132,7 @@ GLfloat TruncateDeg( GLfloat deg ) * Convert a degree (360-based) into a radian. * 360' = 2 * PI *****************************************************************************/ -double deg2rad( double deg ) +static double deg2rad( double deg ) { return deg / 360 * (2 * M_PI); } @@ -136,7 +140,7 @@ double deg2rad( double deg ) /***************************************************************************** * 360' sin(). *****************************************************************************/ -double sin_deg( double deg ) +static double sin_deg( double deg ) { return sin( deg2rad( deg ) ); } @@ -144,7 +148,7 @@ double sin_deg( double deg ) /***************************************************************************** * 360' cos(). *****************************************************************************/ -double cos_deg( double deg ) +static double cos_deg( double deg ) { return cos( deg2rad( deg ) ); } @@ -154,7 +158,7 @@ double cos_deg( double deg ) * * c = a x b *****************************************************************************/ -void CrossProduct( vertex_t a, vertex_t b, vertex_t c, vertex_t *n ) +static void CrossProduct( vertex_t a, vertex_t b, vertex_t c, vertex_t *n ) { GLfloat u1, u2, u3; GLfloat v1, v2, v3; @@ -179,7 +183,7 @@ void CrossProduct( vertex_t a, vertex_t b, vertex_t c, vertex_t *n ) /***************************************************************************** * init() *****************************************************************************/ -void init( void ) +static void init( void ) { /* * Clear background. @@ -193,7 +197,7 @@ void init( void ) /***************************************************************************** * display() *****************************************************************************/ -void display(void) +static void display(void) { glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); glPushMatrix(); @@ -214,7 +218,7 @@ void display(void) /***************************************************************************** * reshape() *****************************************************************************/ -void reshape( GLFWwindow* window, int w, int h ) +static void reshape( GLFWwindow* window, int w, int h ) { mat4x4 projection, view; @@ -237,7 +241,7 @@ void reshape( GLFWwindow* window, int w, int h ) glLoadMatrixf((const GLfloat*) view); } -void key_callback( GLFWwindow* window, int key, int scancode, int action, int mods ) +static void key_callback( GLFWwindow* window, int key, int scancode, int action, int mods ) { if (action != GLFW_PRESS) return; @@ -273,7 +277,7 @@ static void set_ball_pos ( GLfloat x, GLfloat y ) ball_y = y - (height / 2); } -void mouse_button_callback( GLFWwindow* window, int button, int action, int mods ) +static void mouse_button_callback( GLFWwindow* window, int button, int action, int mods ) { if (button != GLFW_MOUSE_BUTTON_LEFT) return; @@ -289,7 +293,7 @@ void mouse_button_callback( GLFWwindow* window, int button, int action, int mods } } -void cursor_position_callback( GLFWwindow* window, double x, double y ) +static void cursor_position_callback( GLFWwindow* window, double x, double y ) { cursor_x = (float) x; cursor_y = (float) y; @@ -306,7 +310,7 @@ void cursor_position_callback( GLFWwindow* window, double x, double y ) * The ball is built by stacking latitudinal circles. Each circle is composed * of a widely-separated set of points, so that each facet is noticeably large. *****************************************************************************/ -void DrawBoingBall( void ) +static void DrawBoingBall( void ) { GLfloat lon_deg; /* degree of longitude */ double dt_total, dt2; @@ -383,7 +387,7 @@ void DrawBoingBall( void ) /***************************************************************************** * Bounce the ball. *****************************************************************************/ -void BounceBall( double delta_t ) +static void BounceBall( double delta_t ) { GLfloat sign; GLfloat deg; @@ -436,7 +440,7 @@ void BounceBall( double delta_t ) * Parms: long_lo, long_hi * Low and high longitudes of slice, resp. *****************************************************************************/ -void DrawBoingBallBand( GLfloat long_lo, +static void DrawBoingBallBand( GLfloat long_lo, GLfloat long_hi ) { vertex_t vert_ne; /* "ne" means south-east, so on */ @@ -540,7 +544,7 @@ void DrawBoingBallBand( GLfloat long_lo, * Draw the purple grid of lines, behind the Boing ball. * When the Workbench is dropped to the bottom, Boing shows 12 rows. *****************************************************************************/ -void DrawGrid( void ) +static void DrawGrid( void ) { int row, col; const int rowTotal = 12; /* must be divisible by 2 */ @@ -621,6 +625,11 @@ void DrawGrid( void ) * main() *======================================================================*/ + +#ifdef BUILD_MONOLITHIC +#define main glfw_boing_example_main +#endif + int main( void ) { GLFWwindow* window; diff --git a/glfw/examples/gears.c b/glfw/examples/gears.c index 3d63013d..737a7ac6 100644 --- a/glfw/examples/gears.c +++ b/glfw/examples/gears.c @@ -23,7 +23,9 @@ #if defined(_MSC_VER) // Make MS math.h define M_PI - #define _USE_MATH_DEFINES +#if !defined(_USE_MATH_DEFINES) +#define _USE_MATH_DEFINES +#endif #endif #include @@ -31,7 +33,9 @@ #include #include +#ifndef BUILD_MONOLITHIC #define GLAD_GL_IMPLEMENTATION +#endif #include #define GLFW_INCLUDE_NONE #include @@ -163,7 +167,6 @@ gear(GLfloat inner_radius, GLfloat outer_radius, GLfloat width, glVertex3f(r0 * (float) cos(angle), r0 * (float) sin(angle), width * 0.5f); } glEnd(); - } @@ -212,7 +215,7 @@ static void animate(void) /* change view angle, exit upon ESC */ -void key( GLFWwindow* window, int k, int s, int action, int mods ) +static void key( GLFWwindow* window, int k, int s, int action, int mods ) { if( action != GLFW_PRESS ) return; @@ -245,7 +248,7 @@ void key( GLFWwindow* window, int k, int s, int action, int mods ) /* new window size */ -void reshape( GLFWwindow* window, int width, int height ) +static void reshape( GLFWwindow* window, int width, int height ) { GLfloat h = (GLfloat) height / (GLfloat) width; GLfloat xmax, znear, zfar; @@ -301,8 +304,12 @@ static void init(void) } +#ifdef BUILD_MONOLITHIC +#define main glfw_gears_example_main +#endif + /* program entry */ -int main(int argc, char *argv[]) +int main(int argc, const char **argv) { GLFWwindow* window; int width, height; diff --git a/glfw/examples/heightmap.c b/glfw/examples/heightmap.c index ad5d47c1..380025cd 100644 --- a/glfw/examples/heightmap.c +++ b/glfw/examples/heightmap.c @@ -29,7 +29,9 @@ #include #include +#ifndef BUILD_MONOLITHIC #define GLAD_GL_IMPLEMENTATION +#endif #include #define GLFW_INCLUDE_NONE #include @@ -398,7 +400,12 @@ static void error_callback(int error, const char* description) fprintf(stderr, "Error: %s\n", description); } -int main(int argc, char** argv) + +#ifdef BUILD_MONOLITHIC +#define main glfw_heightmap_example_main +#endif + +int main(int argc, const char** argv) { GLFWwindow* window; int iter; diff --git a/glfw/examples/monolithic_examples.h b/glfw/examples/monolithic_examples.h new file mode 100644 index 00000000..5fbf43df --- /dev/null +++ b/glfw/examples/monolithic_examples.h @@ -0,0 +1,46 @@ + +#pragma once + +#if defined(BUILD_MONOLITHIC) + +#ifdef __cplusplus +extern "C" { +#endif + + int glfw_boing_example_main(int argc, const char** argv); + int glfw_gears_example_main(int argc, const char** argv); + int glfw_heightmap_example_main(int argc, const char** argv); + int glfw_offscreen_example_main(int argc, const char** argv); + int glfw_particles_example_main(int argc, const char** argv); + int glfw_sharing_example_main(int argc, const char** argv); + int glfw_splitview_example_main(int argc, const char** argv); + int glfw_triangle_opengl_example_main(int argc, const char** argv); + int glfw_triangle_opengles_example_main(int argc, const char** argv); + int glfw_wave_example_main(int argc, const char** argv); + int glfw_windows_example_main(int argc, const char** argv); + int glfw_allocator_test_main(int argc, const char** argv); + int glfw_clipboard_test_main(int argc, const char** argv); + int glfw_cursor_test_main(int argc, const char** argv); + int glfw_empty_test_main(int argc, const char** argv); + int glfw_events_test_main(int argc, const char** argv); + int glfw_gamma_test_main(int argc, const char** argv); + int glfw_glfwindow_test_main(int argc, const char** argv); + int glfw_glfwinfo_test_main(int argc, const char** argv); + int glfw_icon_test_main(int argc, const char** argv); + int glfw_iconify_test_main(int argc, const char** argv); + int glfw_inputlag_test_main(int argc, const char** argv); + int glfw_joysticks_test_main(int argc, const char** argv); + int glfw_monitors_test_main(int argc, const char** argv); + int glfw_msaa_test_main(int argc, const char** argv); + int glfw_reopen_test_main(int argc, const char** argv); + int glfw_tearing_test_main(int argc, const char** argv); + int glfw_threads_test_main(int argc, const char** argv); + int glfw_timeout_test_main(int argc, const char** argv); + int glfw_title_test_main(int argc, const char** argv); + int glfw_triangle_vulkan_example_main(int argc, const char** argv); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/glfw/examples/monolithic_gle2_implementation.c b/glfw/examples/monolithic_gle2_implementation.c new file mode 100644 index 00000000..aea70ada --- /dev/null +++ b/glfw/examples/monolithic_gle2_implementation.c @@ -0,0 +1,8 @@ + +#include "monolithic_examples.h" + +//#define GLAD_GLES2_IMPLEMENTATION +#include +#define GLFW_INCLUDE_NONE +#include + diff --git a/glfw/examples/monolithic_glfw_implementation.c b/glfw/examples/monolithic_glfw_implementation.c new file mode 100644 index 00000000..575a1adf --- /dev/null +++ b/glfw/examples/monolithic_glfw_implementation.c @@ -0,0 +1,7 @@ + +#include "monolithic_examples.h" + +#define GLAD_GL_IMPLEMENTATION // Warning: clashes with GLAD_GLES2_IMPLEMENTATION +#include +#define GLFW_INCLUDE_NONE +#include diff --git a/glfw/examples/monolithic_main.c b/glfw/examples/monolithic_main.c new file mode 100644 index 00000000..262adf4d --- /dev/null +++ b/glfw/examples/monolithic_main.c @@ -0,0 +1,46 @@ + +#include "monolithic_examples.h" + +#define USAGE_NAME "glfw_tests" + +#include "monolithic_main_internal_defs.h" + +MONOLITHIC_CMD_TABLE_START() + + { "glfw_allocator", {.fa = glfw_allocator_test_main } }, + { "glfw_boing", {.fa = glfw_boing_example_main } }, + { "glfw_clipboard", {.fa = glfw_clipboard_test_main } }, + { "glfw_cursor", {.fa = glfw_cursor_test_main } }, + { "glfw_empty", {.fa = glfw_empty_test_main } }, + { "glfw_events", {.fa = glfw_events_test_main } }, + { "glfw_gamma", {.fa = glfw_gamma_test_main } }, + { "glfw_gears", {.fa = glfw_gears_example_main } }, + { "glfw_glfwindow", {.fa = glfw_glfwindow_test_main } }, + { "glfwinfo", {.fa = glfw_glfwinfo_test_main } }, + { "glfw_heightmap", {.fa = glfw_heightmap_example_main } }, + { "glfw_icon", {.fa = glfw_icon_test_main } }, + { "glfw_iconify", {.fa = glfw_iconify_test_main } }, + { "glfw_inputlag", {.fa = glfw_inputlag_test_main } }, + { "glfw_joysticks", {.fa = glfw_joysticks_test_main } }, + { "glfw_monitors", {.fa = glfw_monitors_test_main } }, + { "glfw_msaa", {.fa = glfw_msaa_test_main } }, + { "glfw_offscreen", {.fa = glfw_offscreen_example_main } }, + { "glfw_particles", {.fa = glfw_particles_example_main } }, + { "glfw_reopen", {.fa = glfw_reopen_test_main } }, + { "glfw_sharing", {.fa = glfw_sharing_example_main } }, + { "glfw_splitview", {.fa = glfw_splitview_example_main } }, + { "glfw_tearing", {.fa = glfw_tearing_test_main } }, + { "glfw_threads", {.fa = glfw_threads_test_main } }, + { "glfw_timeout", {.fa = glfw_timeout_test_main } }, + { "glfw_title", {.fa = glfw_title_test_main } }, + { "glfw_triangle_opengl", {.fa = glfw_triangle_opengl_example_main } }, + { "glfw_triangle_opengles", {.fa = glfw_triangle_opengles_example_main } }, + { "glfw_triangle_vulkan", {.fa = glfw_triangle_vulkan_example_main } }, + { "glfw_wave", {.fa = glfw_wave_example_main } }, + { "glfw_windows", {.fa = glfw_windows_example_main } }, + +MONOLITHIC_CMD_TABLE_END(); + +#define MONOLITHIC_SUBCLUSTER_MAIN glfw_monolithic_subcluster_main + +#include "monolithic_main_tpl.h" diff --git a/glfw/examples/monolithic_nuklear_implementation.c b/glfw/examples/monolithic_nuklear_implementation.c new file mode 100644 index 00000000..413a5461 --- /dev/null +++ b/glfw/examples/monolithic_nuklear_implementation.c @@ -0,0 +1,16 @@ + +#include "monolithic_examples.h" + +#define NK_LIB +#define NK_IMPLEMENTATION +#define NK_INCLUDE_FIXED_TYPES +#define NK_INCLUDE_FONT_BAKING +#define NK_INCLUDE_DEFAULT_FONT +#define NK_INCLUDE_DEFAULT_ALLOCATOR +#define NK_INCLUDE_VERTEX_BUFFER_OUTPUT +#define NK_INCLUDE_STANDARD_VARARGS +#define NK_BUTTON_TRIGGER_ON_RELEASE +#include + +#define NK_GLFW_GL2_IMPLEMENTATION +#include diff --git a/glfw/examples/monolithic_vulkan_implementation.c b/glfw/examples/monolithic_vulkan_implementation.c new file mode 100644 index 00000000..391e96b0 --- /dev/null +++ b/glfw/examples/monolithic_vulkan_implementation.c @@ -0,0 +1,8 @@ + +#include "monolithic_examples.h" + +#define GLAD_VULKAN_IMPLEMENTATION +#include +#define GLFW_INCLUDE_NONE +#include + diff --git a/glfw/examples/offscreen.c b/glfw/examples/offscreen.c index e2852860..6c8d2c77 100644 --- a/glfw/examples/offscreen.c +++ b/glfw/examples/offscreen.c @@ -23,7 +23,9 @@ // //======================================================================== +#ifndef BUILD_MONOLITHIC #define GLAD_GL_IMPLEMENTATION +#endif #include #define GLFW_INCLUDE_NONE #include @@ -72,6 +74,11 @@ static void error_callback(int error, const char* description) fprintf(stderr, "Error: %s\n", description); } + +#ifdef BUILD_MONOLITHIC +#define main glfw_offscreen_example_main +#endif + int main(void) { GLFWwindow* window; diff --git a/glfw/examples/particles.c b/glfw/examples/particles.c index baafe826..9fe9096c 100644 --- a/glfw/examples/particles.c +++ b/glfw/examples/particles.c @@ -26,7 +26,9 @@ #if defined(_MSC_VER) // Make MS math.h define M_PI - #define _USE_MATH_DEFINES +#if !defined(_USE_MATH_DEFINES) +#define _USE_MATH_DEFINES +#endif #endif #include @@ -39,7 +41,9 @@ #include #include +#ifndef BUILD_MONOLITHIC #define GLAD_GL_IMPLEMENTATION +#endif #include #define GLFW_INCLUDE_NONE #include @@ -81,13 +85,13 @@ typedef struct //======================================================================== // Window dimensions -float aspect_ratio; +static float aspect_ratio; // "wireframe" flag (true if we use wireframe view) -int wireframe; +static int wireframe; // Thread synchronization -struct { +static struct { double t; // Time (s) float dt; // Time since last frame (s) int p_frame; // Particle physics frame number @@ -109,10 +113,10 @@ struct { #define F_TEX_HEIGHT 16 // Texture object IDs -GLuint particle_tex_id, floor_tex_id; +static GLuint particle_tex_id, floor_tex_id; // Particle texture (a simple spot) -const unsigned char particle_texture[ P_TEX_WIDTH * P_TEX_HEIGHT ] = { +static const unsigned char particle_texture[ P_TEX_WIDTH * P_TEX_HEIGHT ] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x22, 0x22, 0x11, 0x00, 0x00, 0x00, 0x11, 0x33, 0x88, 0x77, 0x33, 0x11, 0x00, @@ -124,7 +128,7 @@ const unsigned char particle_texture[ P_TEX_WIDTH * P_TEX_HEIGHT ] = { }; // Floor texture (your basic checkered floor) -const unsigned char floor_texture[ F_TEX_WIDTH * F_TEX_HEIGHT ] = { +static const unsigned char floor_texture[ F_TEX_WIDTH * F_TEX_HEIGHT ] = { 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0xff, 0xf0, 0xcc, 0xf0, 0xf0, 0xf0, 0xff, 0xf0, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0xf0, 0xcc, 0xee, 0xff, 0xf0, 0xf0, 0xf0, 0xf0, 0x30, 0x66, 0x30, 0x30, 0x30, 0x20, 0x30, 0x30, @@ -211,13 +215,13 @@ static float glow_pos[4]; // Object material and fog configuration constants //======================================================================== -const GLfloat fountain_diffuse[4] = { 0.7f, 1.f, 1.f, 1.f }; -const GLfloat fountain_specular[4] = { 1.f, 1.f, 1.f, 1.f }; -const GLfloat fountain_shininess = 12.f; -const GLfloat floor_diffuse[4] = { 1.f, 0.6f, 0.6f, 1.f }; -const GLfloat floor_specular[4] = { 0.6f, 0.6f, 0.6f, 1.f }; -const GLfloat floor_shininess = 18.f; -const GLfloat fog_color[4] = { 0.1f, 0.1f, 0.1f, 1.f }; +static const GLfloat fountain_diffuse[4] = { 0.7f, 1.f, 1.f, 1.f }; +static const GLfloat fountain_specular[4] = { 1.f, 1.f, 1.f, 1.f }; +static const GLfloat fountain_shininess = 12.f; +static const GLfloat floor_diffuse[4] = { 1.f, 0.6f, 0.6f, 1.f }; +static const GLfloat floor_specular[4] = { 0.6f, 0.6f, 0.6f, 1.f }; +static const GLfloat floor_shininess = 18.f; +static const GLfloat fog_color[4] = { 0.1f, 0.1f, 0.1f, 1.f }; //======================================================================== @@ -940,7 +944,12 @@ static int physics_thread_main(void* arg) // main //======================================================================== -int main(int argc, char** argv) + +#ifdef BUILD_MONOLITHIC +#define main glfw_particles_example_main +#endif + +int main(int argc, const char** argv) { int ch, width, height; thrd_t physics_thread = 0; diff --git a/glfw/examples/sharing.c b/glfw/examples/sharing.c index 502f9eea..ab465a8f 100644 --- a/glfw/examples/sharing.c +++ b/glfw/examples/sharing.c @@ -23,7 +23,9 @@ // //======================================================================== +#ifndef BUILD_MONOLITHIC #define GLAD_GL_IMPLEMENTATION +#endif #include #define GLFW_INCLUDE_NONE #include @@ -73,7 +75,12 @@ static void key_callback(GLFWwindow* window, int key, int scancode, int action, glfwSetWindowShouldClose(window, GLFW_TRUE); } -int main(int argc, char** argv) + +#ifdef BUILD_MONOLITHIC +#define main glfw_sharing_example_main +#endif + +int main(int argc, const char** argv) { GLFWwindow* windows[2]; GLuint texture, program, vertex_buffer; diff --git a/glfw/examples/splitview.c b/glfw/examples/splitview.c index 990df12c..771585b9 100644 --- a/glfw/examples/splitview.c +++ b/glfw/examples/splitview.c @@ -10,14 +10,18 @@ // because I am not a friend of orthogonal projections) //======================================================================== +#ifndef BUILD_MONOLITHIC #define GLAD_GL_IMPLEMENTATION +#endif #include #define GLFW_INCLUDE_NONE #include #if defined(_MSC_VER) // Make MS math.h define M_PI - #define _USE_MATH_DEFINES +#if !defined(_USE_MATH_DEFINES) +#define _USE_MATH_DEFINES +#endif #endif #include @@ -483,6 +487,11 @@ static void key_callback(GLFWwindow* window, int key, int scancode, int action, // main //======================================================================== + +#ifdef BUILD_MONOLITHIC +#define main glfw_splitview_example_main +#endif + int main(void) { GLFWwindow* window; diff --git a/glfw/examples/triangle-opengl.c b/glfw/examples/triangle-opengl.c index ff9e7d3b..270f85a1 100644 --- a/glfw/examples/triangle-opengl.c +++ b/glfw/examples/triangle-opengl.c @@ -24,7 +24,9 @@ //======================================================================== //! [code] +#ifndef BUILD_MONOLITHIC #define GLAD_GL_IMPLEMENTATION +#endif #include #define GLFW_INCLUDE_NONE #include @@ -80,6 +82,11 @@ static void key_callback(GLFWwindow* window, int key, int scancode, int action, glfwSetWindowShouldClose(window, GLFW_TRUE); } + +#ifdef BUILD_MONOLITHIC +#define main glfw_triangle_opengl_example_main +#endif + int main(void) { glfwSetErrorCallback(error_callback); diff --git a/glfw/examples/triangle-opengles.c b/glfw/examples/triangle-opengles.c index 03eb026f..f3fa914a 100644 --- a/glfw/examples/triangle-opengles.c +++ b/glfw/examples/triangle-opengles.c @@ -23,8 +23,12 @@ // //======================================================================== +#ifdef BUILD_MONOLITHIC +#include +#else #define GLAD_GLES2_IMPLEMENTATION #include +#endif #define GLFW_INCLUDE_NONE #include @@ -80,6 +84,11 @@ static void key_callback(GLFWwindow* window, int key, int scancode, int action, glfwSetWindowShouldClose(window, GLFW_TRUE); } + +#ifdef BUILD_MONOLITHIC +#define main glfw_triangle_opengles_example_main +#endif + int main(void) { glfwSetErrorCallback(error_callback); @@ -107,8 +116,12 @@ int main(void) glfwSetKeyCallback(window, key_callback); glfwMakeContextCurrent(window); - gladLoadGLES2(glfwGetProcAddress); - glfwSwapInterval(1); +#ifdef BUILD_MONOLITHIC + gladLoadGL(glfwGetProcAddress); +#else + gladLoadGLES2(glfwGetProcAddress); +#endif + glfwSwapInterval(1); GLuint vertex_buffer; glGenBuffers(1, &vertex_buffer); diff --git a/glfw/examples/wave.c b/glfw/examples/wave.c index d7ead493..220becef 100644 --- a/glfw/examples/wave.c +++ b/glfw/examples/wave.c @@ -10,14 +10,18 @@ #if defined(_MSC_VER) // Make MS math.h define M_PI - #define _USE_MATH_DEFINES +#if !defined(_USE_MATH_DEFINES) +#define _USE_MATH_DEFINES +#endif #endif #include #include #include +#ifndef BUILD_MONOLITHIC #define GLAD_GL_IMPLEMENTATION +#endif #include #define GLFW_INCLUDE_NONE #include @@ -30,11 +34,11 @@ // Animation speed (10.0 looks good) #define ANIMATION_SPEED 10.0 -GLfloat alpha = 210.f, beta = -70.f; -GLfloat zoom = 2.f; +static GLfloat alpha = 210.f, beta = -70.f; +static GLfloat zoom = 2.f; -double cursorX; -double cursorY; +static double cursorX; +static double cursorY; struct Vertex { @@ -50,8 +54,8 @@ struct Vertex #define QUADH (GRIDH - 1) #define QUADNUM (QUADW*QUADH) -GLuint quad[4 * QUADNUM]; -struct Vertex vertex[VERTEXNUM]; +static GLuint quad[4 * QUADNUM]; +static struct Vertex vertex[VERTEXNUM]; /* The grid will look like this: * @@ -68,7 +72,7 @@ struct Vertex vertex[VERTEXNUM]; // Initialize grid geometry //======================================================================== -void init_vertices(void) +static void init_vertices(void) { int x, y, p; @@ -107,16 +111,16 @@ void init_vertices(void) } } -double dt; -double p[GRIDW][GRIDH]; -double vx[GRIDW][GRIDH], vy[GRIDW][GRIDH]; -double ax[GRIDW][GRIDH], ay[GRIDW][GRIDH]; +static double dt; +static double p[GRIDW][GRIDH]; +static double vx[GRIDW][GRIDH], vy[GRIDW][GRIDH]; +static double ax[GRIDW][GRIDH], ay[GRIDW][GRIDH]; //======================================================================== // Initialize grid //======================================================================== -void init_grid(void) +static void init_grid(void) { int x, y; double dx, dy, d; @@ -147,7 +151,7 @@ void init_grid(void) // Draw scene //======================================================================== -void draw_scene(GLFWwindow* window) +static void draw_scene(GLFWwindow* window) { // Clear the color and depth buffers glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); @@ -172,7 +176,7 @@ void draw_scene(GLFWwindow* window) // Initialize Miscellaneous OpenGL state //======================================================================== -void init_opengl(void) +static void init_opengl(void) { // Use Gouraud (smooth) shading glShadeModel(GL_SMOOTH); @@ -196,7 +200,7 @@ void init_opengl(void) // Modify the height of each vertex according to the pressure //======================================================================== -void adjust_grid(void) +static void adjust_grid(void) { int pos; int x, y; @@ -216,7 +220,7 @@ void adjust_grid(void) // Calculate wave propagation //======================================================================== -void calc_grid(void) +static void calc_grid(void) { int x, y, x2, y2; double time_step = dt * ANIMATION_SPEED; @@ -273,7 +277,7 @@ static void error_callback(int error, const char* description) // Handle key strokes //======================================================================== -void key_callback(GLFWwindow* window, int key, int scancode, int action, int mods) +static void key_callback(GLFWwindow* window, int key, int scancode, int action, int mods) { if (action != GLFW_PRESS) return; @@ -316,7 +320,7 @@ void key_callback(GLFWwindow* window, int key, int scancode, int action, int mod // Callback function for mouse button events //======================================================================== -void mouse_button_callback(GLFWwindow* window, int button, int action, int mods) +static void mouse_button_callback(GLFWwindow* window, int button, int action, int mods) { if (button != GLFW_MOUSE_BUTTON_LEFT) return; @@ -335,7 +339,7 @@ void mouse_button_callback(GLFWwindow* window, int button, int action, int mods) // Callback function for cursor motion events //======================================================================== -void cursor_position_callback(GLFWwindow* window, double x, double y) +static void cursor_position_callback(GLFWwindow* window, double x, double y) { if (glfwGetInputMode(window, GLFW_CURSOR) == GLFW_CURSOR_DISABLED) { @@ -352,7 +356,7 @@ void cursor_position_callback(GLFWwindow* window, double x, double y) // Callback function for scroll events //======================================================================== -void scroll_callback(GLFWwindow* window, double x, double y) +static void scroll_callback(GLFWwindow* window, double x, double y) { zoom += (float) y / 4.f; if (zoom < 0) @@ -364,7 +368,7 @@ void scroll_callback(GLFWwindow* window, double x, double y) // Callback function for framebuffer resize events //======================================================================== -void framebuffer_size_callback(GLFWwindow* window, int width, int height) +static void framebuffer_size_callback(GLFWwindow* window, int width, int height) { float ratio = 1.f; mat4x4 projection; @@ -389,7 +393,12 @@ void framebuffer_size_callback(GLFWwindow* window, int width, int height) // main //======================================================================== -int main(int argc, char* argv[]) + +#ifdef BUILD_MONOLITHIC +#define main glfw_wave_example_main +#endif + +int main(int argc, const char** argv) { GLFWwindow* window; double t, dt_total, t_old; diff --git a/glfw/examples/windows.c b/glfw/examples/windows.c index 1589ffbf..ab4352cf 100644 --- a/glfw/examples/windows.c +++ b/glfw/examples/windows.c @@ -23,7 +23,9 @@ // //======================================================================== +#ifndef BUILD_MONOLITHIC #define GLAD_GL_IMPLEMENTATION +#endif #include #define GLFW_INCLUDE_NONE #include @@ -31,7 +33,12 @@ #include #include -int main(int argc, char** argv) + +#ifdef BUILD_MONOLITHIC +#define main glfw_windows_example_main +#endif + +int main(int argc, const char** argv) { int xpos, ypos, height; const char* description; diff --git a/glfw/include/GLFW/glfw3.h b/glfw/include/GLFW/glfw3.h index 79b06288..99e8a5a5 100644 --- a/glfw/include/GLFW/glfw3.h +++ b/glfw/include/GLFW/glfw3.h @@ -118,6 +118,9 @@ extern "C" { /* It is customary to use APIENTRY for OpenGL function pointer declarations on * all platforms. Additionally, the Windows OpenGL header needs APIENTRY. */ +#if defined(_MSC_VER) +#include // --> minwindef.h --> APIENTRY defined. Prevent compiler (preprocessor) error about redefinition. +#endif #if !defined(APIENTRY) #if defined(_WIN32) #define APIENTRY __stdcall diff --git a/glfw/src/egl_context.c b/glfw/src/egl_context.c index 517c64cb..60e5d3fa 100644 --- a/glfw/src/egl_context.c +++ b/glfw/src/egl_context.c @@ -197,6 +197,14 @@ static GLFWbool chooseEGLConfig(const _GLFWctxconfig* ctxconfig, u->samples = getEGLConfigAttrib(n, EGL_SAMPLES); u->doublebuffer = fbconfig->doublebuffer; +#if defined(_GLFW_WAYLAND) + // Avoid using transparent buffer on Wayland if transparency is not requested. + // Otherwise mutter will fail to properly screenshot OpenGL content. + if (u->alphaBits > 0 && !fbconfig->transparent) { + continue; + } +#endif // _GLFW_WAYLAND + u->handle = (uintptr_t) n; usableCount++; } @@ -751,10 +759,45 @@ GLFWbool _glfwCreateContextEGL(_GLFWwindow* window, if (window->context.egl.surface == EGL_NO_SURFACE) { - _glfwInputError(GLFW_PLATFORM_ERROR, - "EGL: Failed to create window surface: %s", - getEGLErrorString(eglGetError())); - return GLFW_FALSE; + // nvidia x11 GPU driver issue + + // Set up attributes for surface creation + index = 0; + + if (fbconfig->sRGB) + { + if (_glfw.egl.KHR_gl_colorspace) + SET_ATTRIB(EGL_GL_COLORSPACE_KHR, EGL_GL_COLORSPACE_SRGB_KHR); + } + + if (!fbconfig->doublebuffer) + SET_ATTRIB(EGL_RENDER_BUFFER, EGL_SINGLE_BUFFER); + + SET_ATTRIB(EGL_NONE, EGL_NONE); + + native = _glfw.platform.getEGLNativeWindow(window); + // HACK: ANGLE does not implement eglCreatePlatformWindowSurfaceEXT + // despite reporting EGL_EXT_platform_base + if (_glfw.egl.platform && _glfw.egl.platform != EGL_PLATFORM_ANGLE_ANGLE) + { + window->context.egl.surface = + eglCreatePlatformWindowSurfaceEXT(_glfw.egl.display, config, native, attribs); + } + else + { + window->context.egl.surface = + eglCreateWindowSurface(_glfw.egl.display, config, native, attribs); + } + + // nvidia x11 GPU driver issue end + + if (window->context.egl.surface == EGL_NO_SURFACE) + { + _glfwInputError(GLFW_PLATFORM_ERROR, + "EGL: Failed to create window surface: %s", + getEGLErrorString(eglGetError())); + return GLFW_FALSE; + } } window->context.egl.config = config; diff --git a/glfw/src/input.c b/glfw/src/input.c index c619eefc..9cfbc132 100644 --- a/glfw/src/input.c +++ b/glfw/src/input.c @@ -493,7 +493,7 @@ void _glfwInitGamepadMappings(void) for (i = 0; i < count; i++) { - if (parseMapping(&_glfw.mappings[_glfw.mappingCount], _glfwDefaultMappings[i])) + if (_glfwDefaultMappings[i] != NULL && parseMapping(&_glfw.mappings[_glfw.mappingCount], _glfwDefaultMappings[i])) _glfw.mappingCount++; } } diff --git a/glfw/src/mappings.h b/glfw/src/mappings.h index cd32e5d0..b7fe0a4a 100644 --- a/glfw/src/mappings.h +++ b/glfw/src/mappings.h @@ -997,5 +997,6 @@ const char* _glfwDefaultMappings[] = "03000000120c0000100e000011010000,ZEROPLUS P4 Gamepad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,", "03000000120c0000101e000011010000,ZEROPLUS P4 Wired Gamepad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,", #endif // GLFW_BUILD_LINUX_JOYSTICK + NULL // sentinel }; diff --git a/glfw/src/platform.c b/glfw/src/platform.c index 9ca64963..ca651b0b 100644 --- a/glfw/src/platform.c +++ b/glfw/src/platform.c @@ -56,11 +56,12 @@ static const struct #if defined(_GLFW_X11) { GLFW_PLATFORM_X11, _glfwConnectX11 }, #endif + {0} // sentinel }; GLFWbool _glfwSelectPlatform(int desiredID, _GLFWplatform* platform) { - const size_t count = sizeof(supportedPlatforms) / sizeof(supportedPlatforms[0]); + const size_t count = sizeof(supportedPlatforms) / sizeof(supportedPlatforms[0]) - 1 /* discount sentinel */; size_t i; if (desiredID != GLFW_ANY_PLATFORM && @@ -140,7 +141,7 @@ GLFWAPI int glfwGetPlatform(void) GLFWAPI int glfwPlatformSupported(int platformID) { - const size_t count = sizeof(supportedPlatforms) / sizeof(supportedPlatforms[0]); + const size_t count = sizeof(supportedPlatforms) / sizeof(supportedPlatforms[0]) - 1 /* discount sentinel */; size_t i; if (platformID != GLFW_PLATFORM_WIN32 && diff --git a/glfw/src/wgl_context.c b/glfw/src/wgl_context.c index 1c9189fa..54dfce7f 100644 --- a/glfw/src/wgl_context.c +++ b/glfw/src/wgl_context.c @@ -306,9 +306,10 @@ static void makeContextCurrentWGL(_GLFWwindow* window) _glfwPlatformSetTls(&_glfw.contextSlot, window); else { - _glfwInputErrorWin32(GLFW_PLATFORM_ERROR, - "WGL: Failed to make context current"); - _glfwPlatformSetTls(&_glfw.contextSlot, NULL); + // CAUSES A BUG ON INTEL DRIVERS + // _glfwInputErrorWin32(GLFW_PLATFORM_ERROR, + // "WGL: Failed to make context current"); + // _glfwPlatformSetTls(&_glfw.contextSlot, NULL); } } else diff --git a/glfw/src/win32_platform.h b/glfw/src/win32_platform.h index a2f86852..836eed49 100644 --- a/glfw/src/win32_platform.h +++ b/glfw/src/win32_platform.h @@ -30,19 +30,23 @@ #define NOMINMAX #endif -#ifndef VC_EXTRALEAN - #define VC_EXTRALEAN -#endif +//#ifndef VC_EXTRALEAN +// #define VC_EXTRALEAN +//#endif -#ifndef WIN32_LEAN_AND_MEAN - #define WIN32_LEAN_AND_MEAN -#endif +//#ifndef WIN32_LEAN_AND_MEAN +// #define WIN32_LEAN_AND_MEAN +//#endif + +#ifndef _WINDOWS_ // set when windows.h has already been included before. // This is a workaround for the fact that glfw3.h needs to export APIENTRY (for // example to allow applications to correctly declare a GL_KHR_debug callback) // but windows.h assumes no one will define APIENTRY before it does #undef APIENTRY +#endif // _WINDOWS_ + // GLFW on Windows is Unicode only and does not work in MBCS mode #ifndef UNICODE #define UNICODE @@ -59,10 +63,14 @@ #endif // GLFW uses DirectInput8 interfaces -#define DIRECTINPUT_VERSION 0x0800 +#ifndef DIRECTINPUT_VERSION +#define DIRECTINPUT_VERSION 0x0800 +#endif // GLFW uses OEM cursor resources +#ifndef OEMRESOURCE #define OEMRESOURCE +#endif #include #include @@ -355,6 +363,15 @@ typedef struct VkWin32SurfaceCreateInfoKHR HWND hwnd; } VkWin32SurfaceCreateInfoKHR; +#if !defined(APIENTRY) +#if defined(_WIN32) +#define APIENTRY __stdcall +#else +#define APIENTRY +#endif +#define GLFW_APIENTRY_DEFINED +#endif /* APIENTRY */ + typedef VkResult (APIENTRY *PFN_vkCreateWin32SurfaceKHR)(VkInstance,const VkWin32SurfaceCreateInfoKHR*,const VkAllocationCallbacks*,VkSurfaceKHR*); typedef VkBool32 (APIENTRY *PFN_vkGetPhysicalDeviceWin32PresentationSupportKHR)(VkPhysicalDevice,uint32_t); diff --git a/glfw/src/win32_window.c b/glfw/src/win32_window.c index d014944b..5106599b 100644 --- a/glfw/src/win32_window.c +++ b/glfw/src/win32_window.c @@ -714,11 +714,11 @@ static LRESULT CALLBACK windowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM l const int mods = getKeyMods(); scancode = (HIWORD(lParam) & (KF_EXTENDED | 0xff)); - if (!scancode) + if (scancode == 0x100) { - // NOTE: Some synthetic key messages have a scancode of zero + // NOTE: Some synthetic key messages have a scancode of extended zero // HACK: Map the virtual key back to a usable scancode - scancode = MapVirtualKeyW((UINT) wParam, MAPVK_VK_TO_VSC); + scancode = KF_EXTENDED | MapVirtualKeyW((UINT) wParam, MAPVK_VK_TO_VSC); } // HACK: Alt+PrtSc has a different scancode than just PrtSc diff --git a/glfw/src/wl_window.c b/glfw/src/wl_window.c index 2e842aaa..1497472e 100644 --- a/glfw/src/wl_window.c +++ b/glfw/src/wl_window.c @@ -2235,8 +2235,7 @@ void _glfwSetWindowTitleWayland(_GLFWwindow* window, const char* title) void _glfwSetWindowIconWayland(_GLFWwindow* window, int count, const GLFWimage* images) { - _glfwInputError(GLFW_FEATURE_UNAVAILABLE, - "Wayland: The platform does not support setting the window icon"); + fprintf(stderr, "!!! Ignoring Error: Wayland: Setting window icon not supported\n"); } void _glfwGetWindowPosWayland(_GLFWwindow* window, int* xpos, int* ypos) diff --git a/glfw/tests/allocator.c b/glfw/tests/allocator.c index 3fb004d2..47fe8512 100644 --- a/glfw/tests/allocator.c +++ b/glfw/tests/allocator.c @@ -23,7 +23,9 @@ // //======================================================================== +#ifndef BUILD_MONOLITHIC #define GLAD_GL_IMPLEMENTATION +#endif #include #define GLFW_INCLUDE_NONE #include @@ -101,6 +103,11 @@ static void* reallocate(void* block, size_t size, void* user) return real_block + 1; } + +#ifdef BUILD_MONOLITHIC +#define main glfw_allocator_test_main +#endif + int main(void) { struct allocator_stats stats = {0}; diff --git a/glfw/tests/clipboard.c b/glfw/tests/clipboard.c index eaad516d..4eb3bf60 100644 --- a/glfw/tests/clipboard.c +++ b/glfw/tests/clipboard.c @@ -27,7 +27,9 @@ // //======================================================================== +#ifndef BUILD_MONOLITHIC #define GLAD_GL_IMPLEMENTATION +#endif #include #define GLFW_INCLUDE_NONE #include @@ -88,7 +90,12 @@ static void key_callback(GLFWwindow* window, int key, int scancode, int action, } } -int main(int argc, char** argv) + +#ifdef BUILD_MONOLITHIC +#define main glfw_clipboard_test_main +#endif + +int main(int argc, const char** argv) { int ch; GLFWwindow* window; diff --git a/glfw/tests/cursor.c b/glfw/tests/cursor.c index 37f3299c..b1af8a1e 100644 --- a/glfw/tests/cursor.c +++ b/glfw/tests/cursor.c @@ -30,14 +30,18 @@ // //======================================================================== +#ifndef BUILD_MONOLITHIC #define GLAD_GL_IMPLEMENTATION +#endif #include #define GLFW_INCLUDE_NONE #include #if defined(_MSC_VER) // Make MS math.h define M_PI - #define _USE_MATH_DEFINES +#if !defined(_USE_MATH_DEFINES) +#define _USE_MATH_DEFINES +#endif #endif #include @@ -324,6 +328,11 @@ static void key_callback(GLFWwindow* window, int key, int scancode, int action, } } + +#ifdef BUILD_MONOLITHIC +#define main glfw_cursor_test_main +#endif + int main(void) { int i; diff --git a/glfw/tests/empty.c b/glfw/tests/empty.c index 72caccbd..b5ae8f15 100644 --- a/glfw/tests/empty.c +++ b/glfw/tests/empty.c @@ -29,7 +29,9 @@ #include "tinycthread.h" +#ifndef BUILD_MONOLITHIC #define GLAD_GL_IMPLEMENTATION +#endif #include #define GLFW_INCLUDE_NONE #include @@ -72,6 +74,11 @@ static float nrand(void) return (float) rand() / (float) RAND_MAX; } + +#ifdef BUILD_MONOLITHIC +#define main glfw_empty_test_main +#endif + int main(void) { int result; diff --git a/glfw/tests/events.c b/glfw/tests/events.c index ab3b99a7..e12ebb40 100644 --- a/glfw/tests/events.c +++ b/glfw/tests/events.c @@ -31,7 +31,9 @@ // //======================================================================== +#ifndef BUILD_MONOLITHIC #define GLAD_GL_IMPLEMENTATION +#endif #include #define GLFW_INCLUDE_NONE #include @@ -542,7 +544,12 @@ static void joystick_callback(int jid, int event) } } -int main(int argc, char** argv) + +#ifdef BUILD_MONOLITHIC +#define main glfw_events_test_main +#endif + +int main(int argc, const char** argv) { Slot* slots; GLFWmonitor* monitor = NULL; diff --git a/glfw/tests/gamma.c b/glfw/tests/gamma.c index d1f6dc27..2576089a 100644 --- a/glfw/tests/gamma.c +++ b/glfw/tests/gamma.c @@ -28,12 +28,18 @@ // //======================================================================== +#ifndef BUILD_MONOLITHIC #define GLAD_GL_IMPLEMENTATION +#endif #include #define GLFW_INCLUDE_NONE #include +#ifdef BUILD_MONOLITHIC +#define NK_LIB +#else #define NK_IMPLEMENTATION +#endif #define NK_INCLUDE_FIXED_TYPES #define NK_INCLUDE_FONT_BAKING #define NK_INCLUDE_DEFAULT_FONT @@ -43,7 +49,9 @@ #define NK_BUTTON_TRIGGER_ON_RELEASE #include +#ifndef BUILD_MONOLITHIC #define NK_GLFW_GL2_IMPLEMENTATION +#endif #include #include @@ -85,6 +93,11 @@ static void chart_ramp_array(struct nk_context* nk, } } + +#ifdef BUILD_MONOLITHIC +#define main glfw_gamma_test_main +#endif + int main(int argc, char** argv) { GLFWmonitor* monitor = NULL; diff --git a/glfw/tests/glfwindow.c b/glfw/tests/glfwindow.c new file mode 100644 index 00000000..8ba776f0 --- /dev/null +++ b/glfw/tests/glfwindow.c @@ -0,0 +1,471 @@ +//======================================================================== +// Window properties test +// Copyright (c) Camilla Löwy +// +// This software is provided 'as-is', without any express or implied +// warranty. In no event will the authors be held liable for any damages +// arising from the use of this software. +// +// Permission is granted to anyone to use this software for any purpose, +// including commercial applications, and to alter it and redistribute it +// freely, subject to the following restrictions: +// +// 1. The origin of this software must not be misrepresented; you must not +// claim that you wrote the original software. If you use this software +// in a product, an acknowledgment in the product documentation would +// be appreciated but is not required. +// +// 2. Altered source versions must be plainly marked as such, and must not +// be misrepresented as being the original software. +// +// 3. This notice may not be removed or altered from any source +// distribution. +// +//======================================================================== + +#ifndef BUILD_MONOLITHIC +#define GLAD_GL_IMPLEMENTATION +#endif +#include +#define GLFW_INCLUDE_NONE +#include + +#include + +#ifdef BUILD_MONOLITHIC +#define NK_LIB +#else +#define NK_IMPLEMENTATION +#endif +#define NK_INCLUDE_FIXED_TYPES +#define NK_INCLUDE_FONT_BAKING +#define NK_INCLUDE_DEFAULT_FONT +#define NK_INCLUDE_DEFAULT_ALLOCATOR +#define NK_INCLUDE_VERTEX_BUFFER_OUTPUT +#define NK_INCLUDE_STANDARD_VARARGS +#define NK_BUTTON_TRIGGER_ON_RELEASE +#include + +#ifndef BUILD_MONOLITHIC +#define NK_GLFW_GL2_IMPLEMENTATION +#endif +#include + +#include +#include +#include +#include + + +#ifdef BUILD_MONOLITHIC +#define main glfw_glfwindow_test_main +#endif + +int main(int argc, const char** argv) +{ + int windowed_x, windowed_y, windowed_width, windowed_height; + int last_xpos = INT_MIN, last_ypos = INT_MIN; + int last_width = INT_MIN, last_height = INT_MIN; + int limit_aspect_ratio = false, aspect_numer = 1, aspect_denom = 1; + int limit_min_size = false, min_width = 400, min_height = 400; + int limit_max_size = false, max_width = 400, max_height = 400; + char width_buffer[12] = "", height_buffer[12] = ""; + char xpos_buffer[12] = "", ypos_buffer[12] = ""; + char numer_buffer[12] = "", denom_buffer[12] = ""; + char min_width_buffer[12] = "", min_height_buffer[12] = ""; + char max_width_buffer[12] = "", max_height_buffer[12] = ""; + int may_close = true; + char window_title[64] = ""; + + if (!glfwInit()) + exit(EXIT_FAILURE); + + glfwWindowHint(GLFW_SCALE_TO_MONITOR, GLFW_TRUE); + glfwWindowHint(GLFW_WIN32_KEYBOARD_MENU, GLFW_TRUE); + glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 2); + glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 1); + + GLFWwindow* window = glfwCreateWindow(600, 660, "Window Features", NULL, NULL); + if (!window) + { + glfwTerminate(); + exit(EXIT_FAILURE); + } + glfwSetInputMode(window, GLFW_UNLIMITED_MOUSE_BUTTONS, GLFW_TRUE); + + glfwMakeContextCurrent(window); + gladLoadGL(glfwGetProcAddress); + glfwSwapInterval(0); + + bool position_supported = true; + + glfwGetError(NULL); + glfwGetWindowPos(window, &last_xpos, &last_ypos); + sprintf(xpos_buffer, "%i", last_xpos); + sprintf(ypos_buffer, "%i", last_ypos); + if (glfwGetError(NULL) == GLFW_FEATURE_UNAVAILABLE) + position_supported = false; + + glfwGetWindowSize(window, &last_width, &last_height); + sprintf(width_buffer, "%i", last_width); + sprintf(height_buffer, "%i", last_height); + + sprintf(numer_buffer, "%i", aspect_numer); + sprintf(denom_buffer, "%i", aspect_denom); + + sprintf(min_width_buffer, "%i", min_width); + sprintf(min_height_buffer, "%i", min_height); + sprintf(max_width_buffer, "%i", max_width); + sprintf(max_height_buffer, "%i", max_height); + + struct nk_context* nk = nk_glfw3_init(window, NK_GLFW3_INSTALL_CALLBACKS); + + struct nk_font_atlas* atlas; + nk_glfw3_font_stash_begin(&atlas); + nk_glfw3_font_stash_end(); + + strncpy(window_title, glfwGetWindowTitle(window), sizeof(window_title)); + + while (!(may_close && glfwWindowShouldClose(window))) + { + int width, height; + + glfwGetWindowSize(window, &width, &height); + + struct nk_rect area = nk_rect(0.f, 0.f, (float) width, (float) height); + nk_window_set_bounds(nk, "main", area); + + nk_glfw3_new_frame(); + if (nk_begin(nk, "main", area, 0)) + { + nk_layout_row_dynamic(nk, 30, 4); + + if (glfwGetWindowMonitor(window)) + { + if (nk_button_label(nk, "Make Windowed")) + { + glfwSetWindowMonitor(window, NULL, + windowed_x, windowed_y, + windowed_width, windowed_height, 0); + } + } + else + { + if (nk_button_label(nk, "Make Fullscreen")) + { + GLFWmonitor* monitor = glfwGetPrimaryMonitor(); + const GLFWvidmode* mode = glfwGetVideoMode(monitor); + glfwGetWindowPos(window, &windowed_x, &windowed_y); + glfwGetWindowSize(window, &windowed_width, &windowed_height); + glfwSetWindowMonitor(window, monitor, + 0, 0, mode->width, mode->height, + mode->refreshRate); + } + } + + if (nk_button_label(nk, "Maximize")) + glfwMaximizeWindow(window); + if (nk_button_label(nk, "Iconify")) + glfwIconifyWindow(window); + if (nk_button_label(nk, "Restore")) + glfwRestoreWindow(window); + + nk_layout_row_dynamic(nk, 30, 2); + + if (nk_button_label(nk, "Hide (for 3s)")) + { + glfwHideWindow(window); + + const double time = glfwGetTime() + 3.0; + while (glfwGetTime() < time) + glfwWaitEventsTimeout(1.0); + + glfwShowWindow(window); + } + if (nk_button_label(nk, "Request Attention (after 3s)")) + { + glfwIconifyWindow(window); + + const double time = glfwGetTime() + 3.0; + while (glfwGetTime() < time) + glfwWaitEventsTimeout(1.0); + + glfwRequestWindowAttention(window); + } + + nk_layout_row_dynamic(nk, 30, 1); + + if (glfwGetWindowAttrib(window, GLFW_MOUSE_PASSTHROUGH)) + { + nk_label(nk, "Press H to disable mouse passthrough", NK_TEXT_CENTERED); + + if (glfwGetKey(window, GLFW_KEY_H)) + glfwSetWindowAttrib(window, GLFW_MOUSE_PASSTHROUGH, false); + } + + nk_label(nk, "Press Enter in a text field to set value", NK_TEXT_CENTERED); + + nk_flags events; + const nk_flags flags = NK_EDIT_FIELD | + NK_EDIT_SIG_ENTER | + NK_EDIT_GOTO_END_ON_ACTIVATE; + + nk_layout_row_begin(nk, NK_DYNAMIC, 30, 2); + nk_layout_row_push(nk, 1.f / 3.f); + nk_label(nk, "Title", NK_TEXT_LEFT); + nk_layout_row_push(nk, 2.f / 3.f); + events = nk_edit_string_zero_terminated(nk, flags, window_title, + sizeof(window_title), NULL); + if (events & NK_EDIT_COMMITED) + glfwSetWindowTitle(window, window_title); + nk_layout_row_end(nk); + + if (position_supported) + { + int xpos, ypos; + glfwGetWindowPos(window, &xpos, &ypos); + + nk_layout_row_dynamic(nk, 30, 3); + nk_label(nk, "Position", NK_TEXT_LEFT); + + events = nk_edit_string_zero_terminated(nk, flags, xpos_buffer, + sizeof(xpos_buffer), + nk_filter_decimal); + if (events & NK_EDIT_COMMITED) + { + xpos = atoi(xpos_buffer); + glfwSetWindowPos(window, xpos, ypos); + } + else if (xpos != last_xpos || (events & NK_EDIT_DEACTIVATED)) + sprintf(xpos_buffer, "%i", xpos); + + events = nk_edit_string_zero_terminated(nk, flags, ypos_buffer, + sizeof(ypos_buffer), + nk_filter_decimal); + if (events & NK_EDIT_COMMITED) + { + ypos = atoi(ypos_buffer); + glfwSetWindowPos(window, xpos, ypos); + } + else if (ypos != last_ypos || (events & NK_EDIT_DEACTIVATED)) + sprintf(ypos_buffer, "%i", ypos); + + last_xpos = xpos; + last_ypos = ypos; + } + else + nk_label(nk, "Platform does not support window position", NK_TEXT_LEFT); + + nk_layout_row_dynamic(nk, 30, 3); + nk_label(nk, "Size", NK_TEXT_LEFT); + + events = nk_edit_string_zero_terminated(nk, flags, width_buffer, + sizeof(width_buffer), + nk_filter_decimal); + if (events & NK_EDIT_COMMITED) + { + width = atoi(width_buffer); + glfwSetWindowSize(window, width, height); + } + else if (width != last_width || (events & NK_EDIT_DEACTIVATED)) + sprintf(width_buffer, "%i", width); + + events = nk_edit_string_zero_terminated(nk, flags, height_buffer, + sizeof(height_buffer), + nk_filter_decimal); + if (events & NK_EDIT_COMMITED) + { + height = atoi(height_buffer); + glfwSetWindowSize(window, width, height); + } + else if (height != last_height || (events & NK_EDIT_DEACTIVATED)) + sprintf(height_buffer, "%i", height); + + last_width = width; + last_height = height; + + bool update_ratio_limit = false; + if (nk_checkbox_label(nk, "Aspect Ratio", &limit_aspect_ratio)) + update_ratio_limit = true; + + events = nk_edit_string_zero_terminated(nk, flags, numer_buffer, + sizeof(numer_buffer), + nk_filter_decimal); + if (events & NK_EDIT_COMMITED) + { + aspect_numer = abs(atoi(numer_buffer)); + update_ratio_limit = true; + } + else if (events & NK_EDIT_DEACTIVATED) + sprintf(numer_buffer, "%i", aspect_numer); + + events = nk_edit_string_zero_terminated(nk, flags, denom_buffer, + sizeof(denom_buffer), + nk_filter_decimal); + if (events & NK_EDIT_COMMITED) + { + aspect_denom = abs(atoi(denom_buffer)); + update_ratio_limit = true; + } + else if (events & NK_EDIT_DEACTIVATED) + sprintf(denom_buffer, "%i", aspect_denom); + + if (update_ratio_limit) + { + if (limit_aspect_ratio) + glfwSetWindowAspectRatio(window, aspect_numer, aspect_denom); + else + glfwSetWindowAspectRatio(window, GLFW_DONT_CARE, GLFW_DONT_CARE); + } + + bool update_size_limit = false; + + if (nk_checkbox_label(nk, "Minimum Size", &limit_min_size)) + update_size_limit = true; + + events = nk_edit_string_zero_terminated(nk, flags, min_width_buffer, + sizeof(min_width_buffer), + nk_filter_decimal); + if (events & NK_EDIT_COMMITED) + { + min_width = abs(atoi(min_width_buffer)); + update_size_limit = true; + } + else if (events & NK_EDIT_DEACTIVATED) + sprintf(min_width_buffer, "%i", min_width); + + events = nk_edit_string_zero_terminated(nk, flags, min_height_buffer, + sizeof(min_height_buffer), + nk_filter_decimal); + if (events & NK_EDIT_COMMITED) + { + min_height = abs(atoi(min_height_buffer)); + update_size_limit = true; + } + else if (events & NK_EDIT_DEACTIVATED) + sprintf(min_height_buffer, "%i", min_height); + + if (nk_checkbox_label(nk, "Maximum Size", &limit_max_size)) + update_size_limit = true; + + events = nk_edit_string_zero_terminated(nk, flags, max_width_buffer, + sizeof(max_width_buffer), + nk_filter_decimal); + if (events & NK_EDIT_COMMITED) + { + max_width = abs(atoi(max_width_buffer)); + update_size_limit = true; + } + else if (events & NK_EDIT_DEACTIVATED) + sprintf(max_width_buffer, "%i", max_width); + + events = nk_edit_string_zero_terminated(nk, flags, max_height_buffer, + sizeof(max_height_buffer), + nk_filter_decimal); + if (events & NK_EDIT_COMMITED) + { + max_height = abs(atoi(max_height_buffer)); + update_size_limit = true; + } + else if (events & NK_EDIT_DEACTIVATED) + sprintf(max_height_buffer, "%i", max_height); + + if (update_size_limit) + { + glfwSetWindowSizeLimits(window, + limit_min_size ? min_width : GLFW_DONT_CARE, + limit_min_size ? min_height : GLFW_DONT_CARE, + limit_max_size ? max_width : GLFW_DONT_CARE, + limit_max_size ? max_height : GLFW_DONT_CARE); + } + + int fb_width, fb_height; + glfwGetFramebufferSize(window, &fb_width, &fb_height); + nk_label(nk, "Framebuffer Size", NK_TEXT_LEFT); + nk_labelf(nk, NK_TEXT_LEFT, "%i", fb_width); + nk_labelf(nk, NK_TEXT_LEFT, "%i", fb_height); + + float xscale, yscale; + glfwGetWindowContentScale(window, &xscale, &yscale); + nk_label(nk, "Content Scale", NK_TEXT_LEFT); + nk_labelf(nk, NK_TEXT_LEFT, "%f", xscale); + nk_labelf(nk, NK_TEXT_LEFT, "%f", yscale); + + nk_layout_row_begin(nk, NK_DYNAMIC, 30, 5); + int frame_left, frame_top, frame_right, frame_bottom; + glfwGetWindowFrameSize(window, &frame_left, &frame_top, &frame_right, &frame_bottom); + nk_layout_row_push(nk, 1.f / 3.f); + nk_label(nk, "Frame Size:", NK_TEXT_LEFT); + nk_layout_row_push(nk, 1.f / 6.f); + nk_labelf(nk, NK_TEXT_LEFT, "%i", frame_left); + nk_layout_row_push(nk, 1.f / 6.f); + nk_labelf(nk, NK_TEXT_LEFT, "%i", frame_top); + nk_layout_row_push(nk, 1.f / 6.f); + nk_labelf(nk, NK_TEXT_LEFT, "%i", frame_right); + nk_layout_row_push(nk, 1.f / 6.f); + nk_labelf(nk, NK_TEXT_LEFT, "%i", frame_bottom); + nk_layout_row_end(nk); + + nk_layout_row_begin(nk, NK_DYNAMIC, 30, 2); + float opacity = glfwGetWindowOpacity(window); + nk_layout_row_push(nk, 1.f / 3.f); + nk_labelf(nk, NK_TEXT_LEFT, "Opacity: %0.3f", opacity); + nk_layout_row_push(nk, 2.f / 3.f); + if (nk_slider_float(nk, 0.f, &opacity, 1.f, 0.001f)) + glfwSetWindowOpacity(window, opacity); + nk_layout_row_end(nk); + + nk_layout_row_begin(nk, NK_DYNAMIC, 30, 2); + int should_close = glfwWindowShouldClose(window); + nk_layout_row_push(nk, 1.f / 3.f); + if (nk_checkbox_label(nk, "Should Close", &should_close)) + glfwSetWindowShouldClose(window, should_close); + nk_layout_row_push(nk, 2.f / 3.f); + nk_checkbox_label(nk, "May Close", &may_close); + nk_layout_row_end(nk); + + nk_layout_row_dynamic(nk, 30, 1); + nk_label(nk, "Attributes", NK_TEXT_CENTERED); + + nk_layout_row_dynamic(nk, 30, width > 200 ? width / 200 : 1); + + int decorated = glfwGetWindowAttrib(window, GLFW_DECORATED); + if (nk_checkbox_label(nk, "Decorated", &decorated)) + glfwSetWindowAttrib(window, GLFW_DECORATED, decorated); + + int resizable = glfwGetWindowAttrib(window, GLFW_RESIZABLE); + if (nk_checkbox_label(nk, "Resizable", &resizable)) + glfwSetWindowAttrib(window, GLFW_RESIZABLE, resizable); + + int floating = glfwGetWindowAttrib(window, GLFW_FLOATING); + if (nk_checkbox_label(nk, "Floating", &floating)) + glfwSetWindowAttrib(window, GLFW_FLOATING, floating); + + int passthrough = glfwGetWindowAttrib(window, GLFW_MOUSE_PASSTHROUGH); + if (nk_checkbox_label(nk, "Mouse Passthrough", &passthrough)) + glfwSetWindowAttrib(window, GLFW_MOUSE_PASSTHROUGH, passthrough); + + int auto_iconify = glfwGetWindowAttrib(window, GLFW_AUTO_ICONIFY); + if (nk_checkbox_label(nk, "Auto Iconify", &auto_iconify)) + glfwSetWindowAttrib(window, GLFW_AUTO_ICONIFY, auto_iconify); + + nk_value_bool(nk, "Focused", glfwGetWindowAttrib(window, GLFW_FOCUSED)); + nk_value_bool(nk, "Hovered", glfwGetWindowAttrib(window, GLFW_HOVERED)); + nk_value_bool(nk, "Visible", glfwGetWindowAttrib(window, GLFW_VISIBLE)); + nk_value_bool(nk, "Iconified", glfwGetWindowAttrib(window, GLFW_ICONIFIED)); + nk_value_bool(nk, "Maximized", glfwGetWindowAttrib(window, GLFW_MAXIMIZED)); + } + nk_end(nk); + + glClear(GL_COLOR_BUFFER_BIT); + nk_glfw3_render(NK_ANTI_ALIASING_ON); + glfwSwapBuffers(window); + + glfwWaitEvents(); + } + + nk_glfw3_shutdown(); + glfwTerminate(); + exit(EXIT_SUCCESS); +} + diff --git a/glfw/tests/glfwinfo.c b/glfw/tests/glfwinfo.c index 12acbccc..3aff6d79 100644 --- a/glfw/tests/glfwinfo.c +++ b/glfw/tests/glfwinfo.c @@ -23,9 +23,13 @@ // //======================================================================== +#ifndef BUILD_MONOLITHIC #define GLAD_GL_IMPLEMENTATION +#endif #include +#ifndef BUILD_MONOLITHIC #define GLAD_VULKAN_IMPLEMENTATION +#endif #include #define GLFW_INCLUDE_NONE #include @@ -348,7 +352,12 @@ static void print_platform(void) } } -int main(int argc, char** argv) + +#ifdef BUILD_MONOLITHIC +#define main glfw_glfwinfo_test_main +#endif + +int main(int argc, const char** argv) { int ch; bool list_extensions = false, list_layers = false; @@ -449,7 +458,7 @@ int main(int argc, char** argv) else { usage(); - exit(EXIT_FAILURE); + return EXIT_FAILURE; } break; case 'a': @@ -461,7 +470,7 @@ int main(int argc, char** argv) else { usage(); - exit(EXIT_FAILURE); + return EXIT_FAILURE; } break; case 'b': @@ -473,7 +482,7 @@ int main(int argc, char** argv) else { usage(); - exit(EXIT_FAILURE); + return EXIT_FAILURE; } break; case 'c': @@ -487,7 +496,7 @@ int main(int argc, char** argv) else { usage(); - exit(EXIT_FAILURE); + return EXIT_FAILURE; } break; case 'd': @@ -501,7 +510,7 @@ int main(int argc, char** argv) case 'h': case HELP: usage(); - exit(EXIT_SUCCESS); + return EXIT_SUCCESS; case 'l': case EXTENSIONS: list_extensions = true; @@ -526,7 +535,7 @@ int main(int argc, char** argv) else { usage(); - exit(EXIT_FAILURE); + return EXIT_FAILURE; } break; case 's': @@ -538,13 +547,13 @@ int main(int argc, char** argv) else { usage(); - exit(EXIT_FAILURE); + return EXIT_FAILURE; } break; case 'v': case VERSION: print_version(); - exit(EXIT_SUCCESS); + return EXIT_SUCCESS; case REDBITS: if (strcmp(optarg, "-") == 0) fb_red_bits = GLFW_DONT_CARE; @@ -645,7 +654,7 @@ int main(int argc, char** argv) else { usage(); - exit(EXIT_FAILURE); + return EXIT_FAILURE; } break; case GRAPHICS_SWITCHING: @@ -656,14 +665,14 @@ int main(int argc, char** argv) break; default: usage(); - exit(EXIT_FAILURE); + return EXIT_FAILURE; } } // Initialize GLFW and create window if (!valid_version()) - exit(EXIT_FAILURE); + return EXIT_FAILURE; glfwSetErrorCallback(error_callback); @@ -675,7 +684,7 @@ int main(int argc, char** argv) glfwInitHint(GLFW_X11_XCB_VULKAN_SURFACE, !disable_xcb_surface); if (!glfwInit()) - exit(EXIT_FAILURE); + return EXIT_FAILURE; print_version(); print_platform(); @@ -749,26 +758,33 @@ int main(int argc, char** argv) printf("%s context flags (0x%08x):", get_api_name(client), flags); if (flags & GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT) - printf(" forward-compatible"); + printf(" forward-compatible"), flags &= ~GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT; if (flags & 2/*GL_CONTEXT_FLAG_DEBUG_BIT*/) - printf(" debug"); + printf(" debug"), flags &= ~2; if (flags & GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT_ARB) - printf(" robustness"); + printf(" robustness"), flags &= ~GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT_ARB; if (flags & 8/*GL_CONTEXT_FLAG_NO_ERROR_BIT_KHR*/) - printf(" no-error"); - putchar('\n'); + printf(" no-error"), flags &= ~8; + if (flags == 0) + printf(" none"); + else + printf(" (0x%08x)", flags); + putchar('\n'); printf("%s context flags parsed by GLFW:", get_api_name(client)); + int any = 0; if (glfwGetWindowAttrib(window, GLFW_OPENGL_FORWARD_COMPAT)) - printf(" forward-compatible"); + printf(" forward-compatible"), any = 1; if (glfwGetWindowAttrib(window, GLFW_CONTEXT_DEBUG)) - printf(" debug"); + printf(" debug"), any = 1; if (glfwGetWindowAttrib(window, GLFW_CONTEXT_ROBUSTNESS) == GLFW_LOSE_CONTEXT_ON_RESET) - printf(" robustness"); + printf(" robustness"), any = 1; if (glfwGetWindowAttrib(window, GLFW_CONTEXT_NO_ERROR)) - printf(" no-error"); - putchar('\n'); + printf(" no-error"), any = 1; + if (!any) + printf(" none"); + putchar('\n'); } if (major >= 4 || (major == 3 && minor >= 2)) @@ -899,7 +915,7 @@ int main(int argc, char** argv) if (!window) { glfwTerminate(); - exit(EXIT_FAILURE); + return EXIT_FAILURE; } printf("Vulkan loader: %s\n", @@ -995,7 +1011,7 @@ int main(int argc, char** argv) if (vkCreateInstance(&ici, NULL, &instance) != VK_SUCCESS) { glfwTerminate(); - exit(EXIT_FAILURE); + return EXIT_FAILURE; } free((void*) re); @@ -1095,6 +1111,6 @@ int main(int argc, char** argv) glfwDestroyWindow(window); glfwTerminate(); - exit(EXIT_SUCCESS); + return EXIT_SUCCESS; } diff --git a/glfw/tests/icon.c b/glfw/tests/icon.c index d5baf0a0..f615a4f9 100644 --- a/glfw/tests/icon.c +++ b/glfw/tests/icon.c @@ -27,7 +27,9 @@ // //======================================================================== +#ifndef BUILD_MONOLITHIC #define GLAD_GL_IMPLEMENTATION +#endif #include #define GLFW_INCLUDE_NONE #include @@ -37,7 +39,7 @@ #include // a simple glfw logo -const char* const logo[] = +static const char* const logo[] = { "................", "................", @@ -57,7 +59,7 @@ const char* const logo[] = "................" }; -const unsigned char icon_colors[5][4] = +static const unsigned char icon_colors[5][4] = { { 0, 0, 0, 255 }, // black { 255, 0, 0, 255 }, // red @@ -111,7 +113,12 @@ static void key_callback(GLFWwindow* window, int key, int scancode, int action, } } -int main(int argc, char** argv) + +#ifdef BUILD_MONOLITHIC +#define main glfw_icon_test_main +#endif + +int main(int argc, const char** argv) { GLFWwindow* window; diff --git a/glfw/tests/iconify.c b/glfw/tests/iconify.c index 32fd44f2..5fcc0c8c 100644 --- a/glfw/tests/iconify.c +++ b/glfw/tests/iconify.c @@ -28,7 +28,9 @@ // //======================================================================== +#ifndef BUILD_MONOLITHIC #define GLAD_GL_IMPLEMENTATION +#endif #include #define GLFW_INCLUDE_NONE #include @@ -198,7 +200,12 @@ static GLFWwindow* create_window(GLFWmonitor* monitor) return window; } -int main(int argc, char** argv) + +#ifdef BUILD_MONOLITHIC +#define main glfw_iconify_test_main +#endif + +int main(int argc, const char** argv) { int ch, i, window_count; int fullscreen = GLFW_FALSE, all_monitors = GLFW_FALSE; diff --git a/glfw/tests/inputlag.c b/glfw/tests/inputlag.c index 12e693f0..d9294415 100644 --- a/glfw/tests/inputlag.c +++ b/glfw/tests/inputlag.c @@ -28,12 +28,18 @@ // //======================================================================== +#ifndef BUILD_MONOLITHIC #define GLAD_GL_IMPLEMENTATION +#endif #include #define GLFW_INCLUDE_NONE #include +#ifdef BUILD_MONOLITHIC +#define NK_LIB +#else #define NK_IMPLEMENTATION +#endif #define NK_INCLUDE_FIXED_TYPES #define NK_INCLUDE_FONT_BAKING #define NK_INCLUDE_DEFAULT_FONT @@ -42,7 +48,9 @@ #define NK_INCLUDE_STANDARD_VARARGS #include +#ifndef BUILD_MONOLITHIC #define NK_GLFW_GL2_IMPLEMENTATION +#endif #include #include @@ -51,7 +59,7 @@ #include "getopt.h" -void usage(void) +static void usage(void) { printf("Usage: inputlag [-h] [-f]\n"); printf("Options:\n"); @@ -59,10 +67,10 @@ void usage(void) printf(" -h show this help\n"); } -struct nk_vec2 cursor_new, cursor_pos, cursor_vel; -enum { cursor_sync_query, cursor_input_message } cursor_method = cursor_sync_query; +static struct nk_vec2 cursor_new, cursor_pos, cursor_vel; +static enum { cursor_sync_query, cursor_input_message } cursor_method = cursor_sync_query; -void sample_input(GLFWwindow* window) +static void sample_input(GLFWwindow* window) { float a = .25; // exponential smoothing factor @@ -78,26 +86,26 @@ void sample_input(GLFWwindow* window) cursor_pos = cursor_new; } -void cursor_pos_callback(GLFWwindow* window, double xpos, double ypos) +static void cursor_pos_callback(GLFWwindow* window, double xpos, double ypos) { cursor_new.x = (float) xpos; cursor_new.y = (float) ypos; } -int enable_vsync = nk_true; +static int enable_vsync = nk_true; -void update_vsync() +static void update_vsync(void) { glfwSwapInterval(enable_vsync == nk_true ? 1 : 0); } -int swap_clear = nk_false; -int swap_finish = nk_true; -int swap_occlusion_query = nk_false; -int swap_read_pixels = nk_false; -GLuint occlusion_query; +static int swap_clear = nk_false; +static int swap_finish = nk_true; +static int swap_occlusion_query = nk_false; +static int swap_read_pixels = nk_false; +static GLuint occlusion_query; -void swap_buffers(GLFWwindow* window) +static void swap_buffers(GLFWwindow* window) { glfwSwapBuffers(window); @@ -125,12 +133,12 @@ void swap_buffers(GLFWwindow* window) } } -void error_callback(int error, const char* description) +static void error_callback(int error, const char* description) { fprintf(stderr, "Error: %s\n", description); } -void key_callback(GLFWwindow* window, int key, int scancode, int action, int mods) +static void key_callback(GLFWwindow* window, int key, int scancode, int action, int mods) { if (action != GLFW_PRESS) return; @@ -143,14 +151,19 @@ void key_callback(GLFWwindow* window, int key, int scancode, int action, int mod } } -void draw_marker(struct nk_command_buffer* canvas, int lead, struct nk_vec2 pos) +static void draw_marker(struct nk_command_buffer* canvas, int lead, struct nk_vec2 pos) { struct nk_color colors[4] = { nk_rgb(255,0,0), nk_rgb(255,255,0), nk_rgb(0,255,0), nk_rgb(0,96,255) }; struct nk_rect rect = { -5 + pos.x, -5 + pos.y, 10, 10 }; nk_fill_circle(canvas, rect, colors[lead]); } -int main(int argc, char** argv) + +#ifdef BUILD_MONOLITHIC +#define main glfw_inputlag_test_main +#endif + +int main(int argc, const char** argv) { int ch, width, height; unsigned long frame_count = 0; diff --git a/glfw/tests/joysticks.c b/glfw/tests/joysticks.c index df000210..a97d9612 100644 --- a/glfw/tests/joysticks.c +++ b/glfw/tests/joysticks.c @@ -28,12 +28,18 @@ // //======================================================================== +#ifndef BUILD_MONOLITHIC #define GLAD_GL_IMPLEMENTATION +#endif #include #define GLFW_INCLUDE_NONE #include +#ifdef BUILD_MONOLITHIC +#define NK_LIB +#else #define NK_IMPLEMENTATION +#endif #define NK_INCLUDE_FIXED_TYPES #define NK_INCLUDE_FONT_BAKING #define NK_INCLUDE_DEFAULT_FONT @@ -43,7 +49,9 @@ #define NK_BUTTON_TRIGGER_ON_RELEASE #include +#ifndef BUILD_MONOLITHIC #define NK_GLFW_GL2_IMPLEMENTATION +#endif #include #include @@ -169,6 +177,11 @@ static void hat_widget(struct nk_context* nk, unsigned char state) } } + +#ifdef BUILD_MONOLITHIC +#define main glfw_joysticks_test_main +#endif + int main(void) { int jid, hat_buttons = GLFW_FALSE; diff --git a/glfw/tests/monitors.c b/glfw/tests/monitors.c index 1043e66c..12c2e695 100644 --- a/glfw/tests/monitors.c +++ b/glfw/tests/monitors.c @@ -28,7 +28,9 @@ // //======================================================================== +#ifndef BUILD_MONOLITHIC #define GLAD_GL_IMPLEMENTATION +#endif #include #define GLFW_INCLUDE_NONE #include @@ -219,7 +221,12 @@ static void test_modes(GLFWmonitor* monitor) } } -int main(int argc, char** argv) + +#ifdef BUILD_MONOLITHIC +#define main glfw_monitors_test_main +#endif + +int main(int argc, const char** argv) { int ch, i, count, mode = LIST_MODE; GLFWmonitor** monitors; diff --git a/glfw/tests/msaa.c b/glfw/tests/msaa.c index 10bfa3c6..1cc089db 100644 --- a/glfw/tests/msaa.c +++ b/glfw/tests/msaa.c @@ -29,14 +29,18 @@ // //======================================================================== +#ifndef BUILD_MONOLITHIC #define GLAD_GL_IMPLEMENTATION +#endif #include #define GLFW_INCLUDE_NONE #include #if defined(_MSC_VER) // Make MS math.h define M_PI - #define _USE_MATH_DEFINES +#if !defined(_USE_MATH_DEFINES) +#define _USE_MATH_DEFINES +#endif #endif #include "linmath.h" @@ -96,7 +100,12 @@ static void usage(void) printf("Usage: msaa [-h] [-s SAMPLES]\n"); } -int main(int argc, char** argv) + +#ifdef BUILD_MONOLITHIC +#define main glfw_msaa_test_main +#endif + +int main(int argc, const char** argv) { int ch, samples = 4; GLFWwindow* window; diff --git a/glfw/tests/reopen.c b/glfw/tests/reopen.c index b458755e..fc34dac5 100644 --- a/glfw/tests/reopen.c +++ b/glfw/tests/reopen.c @@ -33,7 +33,9 @@ // //======================================================================== +#ifndef BUILD_MONOLITHIC #define GLAD_GL_IMPLEMENTATION +#endif #include #define GLFW_INCLUDE_NONE #include @@ -99,7 +101,12 @@ static void close_window(GLFWwindow* window) printf("Closing window took %0.3f seconds\n", glfwGetTime() - base); } -int main(int argc, char** argv) + +#ifdef BUILD_MONOLITHIC +#define main glfw_reopen_test_main +#endif + +int main(int argc, const char** argv) { int count = 0; double base; diff --git a/glfw/tests/tearing.c b/glfw/tests/tearing.c index 5c7893c2..ce62c7b3 100644 --- a/glfw/tests/tearing.c +++ b/glfw/tests/tearing.c @@ -28,7 +28,9 @@ // //======================================================================== +#ifndef BUILD_MONOLITHIC #define GLAD_GL_IMPLEMENTATION +#endif #include #define GLFW_INCLUDE_NONE #include @@ -153,7 +155,12 @@ static void key_callback(GLFWwindow* window, int key, int scancode, int action, } } -int main(int argc, char** argv) + +#ifdef BUILD_MONOLITHIC +#define main glfw_tearing_test_main +#endif + +int main(int argc, const char** argv) { unsigned long frame_count = 0; double last_time, current_time; diff --git a/glfw/tests/threads.c b/glfw/tests/threads.c index a2caea56..8234ac3d 100644 --- a/glfw/tests/threads.c +++ b/glfw/tests/threads.c @@ -30,7 +30,9 @@ #include "tinycthread.h" +#ifndef BUILD_MONOLITHIC #define GLAD_GL_IMPLEMENTATION +#endif #include #define GLFW_INCLUDE_NONE #include @@ -80,6 +82,11 @@ static int thread_main(void* data) return 0; } + +#ifdef BUILD_MONOLITHIC +#define main glfw_threads_test_main +#endif + int main(void) { int i, result; diff --git a/glfw/tests/timeout.c b/glfw/tests/timeout.c index c2737462..8ea1efd4 100644 --- a/glfw/tests/timeout.c +++ b/glfw/tests/timeout.c @@ -27,7 +27,9 @@ // //======================================================================== +#ifndef BUILD_MONOLITHIC #define GLAD_GL_IMPLEMENTATION +#endif #include #define GLFW_INCLUDE_NONE #include @@ -53,6 +55,11 @@ static float nrand(void) return (float) rand() / (float) RAND_MAX; } + +#ifdef BUILD_MONOLITHIC +#define main glfw_timeout_test_main +#endif + int main(void) { GLFWwindow* window; diff --git a/glfw/tests/title.c b/glfw/tests/title.c index 08a24e74..28647609 100644 --- a/glfw/tests/title.c +++ b/glfw/tests/title.c @@ -27,7 +27,9 @@ // //======================================================================== +#ifndef BUILD_MONOLITHIC #define GLAD_GL_IMPLEMENTATION +#endif #include #define GLFW_INCLUDE_NONE #include @@ -40,6 +42,11 @@ static void error_callback(int error, const char* description) fprintf(stderr, "Error: %s\n", description); } + +#ifdef BUILD_MONOLITHIC +#define main glfw_title_test_main +#endif + int main(void) { GLFWwindow* window; diff --git a/glfw/tests/triangle-vulkan.c b/glfw/tests/triangle-vulkan.c index b38ee139..da0bcf67 100644 --- a/glfw/tests/triangle-vulkan.c +++ b/glfw/tests/triangle-vulkan.c @@ -41,7 +41,9 @@ #include #endif +#ifndef BUILD_MONOLITHIC #define GLAD_VULKAN_IMPLEMENTATION +#endif #include #define GLFW_INCLUDE_NONE #include @@ -2123,7 +2125,12 @@ static void demo_resize(struct demo *demo) { demo_prepare(demo); } -int main(const int argc, const char *argv[]) { + +#ifdef BUILD_MONOLITHIC +#define main glfw_triangle_vulkan_example_main +#endif + +int main(const int argc, const char **argv) { struct demo demo; demo_init(&demo, argc, argv); diff --git a/src/editor/BspRenderer.h b/src/editor/BspRenderer.h index bb687eb3..2745de2a 100644 --- a/src/editor/BspRenderer.h +++ b/src/editor/BspRenderer.h @@ -1,8 +1,6 @@ #pragma once #pragma once #include "Bsp.h" -#include -#include #include "Texture.h" #include "ShaderProgram.h" #include "LightmapNode.h" @@ -15,6 +13,8 @@ #include #include "mdl_studio.h" #include "Sprite.h" +#include +#include class Command; diff --git a/src/editor/Gui.cpp b/src/editor/Gui.cpp index 5f0053cc..12a7f859 100644 --- a/src/editor/Gui.cpp +++ b/src/editor/Gui.cpp @@ -6999,8 +6999,8 @@ void Gui::drawOverviewWidget() ortho_custom_h = 256.0f; } - ImGui::End(); } + ImGui::End(); } diff --git a/src/editor/Renderer.cpp b/src/editor/Renderer.cpp index 8e1abe64..31ca1b55 100644 --- a/src/editor/Renderer.cpp +++ b/src/editor/Renderer.cpp @@ -547,7 +547,7 @@ void Renderer::renderLoop() mousePos = vec2((float)xpos, (float)ypos); - GLuint fbo, texture, rbo; + GLuint fbo = NULL, texture, rbo; if (ortho_save_tga || ortho_save_bmp) { @@ -1165,7 +1165,7 @@ void Renderer::renderLoop() glDepthMask(GL_TRUE); glDepthFunc(GL_LESS); - if (ortho_save_tga || ortho_save_bmp) + if (fbo && (ortho_save_tga || ortho_save_bmp)) { std::vector pixels(3 * ortho_tga_w * ortho_tga_h); glBindFramebuffer(GL_FRAMEBUFFER, fbo); diff --git a/src/nav/LeafNavMesh.cpp b/src/nav/LeafNavMesh.cpp index 8fade7a4..eb662c52 100644 --- a/src/nav/LeafNavMesh.cpp +++ b/src/nav/LeafNavMesh.cpp @@ -1,6 +1,5 @@ #include "Renderer.h" #include "LeafNavMesh.h" -#include "GLFW/glfw3.h" #include "PolyOctree.h" #include "Clipper.h" #include "log.h" @@ -13,6 +12,7 @@ #include #include #include +#include "GLFW/glfw3.h" LeafNode::LeafNode() { id = -1; diff --git a/src/nav/LeafNavMeshGenerator.cpp b/src/nav/LeafNavMeshGenerator.cpp index 034fe16f..79056a00 100644 --- a/src/nav/LeafNavMeshGenerator.cpp +++ b/src/nav/LeafNavMeshGenerator.cpp @@ -1,6 +1,5 @@ #include "Renderer.h" #include "LeafNavMeshGenerator.h" -#include "GLFW/glfw3.h" #include "PolyOctree.h" #include "Clipper.h" #include "Bsp.h" @@ -12,6 +11,7 @@ #include #include #include "Entity.h" +#include "GLFW/glfw3.h" LeafNavMesh* LeafNavMeshGenerator::generate(Bsp* map) { diff --git a/vs-project/glfw/src/glfw.dir/Release/microsoft/STL/std.compat.ixx.ifc.dt.d.json b/vs-project/glfw/src/glfw.dir/Release/microsoft/STL/std.compat.ixx.ifc.dt.d.json index f804b09b..031baf8c 100644 --- a/vs-project/glfw/src/glfw.dir/Release/microsoft/STL/std.compat.ixx.ifc.dt.d.json +++ b/vs-project/glfw/src/glfw.dir/Release/microsoft/STL/std.compat.ixx.ifc.dt.d.json @@ -1,7 +1,7 @@ { "Version": "1.2", "Data": { - "Source": "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\modules\\std.compat.ixx", + "Source": "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\modules\\std.compat.ixx", "ProvidedModule": "std.compat", "Includes": [], "ImportedModules": [], diff --git a/vs-project/glfw/src/glfw.dir/Release/microsoft/STL/std.compat.ixx.ifc.dt.module.json b/vs-project/glfw/src/glfw.dir/Release/microsoft/STL/std.compat.ixx.ifc.dt.module.json index dd1fc1cc..6229c919 100644 --- a/vs-project/glfw/src/glfw.dir/Release/microsoft/STL/std.compat.ixx.ifc.dt.module.json +++ b/vs-project/glfw/src/glfw.dir/Release/microsoft/STL/std.compat.ixx.ifc.dt.module.json @@ -1,7 +1,7 @@ { "Version": "1.1", "Data": { - "Source": "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\modules\\std.compat.ixx", + "Source": "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\modules\\std.compat.ixx", "ProvidedModule": "std.compat", "ImportedModules": [ "std" diff --git a/vs-project/glfw/src/glfw.dir/Release/microsoft/STL/std.compat.ixx.ifc.dt.module.json.command b/vs-project/glfw/src/glfw.dir/Release/microsoft/STL/std.compat.ixx.ifc.dt.module.json.command index 0ab0dec2..fa08dbda 100644 Binary files a/vs-project/glfw/src/glfw.dir/Release/microsoft/STL/std.compat.ixx.ifc.dt.module.json.command and b/vs-project/glfw/src/glfw.dir/Release/microsoft/STL/std.compat.ixx.ifc.dt.module.json.command differ diff --git a/vs-project/glfw/src/glfw.dir/Release/microsoft/STL/std.ixx.ifc.dt.d.json b/vs-project/glfw/src/glfw.dir/Release/microsoft/STL/std.ixx.ifc.dt.d.json index 6dbef180..d1dd6a16 100644 --- a/vs-project/glfw/src/glfw.dir/Release/microsoft/STL/std.ixx.ifc.dt.d.json +++ b/vs-project/glfw/src/glfw.dir/Release/microsoft/STL/std.ixx.ifc.dt.d.json @@ -1,29 +1,29 @@ { "Version": "1.2", "Data": { - "Source": "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\modules\\std.ixx", + "Source": "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\modules\\std.ixx", "ProvidedModule": "std", "Includes": [ "c:\\program files (x86)\\windows kits\\10\\include\\10.0.22621.0\\ucrt\\assert.h", "c:\\program files (x86)\\windows kits\\10\\include\\10.0.22621.0\\ucrt\\corecrt.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\vcruntime.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\sal.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\concurrencysal.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\vadefs.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\vcruntime.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\sal.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\concurrencysal.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\vadefs.h", "c:\\program files (x86)\\windows kits\\10\\include\\10.0.22621.0\\ucrt\\ctype.h", "c:\\program files (x86)\\windows kits\\10\\include\\10.0.22621.0\\ucrt\\corecrt_wctype.h", "c:\\program files (x86)\\windows kits\\10\\include\\10.0.22621.0\\ucrt\\errno.h", "c:\\program files (x86)\\windows kits\\10\\include\\10.0.22621.0\\ucrt\\fenv.h", "c:\\program files (x86)\\windows kits\\10\\include\\10.0.22621.0\\ucrt\\float.h", "c:\\program files (x86)\\windows kits\\10\\include\\10.0.22621.0\\ucrt\\inttypes.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\stdint.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\limits.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\stdint.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\limits.h", "c:\\program files (x86)\\windows kits\\10\\include\\10.0.22621.0\\ucrt\\locale.h", "c:\\program files (x86)\\windows kits\\10\\include\\10.0.22621.0\\ucrt\\math.h", "c:\\program files (x86)\\windows kits\\10\\include\\10.0.22621.0\\ucrt\\corecrt_math.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\setjmp.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\setjmp.h", "c:\\program files (x86)\\windows kits\\10\\include\\10.0.22621.0\\ucrt\\signal.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\stdarg.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\stdarg.h", "c:\\program files (x86)\\windows kits\\10\\include\\10.0.22621.0\\ucrt\\stddef.h", "c:\\program files (x86)\\windows kits\\10\\include\\10.0.22621.0\\ucrt\\stdio.h", "c:\\program files (x86)\\windows kits\\10\\include\\10.0.22621.0\\ucrt\\corecrt_wstdio.h", @@ -35,7 +35,7 @@ "c:\\program files (x86)\\windows kits\\10\\include\\10.0.22621.0\\ucrt\\string.h", "c:\\program files (x86)\\windows kits\\10\\include\\10.0.22621.0\\ucrt\\corecrt_memory.h", "c:\\program files (x86)\\windows kits\\10\\include\\10.0.22621.0\\ucrt\\corecrt_memcpy_s.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\vcruntime_string.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\vcruntime_string.h", "c:\\program files (x86)\\windows kits\\10\\include\\10.0.22621.0\\ucrt\\corecrt_wstring.h", "c:\\program files (x86)\\windows kits\\10\\include\\10.0.22621.0\\ucrt\\time.h", "c:\\program files (x86)\\windows kits\\10\\include\\10.0.22621.0\\ucrt\\corecrt_wtime.h", @@ -49,196 +49,198 @@ "c:\\program files (x86)\\windows kits\\10\\include\\10.0.22621.0\\ucrt\\sys\\stat.h", "c:\\program files (x86)\\windows kits\\10\\include\\10.0.22621.0\\ucrt\\sys\\types.h", "c:\\program files (x86)\\windows kits\\10\\include\\10.0.22621.0\\ucrt\\wctype.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\intrin.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\intrin0.inl.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\immintrin.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\wmmintrin.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\nmmintrin.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\smmintrin.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\tmmintrin.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\pmmintrin.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\emmintrin.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\xmmintrin.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\mmintrin.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\intrin.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\intrin0.inl.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\immintrin.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\wmmintrin.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\nmmintrin.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\smmintrin.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\tmmintrin.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\pmmintrin.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\emmintrin.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\xmmintrin.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\mmintrin.h", "c:\\program files (x86)\\windows kits\\10\\include\\10.0.22621.0\\ucrt\\malloc.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\zmmintrin.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\ammintrin.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\algorithm", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\yvals_core.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\xkeycheck.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\__msvc_minmax.hpp", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\cstdint", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\xmemory", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\cstdlib", - "c:\\program files (x86)\\windows kits\\10\\include\\10.0.22621.0\\ucrt\\math.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\limits", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\cfloat", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\climits", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\cwchar", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\cstdio", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\xtr1common", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\intrin0.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\new", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\exception", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\yvals.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\zmmintrin.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\ammintrin.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\algorithm", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\yvals_core.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\xkeycheck.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\__msvc_heap_algorithms.hpp", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\xutility", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\yvals.h", "c:\\program files (x86)\\windows kits\\10\\include\\10.0.22621.0\\ucrt\\crtdbg.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\vcruntime_new_debug.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\vcruntime_new.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\crtdefs.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\use_ansi.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\type_traits", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\cstddef", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\vcruntime_exception.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\eh.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\vcruntime_new_debug.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\vcruntime_new.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\crtdefs.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\use_ansi.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\__msvc_iter_core.hpp", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\utility", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\initializer_list", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\cstddef", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\xtr1common", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\type_traits", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\cstdint", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\compare", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\concepts", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\cstdlib", + "c:\\program files (x86)\\windows kits\\10\\include\\10.0.22621.0\\ucrt\\math.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\climits", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\cstring", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\cwchar", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\cstdio", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\__msvc_minmax.hpp", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\xmemory", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\limits", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\cfloat", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\intrin0.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\new", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\exception", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\vcruntime_exception.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\eh.h", "c:\\program files (x86)\\windows kits\\10\\include\\10.0.22621.0\\ucrt\\corecrt_terminate.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\xatomic.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\xutility", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\__msvc_iter_core.hpp", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\utility", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\initializer_list", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\compare", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\concepts", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\cstring", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\tuple", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\optional", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\xsmf_control.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\any", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\typeinfo", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\vcruntime_typeinfo.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\array", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\atomic", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\xatomic_wait.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\xthreads.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\__msvc_threads_core.hpp", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\xtimec.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\ctime", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\barrier", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\bit", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\__msvc_bit_utils.hpp", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\bitset", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\iosfwd", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\xstring", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\__msvc_sanitizer_annotate_container.hpp", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\__msvc_string_view.hpp", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\xpolymorphic_allocator.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\charconv", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\xbit_ops.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\xcharconv.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\xerrc.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\xcharconv_ryu.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\xcharconv_ryu_tables.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\xcharconv_tables.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\chrono", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\__msvc_chrono.hpp", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\ratio", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\system_error", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\__msvc_system_error_abi.hpp", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\cerrno", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\stdexcept", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\xcall_once.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\xfilesystem_abi.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\__msvc_tzdb.hpp", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\cmath", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\format", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\__msvc_format_ucd_tables.hpp", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\__msvc_formatter.hpp", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\__msvc_print.hpp", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\iterator", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\locale", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\xlocbuf", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\streambuf", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\xiosbase", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\xatomic.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\tuple", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\optional", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\xsmf_control.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\any", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\typeinfo", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\vcruntime_typeinfo.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\array", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\atomic", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\xatomic_wait.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\xthreads.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\__msvc_threads_core.hpp", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\xtimec.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\ctime", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\barrier", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\bit", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\__msvc_bit_utils.hpp", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\bitset", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\iosfwd", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\xstring", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\__msvc_sanitizer_annotate_container.hpp", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\__msvc_string_view.hpp", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\xpolymorphic_allocator.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\charconv", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\xbit_ops.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\xcharconv.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\xerrc.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\xcharconv_ryu.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\xcharconv_ryu_tables.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\xcharconv_tables.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\chrono", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\__msvc_chrono.hpp", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\ratio", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\system_error", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\__msvc_system_error_abi.hpp", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\cerrno", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\stdexcept", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\xcall_once.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\xfilesystem_abi.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\__msvc_tzdb.hpp", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\cmath", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\format", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\__msvc_format_ucd_tables.hpp", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\__msvc_formatter.hpp", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\__msvc_print.hpp", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\iterator", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\locale", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\xlocbuf", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\streambuf", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\xiosbase", "c:\\program files (x86)\\windows kits\\10\\include\\10.0.22621.0\\ucrt\\share.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\xlocale", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\memory", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\xfacet", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\xlocinfo", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\__msvc_xlocinfo_types.hpp", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\cctype", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\clocale", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\xlocmes", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\xlocmon", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\xlocnum", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\xloctime", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\forward_list", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\iomanip", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\istream", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\ostream", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\ios", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\__msvc_filebuf.hpp", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\sstream", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\string", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\vector", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\codecvt", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\complex", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\ymath.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\condition_variable", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\mutex", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\thread", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\xlocale", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\memory", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\xfacet", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\xlocinfo", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\__msvc_xlocinfo_types.hpp", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\cctype", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\clocale", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\xlocmes", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\xlocmon", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\xlocnum", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\xloctime", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\forward_list", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\iomanip", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\istream", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\ostream", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\ios", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\__msvc_filebuf.hpp", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\sstream", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\string", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\vector", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\codecvt", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\complex", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\ymath.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\condition_variable", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\mutex", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\thread", "c:\\program files (x86)\\windows kits\\10\\include\\10.0.22621.0\\ucrt\\process.h", "c:\\program files (x86)\\windows kits\\10\\include\\10.0.22621.0\\ucrt\\corecrt_startup.h", "c:\\program files (x86)\\windows kits\\10\\include\\10.0.22621.0\\ucrt\\math.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\vcruntime_startup.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\stop_token", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\coroutine", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\deque", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\execution", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\numeric", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\queue", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\ranges", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\__msvc_int128.hpp", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\span", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\string_view", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\expected", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\filesystem", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\fstream", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\functional", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\unordered_map", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\xhash", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\list", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\xnode_handle.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\future", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\ppltasks.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\pplwin.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\pplinterface.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\ppltaskscheduler.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\crtdefs.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\pplcancellation_token.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\iostream", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\latch", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\map", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\xtree", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\mdspan", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\memory_resource", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\numbers", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\print", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\random", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\regex", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\scoped_allocator", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\semaphore", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\set", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\shared_mutex", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\source_location", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\spanstream", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\stack", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\stacktrace", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\stdfloat", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\strstream", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\syncstream", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\typeindex", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\unordered_set", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\valarray", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\variant", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\version", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\cassert", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\vcruntime_startup.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\stop_token", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\coroutine", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\deque", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\execution", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\numeric", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\queue", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\__msvc_ranges_to.hpp", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\expected", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\filesystem", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\fstream", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\functional", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\unordered_map", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\xhash", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\list", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\xnode_handle.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\future", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\ppltasks.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\pplwin.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\pplinterface.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\ppltaskscheduler.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\crtdefs.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\pplcancellation_token.h", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\iostream", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\latch", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\map", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\xtree", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\mdspan", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\span", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\memory_resource", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\numbers", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\print", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\random", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\__msvc_int128.hpp", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\ranges", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\string_view", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\regex", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\scoped_allocator", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\semaphore", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\set", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\shared_mutex", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\source_location", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\spanstream", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\stack", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\stacktrace", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\stdfloat", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\strstream", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\syncstream", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\typeindex", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\unordered_set", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\valarray", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\variant", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\version", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\cassert", "c:\\program files (x86)\\windows kits\\10\\include\\10.0.22621.0\\ucrt\\assert.h", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\cfenv", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\cinttypes", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\csetjmp", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\csignal", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\cstdarg", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\cuchar", - "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\include\\cwctype" + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\cfenv", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\cinttypes", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\csetjmp", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\csignal", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\cstdarg", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\cuchar", + "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\include\\cwctype" ], "ImportedModules": [], "ImportedHeaderUnits": [] diff --git a/vs-project/glfw/src/glfw.dir/Release/microsoft/STL/std.ixx.ifc.dt.module.json b/vs-project/glfw/src/glfw.dir/Release/microsoft/STL/std.ixx.ifc.dt.module.json index 0bc62b43..872ab45f 100644 --- a/vs-project/glfw/src/glfw.dir/Release/microsoft/STL/std.ixx.ifc.dt.module.json +++ b/vs-project/glfw/src/glfw.dir/Release/microsoft/STL/std.ixx.ifc.dt.module.json @@ -1,7 +1,7 @@ { "Version": "1.1", "Data": { - "Source": "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.41.34120\\modules\\std.ixx", + "Source": "d:\\program files\\microsoft visual studio\\2022\\community\\vc\\tools\\msvc\\14.42.34433\\modules\\std.ixx", "ProvidedModule": "std", "ImportedModules": [], "ImportedHeaderUnits": [] diff --git a/vs-project/glfw/src/glfw.dir/Release/microsoft/STL/std.ixx.ifc.dt.module.json.command b/vs-project/glfw/src/glfw.dir/Release/microsoft/STL/std.ixx.ifc.dt.module.json.command index c9bfb4a0..0d77807c 100644 Binary files a/vs-project/glfw/src/glfw.dir/Release/microsoft/STL/std.ixx.ifc.dt.module.json.command and b/vs-project/glfw/src/glfw.dir/Release/microsoft/STL/std.ixx.ifc.dt.module.json.command differ diff --git a/vs-project/glfw/src/glfw.vcxproj b/vs-project/glfw/src/glfw.vcxproj index f3c50a6e..aefba25b 100644 --- a/vs-project/glfw/src/glfw.vcxproj +++ b/vs-project/glfw/src/glfw.vcxproj @@ -182,7 +182,7 @@ MultiThreadedDebug false Level3 - %(PreprocessorDefinitions);WIN32;_WINDOWS;_GLFW_WIN32;UNICODE;_UNICODE;_CRT_SECURE_NO_WARNINGS;GLEW_STATIC; + %(PreprocessorDefinitions);WIN32;_WINDOWS;_GLFW_WIN32;UNICODE;_UNICODE;_CRT_SECURE_NO_WARNINGS;GLEW_STATIC;OEMRESOURCE $(IntDir) false true @@ -325,7 +325,7 @@ MultiThreaded false Level3 - %(PreprocessorDefinitions);WIN32;_WINDOWS;NDEBUG;_GLFW_WIN32;UNICODE;_UNICODE;_CRT_SECURE_NO_WARNINGS;GLEW_STATIC; + %(PreprocessorDefinitions);WIN32;_WINDOWS;NDEBUG;_GLFW_WIN32;UNICODE;_UNICODE;_CRT_SECURE_NO_WARNINGS;GLEW_STATIC;OEMRESOURCE $(IntDir) @@ -417,7 +417,7 @@ MultiThreaded false Level3 - %(PreprocessorDefinitions);WIN32;WIN_XP_86;_WINDOWS;NDEBUG;_GLFW_WIN32;UNICODE;_UNICODE;_CRT_SECURE_NO_WARNINGS;GLEW_STATIC; + %(PreprocessorDefinitions);WIN32;WIN_XP_86;_WINDOWS;NDEBUG;_GLFW_WIN32;UNICODE;_UNICODE;_CRT_SECURE_NO_WARNINGS;GLEW_STATIC;OEMRESOURCE $(IntDir)