From 49e17044c97b37fdd2f7dc8ac6291261b2925dbb Mon Sep 17 00:00:00 2001 From: Ray Date: Fri, 9 Apr 2021 00:20:43 +0200 Subject: [PATCH 001/121] Update resource files --- src/raylib.dll.rc | 10 +++++----- src/raylib.dll.rc.data | Bin 11246 -> 11246 bytes src/raylib.rc | 10 +++++----- src/raylib.rc.data | Bin 11182 -> 11182 bytes 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/raylib.dll.rc b/src/raylib.dll.rc index 65bb644e2..f4d90f415 100644 --- a/src/raylib.dll.rc +++ b/src/raylib.dll.rc @@ -1,8 +1,8 @@ GLFW_ICON ICON "raylib.ico" 1 VERSIONINFO -FILEVERSION 3,1,0,0 -PRODUCTVERSION 3,1,0,0 +FILEVERSION 3,7,0,0 +PRODUCTVERSION 3,7,0,0 BEGIN BLOCK "StringFileInfo" BEGIN @@ -11,12 +11,12 @@ BEGIN BEGIN //VALUE "CompanyName", "raylib technologies" VALUE "FileDescription", "raylib dynamic library (www.raylib.com)" - VALUE "FileVersion", "3.1.0" + VALUE "FileVersion", "3.7.0" VALUE "InternalName", "raylib.dll" - VALUE "LegalCopyright", "(c) 2020 Ramon Santamaria (@raysan5)" + VALUE "LegalCopyright", "(c) 2021 Ramon Santamaria (@raysan5)" VALUE "OriginalFilename", "raylib.dll" VALUE "ProductName", "raylib" - VALUE "ProductVersion", "3.1.0" + VALUE "ProductVersion", "3.7.0" END END BLOCK "VarFileInfo" diff --git a/src/raylib.dll.rc.data b/src/raylib.dll.rc.data index 0c1e2dae84e8f7050efc1339f89b197c453cdf74..f4e5b3f3562d855af5a59d241fb71ef9cb995735 100644 GIT binary patch delta 48 zcmaDC{w{pO9Sv@F24)5jU}s>S{82-Ek|xJwHqBd%=93?47BU)64%WKLXg*m}`zQco C7!JVz delta 48 zcmaDC{w{pO9Sv?q24)5jU}RvP{82-Ek|xJwHqBd%hLay^7BU)44%WKLXgFC@`zQcl C*$$`x diff --git a/src/raylib.rc b/src/raylib.rc index f0ccc729b..4c500b2bc 100644 --- a/src/raylib.rc +++ b/src/raylib.rc @@ -1,8 +1,8 @@ GLFW_ICON ICON "raylib.ico" 1 VERSIONINFO -FILEVERSION 3,5,0,0 -PRODUCTVERSION 3,5,0,0 +FILEVERSION 3,7,0,0 +PRODUCTVERSION 3,7,0,0 BEGIN BLOCK "StringFileInfo" BEGIN @@ -11,12 +11,12 @@ BEGIN BEGIN //VALUE "CompanyName", "raylib technologies" VALUE "FileDescription", "raylib application (www.raylib.com)" - VALUE "FileVersion", "3.5.0" + VALUE "FileVersion", "3.7.0" VALUE "InternalName", "raylib app" - VALUE "LegalCopyright", "(c) 2020 Ramon Santamaria (@raysan5)" + VALUE "LegalCopyright", "(c) 2021 Ramon Santamaria (@raysan5)" //VALUE "OriginalFilename", "raylib_app.exe" VALUE "ProductName", "raylib app" - VALUE "ProductVersion", "3.5.0" + VALUE "ProductVersion", "3.7.0" END END BLOCK "VarFileInfo" diff --git a/src/raylib.rc.data b/src/raylib.rc.data index 07ec22e0934bca3586261e7a1b86e524c9bc8a61..4da6b882baaf1923409a8beb0b746e2f7136286f 100644 GIT binary patch delta 48 zcmZ1%zAk*j9Sv@F24)5jU}s>S{82-Ek|xJwHqA?n=96z~7BU)6_STxqXg>L+)=>aT C_71QB delta 48 zcmZ1%zAk*j9Sv?)24)5jU}a#Q{82-Ek|xJwHqA?nrju`K7BU)4_STxqXgc|&)=>aT CFAk>w From 8a8948780ee1c44f6e732d0b87732542cf32b3a2 Mon Sep 17 00:00:00 2001 From: Ray Date: Fri, 9 Apr 2021 00:21:56 +0200 Subject: [PATCH 002/121] REVIEWED: GetKeyPressed() #1712 --- src/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core.c b/src/core.c index 2cce9f429..cf8340f7e 100644 --- a/src/core.c +++ b/src/core.c @@ -5031,7 +5031,7 @@ static void KeyCallback(GLFWwindow *window, int key, int scancode, int action, i else CORE.Input.Keyboard.currentKeyState[key] = 1; // Check if there is space available in the key queue - if ((CORE.Input.Keyboard.keyPressedQueueCount < MAX_KEY_PRESSED_QUEUE) && (action == GLFW_RELEASE)) + if ((CORE.Input.Keyboard.keyPressedQueueCount < MAX_KEY_PRESSED_QUEUE) && (action == GLFW_PRESS)) { // Add character to the queue CORE.Input.Keyboard.keyPressedQueue[CORE.Input.Keyboard.keyPressedQueueCount] = key; From 3cdac3e11e86a2038df395a12e85b0e63e93b326 Mon Sep 17 00:00:00 2001 From: Chris Date: Thu, 8 Apr 2021 23:55:47 +0100 Subject: [PATCH 003/121] Fix off by one bug with GetGamepadAxisCount on PLATFORM_DESKTOP (#1715) - Found testing core_input_gamepad. The last axis was not drawn. - GLFW_GAMEPAD_AXIS_LAST is defined to the last axis which is 5 not the total number which is 6. --- src/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core.c b/src/core.c index cf8340f7e..f4d64b7f5 100644 --- a/src/core.c +++ b/src/core.c @@ -4735,7 +4735,7 @@ static void PollInputEvents(void) CORE.Input.Gamepad.currentState[i][GAMEPAD_BUTTON_LEFT_TRIGGER_2] = (char)(CORE.Input.Gamepad.axisState[i][GAMEPAD_AXIS_LEFT_TRIGGER] > 0.1); CORE.Input.Gamepad.currentState[i][GAMEPAD_BUTTON_RIGHT_TRIGGER_2] = (char)(CORE.Input.Gamepad.axisState[i][GAMEPAD_AXIS_RIGHT_TRIGGER] > 0.1); - CORE.Input.Gamepad.axisCount = GLFW_GAMEPAD_AXIS_LAST; + CORE.Input.Gamepad.axisCount = GLFW_GAMEPAD_AXIS_LAST + 1; } } From 09e6f42f2e6ebfdd0db5fb0258a71f3ef49c7d18 Mon Sep 17 00:00:00 2001 From: Ray Date: Fri, 9 Apr 2021 01:28:52 +0200 Subject: [PATCH 004/121] Update Notepad++ Intellisense --- .../raylib_npp_parser/raylib_npp.xml | 495 +++++++++--------- .../raylib_npp_parser/raylib_to_parse.h | 244 ++++----- 2 files changed, 358 insertions(+), 381 deletions(-) diff --git a/projects/Notepad++/raylib_npp_parser/raylib_npp.xml b/projects/Notepad++/raylib_npp_parser/raylib_npp.xml index a902a93a0..2c8bafb5e 100644 --- a/projects/Notepad++/raylib_npp_parser/raylib_npp.xml +++ b/projects/Notepad++/raylib_npp_parser/raylib_npp.xml @@ -109,18 +109,21 @@ + + + - + - + @@ -215,6 +218,22 @@ + + + + + + + + + + + + + + + + @@ -226,6 +245,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -281,59 +383,79 @@ - + + + + + + + + + + + + - - - - - - - - - - - - - - - - + - + + + + + + + + - - - + + + + + + - - - - + + + + + + + + + + + + + + + + + + @@ -386,7 +508,7 @@ - + @@ -570,6 +692,11 @@ + + + + + @@ -622,9 +749,6 @@ - - - @@ -649,7 +773,7 @@ - + @@ -723,6 +847,15 @@ + + + + + + + + + @@ -770,6 +903,15 @@ + + + + + + + + + @@ -789,8 +931,8 @@ - - + + @@ -799,8 +941,8 @@ - - + + @@ -852,8 +994,8 @@ - - + + @@ -863,8 +1005,8 @@ - - + + @@ -1096,7 +1238,7 @@ - + @@ -1516,7 +1658,7 @@ - + @@ -1566,13 +1708,13 @@ - + - + @@ -1649,6 +1791,16 @@ + + + + + + + + + + @@ -1745,7 +1897,7 @@ - + @@ -1788,7 +1940,7 @@ - + @@ -2142,11 +2294,6 @@ - - - - - @@ -2175,14 +2322,29 @@ - - - - + + + + + + + + + + + + + + + + + + + - + @@ -2209,7 +2371,7 @@ - + @@ -2242,6 +2404,12 @@ + + + + + + @@ -2250,6 +2418,11 @@ + + + + + @@ -2337,11 +2510,6 @@ - - - - - @@ -2477,190 +2645,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2688,7 +2672,7 @@ - + @@ -2820,6 +2804,13 @@ + + + + + + + @@ -2830,6 +2821,11 @@ + + + + + @@ -2850,11 +2846,6 @@ - - - - - diff --git a/projects/Notepad++/raylib_npp_parser/raylib_to_parse.h b/projects/Notepad++/raylib_npp_parser/raylib_to_parse.h index 20080f495..8079f5c78 100644 --- a/projects/Notepad++/raylib_npp_parser/raylib_to_parse.h +++ b/projects/Notepad++/raylib_npp_parser/raylib_to_parse.h @@ -30,9 +30,10 @@ RLAPI void *GetWindowHandle(void); // Get native RLAPI int GetScreenWidth(void); // Get current screen width RLAPI int GetScreenHeight(void); // Get current screen height RLAPI int GetMonitorCount(void); // Get number of connected monitors +RLAPI int GetCurrentMonitor(void); // Get current connected monitor RLAPI Vector2 GetMonitorPosition(int monitor); // Get specified monitor position -RLAPI int GetMonitorWidth(int monitor); // Get specified monitor width -RLAPI int GetMonitorHeight(int monitor); // Get specified monitor height +RLAPI int GetMonitorWidth(int monitor); // Get specified monitor width (max available by monitor) +RLAPI int GetMonitorHeight(int monitor); // Get specified monitor height (max available by monitor) RLAPI int GetMonitorPhysicalWidth(int monitor); // Get specified monitor physical width in millimetres RLAPI int GetMonitorPhysicalHeight(int monitor); // Get specified monitor physical height in millimetres RLAPI int GetMonitorRefreshRate(int monitor); // Get specified monitor refresh rate @@ -60,8 +61,30 @@ RLAPI void BeginMode3D(Camera3D camera); // Initializes RLAPI void EndMode3D(void); // Ends 3D mode and returns to default 2D orthographic mode RLAPI void BeginTextureMode(RenderTexture2D target); // Initializes render texture for drawing RLAPI void EndTextureMode(void); // Ends drawing to render texture +RLAPI void BeginShaderMode(Shader shader); // Begin custom shader drawing +RLAPI void EndShaderMode(void); // End custom shader drawing (use default shader) +RLAPI void BeginBlendMode(int mode); // Begin blending mode (alpha, additive, multiplied) +RLAPI void EndBlendMode(void); // End blending mode (reset to default: alpha blending) RLAPI void BeginScissorMode(int x, int y, int width, int height); // Begin scissor mode (define screen area for following drawing) RLAPI void EndScissorMode(void); // End scissor mode +RLAPI void BeginVrStereoMode(VrStereoConfig config); // Begin stereo rendering (requires VR simulator) +RLAPI void EndVrStereoMode(void); // End stereo rendering (requires VR simulator) + +// VR stereo config functions for VR simulator +RLAPI VrStereoConfig LoadVrStereoConfig(VrDeviceInfo device); // Load VR stereo config for VR simulator device parameters +RLAPI void UnloadVrStereoConfig(VrStereoConfig config); // Unload VR stereo config + +// Shader management functions +// NOTE: Shader functionality is not available on OpenGL 1.1 +RLAPI Shader LoadShader(const char *vsFileName, const char *fsFileName); // Load shader from files and bind default locations +RLAPI Shader LoadShaderFromMemory(const char *vsCode, const char *fsCode); // Load shader from code strings and bind default locations +RLAPI int GetShaderLocation(Shader shader, const char *uniformName); // Get shader uniform location +RLAPI int GetShaderLocationAttrib(Shader shader, const char *attribName); // Get shader attribute location +RLAPI void SetShaderValue(Shader shader, int locIndex, const void *value, int uniformType); // Set shader uniform value +RLAPI void SetShaderValueV(Shader shader, int locIndex, const void *value, int uniformType, int count); // Set shader uniform value vector +RLAPI void SetShaderValueMatrix(Shader shader, int locIndex, Matrix mat); // Set shader uniform value (matrix 4x4) +RLAPI void SetShaderValueTexture(Shader shader, int locIndex, Texture2D texture); // Set shader uniform value for texture (sampler2d) +RLAPI void UnloadShader(Shader shader); // Unload shader from GPU memory (VRAM) // Screen-space-related functions RLAPI Ray GetMouseRay(Vector2 mousePosition, Camera camera); // Returns a ray trace from mouse position @@ -75,21 +98,27 @@ RLAPI Vector2 GetScreenToWorld2D(Vector2 position, Camera2D camera); // Returns // Timing-related functions RLAPI void SetTargetFPS(int fps); // Set target FPS (maximum) RLAPI int GetFPS(void); // Returns current FPS -RLAPI float GetFrameTime(void); // Returns time in seconds for last frame drawn +RLAPI float GetFrameTime(void); // Returns time in seconds for last frame drawn (delta time) RLAPI double GetTime(void); // Returns elapsed time in seconds since InitWindow() // Misc. functions +RLAPI int GetRandomValue(int min, int max); // Returns a random value between min and max (both included) +RLAPI void TakeScreenshot(const char *fileName); // Takes a screenshot of current screen (filename extension defines format) RLAPI void SetConfigFlags(unsigned int flags); // Setup init configuration flags (view FLAGS) -RLAPI void SetTraceLogLevel(int logType); // Set the current threshold (minimum) log level -RLAPI void SetTraceLogExit(int logType); // Set the exit threshold (minimum) log level -RLAPI void SetTraceLogCallback(TraceLogCallback callback); // Set a trace log callback to enable custom logging -RLAPI void TraceLog(int logType, const char *text, ...); // Show trace log messages (LOG_DEBUG, LOG_INFO, LOG_WARNING, LOG_ERROR) - +RLAPI void TraceLog(int logLevel, const char *text, ...); // Show trace log messages (LOG_DEBUG, LOG_INFO, LOG_WARNING, LOG_ERROR) +RLAPI void SetTraceLogLevel(int logLevel); // Set the current threshold (minimum) log level RLAPI void *MemAlloc(int size); // Internal memory allocator +RLAPI void *MemRealloc(void *ptr, int size); // Internal memory reallocator RLAPI void MemFree(void *ptr); // Internal memory free -RLAPI void TakeScreenshot(const char *fileName); // Takes a screenshot of current screen (saved a .png) -RLAPI int GetRandomValue(int min, int max); // Returns a random value between min and max (both included) + +// Set custom callbacks +// WARNING: Callbacks setup is intended for advance users +RLAPI void SetTraceLogCallback(TraceLogCallback callback); // Set custom trace log +RLAPI void SetLoadFileDataCallback(LoadFileDataCallback callback); // Set custom file binary data loader +RLAPI void SetSaveFileDataCallback(SaveFileDataCallback callback); // Set custom file binary data saver +RLAPI void SetLoadFileTextCallback(LoadFileTextCallback callback); // Set custom file text data loader +RLAPI void SetSaveFileTextCallback(SaveFileTextCallback callback); // Set custom file text data saver // Files management functions RLAPI unsigned char *LoadFileData(const char *fileName, unsigned int *bytesRead); // Load file data as byte array (read) @@ -100,8 +129,8 @@ RLAPI void UnloadFileText(unsigned char *text); // Unload file RLAPI bool SaveFileText(const char *fileName, char *text); // Save text data to file (write), string must be '\0' terminated, returns true on success RLAPI bool FileExists(const char *fileName); // Check if file exists RLAPI bool DirectoryExists(const char *dirPath); // Check if a directory path exists -RLAPI bool IsFileExtension(const char *fileName, const char *ext);// Check file extension (including point: .png, .wav) -RLAPI const char *GetFileExtension(const char *fileName); // Get pointer to extension for a filename string (including point: ".png") +RLAPI bool IsFileExtension(const char *fileName, const char *ext); // Check file extension (including point: .png, .wav) +RLAPI const char *GetFileExtension(const char *fileName); // Get pointer to extension for a filename string (includes dot: ".png") RLAPI const char *GetFileName(const char *filePath); // Get pointer to filename for a path string RLAPI const char *GetFileNameWithoutExt(const char *filePath); // Get filename string without extension (uses static string) RLAPI const char *GetDirectoryPath(const char *filePath); // Get full path for a given fileName with path (uses static string) @@ -148,6 +177,7 @@ RLAPI bool IsGamepadButtonUp(int gamepad, int button); // Detect if a gam RLAPI int GetGamepadButtonPressed(void); // Get the last gamepad button pressed RLAPI int GetGamepadAxisCount(int gamepad); // Return gamepad axis count for a gamepad RLAPI float GetGamepadAxisMovement(int gamepad, int axis); // Return axis movement value for a gamepad axis +RLAPI int SetGamepadMappings(const char *mappings); // Set internal gamepad mappings (SDL_GameControllerDB) // Input-related functions: mouse RLAPI bool IsMouseButtonPressed(int button); // Detect if a mouse button has been pressed once @@ -161,7 +191,6 @@ RLAPI void SetMousePosition(int x, int y); // Set mouse posit RLAPI void SetMouseOffset(int offsetX, int offsetY); // Set mouse offset RLAPI void SetMouseScale(float scaleX, float scaleY); // Set mouse scaling RLAPI float GetMouseWheelMove(void); // Returns mouse wheel movement Y -RLAPI int GetMouseCursor(void); // Returns mouse cursor if (MouseCursor enum) RLAPI void SetMouseCursor(int cursor); // Set mouse cursor // Input-related functions: touch @@ -172,30 +201,34 @@ RLAPI Vector2 GetTouchPosition(int index); // Returns touch p //------------------------------------------------------------------------------------ // Gestures and Touch Handling Functions (Module: gestures) //------------------------------------------------------------------------------------ -RLAPI void SetGesturesEnabled(unsigned int gestureFlags); // Enable a set of gestures using flags -RLAPI bool IsGestureDetected(int gesture); // Check if a gesture have been detected -RLAPI int GetGestureDetected(void); // Get latest detected gesture -RLAPI int GetTouchPointsCount(void); // Get touch points count -RLAPI float GetGestureHoldDuration(void); // Get gesture hold time in milliseconds -RLAPI Vector2 GetGestureDragVector(void); // Get gesture drag vector -RLAPI float GetGestureDragAngle(void); // Get gesture drag angle -RLAPI Vector2 GetGesturePinchVector(void); // Get gesture pinch delta -RLAPI float GetGesturePinchAngle(void); // Get gesture pinch angle +RLAPI void SetGesturesEnabled(unsigned int flags); // Enable a set of gestures using flags +RLAPI bool IsGestureDetected(int gesture); // Check if a gesture have been detected +RLAPI int GetGestureDetected(void); // Get latest detected gesture +RLAPI int GetTouchPointsCount(void); // Get touch points count +RLAPI float GetGestureHoldDuration(void); // Get gesture hold time in milliseconds +RLAPI Vector2 GetGestureDragVector(void); // Get gesture drag vector +RLAPI float GetGestureDragAngle(void); // Get gesture drag angle +RLAPI Vector2 GetGesturePinchVector(void); // Get gesture pinch delta +RLAPI float GetGesturePinchAngle(void); // Get gesture pinch angle //------------------------------------------------------------------------------------ // Camera System Functions (Module: camera) //------------------------------------------------------------------------------------ -RLAPI void SetCameraMode(Camera camera, int mode); // Set camera mode (multiple camera modes available) -RLAPI void UpdateCamera(Camera *camera); // Update camera position for selected mode +RLAPI void SetCameraMode(Camera camera, int mode); // Set camera mode (multiple camera modes available) +RLAPI void UpdateCamera(Camera *camera); // Update camera position for selected mode -RLAPI void SetCameraPanControl(int keyPan); // Set camera pan key to combine with mouse movement (free camera) -RLAPI void SetCameraAltControl(int keyAlt); // Set camera alt key to combine with mouse movement (free camera) -RLAPI void SetCameraSmoothZoomControl(int keySmoothZoom); // Set camera smooth zoom key to combine with mouse (free camera) +RLAPI void SetCameraPanControl(int keyPan); // Set camera pan key to combine with mouse movement (free camera) +RLAPI void SetCameraAltControl(int keyAlt); // Set camera alt key to combine with mouse movement (free camera) +RLAPI void SetCameraSmoothZoomControl(int keySmoothZoom); // Set camera smooth zoom key to combine with mouse (free camera) RLAPI void SetCameraMoveControls(int keyFront, int keyBack, int keyRight, int keyLeft, int keyUp, int keyDown); // Set camera move controls (1st person and 3rd person cameras) //------------------------------------------------------------------------------------ // Basic Shapes Drawing Functions (Module: shapes) //------------------------------------------------------------------------------------ +// Set texture and rectangle to be used on shapes drawing +// NOTE: It can be useful when using basic shapes and one single font, +// defining a font char white rectangle would allow drawing everything in a single draw call +RLAPI void SetShapesTexture(Texture2D texture, Rectangle source); // Set texture and rectangle to be used on shapes drawing // Basic shapes drawing functions RLAPI void DrawPixel(int posX, int posY, Color color); // Draw a pixel @@ -204,23 +237,24 @@ RLAPI void DrawLine(int startPosX, int startPosY, int endPosX, int endPosY, Colo RLAPI void DrawLineV(Vector2 startPos, Vector2 endPos, Color color); // Draw a line (Vector version) RLAPI void DrawLineEx(Vector2 startPos, Vector2 endPos, float thick, Color color); // Draw a line defining thickness RLAPI void DrawLineBezier(Vector2 startPos, Vector2 endPos, float thick, Color color); // Draw a line using cubic-bezier curves in-out +RLAPI void DrawLineBezierQuad(Vector2 startPos, Vector2 endPos, Vector2 controlPos, float thick, Color color); //Draw line using quadratic bezier curves with a control point RLAPI void DrawLineStrip(Vector2 *points, int pointsCount, Color color); // Draw lines sequence RLAPI void DrawCircle(int centerX, int centerY, float radius, Color color); // Draw a color-filled circle -RLAPI void DrawCircleSector(Vector2 center, float radius, int startAngle, int endAngle, int segments, Color color); // Draw a piece of a circle -RLAPI void DrawCircleSectorLines(Vector2 center, float radius, int startAngle, int endAngle, int segments, Color color); // Draw circle sector outline +RLAPI void DrawCircleSector(Vector2 center, float radius, float startAngle, float endAngle, int segments, Color color); // Draw a piece of a circle +RLAPI void DrawCircleSectorLines(Vector2 center, float radius, float startAngle, float endAngle, int segments, Color color); // Draw circle sector outline RLAPI void DrawCircleGradient(int centerX, int centerY, float radius, Color color1, Color color2); // Draw a gradient-filled circle RLAPI void DrawCircleV(Vector2 center, float radius, Color color); // Draw a color-filled circle (Vector version) RLAPI void DrawCircleLines(int centerX, int centerY, float radius, Color color); // Draw circle outline RLAPI void DrawEllipse(int centerX, int centerY, float radiusH, float radiusV, Color color); // Draw ellipse RLAPI void DrawEllipseLines(int centerX, int centerY, float radiusH, float radiusV, Color color); // Draw ellipse outline -RLAPI void DrawRing(Vector2 center, float innerRadius, float outerRadius, int startAngle, int endAngle, int segments, Color color); // Draw ring -RLAPI void DrawRingLines(Vector2 center, float innerRadius, float outerRadius, int startAngle, int endAngle, int segments, Color color); // Draw ring outline +RLAPI void DrawRing(Vector2 center, float innerRadius, float outerRadius, float startAngle, float endAngle, int segments, Color color); // Draw ring +RLAPI void DrawRingLines(Vector2 center, float innerRadius, float outerRadius, float startAngle, float endAngle, int segments, Color color); // Draw ring outline RLAPI void DrawRectangle(int posX, int posY, int width, int height, Color color); // Draw a color-filled rectangle RLAPI void DrawRectangleV(Vector2 position, Vector2 size, Color color); // Draw a color-filled rectangle (Vector version) RLAPI void DrawRectangleRec(Rectangle rec, Color color); // Draw a color-filled rectangle RLAPI void DrawRectanglePro(Rectangle rec, Vector2 origin, float rotation, Color color); // Draw a color-filled rectangle with pro parameters -RLAPI void DrawRectangleGradientV(int posX, int posY, int width, int height, Color color1, Color color2);// Draw a vertical-gradient-filled rectangle -RLAPI void DrawRectangleGradientH(int posX, int posY, int width, int height, Color color1, Color color2);// Draw a horizontal-gradient-filled rectangle +RLAPI void DrawRectangleGradientV(int posX, int posY, int width, int height, Color color1, Color color2); // Draw a vertical-gradient-filled rectangle +RLAPI void DrawRectangleGradientH(int posX, int posY, int width, int height, Color color1, Color color2); // Draw a horizontal-gradient-filled rectangle RLAPI void DrawRectangleGradientEx(Rectangle rec, Color col1, Color col2, Color col3, Color col4); // Draw a gradient-filled rectangle with custom vertex colors RLAPI void DrawRectangleLines(int posX, int posY, int width, int height, Color color); // Draw rectangle outline RLAPI void DrawRectangleLinesEx(Rectangle rec, int lineThick, Color color); // Draw rectangle outline with extended parameters @@ -252,7 +286,7 @@ RLAPI Rectangle GetCollisionRec(Rectangle rec1, Rectangle rec2); RLAPI Image LoadImage(const char *fileName); // Load image from file into CPU memory (RAM) RLAPI Image LoadImageRaw(const char *fileName, int width, int height, int format, int headerSize); // Load image from RAW file data RLAPI Image LoadImageAnim(const char *fileName, int *frames); // Load image sequence from file (frames appended to image.data) -RLAPI Image LoadImageFromMemory(const char *fileType, const unsigned char *fileData, int dataSize); // Load image from memory buffer, fileType refers to extension: i.e. "png" +RLAPI Image LoadImageFromMemory(const char *fileType, const unsigned char *fileData, int dataSize); // Load image from memory buffer, fileType refers to extension: i.e. ".png" RLAPI void UnloadImage(Image image); // Unload image from CPU memory (RAM) RLAPI bool ExportImage(Image image, const char *fileName); // Export image data to file, returns true on success RLAPI bool ExportImageAsCode(Image image, const char *fileName); // Export image as code file defining an array of bytes, returns true on success @@ -321,7 +355,7 @@ RLAPI void ImageDrawTextEx(Image *dst, Font font, const char *text, Vector2 posi // NOTE: These functions require GPU access RLAPI Texture2D LoadTexture(const char *fileName); // Load texture from file into GPU memory (VRAM) RLAPI Texture2D LoadTextureFromImage(Image image); // Load texture from image data -RLAPI TextureCubemap LoadTextureCubemap(Image image, int layoutType); // Load cubemap from image, multiple image cubemap layouts supported +RLAPI TextureCubemap LoadTextureCubemap(Image image, int layout); // Load cubemap from image, multiple image cubemap layouts supported RLAPI RenderTexture2D LoadRenderTexture(int width, int height); // Load texture for rendering (framebuffer) RLAPI void UnloadTexture(Texture2D texture); // Unload texture from GPU memory (VRAM) RLAPI void UnloadRenderTexture(RenderTexture2D target); // Unload render texture from GPU memory (VRAM) @@ -332,18 +366,19 @@ RLAPI Image GetScreenData(void); // Texture configuration functions RLAPI void GenTextureMipmaps(Texture2D *texture); // Generate GPU mipmaps for a texture -RLAPI void SetTextureFilter(Texture2D texture, int filterMode); // Set texture scaling filter mode -RLAPI void SetTextureWrap(Texture2D texture, int wrapMode); // Set texture wrapping mode +RLAPI void SetTextureFilter(Texture2D texture, int filter); // Set texture scaling filter mode +RLAPI void SetTextureWrap(Texture2D texture, int wrap); // Set texture wrapping mode // Texture drawing functions RLAPI void DrawTexture(Texture2D texture, int posX, int posY, Color tint); // Draw a Texture2D RLAPI void DrawTextureV(Texture2D texture, Vector2 position, Color tint); // Draw a Texture2D with position defined as Vector2 RLAPI void DrawTextureEx(Texture2D texture, Vector2 position, float rotation, float scale, Color tint); // Draw a Texture2D with extended parameters -RLAPI void DrawTextureRec(Texture2D texture, Rectangle source, Vector2 position, Color tint); // Draw a part of a texture defined by a rectangle +RLAPI void DrawTextureRec(Texture2D texture, Rectangle source, Vector2 position, Color tint); // Draw a part of a texture defined by a rectangle RLAPI void DrawTextureQuad(Texture2D texture, Vector2 tiling, Vector2 offset, Rectangle quad, Color tint); // Draw texture quad with tiling and offset parameters -RLAPI void DrawTextureTiled(Texture2D texture, Rectangle source, Rectangle dest, Vector2 origin, float rotation, float scale, Color tint); // Draw part of a texture (defined by a rectangle) with rotation and scale tiled into dest. -RLAPI void DrawTexturePro(Texture2D texture, Rectangle source, Rectangle dest, Vector2 origin, float rotation, Color tint); // Draw a part of a texture defined by a rectangle with 'pro' parameters -RLAPI void DrawTextureNPatch(Texture2D texture, NPatchInfo nPatchInfo, Rectangle dest, Vector2 origin, float rotation, Color tint); // Draws a texture (or part of it) that stretches or shrinks nicely +RLAPI void DrawTextureTiled(Texture2D texture, Rectangle source, Rectangle dest, Vector2 origin, float rotation, float scale, Color tint); // Draw part of a texture (defined by a rectangle) with rotation and scale tiled into dest. +RLAPI void DrawTexturePro(Texture2D texture, Rectangle source, Rectangle dest, Vector2 origin, float rotation, Color tint); // Draw a part of a texture defined by a rectangle with 'pro' parameters +RLAPI void DrawTextureNPatch(Texture2D texture, NPatchInfo nPatchInfo, Rectangle dest, Vector2 origin, float rotation, Color tint); // Draws a texture (or part of it) that stretches or shrinks nicely +RLAPI void DrawTexturePoly(Texture2D texture, Vector2 center, Vector2 *points, Vector2 *texcoords, int pointsCount, Color tint); // Draw a textured polygon // Color/pixel related functions RLAPI Color Fade(Color color, float alpha); // Returns color with alpha applied, alpha goes from 0.0f to 1.0f @@ -368,18 +403,17 @@ RLAPI Font GetFontDefault(void); RLAPI Font LoadFont(const char *fileName); // Load font from file into GPU memory (VRAM) RLAPI Font LoadFontEx(const char *fileName, int fontSize, int *fontChars, int charsCount); // Load font from file with extended parameters RLAPI Font LoadFontFromImage(Image image, Color key, int firstChar); // Load font from Image (XNA style) -RLAPI Font LoadFontFromMemory(const char *fileType, const unsigned char *fileData, int dataSize, int fontSize, int *fontChars, int charsCount); // Load font from memory buffer, fileType refers to extension: i.e. "ttf" +RLAPI Font LoadFontFromMemory(const char *fileType, const unsigned char *fileData, int dataSize, int fontSize, int *fontChars, int charsCount); // Load font from memory buffer, fileType refers to extension: i.e. ".ttf" RLAPI CharInfo *LoadFontData(const unsigned char *fileData, int dataSize, int fontSize, int *fontChars, int charsCount, int type); // Load font data for further use RLAPI Image GenImageFontAtlas(const CharInfo *chars, Rectangle **recs, int charsCount, int fontSize, int padding, int packMethod); // Generate image font atlas using chars info RLAPI void UnloadFontData(CharInfo *chars, int charsCount); // Unload font chars info data (RAM) RLAPI void UnloadFont(Font font); // Unload Font from GPU memory (VRAM) // Text drawing functions -RLAPI void DrawFPS(int posX, int posY); // Shows current FPS +RLAPI void DrawFPS(int posX, int posY); // Draw current FPS RLAPI void DrawText(const char *text, int posX, int posY, int fontSize, Color color); // Draw text (using default font) RLAPI void DrawTextEx(Font font, const char *text, Vector2 position, float fontSize, float spacing, Color tint); // Draw text using font and additional parameters RLAPI void DrawTextRec(Font font, const char *text, Rectangle rec, float fontSize, float spacing, bool wordWrap, Color tint); // Draw text using font inside rectangle limits -RLAPI void DrawTextRecEx(Font font, const char *text, Rectangle rec, float fontSize, float spacing, bool wordWrap, Color tint, int selectStart, int selectLength, Color selectTint, Color selectBackTint); // Draw text using font inside rectangle limits with support for text selection RLAPI void DrawTextCodepoint(Font font, int codepoint, Vector2 position, float fontSize, Color tint); // Draw one character (codepoint) // Text misc. functions @@ -435,53 +469,55 @@ RLAPI void DrawCylinderWires(Vector3 position, float radiusTop, float radiusBott RLAPI void DrawPlane(Vector3 centerPos, Vector2 size, Color color); // Draw a plane XZ RLAPI void DrawRay(Ray ray, Color color); // Draw a ray line RLAPI void DrawGrid(int slices, float spacing); // Draw a grid (centered at (0, 0, 0)) -RLAPI void DrawGizmo(Vector3 position); // Draw simple gizmo //------------------------------------------------------------------------------------ // Model 3d Loading and Drawing Functions (Module: models) //------------------------------------------------------------------------------------ // Model loading/unloading functions -RLAPI Model LoadModel(const char *fileName); // Load model from files (meshes and materials) -RLAPI Model LoadModelFromMesh(Mesh mesh); // Load model from generated mesh (default material) -RLAPI void UnloadModel(Model model); // Unload model (including meshes) from memory (RAM and/or VRAM) -RLAPI void UnloadModelKeepMeshes(Model model); // Unload model (but not meshes) from memory (RAM and/or VRAM) +RLAPI Model LoadModel(const char *fileName); // Load model from files (meshes and materials) +RLAPI Model LoadModelFromMesh(Mesh mesh); // Load model from generated mesh (default material) +RLAPI void UnloadModel(Model model); // Unload model (including meshes) from memory (RAM and/or VRAM) +RLAPI void UnloadModelKeepMeshes(Model model); // Unload model (but not meshes) from memory (RAM and/or VRAM) // Mesh loading/unloading functions -RLAPI Mesh *LoadMeshes(const char *fileName, int *meshCount); // Load meshes from model file -RLAPI void UnloadMesh(Mesh mesh); // Unload mesh from memory (RAM and/or VRAM) -RLAPI bool ExportMesh(Mesh mesh, const char *fileName); // Export mesh data to file, returns true on success +RLAPI void UploadMesh(Mesh *mesh, bool dynamic); // Upload vertex data into GPU and provided VAO/VBO ids +RLAPI void DrawMesh(Mesh mesh, Material material, Matrix transform); // Draw a 3d mesh with material and transform +RLAPI void DrawMeshInstanced(Mesh mesh, Material material, Matrix *transforms, int instances); // Draw multiple mesh instances with material and different transforms +RLAPI void UnloadMesh(Mesh mesh); // Unload mesh data from CPU and GPU +RLAPI bool ExportMesh(Mesh mesh, const char *fileName); // Export mesh data to file, returns true on success // Material loading/unloading functions -RLAPI Material *LoadMaterials(const char *fileName, int *materialCount); // Load materials from model file -RLAPI Material LoadMaterialDefault(void); // Load default material (Supports: DIFFUSE, SPECULAR, NORMAL maps) -RLAPI void UnloadMaterial(Material material); // Unload material from GPU memory (VRAM) -RLAPI void SetMaterialTexture(Material *material, int mapType, Texture2D texture); // Set texture for a material map type (MAP_DIFFUSE, MAP_SPECULAR...) -RLAPI void SetModelMeshMaterial(Model *model, int meshId, int materialId); // Set material for a mesh +RLAPI Material *LoadMaterials(const char *fileName, int *materialCount); // Load materials from model file +RLAPI Material LoadMaterialDefault(void); // Load default material (Supports: DIFFUSE, SPECULAR, NORMAL maps) +RLAPI void UnloadMaterial(Material material); // Unload material from GPU memory (VRAM) +RLAPI void SetMaterialTexture(Material *material, int mapType, Texture2D texture); // Set texture for a material map type (MATERIAL_MAP_DIFFUSE, MATERIAL_MAP_SPECULAR...) +RLAPI void SetModelMeshMaterial(Model *model, int meshId, int materialId); // Set material for a mesh // Model animations loading/unloading functions -RLAPI ModelAnimation *LoadModelAnimations(const char *fileName, int *animsCount); // Load model animations from file -RLAPI void UpdateModelAnimation(Model model, ModelAnimation anim, int frame); // Update model animation pose -RLAPI void UnloadModelAnimation(ModelAnimation anim); // Unload animation data -RLAPI bool IsModelAnimationValid(Model model, ModelAnimation anim); // Check model animation skeleton match +RLAPI ModelAnimation *LoadModelAnimations(const char *fileName, int *animsCount); // Load model animations from file +RLAPI void UpdateModelAnimation(Model model, ModelAnimation anim, int frame); // Update model animation pose +RLAPI void UnloadModelAnimation(ModelAnimation anim); // Unload animation data +RLAPI void UnloadModelAnimations(ModelAnimation* animations, unsigned int count); // Unload animation array data +RLAPI bool IsModelAnimationValid(Model model, ModelAnimation anim); // Check model animation skeleton match // Mesh generation functions -RLAPI Mesh GenMeshPoly(int sides, float radius); // Generate polygonal mesh -RLAPI Mesh GenMeshPlane(float width, float length, int resX, int resZ); // Generate plane mesh (with subdivisions) -RLAPI Mesh GenMeshCube(float width, float height, float length); // Generate cuboid mesh -RLAPI Mesh GenMeshSphere(float radius, int rings, int slices); // Generate sphere mesh (standard sphere) -RLAPI Mesh GenMeshHemiSphere(float radius, int rings, int slices); // Generate half-sphere mesh (no bottom cap) -RLAPI Mesh GenMeshCylinder(float radius, float height, int slices); // Generate cylinder mesh -RLAPI Mesh GenMeshTorus(float radius, float size, int radSeg, int sides); // Generate torus mesh -RLAPI Mesh GenMeshKnot(float radius, float size, int radSeg, int sides); // Generate trefoil knot mesh -RLAPI Mesh GenMeshHeightmap(Image heightmap, Vector3 size); // Generate heightmap mesh from image data -RLAPI Mesh GenMeshCubicmap(Image cubicmap, Vector3 cubeSize); // Generate cubes-based map mesh from image data +RLAPI Mesh GenMeshDefault(int vertexCount); // Generate an empty mesh with vertex: position, texcoords, normals, colors +RLAPI Mesh GenMeshPoly(int sides, float radius); // Generate polygonal mesh +RLAPI Mesh GenMeshPlane(float width, float length, int resX, int resZ); // Generate plane mesh (with subdivisions) +RLAPI Mesh GenMeshCube(float width, float height, float length); // Generate cuboid mesh +RLAPI Mesh GenMeshSphere(float radius, int rings, int slices); // Generate sphere mesh (standard sphere) +RLAPI Mesh GenMeshHemiSphere(float radius, int rings, int slices); // Generate half-sphere mesh (no bottom cap) +RLAPI Mesh GenMeshCylinder(float radius, float height, int slices); // Generate cylinder mesh +RLAPI Mesh GenMeshTorus(float radius, float size, int radSeg, int sides); // Generate torus mesh +RLAPI Mesh GenMeshKnot(float radius, float size, int radSeg, int sides); // Generate trefoil knot mesh +RLAPI Mesh GenMeshHeightmap(Image heightmap, Vector3 size); // Generate heightmap mesh from image data +RLAPI Mesh GenMeshCubicmap(Image cubicmap, Vector3 cubeSize); // Generate cubes-based map mesh from image data // Mesh manipulation functions -RLAPI BoundingBox MeshBoundingBox(Mesh mesh); // Compute mesh bounding box limits -RLAPI void MeshTangents(Mesh *mesh); // Compute mesh tangents -RLAPI void MeshBinormals(Mesh *mesh); // Compute mesh binormals -RLAPI void MeshNormalsSmooth(Mesh *mesh); // Smooth (average) vertex normals +RLAPI BoundingBox MeshBoundingBox(Mesh mesh); // Compute mesh bounding box limits +RLAPI void MeshTangents(Mesh *mesh); // Compute mesh tangents +RLAPI void MeshBinormals(Mesh *mesh); // Compute mesh binormals // Model drawing functions RLAPI void DrawModel(Model model, Vector3 position, float scale, Color tint); // Draw a model (with texture if set) @@ -504,57 +540,6 @@ RLAPI RayHitInfo GetCollisionRayModel(Ray ray, Model model); RLAPI RayHitInfo GetCollisionRayTriangle(Ray ray, Vector3 p1, Vector3 p2, Vector3 p3); // Get collision info between ray and triangle RLAPI RayHitInfo GetCollisionRayGround(Ray ray, float groundHeight); // Get collision info between ray and ground plane (Y-normal plane) -//------------------------------------------------------------------------------------ -// Shaders System Functions (Module: rlgl) -// NOTE: This functions are useless when using OpenGL 1.1 -//------------------------------------------------------------------------------------ - -// Shader loading/unloading functions -RLAPI Shader LoadShader(const char *vsFileName, const char *fsFileName); // Load shader from files and bind default locations -RLAPI Shader LoadShaderCode(const char *vsCode, const char *fsCode); // Load shader from code strings and bind default locations -RLAPI void UnloadShader(Shader shader); // Unload shader from GPU memory (VRAM) - -RLAPI Shader GetShaderDefault(void); // Get default shader -RLAPI Texture2D GetTextureDefault(void); // Get default texture -RLAPI Texture2D GetShapesTexture(void); // Get texture to draw shapes -RLAPI Rectangle GetShapesTextureRec(void); // Get texture rectangle to draw shapes -RLAPI void SetShapesTexture(Texture2D texture, Rectangle source); // Define default texture used to draw shapes - -// Shader configuration functions -RLAPI int GetShaderLocation(Shader shader, const char *uniformName); // Get shader uniform location -RLAPI int GetShaderLocationAttrib(Shader shader, const char *attribName); // Get shader attribute location -RLAPI void SetShaderValue(Shader shader, int uniformLoc, const void *value, int uniformType); // Set shader uniform value -RLAPI void SetShaderValueV(Shader shader, int uniformLoc, const void *value, int uniformType, int count); // Set shader uniform value vector -RLAPI void SetShaderValueMatrix(Shader shader, int uniformLoc, Matrix mat); // Set shader uniform value (matrix 4x4) -RLAPI void SetShaderValueTexture(Shader shader, int uniformLoc, Texture2D texture); // Set shader uniform value for texture -RLAPI void SetMatrixProjection(Matrix proj); // Set a custom projection matrix (replaces internal projection matrix) -RLAPI void SetMatrixModelview(Matrix view); // Set a custom modelview matrix (replaces internal modelview matrix) -RLAPI Matrix GetMatrixModelview(void); // Get internal modelview matrix -RLAPI Matrix GetMatrixProjection(void); // Get internal projection matrix - -// Texture maps generation (PBR) -// NOTE: Required shaders should be provided -RLAPI TextureCubemap GenTextureCubemap(Shader shader, Texture2D panorama, int size, int format); // Generate cubemap texture from 2D panorama texture -RLAPI TextureCubemap GenTextureIrradiance(Shader shader, TextureCubemap cubemap, int size); // Generate irradiance texture using cubemap data -RLAPI TextureCubemap GenTexturePrefilter(Shader shader, TextureCubemap cubemap, int size); // Generate prefilter texture using cubemap data -RLAPI Texture2D GenTextureBRDF(Shader shader, int size); // Generate BRDF texture - -// Shading begin/end functions -RLAPI void BeginShaderMode(Shader shader); // Begin custom shader drawing -RLAPI void EndShaderMode(void); // End custom shader drawing (use default shader) -RLAPI void BeginBlendMode(int mode); // Begin blending mode (alpha, additive, multiplied) -RLAPI void EndBlendMode(void); // End blending mode (reset to default: alpha blending) - -// VR control functions -RLAPI void InitVrSimulator(void); // Init VR simulator for selected device parameters -RLAPI void CloseVrSimulator(void); // Close VR simulator for current device -RLAPI void UpdateVrTracking(Camera *camera); // Update VR tracking (position and orientation) and camera -RLAPI void SetVrConfiguration(VrDeviceInfo info, Shader distortion); // Set stereo rendering configuration parameters -RLAPI bool IsVrSimulatorReady(void); // Detect if VR simulator is ready -RLAPI void ToggleVrMode(void); // Enable/Disable VR experience -RLAPI void BeginVrDrawing(void); // Begin VR simulator stereo rendering -RLAPI void EndVrDrawing(void); // End VR simulator stereo rendering - //------------------------------------------------------------------------------------ // Audio Loading and Playing Functions (Module: audio) //------------------------------------------------------------------------------------ @@ -567,10 +552,10 @@ RLAPI void SetMasterVolume(float volume); // Set mas // Wave/Sound loading/unloading functions RLAPI Wave LoadWave(const char *fileName); // Load wave data from file -RLAPI Wave LoadWaveFromMemory(const char *fileType, const unsigned char *fileData, int dataSize); // Load wave from memory buffer, fileType refers to extension: i.e. "wav" +RLAPI Wave LoadWaveFromMemory(const char *fileType, const unsigned char *fileData, int dataSize); // Load wave from memory buffer, fileType refers to extension: i.e. ".wav" RLAPI Sound LoadSound(const char *fileName); // Load sound from file RLAPI Sound LoadSoundFromWave(Wave wave); // Load sound from wave data -RLAPI void UpdateSound(Sound sound, const void *data, int samplesCount);// Update sound buffer with new data +RLAPI void UpdateSound(Sound sound, const void *data, int samplesCount); // Update sound buffer with new data RLAPI void UnloadWave(Wave wave); // Unload wave data RLAPI void UnloadSound(Sound sound); // Unload sound RLAPI bool ExportWave(Wave wave, const char *fileName); // Export wave data to file, returns true on success @@ -595,13 +580,14 @@ RLAPI void UnloadWaveSamples(float *samples); // Unload // Music management functions RLAPI Music LoadMusicStream(const char *fileName); // Load music stream from file +RLAPI Music LoadMusicStreamFromMemory(const char *fileType, unsigned char* data, int dataSize); // Load music stream from data RLAPI void UnloadMusicStream(Music music); // Unload music stream RLAPI void PlayMusicStream(Music music); // Start music playing +RLAPI bool IsMusicPlaying(Music music); // Check if music is playing RLAPI void UpdateMusicStream(Music music); // Updates buffers for music streaming RLAPI void StopMusicStream(Music music); // Stop music playing RLAPI void PauseMusicStream(Music music); // Pause music playing RLAPI void ResumeMusicStream(Music music); // Resume playing paused music -RLAPI bool IsMusicPlaying(Music music); // Check if music is playing RLAPI void SetMusicVolume(Music music, float volume); // Set volume for music (1.0 is max level) RLAPI void SetMusicPitch(Music music, float pitch); // Set pitch for a music (1.0 is base level) RLAPI float GetMusicTimeLength(Music music); // Get music time length (in seconds) From f6f9a3d9251e5c5d79fafa4c423eca84b689fe7f Mon Sep 17 00:00:00 2001 From: Jeffery Myers Date: Fri, 9 Apr 2021 02:00:21 -0700 Subject: [PATCH 005/121] use xm streams in the same sample sample size as the output device (#1716) --- src/raudio.c | 36 ++++++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/src/raudio.c b/src/raudio.c index b8b98d75e..a25245ec3 100644 --- a/src/raudio.c +++ b/src/raudio.c @@ -1230,8 +1230,14 @@ Music LoadMusicStream(const char *fileName) { jar_xm_set_max_loop_count(ctxXm, 0); // Set infinite number of loops + unsigned int bits = 32; + if (AUDIO_DEVICE_FORMAT == ma_format_s16) + bits = 16; + else if (AUDIO_DEVICE_FORMAT == ma_format_u8) + bits = 8; + // NOTE: Only stereo is supported for XM - music.stream = InitAudioStream(AUDIO.System.device.sampleRate, 16, AUDIO_DEVICE_CHANNELS); + music.stream = InitAudioStream(AUDIO.System.device.sampleRate, bits, AUDIO_DEVICE_CHANNELS); music.sampleCount = (unsigned int)jar_xm_get_remaining_samples(ctxXm)*2; // 2 channels music.looping = true; // Looping enabled by default jar_xm_reset(ctxXm); // make sure we start at the beginning of the song @@ -1398,8 +1404,14 @@ Music LoadMusicStreamFromMemory(const char *fileType, unsigned char* data, int d music.ctxType = MUSIC_MODULE_XM; jar_xm_set_max_loop_count(ctxXm, 0); // Set infinite number of loops + unsigned int bits = 32; + if (AUDIO_DEVICE_FORMAT == ma_format_s16) + bits = 16; + else if (AUDIO_DEVICE_FORMAT == ma_format_u8) + bits = 8; + // NOTE: Only stereo is supported for XM - music.stream = InitAudioStream(AUDIO.System.device.sampleRate, 16, 2); + music.stream = InitAudioStream(AUDIO.System.device.sampleRate, bits, 2); music.sampleCount = (unsigned int)jar_xm_get_remaining_samples(ctxXm)*2; // 2 channels music.looping = true; // Looping enabled by default jar_xm_reset(ctxXm); // make sure we start at the beginning of the song @@ -1639,8 +1651,24 @@ void UpdateMusicStream(Music music) #if defined(SUPPORT_FILEFORMAT_XM) case MUSIC_MODULE_XM: { - // NOTE: Internally this function considers 2 channels generation, so samplesCount/2 - jar_xm_generate_samples_16bit((jar_xm_context_t *)music.ctxData, (short *)pcm, samplesCount/2); + switch (AUDIO_DEVICE_FORMAT) + { + case ma_format_f32: + // NOTE: Internally this function considers 2 channels generation, so samplesCount/2 + jar_xm_generate_samples((jar_xm_context_t*)music.ctxData, (float*)pcm, samplesCount / 2); + break; + + case ma_format_s16: + // NOTE: Internally this function considers 2 channels generation, so samplesCount/2 + jar_xm_generate_samples_16bit((jar_xm_context_t*)music.ctxData, (short*)pcm, samplesCount / 2); + break; + + case ma_format_u8: + // NOTE: Internally this function considers 2 channels generation, so samplesCount/2 + jar_xm_generate_samples_8bit((jar_xm_context_t*)music.ctxData, (char*)pcm, samplesCount / 2); + break; + } + } break; #endif #if defined(SUPPORT_FILEFORMAT_MOD) From d17c519f88ff33084772263f4585a96051c45cfa Mon Sep 17 00:00:00 2001 From: Ray Date: Fri, 9 Apr 2021 13:01:17 +0200 Subject: [PATCH 006/121] Update with more changes from commits... -WIP- --- CHANGELOG | 72 ++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 58 insertions(+), 14 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 5e2828a32..f7544d4cb 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -9,8 +9,24 @@ Release: raylib 3.7 (xx April 2021) KEY CHANGES: - [core] REDESIGNED: VR simulator -> fbo/shader exposed to user - [rlgl] REDESIGNED: More abstraction +rlgl module has been completely redesigned to move Mesh/Material structures to [models] module. Still some work to do, broken elements: + - Many functions renamed to follow rl*() convention + - Some internal functions exposed in the API + - Some functionality moved to other modules + - Reorganized all functions by categories + - Make sure it keeps working with OpenGL 1.1 and 2.1 + - [models] OpenGL 1.1 mesh rendering: DrawMesh() + - [models] Mesh Instancing: DrawMeshInstanced() + - [models] Stereo rendering: DrawMesh() + - [models] GL_FLOAT, GL_UNSIGNED_INT exposed + - [models] GenMeshCustom() + - [rlgl] GenTexture*() functions removal? + - [rlgl] REVIEWED: Instancing and stereo rendering - [utils] ADDED: File access callbacks system + - [models] Gltf animation support (#1551) by @object71 + +[audio] ADDED: LoadMusicStreamFromMemory() (#1606) by @nezvers - [*] RENAMED: enums values renamed for consistency Detailed changes: @@ -18,9 +34,10 @@ Detailed changes: [core] ADDED: UnloadVrStereoConfig() [core] ADDED: BeginVrStereoMode() [core] ADDED: EndVrStereoMode() -[core] ADDED: GetCurrentMonitor() -[core] ADDED: SetGamepadMappings(), update SDL_GameControllerDB -[core] RENAMED: LoadShaderCode() to LoadShaderFromMemory() +[core] ADDED: GetCurrentMonitor() (#1485) by @object71 +[core] ADDED: SetGamepadMappings() (#1506) +[core] RENAMED: struct Camera: camera.type to camera.projection +[core] RENAMED: LoadShaderCode() to LoadShaderFromMemory() (#1690) [core] RENAMED: SetMatrixProjection() to rlSetMatrixProjection() [core] RENAMED: SetMatrixModelview() to rlSetMatrixModelview() [core] RENAMED: GetMatrixModelview() to rlGetMatrixModelview() @@ -31,33 +48,60 @@ Detailed changes: [core] REMOVED: GetShapesTextureRec() [core] REMOVED: GetMouseCursor() [core] REMOVED: SetTraceLogExit() +[core] REVIEWED: GetFileName() and GetDirectoryPath() (#1534) by @gilzoide +[core] REVIEWED: Wait() to support FreeBSD (#1618) +[core] REVIEWED: HighDPI support on macOS retina (#1510) [core] REDESIGNED: GetFileExtension(), includes the .dot [core] REDESIGNED: IsFileExtension(), includes the .dot -[shapes] REDESIGNED: void SetShapesTexture(Texture2D texture, Rectangle source); -[shapes] ADDED: DrawLineBezierQuad() +[core] REDESIGNED: Compresion API to use sdefl/sinfl libs +[rlgl] REMOVED: GenTexture*() functions (#721) +[rlgl] REVIEWED: rlLoadShaderDefault() +[raymath] REVIEWED: QuaternionFromEuler() (#1651) +[raymath] REVIEWED: MatrixRotateZYX() (#1642) +[shapes] ADDED: DrawLineBezierQuad() (#1468) by @epsilon-phase +[shapes] ADDED: CheckCollisionLines() +[shapes] ADDED: CheckCollisionPointLine() by @mkupiec1 +[shapes] REVIEWED: CheckCollisionPointTriangle() by @mkupiec1 +[shapes] REDESIGNED: SetShapesTexture() [shapes] REDESIGNED: DrawCircleSector(), to use float params [shapes] REDESIGNED: DrawCircleSectorLines(), to use float params [shapes] REDESIGNED: DrawRing(), to use float params [shapes] REDESIGNED: DrawRingLines(), to use float params -[shapes] ADDED: CheckCollisionLines() -[textures] ADDED: DrawTexturePoly() +[textures] ADDED: DrawTexturePoly() and example (#1677) by @chriscamacho +[textures] ADDED: UnloadImageColors() for allocs consistency +[textures] RENAMED: GetImageData() to LoadImageColors() +[textures] REVIEWED: ImageClearBackground() and ImageDrawRectangleRec() (#1487) by @JeffM2501 +[textures] REVIEWED: DrawTexturePro() and DrawRectanglePro() transformations (#1632) by @ChrisDill [text] REDESIGNED: DrawFPS() -[models] ADDED: UploadMesh() +[models] ADDED: UploadMesh() (#1529) [models] ADDED: DrawMesh() [models] ADDED: DrawMeshInstanced() -[models] ADDED: UnloadModelAnimations() -[models] ADDED: GenMeshDefault() +[models] ADDED: UnloadModelAnimations() (#1648) by @object71 +[models] ADDED: GenMeshDefault() (#1556) [models] REMOVED: DrawGizmo() [models] REMOVED: LoadMeshes() [models] REMOVED: MeshNormalsSmooth() -[audio] ADDED: LoadMusicStreamFromMemory() -[auido] REVIEWED: jar_xm library +[models] REVIEWED: DrawLine3D() (#1643) +[audio] REVIEWED: Multichannel sound system (#1548) +[audio] REVIEWED: jar_xm library (#1701) by @jmorel33 [utils] ADDED: SetLoadFileDataCallback() [utils] ADDED: SetSaveFileDataCallback() [utils] ADDED: SetLoadFileTextCallback() [utils] ADDED: SetSaveFileTextCallback() -[examples] ADDED: -[*] renamed some functions parameters for consistency +[examples] ADDED: text_draw_3d (#1689) by @Demizdor +[examples] REDESIGNED: shaders_mesh_intancing by @moliad +[examples] REDESIGNED: models_yaw_pitch_roll +[build] ADDED: Config flag: SUPPORT_STANDARD_FILEIO +[build] ADDED: Config flag: SUPPORT_WINMM_HIGHRES_TIMER (#1641) +[build] ADDED: Examples projects to VS2019 solution +[build] REVIEWED: Makefile to support PLATFORM_RPI (#1580) +[build] REVIEWED: Multiple typecast warnings by @JeffM2501 +[build] REDESIGNED: VS2019 project build paths +[build] REDESIGNED: CMake build system by @object71 +[*] RENAMED: Several functions parameters for consistency +[*] UPDATED: Multiple bindings to latest version +[*] UPDATED: All external libraries to latest versions +[*] Multiple code improvements and fixes by multiple contributors! ------------------------------------------------------------------------- Release: raylib 3.5 - 7th Anniversary Edition (25 December 2020) From c74230a9ea2f38517b9072b5ee968cc3d4167d65 Mon Sep 17 00:00:00 2001 From: Jon <1671674+jonlamb-gh@users.noreply.github.com> Date: Fri, 9 Apr 2021 10:57:14 -0700 Subject: [PATCH 007/121] Enable DRM platform cross compilation support (#1717) * Log a warning if chdir failed, use agnostic CHDIR instead of chdir * Only include libdrm directory explicitly when not cross compiling --- cmake/LibraryConfigurations.cmake | 6 ++++-- src/models.c | 11 +++++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/cmake/LibraryConfigurations.cmake b/cmake/LibraryConfigurations.cmake index 1b1961b9b..2d4767a94 100644 --- a/cmake/LibraryConfigurations.cmake +++ b/cmake/LibraryConfigurations.cmake @@ -73,7 +73,9 @@ elseif (${PLATFORM} MATCHES "DRM") find_library(DRM drm) find_library(GBM gbm) - include_directories(/usr/include/libdrm) + if (NOT CMAKE_CROSSCOMPILING) + include_directories(/usr/include/libdrm) + endif () set(LIBS_PRIVATE ${GLESV2} ${EGL} ${DRM} ${GBM} pthread m dl) endif () @@ -102,4 +104,4 @@ set(LIBS_PRIVATE ${LIBS_PRIVATE} ${OPENAL_LIBRARY}) if (${PLATFORM} MATCHES "Desktop") set(LIBS_PRIVATE ${LIBS_PRIVATE} glfw) -endif () \ No newline at end of file +endif () diff --git a/src/models.c b/src/models.c index 5f59f5352..6c9a75ba6 100644 --- a/src/models.c +++ b/src/models.c @@ -3168,7 +3168,11 @@ static Model LoadOBJ(const char *fileName) unsigned int dataSize = (unsigned int)strlen(fileData); char currentDir[1024] = { 0 }; strcpy(currentDir, GetWorkingDirectory()); - chdir(GetDirectoryPath(fileName)); + const char *workingDir = GetDirectoryPath(fileName); + if (CHDIR(workingDir) != 0) + { + TRACELOG(LOG_WARNING, "MODEL: [%s] Failed to change working directory", workingDir); + } unsigned int flags = TINYOBJ_FLAG_TRIANGULATE; int ret = tinyobj_parse_obj(&attrib, &meshes, &meshCount, &materials, &materialCount, fileData, dataSize, flags); @@ -3306,7 +3310,10 @@ static Model LoadOBJ(const char *fileName) RL_FREE(vnCount); RL_FREE(faceCount); - chdir(currentDir); + if (CHDIR(currentDir) != 0) + { + TRACELOG(LOG_WARNING, "MODEL: [%s] Failed to change working directory", currentDir); + } } return model; From 44f7f8a9974c5a7531e7cd9345b971efcacfe62f Mon Sep 17 00:00:00 2001 From: Ray Date: Sat, 10 Apr 2021 00:28:08 +0200 Subject: [PATCH 008/121] Update CHANGELOG --- CHANGELOG | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index f7544d4cb..9930ba6b2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -7,26 +7,12 @@ Current Release: raylib 3.7.0 (xx April 2021) Release: raylib 3.7 (xx April 2021) ------------------------------------------------------------------------- KEY CHANGES: - - [core] REDESIGNED: VR simulator -> fbo/shader exposed to user - - [rlgl] REDESIGNED: More abstraction -rlgl module has been completely redesigned to move Mesh/Material structures to [models] module. Still some work to do, broken elements: - - Many functions renamed to follow rl*() convention - - Some internal functions exposed in the API - - Some functionality moved to other modules - - Reorganized all functions by categories - - Make sure it keeps working with OpenGL 1.1 and 2.1 - - [models] OpenGL 1.1 mesh rendering: DrawMesh() - - [models] Mesh Instancing: DrawMeshInstanced() - - [models] Stereo rendering: DrawMesh() - - [models] GL_FLOAT, GL_UNSIGNED_INT exposed - - [models] GenMeshCustom() - - [rlgl] GenTexture*() functions removal? - + - [rlgl] REDESIGNED: Greater abstraction level, some functionality moved to core module - [rlgl] REVIEWED: Instancing and stereo rendering + - [core] REDESIGNED: VR simulator, fbo/shader exposed to user - [utils] ADDED: File access callbacks system - - [models] Gltf animation support (#1551) by @object71 - -[audio] ADDED: LoadMusicStreamFromMemory() (#1606) by @nezvers + - [models] ADDED: glTF animations support (#1551) by @object71 + - [audio] ADDED: Music streaming support from memory (#1606) by @nezvers - [*] RENAMED: enums values renamed for consistency Detailed changes: @@ -89,7 +75,11 @@ Detailed changes: [utils] ADDED: SetLoadFileTextCallback() [utils] ADDED: SetSaveFileTextCallback() [examples] ADDED: text_draw_3d (#1689) by @Demizdor -[examples] REDESIGNED: shaders_mesh_intancing by @moliad +[examples] ADDED: textures_poly (#1677) by @chriscamacho +[examples] ADDED: models_gltf_model (#1551) by @object71 +[examples] RENAMED: shaders_rlgl_mesh_instanced to shaders_mesh_intancing +[examples] REDESIGNED: shaders_rlgl_mesh_instanced by @moliad +[examples] REDESIGNED: core_vr_simulator [examples] REDESIGNED: models_yaw_pitch_roll [build] ADDED: Config flag: SUPPORT_STANDARD_FILEIO [build] ADDED: Config flag: SUPPORT_WINMM_HIGHRES_TIMER (#1641) From 88089f22f3deed2aa2df4b2991e356db351f8513 Mon Sep 17 00:00:00 2001 From: Ray Date: Sat, 10 Apr 2021 00:34:54 +0200 Subject: [PATCH 009/121] Update history for raylib 3.7 -WIP- --- HISTORY.md | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/HISTORY.md b/HISTORY.md index 0aa4185aa..3f634192c 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -291,3 +291,46 @@ Here the list with some highlights for `raylib 3.5`. A part of those changes, many new functions have been added, some redundant functions removed and many functions have been reviewed for consistency with the full API (function name, parameters name and order, code formatting...). Again, this release represents is a **great improvement for raylib and marks the way forward** for the library. Make sure to check [CHANGELOG](CHANGELOG) for details! Hope you enjoy it! Happy holidays! :) + +notes on raylib 3.7 +------------------- + +April 2021, it's been about 4 months since last raylib release and here it is already a new one, this time with a bunch of internal redesigns and improvements. Surprisingly, on April the 8th I was awarded for a second time with the [Google Open Source Peer Bonus Award](https://opensource.googleblog.com/2021/04/announcing-first-group-of-google-open-source-peer-bonus-winners.html) for my contribution to open source world with raylib and it seems the library is getting some traction, what a better moment for a new release? Let's see what can be found in this new version: + +Let's start with some numbers: + + - **+100** closed issues (for a TOTAL of **+900**!) + - **+350** commits since previous RELEASE + - **+50** functions ADDED (**+30** of them to rlgl API) + - **+30** functions REVIEWED/REDESIGNED + - **+30** new contributors (for a TOTAL of **+200**!) + +Highlights for `raylib 3.7`: + + - [rlgl] REDESIGNED: Greater abstraction level, some functionality moved to core module + - [rlgl] REVIEWED: Instancing and stereo rendering + - [core] REDESIGNED: VR simulator, fbo/shader exposed to user + - [utils] ADDED: File access callbacks system + - [models] ADDED: glTF animations support (#1551) by @object71 + - [audio] ADDED: Music streaming support from memory (#1606) by @nezvers + - [*] RENAMED: enums values renamed for consistency + +rlgl module has been completely redesigned to move Mesh/Material structures to [models] module. Still some work to do, broken elements: + - Many functions renamed to follow rl*() convention + - Some internal functions exposed in the API + - Some functionality moved to other modules + - Reorganized all functions by categories + - Make sure it keeps working with OpenGL 1.1 and 2.1 + - [models] OpenGL 1.1 mesh rendering: DrawMesh() + - [models] Mesh Instancing: DrawMeshInstanced() + - [models] Stereo rendering: DrawMesh() + - [models] GL_FLOAT, GL_UNSIGNED_INT exposed + - [models] GenMeshCustom() + - [rlgl] GenTexture*() functions removal? + +... + + +Beside those key changes, many functions have been reviewed with improvements and bug fixes, many of them contributed by the community! Again, this release represents is a **great improvement for raylib and marks the way forward** for the library. Make sure to check [CHANGELOG](CHANGELOG) for detailed list of changes! Hope you enjoy this new raylib installment! + +Happy gamedev/tools/graphics programming! :) From caa375412bfed787cc0424069418fa3e9b5d2bba Mon Sep 17 00:00:00 2001 From: Ray Date: Sat, 10 Apr 2021 00:37:19 +0200 Subject: [PATCH 010/121] Update CHANGELOG --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 9930ba6b2..aff48fa9f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -13,7 +13,7 @@ KEY CHANGES: - [utils] ADDED: File access callbacks system - [models] ADDED: glTF animations support (#1551) by @object71 - [audio] ADDED: Music streaming support from memory (#1606) by @nezvers - - [*] RENAMED: enums values renamed for consistency + - [*] RENAMED: enum types and enum values for consistency Detailed changes: [core] ADDED: LoadVrStereoConfig() From fcab72f915077b7741207e7bb4a3e42fad73d5c3 Mon Sep 17 00:00:00 2001 From: Ray Date: Sat, 10 Apr 2021 01:16:15 +0200 Subject: [PATCH 011/121] Update history -WIP- --- HISTORY.md | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index 3f634192c..fd2f60dd7 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -307,29 +307,17 @@ Let's start with some numbers: Highlights for `raylib 3.7`: - - [rlgl] REDESIGNED: Greater abstraction level, some functionality moved to core module - - [rlgl] REVIEWED: Instancing and stereo rendering - - [core] REDESIGNED: VR simulator, fbo/shader exposed to user - - [utils] ADDED: File access callbacks system - - [models] ADDED: glTF animations support (#1551) by @object71 - - [audio] ADDED: Music streaming support from memory (#1606) by @nezvers - - [*] RENAMED: enums values renamed for consistency - -rlgl module has been completely redesigned to move Mesh/Material structures to [models] module. Still some work to do, broken elements: - - Many functions renamed to follow rl*() convention - - Some internal functions exposed in the API - - Some functionality moved to other modules - - Reorganized all functions by categories - - Make sure it keeps working with OpenGL 1.1 and 2.1 - - [models] OpenGL 1.1 mesh rendering: DrawMesh() - - [models] Mesh Instancing: DrawMeshInstanced() - - [models] Stereo rendering: DrawMesh() - - [models] GL_FLOAT, GL_UNSIGNED_INT exposed - - [models] GenMeshCustom() - - [rlgl] GenTexture*() functions removal? - -... - + - REDESIGNED `rlgl` module for a greater abstraction level. Mesh and Materials structs references have been moved to a higher level, to `models` module as well as `DrawMesh()` and `DrawMeshInstanced()` functions. Some shaders functionality has also been moved to a higher level, to `core` module. Several `rlgl` functions names have been reviewed for consistency, following the `rl*()` prefix convention. Reorganized all functions by categories. GenTexture*() functions removal. Reiewed instancing and stereo rendering. + + - REDESIGNED VR simulator along with stereo rendering mechanism, a new API has been added more comprehensive and better integrated with raylib, now stereo rendering can be combined with `RenderTexture` and `Shader` API allowing the user manage fbo and distortion shader directly. + + - ADDED file access callbacks system + + - ADDED: glTF animations support (#1551) by @object71 + + - ADDED: Music streaming support from memory (#1606) by @nezvers + + - RENAMED: enums values renamed for consistency Beside those key changes, many functions have been reviewed with improvements and bug fixes, many of them contributed by the community! Again, this release represents is a **great improvement for raylib and marks the way forward** for the library. Make sure to check [CHANGELOG](CHANGELOG) for detailed list of changes! Hope you enjoy this new raylib installment! From d2cb628a66a0c12828fcecee398f1ba119a7e796 Mon Sep 17 00:00:00 2001 From: Ray Date: Sun, 11 Apr 2021 00:55:45 +0200 Subject: [PATCH 012/121] Some defines simplification --- src/rlgl.h | 67 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 37 insertions(+), 30 deletions(-) diff --git a/src/rlgl.h b/src/rlgl.h index bc40ad010..1d7c07be9 100644 --- a/src/rlgl.h +++ b/src/rlgl.h @@ -18,7 +18,7 @@ * #define GRAPHICS_API_OPENGL_ES2 * Use selected OpenGL graphics backend, should be supported by platform * Those preprocessor defines are only used on rlgl module, if OpenGL version is -* required by any other module, use rlGetVersion() tocheck it +* required by any other module, use rlGetVersion() to check it * * #define RLGL_IMPLEMENTATION * Generates the implementation of the library into the included file. @@ -1454,7 +1454,7 @@ float rlGetLineWidth(void) // Enable line aliasing void rlEnableSmoothLines(void) { -#if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_21) || defined(GRAPHICS_API_OPENGL_11) +#if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_11) glEnable(GL_LINE_SMOOTH); #endif } @@ -1462,7 +1462,7 @@ void rlEnableSmoothLines(void) // Disable line aliasing void rlDisableSmoothLines(void) { -#if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_21) || defined(GRAPHICS_API_OPENGL_11) +#if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_11) glDisable(GL_LINE_SMOOTH); #endif } @@ -1515,7 +1515,7 @@ void rlClearScreenBuffers(void) // Check and log OpenGL error codes void rlCheckErrors() { -#if defined(GRAPHICS_API_OPENGL_21) || defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) +#if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) int check = 1; while (check) { @@ -1631,7 +1631,6 @@ void rlglInit(int width, int height) // Get extensions strings for (int i = 0; i < numExt; i++) extList[i] = (char *)glGetStringi(GL_EXTENSIONS, i); - #endif #if defined(GRAPHICS_API_OPENGL_ES2) || defined(GRAPHICS_API_OPENGL_21) // Allocate 512 strings pointers (2 KB) @@ -2391,10 +2390,6 @@ unsigned int rlLoadTexture(void *data, int width, int height, int format, int mi glGenTextures(1, &id); // Generate texture id -#if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) - //glActiveTexture(GL_TEXTURE0); // If not defined, using GL_TEXTURE0 by default (shader texture) -#endif - glBindTexture(GL_TEXTURE_2D, id); int mipWidth = width; @@ -3673,14 +3668,9 @@ static void rlLoadShaderDefault(void) for (int i = 0; i < MAX_SHADER_LOCATIONS; i++) RLGL.State.defaultShader.locs[i] = -1; // Vertex shader directly defined, no external file required - const char *defaultVShaderStr = + const char *vShaderDefault = #if defined(GRAPHICS_API_OPENGL_21) "#version 120 \n" -#endif -#if defined(GRAPHICS_API_OPENGL_ES2) - "#version 100 \n" -#endif -#if defined(GRAPHICS_API_OPENGL_ES2) || defined(GRAPHICS_API_OPENGL_21) "attribute vec3 vertexPosition; \n" "attribute vec2 vertexTexCoord; \n" "attribute vec4 vertexColor; \n" @@ -3693,6 +3683,14 @@ static void rlLoadShaderDefault(void) "in vec4 vertexColor; \n" "out vec2 fragTexCoord; \n" "out vec4 fragColor; \n" +#endif +#if defined(GRAPHICS_API_OPENGL_ES2) + "#version 100 \n" + "attribute vec3 vertexPosition; \n" + "attribute vec2 vertexTexCoord; \n" + "attribute vec4 vertexColor; \n" + "varying vec2 fragTexCoord; \n" + "varying vec4 fragColor; \n" #endif "uniform mat4 mvp; \n" "void main() \n" @@ -3703,39 +3701,48 @@ static void rlLoadShaderDefault(void) "} \n"; // Fragment shader directly defined, no external file required - const char *defaultFShaderStr = + const char *fShaderDefault = #if defined(GRAPHICS_API_OPENGL_21) "#version 120 \n" -#endif -#if defined(GRAPHICS_API_OPENGL_ES2) - "#version 100 \n" - "precision mediump float; \n" // precision required for OpenGL ES2 (WebGL) -#endif -#if defined(GRAPHICS_API_OPENGL_ES2) || defined(GRAPHICS_API_OPENGL_21) "varying vec2 fragTexCoord; \n" "varying vec4 fragColor; \n" + "uniform sampler2D texture0; \n" + "uniform vec4 colDiffuse; \n" + "void main() \n" + "{ \n" + " vec4 texelColor = texture2D(texture0, fragTexCoord); \n" + " gl_FragColor = texelColor*colDiffuse*fragColor; \n" + "} \n"; #elif defined(GRAPHICS_API_OPENGL_33) "#version 330 \n" "in vec2 fragTexCoord; \n" "in vec4 fragColor; \n" "out vec4 finalColor; \n" -#endif "uniform sampler2D texture0; \n" "uniform vec4 colDiffuse; \n" "void main() \n" "{ \n" -#if defined(GRAPHICS_API_OPENGL_ES2) || defined(GRAPHICS_API_OPENGL_21) - " vec4 texelColor = texture2D(texture0, fragTexCoord); \n" // NOTE: texture2D() is deprecated on OpenGL 3.3 and ES 3.0 - " gl_FragColor = texelColor*colDiffuse*fragColor; \n" -#elif defined(GRAPHICS_API_OPENGL_33) " vec4 texelColor = texture(texture0, fragTexCoord); \n" " finalColor = texelColor*colDiffuse*fragColor; \n" -#endif "} \n"; +#endif +#if defined(GRAPHICS_API_OPENGL_ES2) + "#version 100 \n" + "precision mediump float; \n" // Precision required for OpenGL ES2 (WebGL) + "varying vec2 fragTexCoord; \n" + "varying vec4 fragColor; \n" + "uniform sampler2D texture0; \n" + "uniform vec4 colDiffuse; \n" + "void main() \n" + "{ \n" + " vec4 texelColor = texture2D(texture0, fragTexCoord); \n" + " gl_FragColor = texelColor*colDiffuse*fragColor; \n" + "} \n"; +#endif // NOTE: Compiled vertex/fragment shaders are kept for re-use - RLGL.State.defaultVShaderId = rlCompileShader(defaultVShaderStr, GL_VERTEX_SHADER); // Compile default vertex shader - RLGL.State.defaultFShaderId = rlCompileShader(defaultFShaderStr, GL_FRAGMENT_SHADER); // Compile default fragment shader + RLGL.State.defaultVShaderId = rlCompileShader(vShaderDefault, GL_VERTEX_SHADER); // Compile default vertex shader + RLGL.State.defaultFShaderId = rlCompileShader(fShaderDefault, GL_FRAGMENT_SHADER); // Compile default fragment shader RLGL.State.defaultShader.id = rlLoadShaderProgram(RLGL.State.defaultVShaderId, RLGL.State.defaultFShaderId); From afb254b985919bf56f192e2473af8d652e470a61 Mon Sep 17 00:00:00 2001 From: Ray Date: Sun, 11 Apr 2021 00:58:04 +0200 Subject: [PATCH 013/121] Update rlgl.h --- src/rlgl.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/rlgl.h b/src/rlgl.h index 1d7c07be9..ac6810dcc 100644 --- a/src/rlgl.h +++ b/src/rlgl.h @@ -2409,11 +2409,11 @@ unsigned int rlLoadTexture(void *data, int width, int height, int format, int mi if (glInternalFormat != -1) { if (format < PIXELFORMAT_COMPRESSED_DXT1_RGB) glTexImage2D(GL_TEXTURE_2D, i, glInternalFormat, mipWidth, mipHeight, 0, glFormat, glType, (unsigned char *)data + mipOffset); - #if !defined(GRAPHICS_API_OPENGL_11) +#if !defined(GRAPHICS_API_OPENGL_11) else glCompressedTexImage2D(GL_TEXTURE_2D, i, glInternalFormat, mipWidth, mipHeight, 0, mipSize, (unsigned char *)data + mipOffset); - #endif +#endif - #if defined(GRAPHICS_API_OPENGL_33) +#if defined(GRAPHICS_API_OPENGL_33) if (format == PIXELFORMAT_UNCOMPRESSED_GRAYSCALE) { GLint swizzleMask[] = { GL_RED, GL_RED, GL_RED, GL_ONE }; @@ -2421,14 +2421,14 @@ unsigned int rlLoadTexture(void *data, int width, int height, int format, int mi } else if (format == PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA) { - #if defined(GRAPHICS_API_OPENGL_21) +#if defined(GRAPHICS_API_OPENGL_21) GLint swizzleMask[] = { GL_RED, GL_RED, GL_RED, GL_ALPHA }; - #elif defined(GRAPHICS_API_OPENGL_33) +#elif defined(GRAPHICS_API_OPENGL_33) GLint swizzleMask[] = { GL_RED, GL_RED, GL_RED, GL_GREEN }; - #endif +#endif glTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_RGBA, swizzleMask); } - #endif +#endif } mipWidth /= 2; From 06f16f199a7bb9248089401fc34f93fe7a288f75 Mon Sep 17 00:00:00 2001 From: Ray Date: Tue, 13 Apr 2021 00:05:21 +0200 Subject: [PATCH 014/121] REVIEWED: DrawLine3D() #1721 Increased batch limit check to compensate internal buffers alignment for lines drawing --- src/models.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/models.c b/src/models.c index 6c9a75ba6..6860cc453 100644 --- a/src/models.c +++ b/src/models.c @@ -131,7 +131,10 @@ static void InitGLTFBones(Model* model, const cgltf_data* data); // Draw a line in 3D world space void DrawLine3D(Vector3 startPos, Vector3 endPos, Color color) { - rlCheckRenderBatchLimit(2); + // WARNING: Be careful with internal buffer vertex alignment + // when using RL_LINES or RL_TRIANGLES, data is aligned to fit + // lines-triangles-quads in the same indexed buffers!!! + rlCheckRenderBatchLimit(4); rlBegin(RL_LINES); rlColor4ub(color.r, color.g, color.b, color.a); @@ -143,7 +146,7 @@ void DrawLine3D(Vector3 startPos, Vector3 endPos, Color color) // Draw a point in 3D space, actually a small line void DrawPoint3D(Vector3 position, Color color) { - rlCheckRenderBatchLimit(2); + rlCheckRenderBatchLimit(4); rlPushMatrix(); rlTranslatef(position.x, position.y, position.z); From d289085ce3e4b7bc444a9826dc1b43d747a4f56b Mon Sep 17 00:00:00 2001 From: Ray Date: Tue, 13 Apr 2021 01:08:39 +0200 Subject: [PATCH 015/121] Reviewed DrawLine3D() limits #1721 --- src/models.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/models.c b/src/models.c index 6860cc453..4e3273948 100644 --- a/src/models.c +++ b/src/models.c @@ -134,7 +134,7 @@ void DrawLine3D(Vector3 startPos, Vector3 endPos, Color color) // WARNING: Be careful with internal buffer vertex alignment // when using RL_LINES or RL_TRIANGLES, data is aligned to fit // lines-triangles-quads in the same indexed buffers!!! - rlCheckRenderBatchLimit(4); + rlCheckRenderBatchLimit(8); rlBegin(RL_LINES); rlColor4ub(color.r, color.g, color.b, color.a); @@ -146,7 +146,7 @@ void DrawLine3D(Vector3 startPos, Vector3 endPos, Color color) // Draw a point in 3D space, actually a small line void DrawPoint3D(Vector3 position, Color color) { - rlCheckRenderBatchLimit(4); + rlCheckRenderBatchLimit(8); rlPushMatrix(); rlTranslatef(position.x, position.y, position.z); From dc8a86557ed4355d3679801472205e5d1c575acf Mon Sep 17 00:00:00 2001 From: Ray Date: Wed, 14 Apr 2021 11:38:10 +0200 Subject: [PATCH 016/121] Update README.md --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 9e80b4804..4218635e7 100644 --- a/README.md +++ b/README.md @@ -111,6 +111,11 @@ raylib has been developed on Windows platform using [Notepad++](https://notepad- *Note that there are lots of IDEs supported, some of the provided templates could require some review, please, if you find some issue with some template or you think they could be improved, feel free to send a PR or open a related issue.* +more info +---------- + +TODO. + contact ------- From d7b6505f64bb9990338b7f12fee7f16c547f37b7 Mon Sep 17 00:00:00 2001 From: Ray Date: Wed, 14 Apr 2021 21:05:23 +0200 Subject: [PATCH 017/121] Update Makefile --- examples/Makefile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/examples/Makefile b/examples/Makefile index 5e8b2c217..c7a3ca2ab 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -308,10 +308,6 @@ ifeq ($(PLATFORM),PLATFORM_RPI) LDFLAGS += -L/opt/vc/lib endif -ifeq ($(PLATFORM),PLATFORM_DRM) - LDFLAGS += -lGLESv2 -lEGL -ldrm -lgbm -endif - # Define any libraries required on linking # if you want to link libraries (libname.so or libname.a), use the -lname ifeq ($(PLATFORM),PLATFORM_DESKTOP) From 37f523fdeb6b3bfa60a84aa0014903a4925da671 Mon Sep 17 00:00:00 2001 From: Ray Date: Wed, 14 Apr 2021 21:06:00 +0200 Subject: [PATCH 018/121] Update external libraries --- src/external/cgltf.h | 527 +++++++++++++++++++++++++++++++---------- src/external/dr_flac.h | 124 ++++++++-- src/external/dr_mp3.h | 83 +++++-- src/external/dr_wav.h | 438 ++++++++++++++++------------------ 4 files changed, 781 insertions(+), 391 deletions(-) diff --git a/src/external/cgltf.h b/src/external/cgltf.h index 41b75da0b..4cc2d7ec9 100644 --- a/src/external/cgltf.h +++ b/src/external/cgltf.h @@ -1,7 +1,7 @@ /** * cgltf - a single-file glTF 2.0 parser written in C99. * - * Version: 1.8 + * Version: 1.10 * * Website: https://github.com/jkuhlmann/cgltf * @@ -24,7 +24,7 @@ * * `cgltf_options` is the struct passed to `cgltf_parse()` to control * parts of the parsing process. You can use it to force the file type - * and provide memory allocation as well as file operation callbacks. + * and provide memory allocation as well as file operation callbacks. * Should be zero-initialized to trigger default behavior. * * `cgltf_data` is the struct allocated and filled by `cgltf_parse()`. @@ -42,8 +42,8 @@ * * `cgltf_result cgltf_load_buffer_base64(const cgltf_options* options, * cgltf_size size, const char* base64, void** out_data)` decodes - * base64-encoded data content. Used internally by `cgltf_load_buffers()` - * and may be useful if you're not dealing with normal files. + * base64-encoded data content. Used internally by `cgltf_load_buffers()`. + * This is useful when decoding data URIs in images. * * `cgltf_result cgltf_parse_file(const cgltf_options* options, const * char* path, cgltf_data** out_data)` can be used to open the given @@ -246,6 +246,7 @@ typedef struct cgltf_extension { typedef struct cgltf_buffer { + char* name; cgltf_size size; char* uri; void* data; /* loaded by cgltf_load_buffers */ @@ -281,6 +282,7 @@ typedef struct cgltf_meshopt_compression typedef struct cgltf_buffer_view { + char *name; cgltf_buffer* buffer; cgltf_size offset; cgltf_size size; @@ -315,6 +317,7 @@ typedef struct cgltf_accessor_sparse typedef struct cgltf_accessor { + char* name; cgltf_component_type component_type; cgltf_bool normalized; cgltf_type type; @@ -354,6 +357,7 @@ typedef struct cgltf_image typedef struct cgltf_sampler { + char* name; cgltf_int mag_filter; cgltf_int min_filter; cgltf_int wrap_s; @@ -439,10 +443,19 @@ typedef struct cgltf_ior typedef struct cgltf_specular { cgltf_texture_view specular_texture; + cgltf_texture_view specular_color_texture; cgltf_float specular_color_factor[3]; cgltf_float specular_factor; } cgltf_specular; +typedef struct cgltf_volume +{ + cgltf_texture_view thickness_texture; + cgltf_float thickness_factor; + cgltf_float attenuation_color[3]; + cgltf_float attenuation_distance; +} cgltf_volume; + typedef struct cgltf_sheen { cgltf_texture_view sheen_color_texture; @@ -458,6 +471,7 @@ typedef struct cgltf_material cgltf_bool has_pbr_specular_glossiness; cgltf_bool has_clearcoat; cgltf_bool has_transmission; + cgltf_bool has_volume; cgltf_bool has_ior; cgltf_bool has_specular; cgltf_bool has_sheen; @@ -468,6 +482,7 @@ typedef struct cgltf_material cgltf_specular specular; cgltf_sheen sheen; cgltf_transmission transmission; + cgltf_volume volume; cgltf_texture_view normal_texture; cgltf_texture_view occlusion_texture; cgltf_texture_view emissive_texture; @@ -481,6 +496,13 @@ typedef struct cgltf_material cgltf_extension* extensions; } cgltf_material; +typedef struct cgltf_material_mapping +{ + cgltf_size variant; + cgltf_material* material; + cgltf_extras extras; +} cgltf_material_mapping; + typedef struct cgltf_morph_target { cgltf_attribute* attributes; cgltf_size attributes_count; @@ -503,6 +525,8 @@ typedef struct cgltf_primitive { cgltf_extras extras; cgltf_bool has_draco_mesh_compression; cgltf_draco_mesh_compression draco_mesh_compression; + cgltf_material_mapping* mappings; + cgltf_size mappings_count; cgltf_size extensions_count; cgltf_extension* extensions; } cgltf_primitive; @@ -534,8 +558,10 @@ typedef struct cgltf_skin { } cgltf_skin; typedef struct cgltf_camera_perspective { + cgltf_bool has_aspect_ratio; cgltf_float aspect_ratio; cgltf_float yfov; + cgltf_bool has_zfar; cgltf_float zfar; cgltf_float znear; cgltf_extras extras; @@ -633,6 +659,12 @@ typedef struct cgltf_animation { cgltf_extension* extensions; } cgltf_animation; +typedef struct cgltf_material_variant +{ + char* name; + cgltf_extras extras; +} cgltf_material_variant; + typedef struct cgltf_asset { char* copyright; char* generator; @@ -694,6 +726,9 @@ typedef struct cgltf_data cgltf_animation* animations; cgltf_size animations_count; + cgltf_material_variant* variants; + cgltf_size variants_count; + cgltf_extras extras; cgltf_size data_extensions_count; @@ -776,6 +811,7 @@ cgltf_result cgltf_copy_extras_json(const cgltf_data* data, const cgltf_extras* #include /* For strncpy */ #include /* For fopen */ #include /* For UINT_MAX etc */ +#include /* For FLT_MAX */ #if !defined(CGLTF_MALLOC) || !defined(CGLTF_FREE) || !defined(CGLTF_ATOI) || !defined(CGLTF_ATOF) #include /* For malloc, free, atoi, atof */ @@ -847,6 +883,9 @@ static const uint32_t GlbMagicBinChunk = 0x004E4942; #ifndef CGLTF_ATOF #define CGLTF_ATOF(str) atof(str) #endif +#ifndef CGLTF_VALIDATE_ENABLE_ASSERTS +#define CGLTF_VALIDATE_ENABLE_ASSERTS 0 +#endif static void* cgltf_default_alloc(void* user, cgltf_size size) { @@ -1344,6 +1383,12 @@ static cgltf_size cgltf_calc_index_bound(cgltf_buffer_view* buffer_view, cgltf_s return bound; } +#if CGLTF_VALIDATE_ENABLE_ASSERTS +#define CGLTF_ASSERT_IF(cond, result) assert(!(cond)); if (cond) return result; +#else +#define CGLTF_ASSERT_IF(cond, result) if (cond) return result; +#endif + cgltf_result cgltf_validate(cgltf_data* data) { for (cgltf_size i = 0; i < data->accessors_count; ++i) @@ -1356,10 +1401,7 @@ cgltf_result cgltf_validate(cgltf_data* data) { cgltf_size req_size = accessor->offset + accessor->stride * (accessor->count - 1) + element_size; - if (accessor->buffer_view->size < req_size) - { - return cgltf_result_data_too_short; - } + CGLTF_ASSERT_IF(accessor->buffer_view->size < req_size, cgltf_result_data_too_short); } if (accessor->is_sparse) @@ -1370,27 +1412,18 @@ cgltf_result cgltf_validate(cgltf_data* data) cgltf_size indices_req_size = sparse->indices_byte_offset + indices_component_size * sparse->count; cgltf_size values_req_size = sparse->values_byte_offset + element_size * sparse->count; - if (sparse->indices_buffer_view->size < indices_req_size || - sparse->values_buffer_view->size < values_req_size) - { - return cgltf_result_data_too_short; - } + CGLTF_ASSERT_IF(sparse->indices_buffer_view->size < indices_req_size || + sparse->values_buffer_view->size < values_req_size, cgltf_result_data_too_short); - if (sparse->indices_component_type != cgltf_component_type_r_8u && - sparse->indices_component_type != cgltf_component_type_r_16u && - sparse->indices_component_type != cgltf_component_type_r_32u) - { - return cgltf_result_invalid_gltf; - } + CGLTF_ASSERT_IF(sparse->indices_component_type != cgltf_component_type_r_8u && + sparse->indices_component_type != cgltf_component_type_r_16u && + sparse->indices_component_type != cgltf_component_type_r_32u, cgltf_result_invalid_gltf); if (sparse->indices_buffer_view->buffer->data) { cgltf_size index_bound = cgltf_calc_index_bound(sparse->indices_buffer_view, sparse->indices_byte_offset, sparse->indices_component_type, sparse->count); - if (index_bound >= accessor->count) - { - return cgltf_result_data_too_short; - } + CGLTF_ASSERT_IF(index_bound >= accessor->count, cgltf_result_data_too_short); } } } @@ -1399,64 +1432,31 @@ cgltf_result cgltf_validate(cgltf_data* data) { cgltf_size req_size = data->buffer_views[i].offset + data->buffer_views[i].size; - if (data->buffer_views[i].buffer && data->buffer_views[i].buffer->size < req_size) - { - return cgltf_result_data_too_short; - } + CGLTF_ASSERT_IF(data->buffer_views[i].buffer && data->buffer_views[i].buffer->size < req_size, cgltf_result_data_too_short); if (data->buffer_views[i].has_meshopt_compression) { cgltf_meshopt_compression* mc = &data->buffer_views[i].meshopt_compression; - if (mc->buffer == NULL || mc->buffer->size < mc->offset + mc->size) - { - return cgltf_result_data_too_short; - } + CGLTF_ASSERT_IF(mc->buffer == NULL || mc->buffer->size < mc->offset + mc->size, cgltf_result_data_too_short); - if (data->buffer_views[i].stride && mc->stride != data->buffer_views[i].stride) - { - return cgltf_result_invalid_gltf; - } + CGLTF_ASSERT_IF(data->buffer_views[i].stride && mc->stride != data->buffer_views[i].stride, cgltf_result_invalid_gltf); - if (data->buffer_views[i].size != mc->stride * mc->count) - { - return cgltf_result_invalid_gltf; - } + CGLTF_ASSERT_IF(data->buffer_views[i].size != mc->stride * mc->count, cgltf_result_invalid_gltf); - if (mc->mode == cgltf_meshopt_compression_mode_invalid) - { - return cgltf_result_invalid_gltf; - } + CGLTF_ASSERT_IF(mc->mode == cgltf_meshopt_compression_mode_invalid, cgltf_result_invalid_gltf); - if (mc->mode == cgltf_meshopt_compression_mode_attributes && !(mc->stride % 4 == 0 && mc->stride <= 256)) - { - return cgltf_result_invalid_gltf; - } + CGLTF_ASSERT_IF(mc->mode == cgltf_meshopt_compression_mode_attributes && !(mc->stride % 4 == 0 && mc->stride <= 256), cgltf_result_invalid_gltf); - if (mc->mode == cgltf_meshopt_compression_mode_triangles && mc->count % 3 != 0) - { - return cgltf_result_invalid_gltf; - } + CGLTF_ASSERT_IF(mc->mode == cgltf_meshopt_compression_mode_triangles && mc->count % 3 != 0, cgltf_result_invalid_gltf); - if ((mc->mode == cgltf_meshopt_compression_mode_triangles || mc->mode == cgltf_meshopt_compression_mode_indices) && mc->stride != 2 && mc->stride != 4) - { - return cgltf_result_invalid_gltf; - } + CGLTF_ASSERT_IF((mc->mode == cgltf_meshopt_compression_mode_triangles || mc->mode == cgltf_meshopt_compression_mode_indices) && mc->stride != 2 && mc->stride != 4, cgltf_result_invalid_gltf); - if ((mc->mode == cgltf_meshopt_compression_mode_triangles || mc->mode == cgltf_meshopt_compression_mode_indices) && mc->filter != cgltf_meshopt_compression_filter_none) - { - return cgltf_result_invalid_gltf; - } + CGLTF_ASSERT_IF((mc->mode == cgltf_meshopt_compression_mode_triangles || mc->mode == cgltf_meshopt_compression_mode_indices) && mc->filter != cgltf_meshopt_compression_filter_none, cgltf_result_invalid_gltf); - if (mc->filter == cgltf_meshopt_compression_filter_octahedral && mc->stride != 4 && mc->stride != 8) - { - return cgltf_result_invalid_gltf; - } + CGLTF_ASSERT_IF(mc->filter == cgltf_meshopt_compression_filter_octahedral && mc->stride != 4 && mc->stride != 8, cgltf_result_invalid_gltf); - if (mc->filter == cgltf_meshopt_compression_filter_quaternion && mc->stride != 8) - { - return cgltf_result_invalid_gltf; - } + CGLTF_ASSERT_IF(mc->filter == cgltf_meshopt_compression_filter_quaternion && mc->stride != 8, cgltf_result_invalid_gltf); } } @@ -1464,26 +1464,17 @@ cgltf_result cgltf_validate(cgltf_data* data) { if (data->meshes[i].weights) { - if (data->meshes[i].primitives_count && data->meshes[i].primitives[0].targets_count != data->meshes[i].weights_count) - { - return cgltf_result_invalid_gltf; - } + CGLTF_ASSERT_IF(data->meshes[i].primitives_count && data->meshes[i].primitives[0].targets_count != data->meshes[i].weights_count, cgltf_result_invalid_gltf); } if (data->meshes[i].target_names) { - if (data->meshes[i].primitives_count && data->meshes[i].primitives[0].targets_count != data->meshes[i].target_names_count) - { - return cgltf_result_invalid_gltf; - } + CGLTF_ASSERT_IF(data->meshes[i].primitives_count && data->meshes[i].primitives[0].targets_count != data->meshes[i].target_names_count, cgltf_result_invalid_gltf); } for (cgltf_size j = 0; j < data->meshes[i].primitives_count; ++j) { - if (data->meshes[i].primitives[j].targets_count != data->meshes[i].primitives[0].targets_count) - { - return cgltf_result_invalid_gltf; - } + CGLTF_ASSERT_IF(data->meshes[i].primitives[j].targets_count != data->meshes[i].primitives[0].targets_count, cgltf_result_invalid_gltf); if (data->meshes[i].primitives[j].attributes_count) { @@ -1491,41 +1482,34 @@ cgltf_result cgltf_validate(cgltf_data* data) for (cgltf_size k = 0; k < data->meshes[i].primitives[j].attributes_count; ++k) { - if (data->meshes[i].primitives[j].attributes[k].data->count != first->count) - { - return cgltf_result_invalid_gltf; - } + CGLTF_ASSERT_IF(data->meshes[i].primitives[j].attributes[k].data->count != first->count, cgltf_result_invalid_gltf); } for (cgltf_size k = 0; k < data->meshes[i].primitives[j].targets_count; ++k) { for (cgltf_size m = 0; m < data->meshes[i].primitives[j].targets[k].attributes_count; ++m) { - if (data->meshes[i].primitives[j].targets[k].attributes[m].data->count != first->count) - { - return cgltf_result_invalid_gltf; - } + CGLTF_ASSERT_IF(data->meshes[i].primitives[j].targets[k].attributes[m].data->count != first->count, cgltf_result_invalid_gltf); } } cgltf_accessor* indices = data->meshes[i].primitives[j].indices; - if (indices && + CGLTF_ASSERT_IF(indices && indices->component_type != cgltf_component_type_r_8u && indices->component_type != cgltf_component_type_r_16u && - indices->component_type != cgltf_component_type_r_32u) - { - return cgltf_result_invalid_gltf; - } + indices->component_type != cgltf_component_type_r_32u, cgltf_result_invalid_gltf); if (indices && indices->buffer_view && indices->buffer_view->buffer->data) { cgltf_size index_bound = cgltf_calc_index_bound(indices->buffer_view, indices->offset, indices->component_type, indices->count); - if (index_bound >= first->count) - { - return cgltf_result_data_too_short; - } + CGLTF_ASSERT_IF(index_bound >= first->count, cgltf_result_data_too_short); + } + + for (cgltf_size k = 0; k < data->meshes[i].primitives[j].mappings_count; ++k) + { + CGLTF_ASSERT_IF(data->meshes[i].primitives[j].mappings[k].variant >= data->variants_count, cgltf_result_invalid_gltf); } } } @@ -1535,10 +1519,7 @@ cgltf_result cgltf_validate(cgltf_data* data) { if (data->nodes[i].weights && data->nodes[i].mesh) { - if (data->nodes[i].mesh->primitives_count && data->nodes[i].mesh->primitives[0].targets_count != data->nodes[i].weights_count) - { - return cgltf_result_invalid_gltf; - } + CGLTF_ASSERT_IF (data->nodes[i].mesh->primitives_count && data->nodes[i].mesh->primitives[0].targets_count != data->nodes[i].weights_count, cgltf_result_invalid_gltf); } } @@ -1549,10 +1530,7 @@ cgltf_result cgltf_validate(cgltf_data* data) while (p1 && p2) { - if (p1 == p2) - { - return cgltf_result_invalid_gltf; - } + CGLTF_ASSERT_IF(p1 == p2, cgltf_result_invalid_gltf); p1 = p1->parent; p2 = p2->parent ? p2->parent->parent : NULL; @@ -1563,10 +1541,7 @@ cgltf_result cgltf_validate(cgltf_data* data) { for (cgltf_size j = 0; j < data->scenes[i].nodes_count; ++j) { - if (data->scenes[i].nodes[j]->parent) - { - return cgltf_result_invalid_gltf; - } + CGLTF_ASSERT_IF(data->scenes[i].nodes[j]->parent, cgltf_result_invalid_gltf); } } @@ -1585,20 +1560,14 @@ cgltf_result cgltf_validate(cgltf_data* data) if (channel->target_path == cgltf_animation_path_type_weights) { - if (!channel->target_node->mesh || !channel->target_node->mesh->primitives_count) - { - return cgltf_result_invalid_gltf; - } + CGLTF_ASSERT_IF(!channel->target_node->mesh || !channel->target_node->mesh->primitives_count, cgltf_result_invalid_gltf); components = channel->target_node->mesh->primitives[0].targets_count; } cgltf_size values = channel->sampler->interpolation == cgltf_interpolation_type_cubic_spline ? 3 : 1; - if (channel->sampler->input->count * components * values != channel->sampler->output->count) - { - return cgltf_result_data_too_short; - } + CGLTF_ASSERT_IF(channel->sampler->input->count * components * values != channel->sampler->output->count, cgltf_result_data_too_short); } } @@ -1661,6 +1630,8 @@ void cgltf_free(cgltf_data* data) for (cgltf_size i = 0; i < data->accessors_count; ++i) { + data->memory.free(data->memory.user_data, data->accessors[i].name); + if(data->accessors[i].is_sparse) { cgltf_free_extensions(data, data->accessors[i].sparse.extensions, data->accessors[i].sparse.extensions_count); @@ -1673,6 +1644,7 @@ void cgltf_free(cgltf_data* data) for (cgltf_size i = 0; i < data->buffer_views_count; ++i) { + data->memory.free(data->memory.user_data, data->buffer_views[i].name); data->memory.free(data->memory.user_data, data->buffer_views[i].data); cgltf_free_extensions(data, data->buffer_views[i].extensions, data->buffer_views[i].extensions_count); @@ -1681,6 +1653,8 @@ void cgltf_free(cgltf_data* data) for (cgltf_size i = 0; i < data->buffers_count; ++i) { + data->memory.free(data->memory.user_data, data->buffers[i].name); + if (data->buffers[i].data != data->bin) { file_release(&data->memory, &data->file, data->buffers[i].data); @@ -1727,6 +1701,8 @@ void cgltf_free(cgltf_data* data) data->memory.free(data->memory.user_data, data->meshes[i].primitives[j].draco_mesh_compression.attributes); } + data->memory.free(data->memory.user_data, data->meshes[i].primitives[j].mappings); + cgltf_free_extensions(data, data->meshes[i].primitives[j].extensions, data->meshes[i].primitives[j].extensions_count); } @@ -1768,11 +1744,16 @@ void cgltf_free(cgltf_data* data) if(data->materials[i].has_specular) { cgltf_free_extensions(data, data->materials[i].specular.specular_texture.extensions, data->materials[i].specular.specular_texture.extensions_count); + cgltf_free_extensions(data, data->materials[i].specular.specular_color_texture.extensions, data->materials[i].specular.specular_color_texture.extensions_count); } if(data->materials[i].has_transmission) { cgltf_free_extensions(data, data->materials[i].transmission.transmission_texture.extensions, data->materials[i].transmission.transmission_texture.extensions_count); } + if (data->materials[i].has_volume) + { + cgltf_free_extensions(data, data->materials[i].volume.thickness_texture.extensions, data->materials[i].volume.thickness_texture.extensions_count); + } if(data->materials[i].has_sheen) { cgltf_free_extensions(data, data->materials[i].sheen.sheen_color_texture.extensions, data->materials[i].sheen.sheen_color_texture.extensions_count); @@ -1809,6 +1790,7 @@ void cgltf_free(cgltf_data* data) for (cgltf_size i = 0; i < data->samplers_count; ++i) { + data->memory.free(data->memory.user_data, data->samplers[i].name); cgltf_free_extensions(data, data->samplers[i].extensions, data->samplers[i].extensions_count); } @@ -1879,6 +1861,13 @@ void cgltf_free(cgltf_data* data) data->memory.free(data->memory.user_data, data->animations); + for (cgltf_size i = 0; i < data->variants_count; ++i) + { + data->memory.free(data->memory.user_data, data->variants[i].name); + } + + data->memory.free(data->memory.user_data, data->variants); + cgltf_free_extensions(data, data->data_extensions, data->data_extensions_count); for (cgltf_size i = 0; i < data->extensions_used_count; ++i) @@ -2608,6 +2597,136 @@ static int cgltf_parse_json_draco_mesh_compression(cgltf_options* options, jsmnt out_draco_mesh_compression->buffer_view = CGLTF_PTRINDEX(cgltf_buffer_view, cgltf_json_to_int(tokens + i, json_chunk)); ++i; } + + if (i < 0) + { + return i; + } + } + + return i; +} + +static int cgltf_parse_json_material_mapping_data(cgltf_options* options, jsmntok_t const* tokens, int i, const uint8_t* json_chunk, cgltf_material_mapping* out_mappings, cgltf_size* offset) +{ + (void)options; + CGLTF_CHECK_TOKTYPE(tokens[i], JSMN_ARRAY); + + int size = tokens[i].size; + ++i; + + for (int j = 0; j < size; ++j) + { + CGLTF_CHECK_TOKTYPE(tokens[i], JSMN_OBJECT); + + int obj_size = tokens[i].size; + ++i; + + int material = -1; + int variants_tok = -1; + cgltf_extras extras = {0, 0}; + + for (int k = 0; k < obj_size; ++k) + { + CGLTF_CHECK_KEY(tokens[i]); + + if (cgltf_json_strcmp(tokens + i, json_chunk, "material") == 0) + { + ++i; + material = cgltf_json_to_int(tokens + i, json_chunk); + ++i; + } + else if (cgltf_json_strcmp(tokens + i, json_chunk, "variants") == 0) + { + variants_tok = i+1; + CGLTF_CHECK_TOKTYPE(tokens[variants_tok], JSMN_ARRAY); + + i = cgltf_skip_json(tokens, i+1); + } + else if (cgltf_json_strcmp(tokens + i, json_chunk, "extras") == 0) + { + i = cgltf_parse_json_extras(tokens, i + 1, json_chunk, &extras); + } + else + { + i = cgltf_skip_json(tokens, i+1); + } + + if (i < 0) + { + return i; + } + } + + if (material < 0 || variants_tok < 0) + { + return CGLTF_ERROR_JSON; + } + + if (out_mappings) + { + for (int k = 0; k < tokens[variants_tok].size; ++k) + { + int variant = cgltf_json_to_int(&tokens[variants_tok + 1 + k], json_chunk); + if (variant < 0) + return variant; + + out_mappings[*offset].material = CGLTF_PTRINDEX(cgltf_material, material); + out_mappings[*offset].variant = variant; + out_mappings[*offset].extras = extras; + + (*offset)++; + } + } + else + { + (*offset) += tokens[variants_tok].size; + } + } + + return i; +} + +static int cgltf_parse_json_material_mappings(cgltf_options* options, jsmntok_t const* tokens, int i, const uint8_t* json_chunk, cgltf_primitive* out_prim) +{ + CGLTF_CHECK_TOKTYPE(tokens[i], JSMN_OBJECT); + + int size = tokens[i].size; + ++i; + + for (int j = 0; j < size; ++j) + { + CGLTF_CHECK_KEY(tokens[i]); + + if (cgltf_json_strcmp(tokens + i, json_chunk, "mappings") == 0) + { + if (out_prim->mappings) + { + return CGLTF_ERROR_JSON; + } + + cgltf_size mappings_offset = 0; + int k = cgltf_parse_json_material_mapping_data(options, tokens, i + 1, json_chunk, NULL, &mappings_offset); + if (k < 0) + { + return k; + } + + out_prim->mappings_count = mappings_offset; + out_prim->mappings = (cgltf_material_mapping*)cgltf_calloc(options, sizeof(cgltf_material_mapping), out_prim->mappings_count); + + mappings_offset = 0; + i = cgltf_parse_json_material_mapping_data(options, tokens, i + 1, json_chunk, out_prim->mappings, &mappings_offset); + } + else + { + i = cgltf_skip_json(tokens, i+1); + } + + if (i < 0) + { + return i; + } } return i; @@ -2700,6 +2819,10 @@ static int cgltf_parse_json_primitive(cgltf_options* options, jsmntok_t const* t out_prim->has_draco_mesh_compression = 1; i = cgltf_parse_json_draco_mesh_compression(options, tokens, i + 1, json_chunk, &out_prim->draco_mesh_compression); } + else if (cgltf_json_strcmp(tokens+i, json_chunk, "KHR_materials_variants") == 0) + { + i = cgltf_parse_json_material_mappings(options, tokens, i + 1, json_chunk, out_prim); + } else { i = cgltf_parse_json_unprocessed_extension(options, tokens, i, json_chunk, &(out_prim->extensions[out_prim->extensions_count++])); @@ -2783,7 +2906,7 @@ static int cgltf_parse_json_mesh(cgltf_options* options, jsmntok_t const* tokens { CGLTF_CHECK_KEY(tokens[i]); - if (cgltf_json_strcmp(tokens+i, json_chunk, "targetNames") == 0) + if (cgltf_json_strcmp(tokens+i, json_chunk, "targetNames") == 0 && tokens[i+1].type == JSMN_ARRAY) { i = cgltf_parse_json_string_array(options, tokens, i + 1, json_chunk, &out_mesh->target_names, &out_mesh->target_names_count); } @@ -3005,7 +3128,11 @@ static int cgltf_parse_json_accessor(cgltf_options* options, jsmntok_t const* to { CGLTF_CHECK_KEY(tokens[i]); - if (cgltf_json_strcmp(tokens+i, json_chunk, "bufferView") == 0) + if (cgltf_json_strcmp(tokens + i, json_chunk, "name") == 0) + { + i = cgltf_parse_json_string(options, tokens, i + 1, json_chunk, &out_accessor->name); + } + else if (cgltf_json_strcmp(tokens+i, json_chunk, "bufferView") == 0) { ++i; out_accessor->buffer_view = CGLTF_PTRINDEX(cgltf_buffer_view, cgltf_json_to_int(tokens + i, json_chunk)); @@ -3467,6 +3594,10 @@ static int cgltf_parse_json_specular(cgltf_options* options, jsmntok_t const* to { i = cgltf_parse_json_texture_view(options, tokens, i + 1, json_chunk, &out_specular->specular_texture); } + else if (cgltf_json_strcmp(tokens + i, json_chunk, "specularColorTexture") == 0) + { + i = cgltf_parse_json_texture_view(options, tokens, i + 1, json_chunk, &out_specular->specular_color_texture); + } else { i = cgltf_skip_json(tokens, i+1); @@ -3515,6 +3646,50 @@ static int cgltf_parse_json_transmission(cgltf_options* options, jsmntok_t const return i; } +static int cgltf_parse_json_volume(cgltf_options* options, jsmntok_t const* tokens, int i, const uint8_t* json_chunk, cgltf_volume* out_volume) +{ + CGLTF_CHECK_TOKTYPE(tokens[i], JSMN_OBJECT); + int size = tokens[i].size; + ++i; + + for (int j = 0; j < size; ++j) + { + CGLTF_CHECK_KEY(tokens[i]); + + if (cgltf_json_strcmp(tokens + i, json_chunk, "thicknessFactor") == 0) + { + ++i; + out_volume->thickness_factor = cgltf_json_to_float(tokens + i, json_chunk); + ++i; + } + else if (cgltf_json_strcmp(tokens + i, json_chunk, "thicknessTexture") == 0) + { + i = cgltf_parse_json_texture_view(options, tokens, i + 1, json_chunk, &out_volume->thickness_texture); + } + else if (cgltf_json_strcmp(tokens + i, json_chunk, "attenuationColor") == 0) + { + i = cgltf_parse_json_float_array(tokens, i + 1, json_chunk, out_volume->attenuation_color, 3); + } + else if (cgltf_json_strcmp(tokens + i, json_chunk, "attenuationDistance") == 0) + { + ++i; + out_volume->attenuation_distance = cgltf_json_to_float(tokens + i, json_chunk); + ++i; + } + else + { + i = cgltf_skip_json(tokens, i + 1); + } + + if (i < 0) + { + return i; + } + } + + return i; +} + static int cgltf_parse_json_sheen(cgltf_options* options, jsmntok_t const* tokens, int i, const uint8_t* json_chunk, cgltf_sheen* out_sheen) { CGLTF_CHECK_TOKTYPE(tokens[i], JSMN_OBJECT); @@ -3623,7 +3798,11 @@ static int cgltf_parse_json_sampler(cgltf_options* options, jsmntok_t const* tok { CGLTF_CHECK_KEY(tokens[i]); - if (cgltf_json_strcmp(tokens + i, json_chunk, "magFilter") == 0) + if (cgltf_json_strcmp(tokens + i, json_chunk, "name") == 0) + { + i = cgltf_parse_json_string(options, tokens, i + 1, json_chunk, &out_sampler->name); + } + else if (cgltf_json_strcmp(tokens + i, json_chunk, "magFilter") == 0) { ++i; out_sampler->mag_filter @@ -3734,6 +3913,9 @@ static int cgltf_parse_json_material(cgltf_options* options, jsmntok_t const* to cgltf_fill_float_array(out_material->pbr_specular_glossiness.specular_factor, 3, 1.0f); out_material->pbr_specular_glossiness.glossiness_factor = 1.0f; + cgltf_fill_float_array(out_material->volume.attenuation_color, 3, 1.0f); + out_material->volume.attenuation_distance = FLT_MAX; + out_material->alpha_cutoff = 0.5f; int size = tokens[i].size; @@ -3859,6 +4041,11 @@ static int cgltf_parse_json_material(cgltf_options* options, jsmntok_t const* to out_material->has_transmission = 1; i = cgltf_parse_json_transmission(options, tokens, i + 1, json_chunk, &out_material->transmission); } + else if (cgltf_json_strcmp(tokens + i, json_chunk, "KHR_materials_volume") == 0) + { + out_material->has_volume = 1; + i = cgltf_parse_json_volume(options, tokens, i + 1, json_chunk, &out_material->volume); + } else if (cgltf_json_strcmp(tokens+i, json_chunk, "KHR_materials_sheen") == 0) { out_material->has_sheen = 1; @@ -4089,7 +4276,11 @@ static int cgltf_parse_json_buffer_view(cgltf_options* options, jsmntok_t const* { CGLTF_CHECK_KEY(tokens[i]); - if (cgltf_json_strcmp(tokens+i, json_chunk, "buffer") == 0) + if (cgltf_json_strcmp(tokens + i, json_chunk, "name") == 0) + { + i = cgltf_parse_json_string(options, tokens, i + 1, json_chunk, &out_buffer_view->name); + } + else if (cgltf_json_strcmp(tokens+i, json_chunk, "buffer") == 0) { ++i; out_buffer_view->buffer = CGLTF_PTRINDEX(cgltf_buffer, cgltf_json_to_int(tokens + i, json_chunk)); @@ -4223,7 +4414,11 @@ static int cgltf_parse_json_buffer(cgltf_options* options, jsmntok_t const* toke { CGLTF_CHECK_KEY(tokens[i]); - if (cgltf_json_strcmp(tokens+i, json_chunk, "byteLength") == 0) + if (cgltf_json_strcmp(tokens + i, json_chunk, "name") == 0) + { + i = cgltf_parse_json_string(options, tokens, i + 1, json_chunk, &out_buffer->name); + } + else if (cgltf_json_strcmp(tokens+i, json_chunk, "byteLength") == 0) { ++i; out_buffer->size = @@ -4405,6 +4600,7 @@ static int cgltf_parse_json_camera(cgltf_options* options, jsmntok_t const* toke if (cgltf_json_strcmp(tokens+i, json_chunk, "aspectRatio") == 0) { ++i; + out_camera->data.perspective.has_aspect_ratio = 1; out_camera->data.perspective.aspect_ratio = cgltf_json_to_float(tokens + i, json_chunk); ++i; } @@ -4417,6 +4613,7 @@ static int cgltf_parse_json_camera(cgltf_options* options, jsmntok_t const* toke else if (cgltf_json_strcmp(tokens+i, json_chunk, "zfar") == 0) { ++i; + out_camera->data.perspective.has_zfar = 1; out_camera->data.perspective.zfar = cgltf_json_to_float(tokens + i, json_chunk); ++i; } @@ -5160,6 +5357,58 @@ static int cgltf_parse_json_animations(cgltf_options* options, jsmntok_t const* return i; } +static int cgltf_parse_json_variant(cgltf_options* options, jsmntok_t const* tokens, int i, const uint8_t* json_chunk, cgltf_material_variant* out_variant) +{ + CGLTF_CHECK_TOKTYPE(tokens[i], JSMN_OBJECT); + + int size = tokens[i].size; + ++i; + + for (int j = 0; j < size; ++j) + { + CGLTF_CHECK_KEY(tokens[i]); + + if (cgltf_json_strcmp(tokens+i, json_chunk, "name") == 0) + { + i = cgltf_parse_json_string(options, tokens, i + 1, json_chunk, &out_variant->name); + } + else if (cgltf_json_strcmp(tokens + i, json_chunk, "extras") == 0) + { + i = cgltf_parse_json_extras(tokens, i + 1, json_chunk, &out_variant->extras); + } + else + { + i = cgltf_skip_json(tokens, i+1); + } + + if (i < 0) + { + return i; + } + } + + return i; +} + +static int cgltf_parse_json_variants(cgltf_options* options, jsmntok_t const* tokens, int i, const uint8_t* json_chunk, cgltf_data* out_data) +{ + i = cgltf_parse_json_array(options, tokens, i, json_chunk, sizeof(cgltf_material_variant), (void**)&out_data->variants, &out_data->variants_count); + if (i < 0) + { + return i; + } + + for (cgltf_size j = 0; j < out_data->variants_count; ++j) + { + i = cgltf_parse_json_variant(options, tokens, i, json_chunk, &out_data->variants[j]); + if (i < 0) + { + return i; + } + } + return i; +} + static int cgltf_parse_json_asset(cgltf_options* options, jsmntok_t const* tokens, int i, const uint8_t* json_chunk, cgltf_asset* out_asset) { CGLTF_CHECK_TOKTYPE(tokens[i], JSMN_OBJECT); @@ -5400,6 +5649,34 @@ static int cgltf_parse_json_root(cgltf_options* options, jsmntok_t const* tokens } } } + else if (cgltf_json_strcmp(tokens+i, json_chunk, "KHR_materials_variants") == 0) + { + ++i; + + CGLTF_CHECK_TOKTYPE(tokens[i], JSMN_OBJECT); + + int data_size = tokens[i].size; + ++i; + + for (int m = 0; m < data_size; ++m) + { + CGLTF_CHECK_KEY(tokens[i]); + + if (cgltf_json_strcmp(tokens + i, json_chunk, "variants") == 0) + { + i = cgltf_parse_json_variants(options, tokens, i + 1, json_chunk, out_data); + } + else + { + i = cgltf_skip_json(tokens, i + 1); + } + + if (i < 0) + { + return i; + } + } + } else { i = cgltf_parse_json_unprocessed_extension(options, tokens, i, json_chunk, &(out_data->data_extensions[out_data->data_extensions_count++])); @@ -5542,6 +5819,11 @@ static int cgltf_fixup_pointers(cgltf_data* data) CGLTF_PTRFIXUP_REQ(data->meshes[i].primitives[j].draco_mesh_compression.attributes[m].data, data->accessors, data->accessors_count); } } + + for (cgltf_size k = 0; k < data->meshes[i].primitives[j].mappings_count; ++k) + { + CGLTF_PTRFIXUP_REQ(data->meshes[i].primitives[j].mappings[k].material, data->materials, data->materials_count); + } } } @@ -5594,9 +5876,12 @@ static int cgltf_fixup_pointers(cgltf_data* data) CGLTF_PTRFIXUP(data->materials[i].clearcoat.clearcoat_normal_texture.texture, data->textures, data->textures_count); CGLTF_PTRFIXUP(data->materials[i].specular.specular_texture.texture, data->textures, data->textures_count); + CGLTF_PTRFIXUP(data->materials[i].specular.specular_color_texture.texture, data->textures, data->textures_count); CGLTF_PTRFIXUP(data->materials[i].transmission.transmission_texture.texture, data->textures, data->textures_count); + CGLTF_PTRFIXUP(data->materials[i].volume.thickness_texture.texture, data->textures, data->textures_count); + CGLTF_PTRFIXUP(data->materials[i].sheen.sheen_color_texture.texture, data->textures, data->textures_count); CGLTF_PTRFIXUP(data->materials[i].sheen.sheen_roughness_texture.texture, data->textures, data->textures_count); } diff --git a/src/external/dr_flac.h b/src/external/dr_flac.h index 906af001f..a797350a2 100644 --- a/src/external/dr_flac.h +++ b/src/external/dr_flac.h @@ -1,6 +1,6 @@ /* FLAC audio decoder. Choice of public domain or MIT-0. See license statements at the end of this file. -dr_flac - v0.12.22 - 2020-11-01 +dr_flac - v0.12.29 - 2021-04-02 David Reid - mackron@gmail.com @@ -166,7 +166,7 @@ If you just want to quickly decode an entire FLAC file in one go you can do some ... - drflac_free(pSampleData); + drflac_free(pSampleData, NULL); ``` You can read samples as signed 16-bit integer and 32-bit floating-point PCM with the *_s16() and *_f32() family of APIs respectively, but note that these @@ -232,7 +232,7 @@ extern "C" { #define DRFLAC_VERSION_MAJOR 0 #define DRFLAC_VERSION_MINOR 12 -#define DRFLAC_VERSION_REVISION 22 +#define DRFLAC_VERSION_REVISION 29 #define DRFLAC_VERSION_STRING DRFLAC_XSTRINGIFY(DRFLAC_VERSION_MAJOR) "." DRFLAC_XSTRINGIFY(DRFLAC_VERSION_MINOR) "." DRFLAC_XSTRINGIFY(DRFLAC_VERSION_REVISION) #include /* For size_t. */ @@ -408,7 +408,10 @@ typedef struct typedef struct { - /* The metadata type. Use this to know how to interpret the data below. */ + /* + The metadata type. Use this to know how to interpret the data below. Will be set to one of the + DRFLAC_METADATA_BLOCK_TYPE_* tokens. + */ drflac_uint32 type; /* @@ -552,7 +555,8 @@ pMetadata (in) Remarks ------- -Use pMetadata->type to determine which metadata block is being handled and how to read the data. +Use pMetadata->type to determine which metadata block is being handled and how to read the data. This +will be set to one of the DRFLAC_METADATA_BLOCK_TYPE_* tokens. */ typedef void (* drflac_meta_proc)(void* pUserData, drflac_metadata* pMetadata); @@ -797,6 +801,8 @@ from a block of memory respectively. The STREAMINFO block must be present for this to succeed. Use `drflac_open_relaxed()` to open a FLAC stream where the header may not be present. +Use `drflac_open_with_metadata()` if you need access to metadata. + Seek Also --------- @@ -843,6 +849,8 @@ as that is for internal use only. Opening in relaxed mode will continue reading data from onRead until it finds a valid frame. If a frame is never found it will continue forever. To abort, force your `onRead` callback to return 0, which dr_flac will use as an indicator that the end of the stream was found. + +Use `drflac_open_with_metadata_relaxed()` if you need access to metadata. */ DRFLAC_API drflac* drflac_open_relaxed(drflac_read_proc onRead, drflac_seek_proc onSeek, drflac_container container, void* pUserData, const drflac_allocation_callbacks* pAllocationCallbacks); @@ -882,7 +890,9 @@ Close the decoder with `drflac_close()`. This is slower than `drflac_open()`, so avoid this one if you don't need metadata. Internally, this will allocate and free memory on the heap for every metadata block except for STREAMINFO and PADDING blocks. -The caller is notified of the metadata via the `onMeta` callback. All metadata blocks will be handled before the function returns. +The caller is notified of the metadata via the `onMeta` callback. All metadata blocks will be handled before the function returns. This callback takes a +pointer to a `drflac_metadata` object which is a union containing the data of all relevant metadata blocks. Use the `type` member to discriminate against +the different metadata types. The STREAMINFO block must be present for this to succeed. Use `drflac_open_with_metadata_relaxed()` to open a FLAC stream where the header may not be present. @@ -1330,6 +1340,9 @@ DRFLAC_API drflac_bool32 drflac_next_cuesheet_track(drflac_cuesheet_track_iterat #ifndef _BSD_SOURCE #define _BSD_SOURCE #endif + #ifndef _DEFAULT_SOURCE + #define _DEFAULT_SOURCE + #endif #ifndef __USE_BSD #define __USE_BSD #endif @@ -1354,6 +1367,8 @@ DRFLAC_API drflac_bool32 drflac_next_cuesheet_track(drflac_cuesheet_track_iterat #else #define DRFLAC_INLINE inline __attribute__((always_inline)) #endif +#elif defined(__WATCOMC__) + #define DRFLAC_INLINE __inline #else #define DRFLAC_INLINE #endif @@ -1363,7 +1378,7 @@ DRFLAC_API drflac_bool32 drflac_next_cuesheet_track(drflac_cuesheet_track_iterat #define DRFLAC_X64 #elif defined(__i386) || defined(_M_IX86) #define DRFLAC_X86 -#elif defined(__arm__) || defined(_M_ARM) +#elif defined(__arm__) || defined(_M_ARM) || defined(_M_ARM64) #define DRFLAC_ARM #endif @@ -1562,6 +1577,27 @@ static DRFLAC_INLINE drflac_bool32 drflac_has_sse41(void) #if ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)) #define DRFLAC_HAS_BYTESWAP16_INTRINSIC #endif +#elif defined(__WATCOMC__) && defined(__386__) + #define DRFLAC_HAS_BYTESWAP16_INTRINSIC + #define DRFLAC_HAS_BYTESWAP32_INTRINSIC + #define DRFLAC_HAS_BYTESWAP64_INTRINSIC + extern __inline drflac_uint16 _watcom_bswap16(drflac_uint16); + extern __inline drflac_uint32 _watcom_bswap32(drflac_uint32); + extern __inline drflac_uint64 _watcom_bswap64(drflac_uint64); +#pragma aux _watcom_bswap16 = \ + "xchg al, ah" \ + parm [ax] \ + modify [ax]; +#pragma aux _watcom_bswap32 = \ + "bswap eax" \ + parm [eax] \ + modify [eax]; +#pragma aux _watcom_bswap64 = \ + "bswap eax" \ + "bswap edx" \ + "xchg eax,edx" \ + parm [eax edx] \ + modify [eax edx]; #endif @@ -1785,6 +1821,8 @@ static DRFLAC_INLINE drflac_uint16 drflac__swap_endian_uint16(drflac_uint16 n) return _byteswap_ushort(n); #elif defined(__GNUC__) || defined(__clang__) return __builtin_bswap16(n); + #elif defined(__WATCOMC__) && defined(__386__) + return _watcom_bswap16(n); #else #error "This compiler does not support the byte swap intrinsic." #endif @@ -1814,6 +1852,8 @@ static DRFLAC_INLINE drflac_uint32 drflac__swap_endian_uint32(drflac_uint32 n) #else return __builtin_bswap32(n); #endif + #elif defined(__WATCOMC__) && defined(__386__) + return _watcom_bswap32(n); #else #error "This compiler does not support the byte swap intrinsic." #endif @@ -1832,6 +1872,8 @@ static DRFLAC_INLINE drflac_uint64 drflac__swap_endian_uint64(drflac_uint64 n) return _byteswap_uint64(n); #elif defined(__GNUC__) || defined(__clang__) return __builtin_bswap64(n); + #elif defined(__WATCOMC__) && defined(__386__) + return _watcom_bswap64(n); #else #error "This compiler does not support the byte swap intrinsic." #endif @@ -2639,6 +2681,9 @@ static drflac_bool32 drflac__find_and_seek_to_next_sync_code(drflac_bs* bs) #if defined(_MSC_VER) && _MSC_VER >= 1400 && (defined(DRFLAC_X64) || defined(DRFLAC_X86)) && !defined(__clang__) #define DRFLAC_IMPLEMENT_CLZ_MSVC #endif +#if defined(__WATCOMC__) && defined(__386__) +#define DRFLAC_IMPLEMENT_CLZ_WATCOM +#endif static DRFLAC_INLINE drflac_uint32 drflac__clz_software(drflac_cache_t x) { @@ -2786,6 +2831,16 @@ static DRFLAC_INLINE drflac_uint32 drflac__clz_msvc(drflac_cache_t x) } #endif +#ifdef DRFLAC_IMPLEMENT_CLZ_WATCOM +static __inline drflac_uint32 drflac__clz_watcom (drflac_uint32); +#pragma aux drflac__clz_watcom = \ + "bsr eax, eax" \ + "xor eax, 31" \ + parm [eax] nomemory \ + value [eax] \ + modify exact [eax] nomemory; +#endif + static DRFLAC_INLINE drflac_uint32 drflac__clz(drflac_cache_t x) { #ifdef DRFLAC_IMPLEMENT_CLZ_LZCNT @@ -2796,6 +2851,8 @@ static DRFLAC_INLINE drflac_uint32 drflac__clz(drflac_cache_t x) { #ifdef DRFLAC_IMPLEMENT_CLZ_MSVC return drflac__clz_msvc(x); +#elif defined(DRFLAC_IMPLEMENT_CLZ_WATCOM) + return (x == 0) ? sizeof(x)*8 : drflac__clz_watcom(x); #else return drflac__clz_software(x); #endif @@ -3179,7 +3236,6 @@ static drflac_bool32 drflac__decode_samples_with_residual__rice__reference(drfla drflac_uint32 i; DRFLAC_ASSERT(bs != NULL); - DRFLAC_ASSERT(count > 0); DRFLAC_ASSERT(pSamplesOut != NULL); for (i = 0; i < count; ++i) { @@ -3561,7 +3617,6 @@ static drflac_bool32 drflac__decode_samples_with_residual__rice__scalar_zeroorde drflac_uint32 i; DRFLAC_ASSERT(bs != NULL); - DRFLAC_ASSERT(count > 0); DRFLAC_ASSERT(pSamplesOut != NULL); (void)bitsPerSample; @@ -3607,7 +3662,6 @@ static drflac_bool32 drflac__decode_samples_with_residual__rice__scalar(drflac_b drflac_uint32 i; DRFLAC_ASSERT(bs != NULL); - DRFLAC_ASSERT(count > 0); DRFLAC_ASSERT(pSamplesOut != NULL); if (order == 0) { @@ -4161,7 +4215,6 @@ static drflac_bool32 drflac__decode_samples_with_residual__rice__sse41_64(drflac static drflac_bool32 drflac__decode_samples_with_residual__rice__sse41(drflac_bs* bs, drflac_uint32 bitsPerSample, drflac_uint32 count, drflac_uint8 riceParam, drflac_uint32 order, drflac_int32 shift, const drflac_int32* coefficients, drflac_int32* pSamplesOut) { DRFLAC_ASSERT(bs != NULL); - DRFLAC_ASSERT(count > 0); DRFLAC_ASSERT(pSamplesOut != NULL); /* In my testing the order is rarely > 12, so in this case I'm going to simplify the SSE implementation by only handling order <= 12. */ @@ -4660,7 +4713,6 @@ static drflac_bool32 drflac__decode_samples_with_residual__rice__neon_64(drflac_ static drflac_bool32 drflac__decode_samples_with_residual__rice__neon(drflac_bs* bs, drflac_uint32 bitsPerSample, drflac_uint32 count, drflac_uint8 riceParam, drflac_uint32 order, drflac_int32 shift, const drflac_int32* coefficients, drflac_int32* pSamplesOut) { DRFLAC_ASSERT(bs != NULL); - DRFLAC_ASSERT(count > 0); DRFLAC_ASSERT(pSamplesOut != NULL); /* In my testing the order is rarely > 12, so in this case I'm going to simplify the NEON implementation by only handling order <= 12. */ @@ -4703,7 +4755,6 @@ static drflac_bool32 drflac__read_and_seek_residual__rice(drflac_bs* bs, drflac_ drflac_uint32 i; DRFLAC_ASSERT(bs != NULL); - DRFLAC_ASSERT(count > 0); for (i = 0; i < count; ++i) { if (!drflac__seek_rice_parts(bs, riceParam)) { @@ -4719,7 +4770,6 @@ static drflac_bool32 drflac__decode_samples_with_residual__unencoded(drflac_bs* drflac_uint32 i; DRFLAC_ASSERT(bs != NULL); - DRFLAC_ASSERT(count > 0); DRFLAC_ASSERT(unencodedBitsPerSample <= 31); /* <-- unencodedBitsPerSample is a 5 bit number, so cannot exceed 31. */ DRFLAC_ASSERT(pSamplesOut != NULL); @@ -4783,7 +4833,7 @@ static drflac_bool32 drflac__decode_samples_with_residual(drflac_bs* bs, drflac_ } /* Validation check. */ - if ((blockSize / (1 << partitionOrder)) <= order) { + if ((blockSize / (1 << partitionOrder)) < order) { return DRFLAC_FALSE; } @@ -5155,7 +5205,8 @@ static drflac_bool32 drflac__read_next_flac_frame_header(drflac_bs* bs, drflac_u DRFLAC_ASSERT(blockSize > 0); if (blockSize == 1) { header->blockSizeInPCMFrames = 192; - } else if (blockSize >= 2 && blockSize <= 5) { + } else if (blockSize <= 5) { + DRFLAC_ASSERT(blockSize >= 2); header->blockSizeInPCMFrames = 576 * (1 << (blockSize - 2)); } else if (blockSize == 6) { if (!drflac__read_uint16(bs, 8, &header->blockSizeInPCMFrames)) { @@ -8309,7 +8360,7 @@ static drflac_result drflac_result_from_errno(int e) static drflac_result drflac_fopen(FILE** ppFile, const char* pFilePath, const char* pOpenMode) { -#if _MSC_VER && _MSC_VER >= 1400 +#if defined(_MSC_VER) && _MSC_VER >= 1400 errno_t err; #endif @@ -8321,7 +8372,7 @@ static drflac_result drflac_fopen(FILE** ppFile, const char* pFilePath, const ch return DRFLAC_INVALID_ARGS; } -#if _MSC_VER && _MSC_VER >= 1400 +#if defined(_MSC_VER) && _MSC_VER >= 1400 err = fopen_s(ppFile, pFilePath, pOpenMode); if (err != 0) { return drflac_result_from_errno(err); @@ -8356,12 +8407,13 @@ _wfopen() isn't always available in all compilation environments. * MSVC seems to support it universally as far back as VC6 from what I can tell (haven't checked further back). * MinGW-64 (both 32- and 64-bit) seems to support it. * MinGW wraps it in !defined(__STRICT_ANSI__). + * OpenWatcom wraps it in !defined(_NO_EXT_KEYS). This can be reviewed as compatibility issues arise. The preference is to use _wfopen_s() and _wfopen() as opposed to the wcsrtombs() fallback, so if you notice your compiler not detecting this properly I'm happy to look at adding support. */ #if defined(_WIN32) - #if defined(_MSC_VER) || defined(__MINGW64__) || !defined(__STRICT_ANSI__) + #if defined(_MSC_VER) || defined(__MINGW64__) || (!defined(__STRICT_ANSI__) && !defined(_NO_EXT_KEYS)) #define DRFLAC_HAS_WFOPEN #endif #endif @@ -11331,6 +11383,7 @@ DRFLAC_API drflac_bool32 drflac_seek_to_pcm_frame(drflac* pFlac, drflac_uint64 p return drflac__seek_to_first_frame(pFlac); } else { drflac_bool32 wasSuccessful = DRFLAC_FALSE; + drflac_uint64 originalPCMFrame = pFlac->currentPCMFrame; /* Clamp the sample to the end. */ if (pcmFrameIndex > pFlac->totalPCMFrameCount) { @@ -11388,7 +11441,16 @@ DRFLAC_API drflac_bool32 drflac_seek_to_pcm_frame(drflac* pFlac, drflac_uint64 p } } - pFlac->currentPCMFrame = pcmFrameIndex; + if (wasSuccessful) { + pFlac->currentPCMFrame = pcmFrameIndex; + } else { + /* Seek failed. Try putting the decoder back to it's original state. */ + if (drflac_seek_to_pcm_frame(pFlac, originalPCMFrame) == DRFLAC_FALSE) { + /* Failed to seek back to the original PCM frame. Fall back to 0. */ + drflac_seek_to_pcm_frame(pFlac, 0); + } + } + return wasSuccessful; } } @@ -11789,6 +11851,28 @@ DRFLAC_API drflac_bool32 drflac_next_cuesheet_track(drflac_cuesheet_track_iterat /* REVISION HISTORY ================ +v0.12.29 - 2021-04-02 + - Fix a bug where the running PCM frame index is set to an invalid value when over-seeking. + - Fix a decoding error due to an incorrect validation check. + +v0.12.28 - 2021-02-21 + - Fix a warning due to referencing _MSC_VER when it is undefined. + +v0.12.27 - 2021-01-31 + - Fix a static analysis warning. + +v0.12.26 - 2021-01-17 + - Fix a compilation warning due to _BSD_SOURCE being deprecated. + +v0.12.25 - 2020-12-26 + - Update documentation. + +v0.12.24 - 2020-11-29 + - Fix ARM64/NEON detection when compiling with MSVC. + +v0.12.23 - 2020-11-21 + - Fix compilation with OpenWatcom. + v0.12.22 - 2020-11-01 - Fix an error with the previous release. diff --git a/src/external/dr_mp3.h b/src/external/dr_mp3.h index 57311649c..e28f318bc 100644 --- a/src/external/dr_mp3.h +++ b/src/external/dr_mp3.h @@ -1,6 +1,6 @@ /* MP3 audio decoder. Choice of public domain or MIT-0. See license statements at the end of this file. -dr_mp3 - v0.6.19 - 2020-11-13 +dr_mp3 - v0.6.27 - 2021-02-21 David Reid - mackron@gmail.com @@ -95,7 +95,7 @@ extern "C" { #define DRMP3_VERSION_MAJOR 0 #define DRMP3_VERSION_MINOR 6 -#define DRMP3_VERSION_REVISION 19 +#define DRMP3_VERSION_REVISION 27 #define DRMP3_VERSION_STRING DRMP3_XSTRINGIFY(DRMP3_VERSION_MAJOR) "." DRMP3_XSTRINGIFY(DRMP3_VERSION_MINOR) "." DRMP3_XSTRINGIFY(DRMP3_VERSION_REVISION) #include /* For size_t. */ @@ -239,6 +239,8 @@ typedef drmp3_int32 drmp3_result; #else #define DRMP3_INLINE inline __attribute__((always_inline)) #endif +#elif defined(__WATCOMC__) + #define DRMP3_INLINE __inline #else #define DRMP3_INLINE #endif @@ -279,14 +281,6 @@ DRMP3_API void drmp3dec_f32_to_s16(const float *in, drmp3_int16 *out, size_t num Main API (Pull API) =================== */ -#ifndef DRMP3_DEFAULT_CHANNELS -#define DRMP3_DEFAULT_CHANNELS 2 -#endif -#ifndef DRMP3_DEFAULT_SAMPLE_RATE -#define DRMP3_DEFAULT_SAMPLE_RATE 44100 -#endif - - typedef enum { drmp3_seek_origin_start, @@ -596,7 +590,7 @@ DRMP3_API const char* drmp3_version_string(void) #if !defined(DR_MP3_NO_SIMD) -#if !defined(DR_MP3_ONLY_SIMD) && (defined(_M_X64) || defined(_M_ARM64) || defined(__x86_64__) || defined(__aarch64__)) +#if !defined(DR_MP3_ONLY_SIMD) && (defined(_M_X64) || defined(__x86_64__) || defined(__aarch64__) || defined(_M_ARM64)) /* x64 always have SSE2, arm64 always have neon, no need for generic code */ #define DR_MP3_ONLY_SIMD #endif @@ -672,7 +666,7 @@ end: return g_have_simd - 1; #endif } -#elif defined(__ARM_NEON) || defined(__aarch64__) +#elif defined(__ARM_NEON) || defined(__aarch64__) || defined(_M_ARM64) #include #define DRMP3_HAVE_SSE 0 #define DRMP3_HAVE_SIMD 1 @@ -705,7 +699,7 @@ static int drmp3_have_simd(void) #endif -#if defined(__ARM_ARCH) && (__ARM_ARCH >= 6) && !defined(__aarch64__) +#if defined(__ARM_ARCH) && (__ARM_ARCH >= 6) && !defined(__aarch64__) && !defined(_M_ARM64) #define DRMP3_HAVE_ARMV6 1 static __inline__ __attribute__((always_inline)) drmp3_int32 drmp3_clip_int16_arm(int32_t a) { @@ -1868,7 +1862,7 @@ static void drmp3d_DCT_II(float *grbuf, int n) } else #endif #ifdef DR_MP3_ONLY_SIMD - {} + {} /* for HAVE_SIMD=1, MINIMP3_ONLY_SIMD=1 case we do not need non-intrinsic "else" branch */ #else for (; k < n; k++) { @@ -2101,7 +2095,7 @@ static void drmp3d_synth(float *xl, drmp3d_sample_t *dstl, int nch, float *lins) } else #endif #ifdef DR_MP3_ONLY_SIMD - {} + {} /* for HAVE_SIMD=1, MINIMP3_ONLY_SIMD=1 case we do not need non-intrinsic "else" branch */ #else for (i = 14; i >= 0; i--) { @@ -2829,7 +2823,7 @@ static drmp3_bool32 drmp3_init_internal(drmp3* pMP3, drmp3_read_proc onRead, drm /* Decode the first frame to confirm that it is indeed a valid MP3 stream. */ if (!drmp3_decode_next_frame(pMP3)) { - drmp3_uninit(pMP3); + drmp3__free_from_callbacks(pMP3->pData, &pMP3->allocationCallbacks); /* The call above may have allocated memory. Need to make sure it's freed before aborting. */ return DRMP3_FALSE; /* Not a valid MP3 stream. */ } @@ -3331,7 +3325,7 @@ static drmp3_result drmp3_result_from_errno(int e) static drmp3_result drmp3_fopen(FILE** ppFile, const char* pFilePath, const char* pOpenMode) { -#if _MSC_VER && _MSC_VER >= 1400 +#if defined(_MSC_VER) && _MSC_VER >= 1400 errno_t err; #endif @@ -3343,7 +3337,7 @@ static drmp3_result drmp3_fopen(FILE** ppFile, const char* pFilePath, const char return DRMP3_INVALID_ARGS; } -#if _MSC_VER && _MSC_VER >= 1400 +#if defined(_MSC_VER) && _MSC_VER >= 1400 err = fopen_s(ppFile, pFilePath, pOpenMode); if (err != 0) { return drmp3_result_from_errno(err); @@ -3378,12 +3372,13 @@ _wfopen() isn't always available in all compilation environments. * MSVC seems to support it universally as far back as VC6 from what I can tell (haven't checked further back). * MinGW-64 (both 32- and 64-bit) seems to support it. * MinGW wraps it in !defined(__STRICT_ANSI__). + * OpenWatcom wraps it in !defined(_NO_EXT_KEYS). This can be reviewed as compatibility issues arise. The preference is to use _wfopen_s() and _wfopen() as opposed to the wcsrtombs() fallback, so if you notice your compiler not detecting this properly I'm happy to look at adding support. */ #if defined(_WIN32) - #if defined(_MSC_VER) || defined(__MINGW64__) || !defined(__STRICT_ANSI__) + #if defined(_MSC_VER) || defined(__MINGW64__) || (!defined(__STRICT_ANSI__) && !defined(_NO_EXT_KEYS)) #define DRMP3_HAS_WFOPEN #endif #endif @@ -3484,22 +3479,38 @@ static drmp3_bool32 drmp3__on_seek_stdio(void* pUserData, int offset, drmp3_seek DRMP3_API drmp3_bool32 drmp3_init_file(drmp3* pMP3, const char* pFilePath, const drmp3_allocation_callbacks* pAllocationCallbacks) { + drmp3_bool32 result; FILE* pFile; + if (drmp3_fopen(&pFile, pFilePath, "rb") != DRMP3_SUCCESS) { return DRMP3_FALSE; } - return drmp3_init(pMP3, drmp3__on_read_stdio, drmp3__on_seek_stdio, (void*)pFile, pAllocationCallbacks); + result = drmp3_init(pMP3, drmp3__on_read_stdio, drmp3__on_seek_stdio, (void*)pFile, pAllocationCallbacks); + if (result != DRMP3_TRUE) { + fclose(pFile); + return result; + } + + return DRMP3_TRUE; } DRMP3_API drmp3_bool32 drmp3_init_file_w(drmp3* pMP3, const wchar_t* pFilePath, const drmp3_allocation_callbacks* pAllocationCallbacks) { + drmp3_bool32 result; FILE* pFile; + if (drmp3_wfopen(&pFile, pFilePath, L"rb", pAllocationCallbacks) != DRMP3_SUCCESS) { return DRMP3_FALSE; } - return drmp3_init(pMP3, drmp3__on_read_stdio, drmp3__on_seek_stdio, (void*)pFile, pAllocationCallbacks); + result = drmp3_init(pMP3, drmp3__on_read_stdio, drmp3__on_seek_stdio, (void*)pFile, pAllocationCallbacks); + if (result != DRMP3_TRUE) { + fclose(pFile); + return result; + } + + return DRMP3_TRUE; } #endif @@ -3511,7 +3522,11 @@ DRMP3_API void drmp3_uninit(drmp3* pMP3) #ifndef DR_MP3_NO_STDIO if (pMP3->onRead == drmp3__on_read_stdio) { - fclose((FILE*)pMP3->pUserData); + FILE* pFile = (FILE*)pMP3->pUserData; + if (pFile != NULL) { + fclose(pFile); + pMP3->pUserData = NULL; /* Make sure the file handle is cleared to NULL to we don't attempt to close it a second time. */ + } } #endif @@ -4435,6 +4450,30 @@ counts rather than sample counts. /* REVISION HISTORY ================ +v0.6.27 - 2021-02-21 + - Fix a warning due to referencing _MSC_VER when it is undefined. + +v0.6.26 - 2021-01-31 + - Bring up to date with minimp3. + +v0.6.25 - 2020-12-26 + - Remove DRMP3_DEFAULT_CHANNELS and DRMP3_DEFAULT_SAMPLE_RATE which are leftovers from some removed APIs. + +v0.6.24 - 2020-12-07 + - Fix a typo in version date for 0.6.23. + +v0.6.23 - 2020-12-03 + - Fix an error where a file can be closed twice when initialization of the decoder fails. + +v0.6.22 - 2020-12-02 + - Fix an error where it's possible for a file handle to be left open when initialization of the decoder fails. + +v0.6.21 - 2020-11-28 + - Bring up to date with minimp3. + +v0.6.20 - 2020-11-21 + - Fix compilation with OpenWatcom. + v0.6.19 - 2020-11-13 - Minor code clean up. diff --git a/src/external/dr_wav.h b/src/external/dr_wav.h index 0156fa9a1..be1438bde 100644 --- a/src/external/dr_wav.h +++ b/src/external/dr_wav.h @@ -1,6 +1,6 @@ /* WAV audio loader and writer. Choice of public domain or MIT-0. See license statements at the end of this file. -dr_wav - v0.12.14 - 2020-11-13 +dr_wav - v0.12.19 - 2021-02-21 David Reid - mackron@gmail.com @@ -65,7 +65,7 @@ If you just want to quickly open and read the audio data in a single operation y ... - drwav_free(pSampleData); + drwav_free(pSampleData, NULL); ``` The examples above use versions of the API that convert the audio data to a consistent format (32-bit signed PCM, in this case), but you can still output the @@ -144,7 +144,7 @@ extern "C" { #define DRWAV_VERSION_MAJOR 0 #define DRWAV_VERSION_MINOR 12 -#define DRWAV_VERSION_REVISION 14 +#define DRWAV_VERSION_REVISION 19 #define DRWAV_VERSION_STRING DRWAV_XSTRINGIFY(DRWAV_VERSION_MAJOR) "." DRWAV_XSTRINGIFY(DRWAV_VERSION_MINOR) "." DRWAV_XSTRINGIFY(DRWAV_VERSION_REVISION) #include /* For size_t. */ @@ -535,7 +535,7 @@ typedef struct /* The size in bytes of the data chunk. */ drwav_uint64 dataChunkDataSize; - /* The position in the stream of the first byte of the data chunk. This is used for seeking. */ + /* The position in the stream of the first data byte of the data chunk. This is used for seeking. */ drwav_uint64 dataChunkDataPos; /* The number of bytes remaining in the data chunk. */ @@ -1021,6 +1021,8 @@ DRWAV_API drwav_bool32 drwav_fourcc_equal(const drwav_uint8* a, const char* b); #else #define DRWAV_INLINE inline __attribute__((always_inline)) #endif +#elif defined(__WATCOMC__) + #define DRWAV_INLINE __inline #else #define DRWAV_INLINE #endif @@ -1097,34 +1099,12 @@ you doing?! (Let me know, I'd be curious!) Second, you can adjust these by #defi static const drwav_uint8 drwavGUID_W64_RIFF[16] = {0x72,0x69,0x66,0x66, 0x2E,0x91, 0xCF,0x11, 0xA5,0xD6, 0x28,0xDB,0x04,0xC1,0x00,0x00}; /* 66666972-912E-11CF-A5D6-28DB04C10000 */ static const drwav_uint8 drwavGUID_W64_WAVE[16] = {0x77,0x61,0x76,0x65, 0xF3,0xAC, 0xD3,0x11, 0x8C,0xD1, 0x00,0xC0,0x4F,0x8E,0xDB,0x8A}; /* 65766177-ACF3-11D3-8CD1-00C04F8EDB8A */ -static const drwav_uint8 drwavGUID_W64_JUNK[16] = {0x6A,0x75,0x6E,0x6B, 0xF3,0xAC, 0xD3,0x11, 0x8C,0xD1, 0x00,0xC0,0x4F,0x8E,0xDB,0x8A}; /* 6B6E756A-ACF3-11D3-8CD1-00C04F8EDB8A */ +/*static const drwav_uint8 drwavGUID_W64_JUNK[16] = {0x6A,0x75,0x6E,0x6B, 0xF3,0xAC, 0xD3,0x11, 0x8C,0xD1, 0x00,0xC0,0x4F,0x8E,0xDB,0x8A};*/ /* 6B6E756A-ACF3-11D3-8CD1-00C04F8EDB8A */ static const drwav_uint8 drwavGUID_W64_FMT [16] = {0x66,0x6D,0x74,0x20, 0xF3,0xAC, 0xD3,0x11, 0x8C,0xD1, 0x00,0xC0,0x4F,0x8E,0xDB,0x8A}; /* 20746D66-ACF3-11D3-8CD1-00C04F8EDB8A */ static const drwav_uint8 drwavGUID_W64_FACT[16] = {0x66,0x61,0x63,0x74, 0xF3,0xAC, 0xD3,0x11, 0x8C,0xD1, 0x00,0xC0,0x4F,0x8E,0xDB,0x8A}; /* 74636166-ACF3-11D3-8CD1-00C04F8EDB8A */ static const drwav_uint8 drwavGUID_W64_DATA[16] = {0x64,0x61,0x74,0x61, 0xF3,0xAC, 0xD3,0x11, 0x8C,0xD1, 0x00,0xC0,0x4F,0x8E,0xDB,0x8A}; /* 61746164-ACF3-11D3-8CD1-00C04F8EDB8A */ static const drwav_uint8 drwavGUID_W64_SMPL[16] = {0x73,0x6D,0x70,0x6C, 0xF3,0xAC, 0xD3,0x11, 0x8C,0xD1, 0x00,0xC0,0x4F,0x8E,0xDB,0x8A}; /* 6C706D73-ACF3-11D3-8CD1-00C04F8EDB8A */ -static DRWAV_INLINE drwav_bool32 drwav__guid_equal(const drwav_uint8 a[16], const drwav_uint8 b[16]) -{ - int i; - for (i = 0; i < 16; i += 1) { - if (a[i] != b[i]) { - return DRWAV_FALSE; - } - } - - return DRWAV_TRUE; -} - -static DRWAV_INLINE drwav_bool32 drwav__fourcc_equal(const drwav_uint8* a, const char* b) -{ - return - a[0] == b[0] && - a[1] == b[1] && - a[2] == b[2] && - a[3] == b[3]; -} - - static DRWAV_INLINE int drwav__is_little_endian(void) { @@ -1138,37 +1118,6 @@ static DRWAV_INLINE int drwav__is_little_endian(void) #endif } -static DRWAV_INLINE drwav_uint16 drwav__bytes_to_u16(const drwav_uint8* data) -{ - return (data[0] << 0) | (data[1] << 8); -} - -static DRWAV_INLINE drwav_int16 drwav__bytes_to_s16(const drwav_uint8* data) -{ - return (short)drwav__bytes_to_u16(data); -} - -static DRWAV_INLINE drwav_uint32 drwav__bytes_to_u32(const drwav_uint8* data) -{ - return (data[0] << 0) | (data[1] << 8) | (data[2] << 16) | (data[3] << 24); -} - -static DRWAV_INLINE drwav_int32 drwav__bytes_to_s32(const drwav_uint8* data) -{ - return (drwav_int32)drwav__bytes_to_u32(data); -} - -static DRWAV_INLINE drwav_uint64 drwav__bytes_to_u64(const drwav_uint8* data) -{ - return - ((drwav_uint64)data[0] << 0) | ((drwav_uint64)data[1] << 8) | ((drwav_uint64)data[2] << 16) | ((drwav_uint64)data[3] << 24) | - ((drwav_uint64)data[4] << 32) | ((drwav_uint64)data[5] << 40) | ((drwav_uint64)data[6] << 48) | ((drwav_uint64)data[7] << 56); -} - -static DRWAV_INLINE drwav_int64 drwav__bytes_to_s64(const drwav_uint8* data) -{ - return (drwav_int64)drwav__bytes_to_u64(data); -} static DRWAV_INLINE void drwav__bytes_to_guid(const drwav_uint8* data, drwav_uint8* guid) { @@ -1420,26 +1369,26 @@ static DRWAV_INLINE void drwav__bswap_samples(void* pSamples, drwav_uint64 sampl } -static void* drwav__malloc_default(size_t sz, void* pUserData) +DRWAV_PRIVATE void* drwav__malloc_default(size_t sz, void* pUserData) { (void)pUserData; return DRWAV_MALLOC(sz); } -static void* drwav__realloc_default(void* p, size_t sz, void* pUserData) +DRWAV_PRIVATE void* drwav__realloc_default(void* p, size_t sz, void* pUserData) { (void)pUserData; return DRWAV_REALLOC(p, sz); } -static void drwav__free_default(void* p, void* pUserData) +DRWAV_PRIVATE void drwav__free_default(void* p, void* pUserData) { (void)pUserData; DRWAV_FREE(p); } -static void* drwav__malloc_from_callbacks(size_t sz, const drwav_allocation_callbacks* pAllocationCallbacks) +DRWAV_PRIVATE void* drwav__malloc_from_callbacks(size_t sz, const drwav_allocation_callbacks* pAllocationCallbacks) { if (pAllocationCallbacks == NULL) { return NULL; @@ -1457,7 +1406,7 @@ static void* drwav__malloc_from_callbacks(size_t sz, const drwav_allocation_call return NULL; } -static void* drwav__realloc_from_callbacks(void* p, size_t szNew, size_t szOld, const drwav_allocation_callbacks* pAllocationCallbacks) +DRWAV_PRIVATE void* drwav__realloc_from_callbacks(void* p, size_t szNew, size_t szOld, const drwav_allocation_callbacks* pAllocationCallbacks) { if (pAllocationCallbacks == NULL) { return NULL; @@ -1487,7 +1436,7 @@ static void* drwav__realloc_from_callbacks(void* p, size_t szNew, size_t szOld, return NULL; } -static void drwav__free_from_callbacks(void* p, const drwav_allocation_callbacks* pAllocationCallbacks) +DRWAV_PRIVATE void drwav__free_from_callbacks(void* p, const drwav_allocation_callbacks* pAllocationCallbacks) { if (p == NULL || pAllocationCallbacks == NULL) { return; @@ -1499,7 +1448,7 @@ static void drwav__free_from_callbacks(void* p, const drwav_allocation_callbacks } -static drwav_allocation_callbacks drwav_copy_allocation_callbacks_or_defaults(const drwav_allocation_callbacks* pAllocationCallbacks) +DRWAV_PRIVATE drwav_allocation_callbacks drwav_copy_allocation_callbacks_or_defaults(const drwav_allocation_callbacks* pAllocationCallbacks) { if (pAllocationCallbacks != NULL) { /* Copy. */ @@ -1523,21 +1472,21 @@ static DRWAV_INLINE drwav_bool32 drwav__is_compressed_format_tag(drwav_uint16 fo formatTag == DR_WAVE_FORMAT_DVI_ADPCM; } -static unsigned int drwav__chunk_padding_size_riff(drwav_uint64 chunkSize) +DRWAV_PRIVATE unsigned int drwav__chunk_padding_size_riff(drwav_uint64 chunkSize) { return (unsigned int)(chunkSize % 2); } -static unsigned int drwav__chunk_padding_size_w64(drwav_uint64 chunkSize) +DRWAV_PRIVATE unsigned int drwav__chunk_padding_size_w64(drwav_uint64 chunkSize) { return (unsigned int)(chunkSize % 8); } -static drwav_uint64 drwav_read_pcm_frames_s16__msadpcm(drwav* pWav, drwav_uint64 samplesToRead, drwav_int16* pBufferOut); -static drwav_uint64 drwav_read_pcm_frames_s16__ima(drwav* pWav, drwav_uint64 samplesToRead, drwav_int16* pBufferOut); -static drwav_bool32 drwav_init_write__internal(drwav* pWav, const drwav_data_format* pFormat, drwav_uint64 totalSampleCount); +DRWAV_PRIVATE drwav_uint64 drwav_read_pcm_frames_s16__msadpcm(drwav* pWav, drwav_uint64 samplesToRead, drwav_int16* pBufferOut); +DRWAV_PRIVATE drwav_uint64 drwav_read_pcm_frames_s16__ima(drwav* pWav, drwav_uint64 samplesToRead, drwav_int16* pBufferOut); +DRWAV_PRIVATE drwav_bool32 drwav_init_write__internal(drwav* pWav, const drwav_data_format* pFormat, drwav_uint64 totalSampleCount); -static drwav_result drwav__read_chunk_header(drwav_read_proc onRead, void* pUserData, drwav_container container, drwav_uint64* pRunningBytesReadOut, drwav_chunk_header* pHeaderOut) +DRWAV_PRIVATE drwav_result drwav__read_chunk_header(drwav_read_proc onRead, void* pUserData, drwav_container container, drwav_uint64* pRunningBytesReadOut, drwav_chunk_header* pHeaderOut) { if (container == drwav_container_riff || container == drwav_container_rf64) { drwav_uint8 sizeInBytes[4]; @@ -1550,7 +1499,7 @@ static drwav_result drwav__read_chunk_header(drwav_read_proc onRead, void* pUser return DRWAV_INVALID_FILE; } - pHeaderOut->sizeInBytes = drwav__bytes_to_u32(sizeInBytes); + pHeaderOut->sizeInBytes = drwav_bytes_to_u32(sizeInBytes); pHeaderOut->paddingSize = drwav__chunk_padding_size_riff(pHeaderOut->sizeInBytes); *pRunningBytesReadOut += 8; } else { @@ -1564,7 +1513,7 @@ static drwav_result drwav__read_chunk_header(drwav_read_proc onRead, void* pUser return DRWAV_INVALID_FILE; } - pHeaderOut->sizeInBytes = drwav__bytes_to_u64(sizeInBytes) - 24; /* <-- Subtract 24 because w64 includes the size of the header. */ + pHeaderOut->sizeInBytes = drwav_bytes_to_u64(sizeInBytes) - 24; /* <-- Subtract 24 because w64 includes the size of the header. */ pHeaderOut->paddingSize = drwav__chunk_padding_size_w64(pHeaderOut->sizeInBytes); *pRunningBytesReadOut += 24; } @@ -1572,7 +1521,7 @@ static drwav_result drwav__read_chunk_header(drwav_read_proc onRead, void* pUser return DRWAV_SUCCESS; } -static drwav_bool32 drwav__seek_forward(drwav_seek_proc onSeek, drwav_uint64 offset, void* pUserData) +DRWAV_PRIVATE drwav_bool32 drwav__seek_forward(drwav_seek_proc onSeek, drwav_uint64 offset, void* pUserData) { drwav_uint64 bytesRemainingToSeek = offset; while (bytesRemainingToSeek > 0) { @@ -1592,7 +1541,7 @@ static drwav_bool32 drwav__seek_forward(drwav_seek_proc onSeek, drwav_uint64 off return DRWAV_TRUE; } -static drwav_bool32 drwav__seek_from_start(drwav_seek_proc onSeek, drwav_uint64 offset, void* pUserData) +DRWAV_PRIVATE drwav_bool32 drwav__seek_from_start(drwav_seek_proc onSeek, drwav_uint64 offset, void* pUserData) { if (offset <= 0x7FFFFFFF) { return onSeek(pUserData, (int)offset, drwav_seek_origin_start); @@ -1620,7 +1569,7 @@ static drwav_bool32 drwav__seek_from_start(drwav_seek_proc onSeek, drwav_uint64 } -static drwav_bool32 drwav__read_fmt(drwav_read_proc onRead, drwav_seek_proc onSeek, void* pUserData, drwav_container container, drwav_uint64* pRunningBytesReadOut, drwav_fmt* fmtOut) +DRWAV_PRIVATE drwav_bool32 drwav__read_fmt(drwav_read_proc onRead, drwav_seek_proc onSeek, void* pUserData, drwav_container container, drwav_uint64* pRunningBytesReadOut, drwav_fmt* fmtOut) { drwav_chunk_header header; drwav_uint8 fmt[16]; @@ -1631,7 +1580,7 @@ static drwav_bool32 drwav__read_fmt(drwav_read_proc onRead, drwav_seek_proc onSe /* Skip non-fmt chunks. */ - while (((container == drwav_container_riff || container == drwav_container_rf64) && !drwav__fourcc_equal(header.id.fourcc, "fmt ")) || (container == drwav_container_w64 && !drwav__guid_equal(header.id.guid, drwavGUID_W64_FMT))) { + while (((container == drwav_container_riff || container == drwav_container_rf64) && !drwav_fourcc_equal(header.id.fourcc, "fmt ")) || (container == drwav_container_w64 && !drwav_guid_equal(header.id.guid, drwavGUID_W64_FMT))) { if (!drwav__seek_forward(onSeek, header.sizeInBytes + header.paddingSize, pUserData)) { return DRWAV_FALSE; } @@ -1646,11 +1595,11 @@ static drwav_bool32 drwav__read_fmt(drwav_read_proc onRead, drwav_seek_proc onSe /* Validation. */ if (container == drwav_container_riff || container == drwav_container_rf64) { - if (!drwav__fourcc_equal(header.id.fourcc, "fmt ")) { + if (!drwav_fourcc_equal(header.id.fourcc, "fmt ")) { return DRWAV_FALSE; } } else { - if (!drwav__guid_equal(header.id.guid, drwavGUID_W64_FMT)) { + if (!drwav_guid_equal(header.id.guid, drwavGUID_W64_FMT)) { return DRWAV_FALSE; } } @@ -1661,12 +1610,12 @@ static drwav_bool32 drwav__read_fmt(drwav_read_proc onRead, drwav_seek_proc onSe } *pRunningBytesReadOut += sizeof(fmt); - fmtOut->formatTag = drwav__bytes_to_u16(fmt + 0); - fmtOut->channels = drwav__bytes_to_u16(fmt + 2); - fmtOut->sampleRate = drwav__bytes_to_u32(fmt + 4); - fmtOut->avgBytesPerSec = drwav__bytes_to_u32(fmt + 8); - fmtOut->blockAlign = drwav__bytes_to_u16(fmt + 12); - fmtOut->bitsPerSample = drwav__bytes_to_u16(fmt + 14); + fmtOut->formatTag = drwav_bytes_to_u16(fmt + 0); + fmtOut->channels = drwav_bytes_to_u16(fmt + 2); + fmtOut->sampleRate = drwav_bytes_to_u32(fmt + 4); + fmtOut->avgBytesPerSec = drwav_bytes_to_u32(fmt + 8); + fmtOut->blockAlign = drwav_bytes_to_u16(fmt + 12); + fmtOut->bitsPerSample = drwav_bytes_to_u16(fmt + 14); fmtOut->extendedSize = 0; fmtOut->validBitsPerSample = 0; @@ -1684,7 +1633,7 @@ static drwav_bool32 drwav__read_fmt(drwav_read_proc onRead, drwav_seek_proc onSe bytesReadSoFar = 18; - fmtOut->extendedSize = drwav__bytes_to_u16(fmt_cbSize); + fmtOut->extendedSize = drwav_bytes_to_u16(fmt_cbSize); if (fmtOut->extendedSize > 0) { /* Simple validation. */ if (fmtOut->formatTag == DR_WAVE_FORMAT_EXTENSIBLE) { @@ -1699,8 +1648,8 @@ static drwav_bool32 drwav__read_fmt(drwav_read_proc onRead, drwav_seek_proc onSe return DRWAV_FALSE; /* Expecting more data. */ } - fmtOut->validBitsPerSample = drwav__bytes_to_u16(fmtext + 0); - fmtOut->channelMask = drwav__bytes_to_u32(fmtext + 2); + fmtOut->validBitsPerSample = drwav_bytes_to_u16(fmtext + 0); + fmtOut->channelMask = drwav_bytes_to_u32(fmtext + 2); drwav__bytes_to_guid(fmtext + 6, fmtOut->subFormat); } else { if (!onSeek(pUserData, fmtOut->extendedSize, drwav_seek_origin_current)) { @@ -1730,7 +1679,7 @@ static drwav_bool32 drwav__read_fmt(drwav_read_proc onRead, drwav_seek_proc onSe } -static size_t drwav__on_read(drwav_read_proc onRead, void* pUserData, void* pBufferOut, size_t bytesToRead, drwav_uint64* pCursor) +DRWAV_PRIVATE size_t drwav__on_read(drwav_read_proc onRead, void* pUserData, void* pBufferOut, size_t bytesToRead, drwav_uint64* pCursor) { size_t bytesRead; @@ -1743,7 +1692,7 @@ static size_t drwav__on_read(drwav_read_proc onRead, void* pUserData, void* pBuf } #if 0 -static drwav_bool32 drwav__on_seek(drwav_seek_proc onSeek, void* pUserData, int offset, drwav_seek_origin origin, drwav_uint64* pCursor) +DRWAV_PRIVATE drwav_bool32 drwav__on_seek(drwav_seek_proc onSeek, void* pUserData, int offset, drwav_seek_origin origin, drwav_uint64* pCursor) { DRWAV_ASSERT(onSeek != NULL); DRWAV_ASSERT(pCursor != NULL); @@ -1764,7 +1713,7 @@ static drwav_bool32 drwav__on_seek(drwav_seek_proc onSeek, void* pUserData, int -static drwav_uint32 drwav_get_bytes_per_pcm_frame(drwav* pWav) +DRWAV_PRIVATE drwav_uint32 drwav_get_bytes_per_pcm_frame(drwav* pWav) { /* The bytes per frame is a bit ambiguous. It can be either be based on the bits per sample, or the block align. The way I'm doing it here @@ -1787,11 +1736,11 @@ DRWAV_API drwav_uint16 drwav_fmt_get_format(const drwav_fmt* pFMT) if (pFMT->formatTag != DR_WAVE_FORMAT_EXTENSIBLE) { return pFMT->formatTag; } else { - return drwav__bytes_to_u16(pFMT->subFormat); /* Only the first two bytes are required. */ + return drwav_bytes_to_u16(pFMT->subFormat); /* Only the first two bytes are required. */ } } -static drwav_bool32 drwav_preinit(drwav* pWav, drwav_read_proc onRead, drwav_seek_proc onSeek, void* pReadSeekUserData, const drwav_allocation_callbacks* pAllocationCallbacks) +DRWAV_PRIVATE drwav_bool32 drwav_preinit(drwav* pWav, drwav_read_proc onRead, drwav_seek_proc onSeek, void* pReadSeekUserData, const drwav_allocation_callbacks* pAllocationCallbacks) { if (pWav == NULL || onRead == NULL || onSeek == NULL) { return DRWAV_FALSE; @@ -1810,7 +1759,7 @@ static drwav_bool32 drwav_preinit(drwav* pWav, drwav_read_proc onRead, drwav_see return DRWAV_TRUE; } -static drwav_bool32 drwav_init__internal(drwav* pWav, drwav_chunk_proc onChunk, void* pChunkUserData, drwav_uint32 flags) +DRWAV_PRIVATE drwav_bool32 drwav_init__internal(drwav* pWav, drwav_chunk_proc onChunk, void* pChunkUserData, drwav_uint32 flags) { /* This function assumes drwav_preinit() has been called beforehand. */ @@ -1836,9 +1785,9 @@ static drwav_bool32 drwav_init__internal(drwav* pWav, drwav_chunk_proc onChunk, The first 4 bytes can be used to identify the container. For RIFF files it will start with "RIFF" and for w64 it will start with "riff". */ - if (drwav__fourcc_equal(riff, "RIFF")) { + if (drwav_fourcc_equal(riff, "RIFF")) { pWav->container = drwav_container_riff; - } else if (drwav__fourcc_equal(riff, "riff")) { + } else if (drwav_fourcc_equal(riff, "riff")) { int i; drwav_uint8 riff2[12]; @@ -1854,7 +1803,7 @@ static drwav_bool32 drwav_init__internal(drwav* pWav, drwav_chunk_proc onChunk, return DRWAV_FALSE; } } - } else if (drwav__fourcc_equal(riff, "RF64")) { + } else if (drwav_fourcc_equal(riff, "RF64")) { pWav->container = drwav_container_rf64; } else { return DRWAV_FALSE; /* Unknown or unsupported container. */ @@ -1871,11 +1820,11 @@ static drwav_bool32 drwav_init__internal(drwav* pWav, drwav_chunk_proc onChunk, } if (pWav->container == drwav_container_riff) { - if (drwav__bytes_to_u32(chunkSizeBytes) < 36) { + if (drwav_bytes_to_u32(chunkSizeBytes) < 36) { return DRWAV_FALSE; /* Chunk size should always be at least 36 bytes. */ } } else { - if (drwav__bytes_to_u32(chunkSizeBytes) != 0xFFFFFFFF) { + if (drwav_bytes_to_u32(chunkSizeBytes) != 0xFFFFFFFF) { return DRWAV_FALSE; /* Chunk size should always be set to -1/0xFFFFFFFF for RF64. The actual size is retrieved later. */ } } @@ -1884,7 +1833,7 @@ static drwav_bool32 drwav_init__internal(drwav* pWav, drwav_chunk_proc onChunk, return DRWAV_FALSE; } - if (!drwav__fourcc_equal(wave, "WAVE")) { + if (!drwav_fourcc_equal(wave, "WAVE")) { return DRWAV_FALSE; /* Expecting "WAVE". */ } } else { @@ -1896,7 +1845,7 @@ static drwav_bool32 drwav_init__internal(drwav* pWav, drwav_chunk_proc onChunk, return DRWAV_FALSE; } - if (drwav__bytes_to_u64(chunkSizeBytes) < 80) { + if (drwav_bytes_to_u64(chunkSizeBytes) < 80) { return DRWAV_FALSE; } @@ -1904,7 +1853,7 @@ static drwav_bool32 drwav_init__internal(drwav* pWav, drwav_chunk_proc onChunk, return DRWAV_FALSE; } - if (!drwav__guid_equal(wave, drwavGUID_W64_WAVE)) { + if (!drwav_guid_equal(wave, drwavGUID_W64_WAVE)) { return DRWAV_FALSE; } } @@ -1920,7 +1869,7 @@ static drwav_bool32 drwav_init__internal(drwav* pWav, drwav_chunk_proc onChunk, return DRWAV_FALSE; } - if (!drwav__fourcc_equal(header.id.fourcc, "ds64")) { + if (!drwav_fourcc_equal(header.id.fourcc, "ds64")) { return DRWAV_FALSE; /* Expecting "ds64". */ } @@ -1939,7 +1888,7 @@ static drwav_bool32 drwav_init__internal(drwav* pWav, drwav_chunk_proc onChunk, return DRWAV_FALSE; } bytesRemainingInChunk -= 8; - dataChunkSize = drwav__bytes_to_u64(sizeBytes); + dataChunkSize = drwav_bytes_to_u64(sizeBytes); /* Next 8 bytes is the same count which we would usually derived from the FACT chunk if it was available. */ @@ -1947,7 +1896,7 @@ static drwav_bool32 drwav_init__internal(drwav* pWav, drwav_chunk_proc onChunk, return DRWAV_FALSE; } bytesRemainingInChunk -= 8; - sampleCountFromFactChunk = drwav__bytes_to_u64(sizeBytes); + sampleCountFromFactChunk = drwav_bytes_to_u64(sizeBytes); /* Skip over everything else. */ @@ -1975,7 +1924,7 @@ static drwav_bool32 drwav_init__internal(drwav* pWav, drwav_chunk_proc onChunk, /* Translate the internal format. */ translatedFormatTag = fmt.formatTag; if (translatedFormatTag == DR_WAVE_FORMAT_EXTENSIBLE) { - translatedFormatTag = drwav__bytes_to_u16(fmt.subFormat + 0); + translatedFormatTag = drwav_bytes_to_u16(fmt.subFormat + 0); } @@ -2023,14 +1972,14 @@ static drwav_bool32 drwav_init__internal(drwav* pWav, drwav_chunk_proc onChunk, chunkSize = header.sizeInBytes; if (pWav->container == drwav_container_riff || pWav->container == drwav_container_rf64) { - if (drwav__fourcc_equal(header.id.fourcc, "data")) { + if (drwav_fourcc_equal(header.id.fourcc, "data")) { foundDataChunk = DRWAV_TRUE; if (pWav->container != drwav_container_rf64) { /* The data chunk size for RF64 will always be set to 0xFFFFFFFF here. It was set to it's true value earlier. */ dataChunkSize = chunkSize; } } } else { - if (drwav__guid_equal(header.id.guid, drwavGUID_W64_DATA)) { + if (drwav_guid_equal(header.id.guid, drwavGUID_W64_DATA)) { foundDataChunk = DRWAV_TRUE; dataChunkSize = chunkSize; } @@ -2046,7 +1995,7 @@ static drwav_bool32 drwav_init__internal(drwav* pWav, drwav_chunk_proc onChunk, /* Optional. Get the total sample count from the FACT chunk. This is useful for compressed formats. */ if (pWav->container == drwav_container_riff) { - if (drwav__fourcc_equal(header.id.fourcc, "fact")) { + if (drwav_fourcc_equal(header.id.fourcc, "fact")) { drwav_uint32 sampleCount; if (drwav__on_read(pWav->onRead, pWav->pUserData, &sampleCount, 4, &cursor) != 4) { return DRWAV_FALSE; @@ -2068,7 +2017,7 @@ static drwav_bool32 drwav_init__internal(drwav* pWav, drwav_chunk_proc onChunk, } } } else if (pWav->container == drwav_container_w64) { - if (drwav__guid_equal(header.id.guid, drwavGUID_W64_FACT)) { + if (drwav_guid_equal(header.id.guid, drwavGUID_W64_FACT)) { if (drwav__on_read(pWav->onRead, pWav->pUserData, &sampleCountFromFactChunk, 8, &cursor) != 8) { return DRWAV_FALSE; } @@ -2084,7 +2033,7 @@ static drwav_bool32 drwav_init__internal(drwav* pWav, drwav_chunk_proc onChunk, /* "smpl" chunk. */ if (pWav->container == drwav_container_riff || pWav->container == drwav_container_rf64) { - if (drwav__fourcc_equal(header.id.fourcc, "smpl")) { + if (drwav_fourcc_equal(header.id.fourcc, "smpl")) { drwav_uint8 smplHeaderData[36]; /* 36 = size of the smpl header section, not including the loop data. */ if (chunkSize >= sizeof(smplHeaderData)) { drwav_uint64 bytesJustRead = drwav__on_read(pWav->onRead, pWav->pUserData, smplHeaderData, sizeof(smplHeaderData), &cursor); @@ -2093,15 +2042,15 @@ static drwav_bool32 drwav_init__internal(drwav* pWav, drwav_chunk_proc onChunk, if (bytesJustRead == sizeof(smplHeaderData)) { drwav_uint32 iLoop; - pWav->smpl.manufacturer = drwav__bytes_to_u32(smplHeaderData+0); - pWav->smpl.product = drwav__bytes_to_u32(smplHeaderData+4); - pWav->smpl.samplePeriod = drwav__bytes_to_u32(smplHeaderData+8); - pWav->smpl.midiUnityNotes = drwav__bytes_to_u32(smplHeaderData+12); - pWav->smpl.midiPitchFraction = drwav__bytes_to_u32(smplHeaderData+16); - pWav->smpl.smpteFormat = drwav__bytes_to_u32(smplHeaderData+20); - pWav->smpl.smpteOffset = drwav__bytes_to_u32(smplHeaderData+24); - pWav->smpl.numSampleLoops = drwav__bytes_to_u32(smplHeaderData+28); - pWav->smpl.samplerData = drwav__bytes_to_u32(smplHeaderData+32); + pWav->smpl.manufacturer = drwav_bytes_to_u32(smplHeaderData+0); + pWav->smpl.product = drwav_bytes_to_u32(smplHeaderData+4); + pWav->smpl.samplePeriod = drwav_bytes_to_u32(smplHeaderData+8); + pWav->smpl.midiUnityNotes = drwav_bytes_to_u32(smplHeaderData+12); + pWav->smpl.midiPitchFraction = drwav_bytes_to_u32(smplHeaderData+16); + pWav->smpl.smpteFormat = drwav_bytes_to_u32(smplHeaderData+20); + pWav->smpl.smpteOffset = drwav_bytes_to_u32(smplHeaderData+24); + pWav->smpl.numSampleLoops = drwav_bytes_to_u32(smplHeaderData+28); + pWav->smpl.samplerData = drwav_bytes_to_u32(smplHeaderData+32); for (iLoop = 0; iLoop < pWav->smpl.numSampleLoops && iLoop < drwav_countof(pWav->smpl.loops); ++iLoop) { drwav_uint8 smplLoopData[24]; /* 24 = size of a loop section in the smpl chunk. */ @@ -2109,12 +2058,12 @@ static drwav_bool32 drwav_init__internal(drwav* pWav, drwav_chunk_proc onChunk, chunkSize -= bytesJustRead; if (bytesJustRead == sizeof(smplLoopData)) { - pWav->smpl.loops[iLoop].cuePointId = drwav__bytes_to_u32(smplLoopData+0); - pWav->smpl.loops[iLoop].type = drwav__bytes_to_u32(smplLoopData+4); - pWav->smpl.loops[iLoop].start = drwav__bytes_to_u32(smplLoopData+8); - pWav->smpl.loops[iLoop].end = drwav__bytes_to_u32(smplLoopData+12); - pWav->smpl.loops[iLoop].fraction = drwav__bytes_to_u32(smplLoopData+16); - pWav->smpl.loops[iLoop].playCount = drwav__bytes_to_u32(smplLoopData+20); + pWav->smpl.loops[iLoop].cuePointId = drwav_bytes_to_u32(smplLoopData+0); + pWav->smpl.loops[iLoop].type = drwav_bytes_to_u32(smplLoopData+4); + pWav->smpl.loops[iLoop].start = drwav_bytes_to_u32(smplLoopData+8); + pWav->smpl.loops[iLoop].end = drwav_bytes_to_u32(smplLoopData+12); + pWav->smpl.loops[iLoop].fraction = drwav_bytes_to_u32(smplLoopData+16); + pWav->smpl.loops[iLoop].playCount = drwav_bytes_to_u32(smplLoopData+20); } else { break; /* Break from the smpl loop for loop. */ } @@ -2125,7 +2074,7 @@ static drwav_bool32 drwav_init__internal(drwav* pWav, drwav_chunk_proc onChunk, } } } else { - if (drwav__guid_equal(header.id.guid, drwavGUID_W64_SMPL)) { + if (drwav_guid_equal(header.id.guid, drwavGUID_W64_SMPL)) { /* This path will be hit when a W64 WAV file contains a smpl chunk. I don't have a sample file to test this path, so a contribution is welcome to add support for this. @@ -2249,7 +2198,7 @@ DRWAV_API drwav_bool32 drwav_init_ex(drwav* pWav, drwav_read_proc onRead, drwav_ } -static drwav_uint32 drwav__riff_chunk_size_riff(drwav_uint64 dataChunkSize) +DRWAV_PRIVATE drwav_uint32 drwav__riff_chunk_size_riff(drwav_uint64 dataChunkSize) { drwav_uint64 chunkSize = 4 + 24 + dataChunkSize + drwav__chunk_padding_size_riff(dataChunkSize); /* 4 = "WAVE". 24 = "fmt " chunk. */ if (chunkSize > 0xFFFFFFFFUL) { @@ -2259,7 +2208,7 @@ static drwav_uint32 drwav__riff_chunk_size_riff(drwav_uint64 dataChunkSize) return (drwav_uint32)chunkSize; /* Safe cast due to the clamp above. */ } -static drwav_uint32 drwav__data_chunk_size_riff(drwav_uint64 dataChunkSize) +DRWAV_PRIVATE drwav_uint32 drwav__data_chunk_size_riff(drwav_uint64 dataChunkSize) { if (dataChunkSize <= 0xFFFFFFFFUL) { return (drwav_uint32)dataChunkSize; @@ -2268,19 +2217,19 @@ static drwav_uint32 drwav__data_chunk_size_riff(drwav_uint64 dataChunkSize) } } -static drwav_uint64 drwav__riff_chunk_size_w64(drwav_uint64 dataChunkSize) +DRWAV_PRIVATE drwav_uint64 drwav__riff_chunk_size_w64(drwav_uint64 dataChunkSize) { drwav_uint64 dataSubchunkPaddingSize = drwav__chunk_padding_size_w64(dataChunkSize); return 80 + 24 + dataChunkSize + dataSubchunkPaddingSize; /* +24 because W64 includes the size of the GUID and size fields. */ } -static drwav_uint64 drwav__data_chunk_size_w64(drwav_uint64 dataChunkSize) +DRWAV_PRIVATE drwav_uint64 drwav__data_chunk_size_w64(drwav_uint64 dataChunkSize) { return 24 + dataChunkSize; /* +24 because W64 includes the size of the GUID and size fields. */ } -static drwav_uint64 drwav__riff_chunk_size_rf64(drwav_uint64 dataChunkSize) +DRWAV_PRIVATE drwav_uint64 drwav__riff_chunk_size_rf64(drwav_uint64 dataChunkSize) { drwav_uint64 chunkSize = 4 + 36 + 24 + dataChunkSize + drwav__chunk_padding_size_riff(dataChunkSize); /* 4 = "WAVE". 36 = "ds64" chunk. 24 = "fmt " chunk. */ if (chunkSize > 0xFFFFFFFFUL) { @@ -2290,13 +2239,13 @@ static drwav_uint64 drwav__riff_chunk_size_rf64(drwav_uint64 dataChunkSize) return chunkSize; } -static drwav_uint64 drwav__data_chunk_size_rf64(drwav_uint64 dataChunkSize) +DRWAV_PRIVATE drwav_uint64 drwav__data_chunk_size_rf64(drwav_uint64 dataChunkSize) { return dataChunkSize; } -static size_t drwav__write(drwav* pWav, const void* pData, size_t dataSize) +DRWAV_PRIVATE size_t drwav__write(drwav* pWav, const void* pData, size_t dataSize) { DRWAV_ASSERT(pWav != NULL); DRWAV_ASSERT(pWav->onWrite != NULL); @@ -2305,7 +2254,7 @@ static size_t drwav__write(drwav* pWav, const void* pData, size_t dataSize) return pWav->onWrite(pWav->pUserData, pData, dataSize); } -static size_t drwav__write_u16ne_to_le(drwav* pWav, drwav_uint16 value) +DRWAV_PRIVATE size_t drwav__write_u16ne_to_le(drwav* pWav, drwav_uint16 value) { DRWAV_ASSERT(pWav != NULL); DRWAV_ASSERT(pWav->onWrite != NULL); @@ -2317,7 +2266,7 @@ static size_t drwav__write_u16ne_to_le(drwav* pWav, drwav_uint16 value) return drwav__write(pWav, &value, 2); } -static size_t drwav__write_u32ne_to_le(drwav* pWav, drwav_uint32 value) +DRWAV_PRIVATE size_t drwav__write_u32ne_to_le(drwav* pWav, drwav_uint32 value) { DRWAV_ASSERT(pWav != NULL); DRWAV_ASSERT(pWav->onWrite != NULL); @@ -2329,7 +2278,7 @@ static size_t drwav__write_u32ne_to_le(drwav* pWav, drwav_uint32 value) return drwav__write(pWav, &value, 4); } -static size_t drwav__write_u64ne_to_le(drwav* pWav, drwav_uint64 value) +DRWAV_PRIVATE size_t drwav__write_u64ne_to_le(drwav* pWav, drwav_uint64 value) { DRWAV_ASSERT(pWav != NULL); DRWAV_ASSERT(pWav->onWrite != NULL); @@ -2342,7 +2291,7 @@ static size_t drwav__write_u64ne_to_le(drwav* pWav, drwav_uint64 value) } -static drwav_bool32 drwav_preinit_write(drwav* pWav, const drwav_data_format* pFormat, drwav_bool32 isSequential, drwav_write_proc onWrite, drwav_seek_proc onSeek, void* pUserData, const drwav_allocation_callbacks* pAllocationCallbacks) +DRWAV_PRIVATE drwav_bool32 drwav_preinit_write(drwav* pWav, const drwav_data_format* pFormat, drwav_bool32 isSequential, drwav_write_proc onWrite, drwav_seek_proc onSeek, void* pUserData, const drwav_allocation_callbacks* pAllocationCallbacks) { if (pWav == NULL || onWrite == NULL) { return DRWAV_FALSE; @@ -2382,7 +2331,7 @@ static drwav_bool32 drwav_preinit_write(drwav* pWav, const drwav_data_format* pF return DRWAV_TRUE; } -static drwav_bool32 drwav_init_write__internal(drwav* pWav, const drwav_data_format* pFormat, drwav_uint64 totalSampleCount) +DRWAV_PRIVATE drwav_bool32 drwav_init_write__internal(drwav* pWav, const drwav_data_format* pFormat, drwav_uint64 totalSampleCount) { /* The function assumes drwav_preinit_write() was called beforehand. */ @@ -2462,8 +2411,6 @@ static drwav_bool32 drwav_init_write__internal(drwav* pWav, const drwav_data_for runningPos += drwav__write_u16ne_to_le(pWav, pWav->fmt.blockAlign); runningPos += drwav__write_u16ne_to_le(pWav, pWav->fmt.bitsPerSample); - pWav->dataChunkDataPos = runningPos; - /* "data" chunk. */ if (pFormat->container == drwav_container_riff) { drwav_uint32 chunkSizeDATA = (drwav_uint32)initialDataChunkSize; @@ -2478,19 +2425,13 @@ static drwav_bool32 drwav_init_write__internal(drwav* pWav, const drwav_data_for runningPos += drwav__write_u32ne_to_le(pWav, 0xFFFFFFFF); /* Always set to 0xFFFFFFFF for RF64. The true size of the data chunk is specified in the ds64 chunk. */ } - /* - The runningPos variable is incremented in the section above but is left unused which is causing some static analysis tools to detect it - as a dead store. I'm leaving this as-is for safety just in case I want to expand this function later to include other tags and want to - keep track of the running position for whatever reason. The line below should silence the static analysis tools. - */ - (void)runningPos; - /* Set some properties for the client's convenience. */ pWav->container = pFormat->container; pWav->channels = (drwav_uint16)pFormat->channels; pWav->sampleRate = pFormat->sampleRate; pWav->bitsPerSample = (drwav_uint16)pFormat->bitsPerSample; pWav->translatedFormatTag = (drwav_uint16)pFormat->format; + pWav->dataChunkDataPos = runningPos; return DRWAV_TRUE; } @@ -2549,7 +2490,7 @@ DRWAV_API drwav_uint64 drwav_target_write_size_bytes(const drwav_data_format* pF /* drwav_result_from_errno() is only used for fopen() and wfopen() so putting it inside DR_WAV_NO_STDIO for now. If something else needs this later we can move it out. */ #include -static drwav_result drwav_result_from_errno(int e) +DRWAV_PRIVATE drwav_result drwav_result_from_errno(int e) { switch (e) { @@ -2951,9 +2892,9 @@ static drwav_result drwav_result_from_errno(int e) } } -static drwav_result drwav_fopen(FILE** ppFile, const char* pFilePath, const char* pOpenMode) +DRWAV_PRIVATE drwav_result drwav_fopen(FILE** ppFile, const char* pFilePath, const char* pOpenMode) { -#if _MSC_VER && _MSC_VER >= 1400 +#if defined(_MSC_VER) && _MSC_VER >= 1400 errno_t err; #endif @@ -2965,7 +2906,7 @@ static drwav_result drwav_fopen(FILE** ppFile, const char* pFilePath, const char return DRWAV_INVALID_ARGS; } -#if _MSC_VER && _MSC_VER >= 1400 +#if defined(_MSC_VER) && _MSC_VER >= 1400 err = fopen_s(ppFile, pFilePath, pOpenMode); if (err != 0) { return drwav_result_from_errno(err); @@ -3000,17 +2941,18 @@ _wfopen() isn't always available in all compilation environments. * MSVC seems to support it universally as far back as VC6 from what I can tell (haven't checked further back). * MinGW-64 (both 32- and 64-bit) seems to support it. * MinGW wraps it in !defined(__STRICT_ANSI__). + * OpenWatcom wraps it in !defined(_NO_EXT_KEYS). This can be reviewed as compatibility issues arise. The preference is to use _wfopen_s() and _wfopen() as opposed to the wcsrtombs() fallback, so if you notice your compiler not detecting this properly I'm happy to look at adding support. */ #if defined(_WIN32) - #if defined(_MSC_VER) || defined(__MINGW64__) || !defined(__STRICT_ANSI__) + #if defined(_MSC_VER) || defined(__MINGW64__) || (!defined(__STRICT_ANSI__) && !defined(_NO_EXT_KEYS)) #define DRWAV_HAS_WFOPEN #endif #endif -static drwav_result drwav_wfopen(FILE** ppFile, const wchar_t* pFilePath, const wchar_t* pOpenMode, const drwav_allocation_callbacks* pAllocationCallbacks) +DRWAV_PRIVATE drwav_result drwav_wfopen(FILE** ppFile, const wchar_t* pFilePath, const wchar_t* pOpenMode, const drwav_allocation_callbacks* pAllocationCallbacks) { if (ppFile != NULL) { *ppFile = NULL; /* Safety. */ @@ -3093,17 +3035,17 @@ static drwav_result drwav_wfopen(FILE** ppFile, const wchar_t* pFilePath, const } -static size_t drwav__on_read_stdio(void* pUserData, void* pBufferOut, size_t bytesToRead) +DRWAV_PRIVATE size_t drwav__on_read_stdio(void* pUserData, void* pBufferOut, size_t bytesToRead) { return fread(pBufferOut, 1, bytesToRead, (FILE*)pUserData); } -static size_t drwav__on_write_stdio(void* pUserData, const void* pData, size_t bytesToWrite) +DRWAV_PRIVATE size_t drwav__on_write_stdio(void* pUserData, const void* pData, size_t bytesToWrite) { return fwrite(pData, 1, bytesToWrite, (FILE*)pUserData); } -static drwav_bool32 drwav__on_seek_stdio(void* pUserData, int offset, drwav_seek_origin origin) +DRWAV_PRIVATE drwav_bool32 drwav__on_seek_stdio(void* pUserData, int offset, drwav_seek_origin origin) { return fseek((FILE*)pUserData, offset, (origin == drwav_seek_origin_current) ? SEEK_CUR : SEEK_SET) == 0; } @@ -3114,7 +3056,7 @@ DRWAV_API drwav_bool32 drwav_init_file(drwav* pWav, const char* filename, const } -static drwav_bool32 drwav_init_file__internal_FILE(drwav* pWav, FILE* pFile, drwav_chunk_proc onChunk, void* pChunkUserData, drwav_uint32 flags, const drwav_allocation_callbacks* pAllocationCallbacks) +DRWAV_PRIVATE drwav_bool32 drwav_init_file__internal_FILE(drwav* pWav, FILE* pFile, drwav_chunk_proc onChunk, void* pChunkUserData, drwav_uint32 flags, const drwav_allocation_callbacks* pAllocationCallbacks) { drwav_bool32 result; @@ -3161,7 +3103,7 @@ DRWAV_API drwav_bool32 drwav_init_file_ex_w(drwav* pWav, const wchar_t* filename } -static drwav_bool32 drwav_init_file_write__internal_FILE(drwav* pWav, FILE* pFile, const drwav_data_format* pFormat, drwav_uint64 totalSampleCount, drwav_bool32 isSequential, const drwav_allocation_callbacks* pAllocationCallbacks) +DRWAV_PRIVATE drwav_bool32 drwav_init_file_write__internal_FILE(drwav* pWav, FILE* pFile, const drwav_data_format* pFormat, drwav_uint64 totalSampleCount, drwav_bool32 isSequential, const drwav_allocation_callbacks* pAllocationCallbacks) { drwav_bool32 result; @@ -3180,7 +3122,7 @@ static drwav_bool32 drwav_init_file_write__internal_FILE(drwav* pWav, FILE* pFil return DRWAV_TRUE; } -static drwav_bool32 drwav_init_file_write__internal(drwav* pWav, const char* filename, const drwav_data_format* pFormat, drwav_uint64 totalSampleCount, drwav_bool32 isSequential, const drwav_allocation_callbacks* pAllocationCallbacks) +DRWAV_PRIVATE drwav_bool32 drwav_init_file_write__internal(drwav* pWav, const char* filename, const drwav_data_format* pFormat, drwav_uint64 totalSampleCount, drwav_bool32 isSequential, const drwav_allocation_callbacks* pAllocationCallbacks) { FILE* pFile; if (drwav_fopen(&pFile, filename, "wb") != DRWAV_SUCCESS) { @@ -3191,7 +3133,7 @@ static drwav_bool32 drwav_init_file_write__internal(drwav* pWav, const char* fil return drwav_init_file_write__internal_FILE(pWav, pFile, pFormat, totalSampleCount, isSequential, pAllocationCallbacks); } -static drwav_bool32 drwav_init_file_write_w__internal(drwav* pWav, const wchar_t* filename, const drwav_data_format* pFormat, drwav_uint64 totalSampleCount, drwav_bool32 isSequential, const drwav_allocation_callbacks* pAllocationCallbacks) +DRWAV_PRIVATE drwav_bool32 drwav_init_file_write_w__internal(drwav* pWav, const wchar_t* filename, const drwav_data_format* pFormat, drwav_uint64 totalSampleCount, drwav_bool32 isSequential, const drwav_allocation_callbacks* pAllocationCallbacks) { FILE* pFile; if (drwav_wfopen(&pFile, filename, L"wb", pAllocationCallbacks) != DRWAV_SUCCESS) { @@ -3242,7 +3184,7 @@ DRWAV_API drwav_bool32 drwav_init_file_write_sequential_pcm_frames_w(drwav* pWav #endif /* DR_WAV_NO_STDIO */ -static size_t drwav__on_read_memory(void* pUserData, void* pBufferOut, size_t bytesToRead) +DRWAV_PRIVATE size_t drwav__on_read_memory(void* pUserData, void* pBufferOut, size_t bytesToRead) { drwav* pWav = (drwav*)pUserData; size_t bytesRemaining; @@ -3263,7 +3205,7 @@ static size_t drwav__on_read_memory(void* pUserData, void* pBufferOut, size_t by return bytesToRead; } -static drwav_bool32 drwav__on_seek_memory(void* pUserData, int offset, drwav_seek_origin origin) +DRWAV_PRIVATE drwav_bool32 drwav__on_seek_memory(void* pUserData, int offset, drwav_seek_origin origin) { drwav* pWav = (drwav*)pUserData; DRWAV_ASSERT(pWav != NULL); @@ -3292,7 +3234,7 @@ static drwav_bool32 drwav__on_seek_memory(void* pUserData, int offset, drwav_see return DRWAV_TRUE; } -static size_t drwav__on_write_memory(void* pUserData, const void* pDataIn, size_t bytesToWrite) +DRWAV_PRIVATE size_t drwav__on_write_memory(void* pUserData, const void* pDataIn, size_t bytesToWrite) { drwav* pWav = (drwav*)pUserData; size_t bytesRemaining; @@ -3332,7 +3274,7 @@ static size_t drwav__on_write_memory(void* pUserData, const void* pDataIn, size_ return bytesToWrite; } -static drwav_bool32 drwav__on_seek_memory_write(void* pUserData, int offset, drwav_seek_origin origin) +DRWAV_PRIVATE drwav_bool32 drwav__on_seek_memory_write(void* pUserData, int offset, drwav_seek_origin origin) { drwav* pWav = (drwav*)pUserData; DRWAV_ASSERT(pWav != NULL); @@ -3384,7 +3326,7 @@ DRWAV_API drwav_bool32 drwav_init_memory_ex(drwav* pWav, const void* data, size_ } -static drwav_bool32 drwav_init_memory_write__internal(drwav* pWav, void** ppData, size_t* pDataSize, const drwav_data_format* pFormat, drwav_uint64 totalSampleCount, drwav_bool32 isSequential, const drwav_allocation_callbacks* pAllocationCallbacks) +DRWAV_PRIVATE drwav_bool32 drwav_init_memory_write__internal(drwav* pWav, void** ppData, size_t* pDataSize, const drwav_data_format* pFormat, drwav_uint64 totalSampleCount, drwav_bool32 isSequential, const drwav_allocation_callbacks* pAllocationCallbacks) { if (ppData == NULL || pDataSize == NULL) { return DRWAV_FALSE; @@ -3467,8 +3409,8 @@ DRWAV_API drwav_result drwav_uninit(drwav* pWav) drwav__write_u32ne_to_le(pWav, riffChunkSize); } - /* the "data" chunk size. */ - if (pWav->onSeek(pWav->pUserData, (int)pWav->dataChunkDataPos + 4, drwav_seek_origin_start)) { + /* The "data" chunk size. */ + if (pWav->onSeek(pWav->pUserData, (int)pWav->dataChunkDataPos - 4, drwav_seek_origin_start)) { drwav_uint32 dataChunkSize = drwav__data_chunk_size_riff(pWav->dataChunkDataSize); drwav__write_u32ne_to_le(pWav, dataChunkSize); } @@ -3480,7 +3422,7 @@ DRWAV_API drwav_result drwav_uninit(drwav* pWav) } /* The "data" chunk size. */ - if (pWav->onSeek(pWav->pUserData, (int)pWav->dataChunkDataPos + 16, drwav_seek_origin_start)) { + if (pWav->onSeek(pWav->pUserData, (int)pWav->dataChunkDataPos - 8, drwav_seek_origin_start)) { drwav_uint64 dataChunkSize = drwav__data_chunk_size_w64(pWav->dataChunkDataSize); drwav__write_u64ne_to_le(pWav, dataChunkSize); } @@ -3601,7 +3543,7 @@ DRWAV_API drwav_uint64 drwav_read_pcm_frames_le(drwav* pWav, drwav_uint64 frames /* Don't try to read more samples than can potentially fit in the output buffer. */ bytesToRead = framesToRead * bytesPerFrame; if (bytesToRead > DRWAV_SIZE_MAX) { - framesToRead = DRWAV_SIZE_MAX / bytesPerFrame; + bytesToRead = (DRWAV_SIZE_MAX / bytesPerFrame) * bytesPerFrame; /* Round the number of bytes to read to a clean frame boundary. */ } /* @@ -3637,7 +3579,7 @@ DRWAV_API drwav_uint64 drwav_read_pcm_frames(drwav* pWav, drwav_uint64 framesToR -DRWAV_API drwav_bool32 drwav_seek_to_first_pcm_frame(drwav* pWav) +DRWAV_PRIVATE drwav_bool32 drwav_seek_to_first_pcm_frame(drwav* pWav) { if (pWav->onWrite != NULL) { return DRWAV_FALSE; /* No seeking in write mode. */ @@ -3887,7 +3829,7 @@ DRWAV_API drwav_uint64 drwav_write_pcm_frames(drwav* pWav, drwav_uint64 framesTo } -static drwav_uint64 drwav_read_pcm_frames_s16__msadpcm(drwav* pWav, drwav_uint64 framesToRead, drwav_int16* pBufferOut) +DRWAV_PRIVATE drwav_uint64 drwav_read_pcm_frames_s16__msadpcm(drwav* pWav, drwav_uint64 framesToRead, drwav_int16* pBufferOut) { drwav_uint64 totalFramesRead = 0; @@ -3896,7 +3838,9 @@ static drwav_uint64 drwav_read_pcm_frames_s16__msadpcm(drwav* pWav, drwav_uint64 /* TODO: Lots of room for optimization here. */ - while (framesToRead > 0 && pWav->compressed.iCurrentPCMFrame < pWav->totalPCMFrameCount) { + while (pWav->compressed.iCurrentPCMFrame < pWav->totalPCMFrameCount) { + DRWAV_ASSERT(framesToRead > 0); /* This loop iteration will never get hit with framesToRead == 0 because it's asserted at the top, and we check for 0 inside the loop just below. */ + /* If there are no cached frames we need to load a new block. */ if (pWav->msadpcm.cachedFrameCount == 0 && pWav->msadpcm.bytesRemainingInBlock == 0) { if (pWav->channels == 1) { @@ -3908,9 +3852,9 @@ static drwav_uint64 drwav_read_pcm_frames_s16__msadpcm(drwav* pWav, drwav_uint64 pWav->msadpcm.bytesRemainingInBlock = pWav->fmt.blockAlign - sizeof(header); pWav->msadpcm.predictor[0] = header[0]; - pWav->msadpcm.delta[0] = drwav__bytes_to_s16(header + 1); - pWav->msadpcm.prevFrames[0][1] = (drwav_int32)drwav__bytes_to_s16(header + 3); - pWav->msadpcm.prevFrames[0][0] = (drwav_int32)drwav__bytes_to_s16(header + 5); + pWav->msadpcm.delta[0] = drwav_bytes_to_s16(header + 1); + pWav->msadpcm.prevFrames[0][1] = (drwav_int32)drwav_bytes_to_s16(header + 3); + pWav->msadpcm.prevFrames[0][0] = (drwav_int32)drwav_bytes_to_s16(header + 5); pWav->msadpcm.cachedFrames[2] = pWav->msadpcm.prevFrames[0][0]; pWav->msadpcm.cachedFrames[3] = pWav->msadpcm.prevFrames[0][1]; pWav->msadpcm.cachedFrameCount = 2; @@ -3924,12 +3868,12 @@ static drwav_uint64 drwav_read_pcm_frames_s16__msadpcm(drwav* pWav, drwav_uint64 pWav->msadpcm.predictor[0] = header[0]; pWav->msadpcm.predictor[1] = header[1]; - pWav->msadpcm.delta[0] = drwav__bytes_to_s16(header + 2); - pWav->msadpcm.delta[1] = drwav__bytes_to_s16(header + 4); - pWav->msadpcm.prevFrames[0][1] = (drwav_int32)drwav__bytes_to_s16(header + 6); - pWav->msadpcm.prevFrames[1][1] = (drwav_int32)drwav__bytes_to_s16(header + 8); - pWav->msadpcm.prevFrames[0][0] = (drwav_int32)drwav__bytes_to_s16(header + 10); - pWav->msadpcm.prevFrames[1][0] = (drwav_int32)drwav__bytes_to_s16(header + 12); + pWav->msadpcm.delta[0] = drwav_bytes_to_s16(header + 2); + pWav->msadpcm.delta[1] = drwav_bytes_to_s16(header + 4); + pWav->msadpcm.prevFrames[0][1] = (drwav_int32)drwav_bytes_to_s16(header + 6); + pWav->msadpcm.prevFrames[1][1] = (drwav_int32)drwav_bytes_to_s16(header + 8); + pWav->msadpcm.prevFrames[0][0] = (drwav_int32)drwav_bytes_to_s16(header + 10); + pWav->msadpcm.prevFrames[1][0] = (drwav_int32)drwav_bytes_to_s16(header + 12); pWav->msadpcm.cachedFrames[0] = pWav->msadpcm.prevFrames[0][0]; pWav->msadpcm.cachedFrames[1] = pWav->msadpcm.prevFrames[1][0]; @@ -3957,7 +3901,7 @@ static drwav_uint64 drwav_read_pcm_frames_s16__msadpcm(drwav* pWav, drwav_uint64 } if (framesToRead == 0) { - return totalFramesRead; + break; } @@ -4067,7 +4011,7 @@ static drwav_uint64 drwav_read_pcm_frames_s16__msadpcm(drwav* pWav, drwav_uint64 } -static drwav_uint64 drwav_read_pcm_frames_s16__ima(drwav* pWav, drwav_uint64 framesToRead, drwav_int16* pBufferOut) +DRWAV_PRIVATE drwav_uint64 drwav_read_pcm_frames_s16__ima(drwav* pWav, drwav_uint64 framesToRead, drwav_int16* pBufferOut) { drwav_uint64 totalFramesRead = 0; drwav_uint32 iChannel; @@ -4094,7 +4038,9 @@ static drwav_uint64 drwav_read_pcm_frames_s16__ima(drwav* pWav, drwav_uint64 fra /* TODO: Lots of room for optimization here. */ - while (framesToRead > 0 && pWav->compressed.iCurrentPCMFrame < pWav->totalPCMFrameCount) { + while (pWav->compressed.iCurrentPCMFrame < pWav->totalPCMFrameCount) { + DRWAV_ASSERT(framesToRead > 0); /* This loop iteration will never get hit with framesToRead == 0 because it's asserted at the top, and we check for 0 inside the loop just below. */ + /* If there are no cached samples we need to load a new block. */ if (pWav->ima.cachedFrameCount == 0 && pWav->ima.bytesRemainingInBlock == 0) { if (pWav->channels == 1) { @@ -4111,7 +4057,7 @@ static drwav_uint64 drwav_read_pcm_frames_s16__ima(drwav* pWav, drwav_uint64 fra return totalFramesRead; /* Invalid data. */ } - pWav->ima.predictor[0] = drwav__bytes_to_s16(header + 0); + pWav->ima.predictor[0] = drwav_bytes_to_s16(header + 0); pWav->ima.stepIndex[0] = header[2]; pWav->ima.cachedFrames[drwav_countof(pWav->ima.cachedFrames) - 1] = pWav->ima.predictor[0]; pWav->ima.cachedFrameCount = 1; @@ -4129,9 +4075,9 @@ static drwav_uint64 drwav_read_pcm_frames_s16__ima(drwav* pWav, drwav_uint64 fra return totalFramesRead; /* Invalid data. */ } - pWav->ima.predictor[0] = drwav__bytes_to_s16(header + 0); + pWav->ima.predictor[0] = drwav_bytes_to_s16(header + 0); pWav->ima.stepIndex[0] = header[2]; - pWav->ima.predictor[1] = drwav__bytes_to_s16(header + 4); + pWav->ima.predictor[1] = drwav_bytes_to_s16(header + 4); pWav->ima.stepIndex[1] = header[6]; pWav->ima.cachedFrames[drwav_countof(pWav->ima.cachedFrames) - 2] = pWav->ima.predictor[0]; @@ -4157,7 +4103,7 @@ static drwav_uint64 drwav_read_pcm_frames_s16__ima(drwav* pWav, drwav_uint64 fra } if (framesToRead == 0) { - return totalFramesRead; + break; } /* @@ -4275,7 +4221,7 @@ static DRWAV_INLINE drwav_int16 drwav__mulaw_to_s16(drwav_uint8 sampleIn) -static void drwav__pcm_to_s16(drwav_int16* pOut, const drwav_uint8* pIn, size_t totalSampleCount, unsigned int bytesPerSample) +DRWAV_PRIVATE void drwav__pcm_to_s16(drwav_int16* pOut, const drwav_uint8* pIn, size_t totalSampleCount, unsigned int bytesPerSample) { unsigned int i; @@ -4327,7 +4273,7 @@ static void drwav__pcm_to_s16(drwav_int16* pOut, const drwav_uint8* pIn, size_t } } -static void drwav__ieee_to_s16(drwav_int16* pOut, const drwav_uint8* pIn, size_t totalSampleCount, unsigned int bytesPerSample) +DRWAV_PRIVATE void drwav__ieee_to_s16(drwav_int16* pOut, const drwav_uint8* pIn, size_t totalSampleCount, unsigned int bytesPerSample) { if (bytesPerSample == 4) { drwav_f32_to_s16(pOut, (const float*)pIn, totalSampleCount); @@ -4342,11 +4288,11 @@ static void drwav__ieee_to_s16(drwav_int16* pOut, const drwav_uint8* pIn, size_t } } -static drwav_uint64 drwav_read_pcm_frames_s16__pcm(drwav* pWav, drwav_uint64 framesToRead, drwav_int16* pBufferOut) +DRWAV_PRIVATE drwav_uint64 drwav_read_pcm_frames_s16__pcm(drwav* pWav, drwav_uint64 framesToRead, drwav_int16* pBufferOut) { - drwav_uint32 bytesPerFrame; drwav_uint64 totalFramesRead; drwav_uint8 sampleData[4096]; + drwav_uint32 bytesPerFrame; /* Fast path. */ if ((pWav->translatedFormatTag == DR_WAVE_FORMAT_PCM && pWav->bitsPerSample == 16) || pBufferOut == NULL) { @@ -4376,7 +4322,7 @@ static drwav_uint64 drwav_read_pcm_frames_s16__pcm(drwav* pWav, drwav_uint64 fra return totalFramesRead; } -static drwav_uint64 drwav_read_pcm_frames_s16__ieee(drwav* pWav, drwav_uint64 framesToRead, drwav_int16* pBufferOut) +DRWAV_PRIVATE drwav_uint64 drwav_read_pcm_frames_s16__ieee(drwav* pWav, drwav_uint64 framesToRead, drwav_int16* pBufferOut) { drwav_uint64 totalFramesRead; drwav_uint8 sampleData[4096]; @@ -4409,7 +4355,7 @@ static drwav_uint64 drwav_read_pcm_frames_s16__ieee(drwav* pWav, drwav_uint64 fr return totalFramesRead; } -static drwav_uint64 drwav_read_pcm_frames_s16__alaw(drwav* pWav, drwav_uint64 framesToRead, drwav_int16* pBufferOut) +DRWAV_PRIVATE drwav_uint64 drwav_read_pcm_frames_s16__alaw(drwav* pWav, drwav_uint64 framesToRead, drwav_int16* pBufferOut) { drwav_uint64 totalFramesRead; drwav_uint8 sampleData[4096]; @@ -4442,7 +4388,7 @@ static drwav_uint64 drwav_read_pcm_frames_s16__alaw(drwav* pWav, drwav_uint64 fr return totalFramesRead; } -static drwav_uint64 drwav_read_pcm_frames_s16__mulaw(drwav* pWav, drwav_uint64 framesToRead, drwav_int16* pBufferOut) +DRWAV_PRIVATE drwav_uint64 drwav_read_pcm_frames_s16__mulaw(drwav* pWav, drwav_uint64 framesToRead, drwav_int16* pBufferOut) { drwav_uint64 totalFramesRead; drwav_uint8 sampleData[4096]; @@ -4620,7 +4566,7 @@ DRWAV_API void drwav_mulaw_to_s16(drwav_int16* pOut, const drwav_uint8* pIn, siz -static void drwav__pcm_to_f32(float* pOut, const drwav_uint8* pIn, size_t sampleCount, unsigned int bytesPerSample) +DRWAV_PRIVATE void drwav__pcm_to_f32(float* pOut, const drwav_uint8* pIn, size_t sampleCount, unsigned int bytesPerSample) { unsigned int i; @@ -4669,7 +4615,7 @@ static void drwav__pcm_to_f32(float* pOut, const drwav_uint8* pIn, size_t sample } } -static void drwav__ieee_to_f32(float* pOut, const drwav_uint8* pIn, size_t sampleCount, unsigned int bytesPerSample) +DRWAV_PRIVATE void drwav__ieee_to_f32(float* pOut, const drwav_uint8* pIn, size_t sampleCount, unsigned int bytesPerSample) { if (bytesPerSample == 4) { unsigned int i; @@ -4688,12 +4634,12 @@ static void drwav__ieee_to_f32(float* pOut, const drwav_uint8* pIn, size_t sampl } -static drwav_uint64 drwav_read_pcm_frames_f32__pcm(drwav* pWav, drwav_uint64 framesToRead, float* pBufferOut) +DRWAV_PRIVATE drwav_uint64 drwav_read_pcm_frames_f32__pcm(drwav* pWav, drwav_uint64 framesToRead, float* pBufferOut) { drwav_uint64 totalFramesRead; drwav_uint8 sampleData[4096]; - drwav_uint32 bytesPerFrame = drwav_get_bytes_per_pcm_frame(pWav); + if (bytesPerFrame == 0) { return 0; } @@ -4716,7 +4662,7 @@ static drwav_uint64 drwav_read_pcm_frames_f32__pcm(drwav* pWav, drwav_uint64 fra return totalFramesRead; } -static drwav_uint64 drwav_read_pcm_frames_f32__msadpcm(drwav* pWav, drwav_uint64 framesToRead, float* pBufferOut) +DRWAV_PRIVATE drwav_uint64 drwav_read_pcm_frames_f32__msadpcm(drwav* pWav, drwav_uint64 framesToRead, float* pBufferOut) { /* We're just going to borrow the implementation from the drwav_read_s16() since ADPCM is a little bit more complicated than other formats and I don't @@ -4724,6 +4670,7 @@ static drwav_uint64 drwav_read_pcm_frames_f32__msadpcm(drwav* pWav, drwav_uint64 */ drwav_uint64 totalFramesRead = 0; drwav_int16 samples16[2048]; + while (framesToRead > 0) { drwav_uint64 framesRead = drwav_read_pcm_frames_s16(pWav, drwav_min(framesToRead, drwav_countof(samples16)/pWav->channels), samples16); if (framesRead == 0) { @@ -4740,7 +4687,7 @@ static drwav_uint64 drwav_read_pcm_frames_f32__msadpcm(drwav* pWav, drwav_uint64 return totalFramesRead; } -static drwav_uint64 drwav_read_pcm_frames_f32__ima(drwav* pWav, drwav_uint64 framesToRead, float* pBufferOut) +DRWAV_PRIVATE drwav_uint64 drwav_read_pcm_frames_f32__ima(drwav* pWav, drwav_uint64 framesToRead, float* pBufferOut) { /* We're just going to borrow the implementation from the drwav_read_s16() since IMA-ADPCM is a little bit more complicated than other formats and I don't @@ -4748,6 +4695,7 @@ static drwav_uint64 drwav_read_pcm_frames_f32__ima(drwav* pWav, drwav_uint64 fra */ drwav_uint64 totalFramesRead = 0; drwav_int16 samples16[2048]; + while (framesToRead > 0) { drwav_uint64 framesRead = drwav_read_pcm_frames_s16(pWav, drwav_min(framesToRead, drwav_countof(samples16)/pWav->channels), samples16); if (framesRead == 0) { @@ -4764,7 +4712,7 @@ static drwav_uint64 drwav_read_pcm_frames_f32__ima(drwav* pWav, drwav_uint64 fra return totalFramesRead; } -static drwav_uint64 drwav_read_pcm_frames_f32__ieee(drwav* pWav, drwav_uint64 framesToRead, float* pBufferOut) +DRWAV_PRIVATE drwav_uint64 drwav_read_pcm_frames_f32__ieee(drwav* pWav, drwav_uint64 framesToRead, float* pBufferOut) { drwav_uint64 totalFramesRead; drwav_uint8 sampleData[4096]; @@ -4798,11 +4746,12 @@ static drwav_uint64 drwav_read_pcm_frames_f32__ieee(drwav* pWav, drwav_uint64 fr return totalFramesRead; } -static drwav_uint64 drwav_read_pcm_frames_f32__alaw(drwav* pWav, drwav_uint64 framesToRead, float* pBufferOut) +DRWAV_PRIVATE drwav_uint64 drwav_read_pcm_frames_f32__alaw(drwav* pWav, drwav_uint64 framesToRead, float* pBufferOut) { drwav_uint64 totalFramesRead; drwav_uint8 sampleData[4096]; drwav_uint32 bytesPerFrame = drwav_get_bytes_per_pcm_frame(pWav); + if (bytesPerFrame == 0) { return 0; } @@ -4825,12 +4774,12 @@ static drwav_uint64 drwav_read_pcm_frames_f32__alaw(drwav* pWav, drwav_uint64 fr return totalFramesRead; } -static drwav_uint64 drwav_read_pcm_frames_f32__mulaw(drwav* pWav, drwav_uint64 framesToRead, float* pBufferOut) +DRWAV_PRIVATE drwav_uint64 drwav_read_pcm_frames_f32__mulaw(drwav* pWav, drwav_uint64 framesToRead, float* pBufferOut) { drwav_uint64 totalFramesRead; drwav_uint8 sampleData[4096]; - drwav_uint32 bytesPerFrame = drwav_get_bytes_per_pcm_frame(pWav); + if (bytesPerFrame == 0) { return 0; } @@ -5030,7 +4979,7 @@ DRWAV_API void drwav_mulaw_to_f32(float* pOut, const drwav_uint8* pIn, size_t sa -static void drwav__pcm_to_s32(drwav_int32* pOut, const drwav_uint8* pIn, size_t totalSampleCount, unsigned int bytesPerSample) +DRWAV_PRIVATE void drwav__pcm_to_s32(drwav_int32* pOut, const drwav_uint8* pIn, size_t totalSampleCount, unsigned int bytesPerSample) { unsigned int i; @@ -5081,7 +5030,7 @@ static void drwav__pcm_to_s32(drwav_int32* pOut, const drwav_uint8* pIn, size_t } } -static void drwav__ieee_to_s32(drwav_int32* pOut, const drwav_uint8* pIn, size_t totalSampleCount, unsigned int bytesPerSample) +DRWAV_PRIVATE void drwav__ieee_to_s32(drwav_int32* pOut, const drwav_uint8* pIn, size_t totalSampleCount, unsigned int bytesPerSample) { if (bytesPerSample == 4) { drwav_f32_to_s32(pOut, (const float*)pIn, totalSampleCount); @@ -5097,7 +5046,7 @@ static void drwav__ieee_to_s32(drwav_int32* pOut, const drwav_uint8* pIn, size_t } -static drwav_uint64 drwav_read_pcm_frames_s32__pcm(drwav* pWav, drwav_uint64 framesToRead, drwav_int32* pBufferOut) +DRWAV_PRIVATE drwav_uint64 drwav_read_pcm_frames_s32__pcm(drwav* pWav, drwav_uint64 framesToRead, drwav_int32* pBufferOut) { drwav_uint64 totalFramesRead; drwav_uint8 sampleData[4096]; @@ -5131,7 +5080,7 @@ static drwav_uint64 drwav_read_pcm_frames_s32__pcm(drwav* pWav, drwav_uint64 fra return totalFramesRead; } -static drwav_uint64 drwav_read_pcm_frames_s32__msadpcm(drwav* pWav, drwav_uint64 framesToRead, drwav_int32* pBufferOut) +DRWAV_PRIVATE drwav_uint64 drwav_read_pcm_frames_s32__msadpcm(drwav* pWav, drwav_uint64 framesToRead, drwav_int32* pBufferOut) { /* We're just going to borrow the implementation from the drwav_read_s16() since ADPCM is a little bit more complicated than other formats and I don't @@ -5139,6 +5088,7 @@ static drwav_uint64 drwav_read_pcm_frames_s32__msadpcm(drwav* pWav, drwav_uint64 */ drwav_uint64 totalFramesRead = 0; drwav_int16 samples16[2048]; + while (framesToRead > 0) { drwav_uint64 framesRead = drwav_read_pcm_frames_s16(pWav, drwav_min(framesToRead, drwav_countof(samples16)/pWav->channels), samples16); if (framesRead == 0) { @@ -5155,7 +5105,7 @@ static drwav_uint64 drwav_read_pcm_frames_s32__msadpcm(drwav* pWav, drwav_uint64 return totalFramesRead; } -static drwav_uint64 drwav_read_pcm_frames_s32__ima(drwav* pWav, drwav_uint64 framesToRead, drwav_int32* pBufferOut) +DRWAV_PRIVATE drwav_uint64 drwav_read_pcm_frames_s32__ima(drwav* pWav, drwav_uint64 framesToRead, drwav_int32* pBufferOut) { /* We're just going to borrow the implementation from the drwav_read_s16() since IMA-ADPCM is a little bit more complicated than other formats and I don't @@ -5163,6 +5113,7 @@ static drwav_uint64 drwav_read_pcm_frames_s32__ima(drwav* pWav, drwav_uint64 fra */ drwav_uint64 totalFramesRead = 0; drwav_int16 samples16[2048]; + while (framesToRead > 0) { drwav_uint64 framesRead = drwav_read_pcm_frames_s16(pWav, drwav_min(framesToRead, drwav_countof(samples16)/pWav->channels), samples16); if (framesRead == 0) { @@ -5179,12 +5130,12 @@ static drwav_uint64 drwav_read_pcm_frames_s32__ima(drwav* pWav, drwav_uint64 fra return totalFramesRead; } -static drwav_uint64 drwav_read_pcm_frames_s32__ieee(drwav* pWav, drwav_uint64 framesToRead, drwav_int32* pBufferOut) +DRWAV_PRIVATE drwav_uint64 drwav_read_pcm_frames_s32__ieee(drwav* pWav, drwav_uint64 framesToRead, drwav_int32* pBufferOut) { drwav_uint64 totalFramesRead; drwav_uint8 sampleData[4096]; - drwav_uint32 bytesPerFrame = drwav_get_bytes_per_pcm_frame(pWav); + if (bytesPerFrame == 0) { return 0; } @@ -5207,12 +5158,12 @@ static drwav_uint64 drwav_read_pcm_frames_s32__ieee(drwav* pWav, drwav_uint64 fr return totalFramesRead; } -static drwav_uint64 drwav_read_pcm_frames_s32__alaw(drwav* pWav, drwav_uint64 framesToRead, drwav_int32* pBufferOut) +DRWAV_PRIVATE drwav_uint64 drwav_read_pcm_frames_s32__alaw(drwav* pWav, drwav_uint64 framesToRead, drwav_int32* pBufferOut) { drwav_uint64 totalFramesRead; drwav_uint8 sampleData[4096]; - drwav_uint32 bytesPerFrame = drwav_get_bytes_per_pcm_frame(pWav); + if (bytesPerFrame == 0) { return 0; } @@ -5235,12 +5186,12 @@ static drwav_uint64 drwav_read_pcm_frames_s32__alaw(drwav* pWav, drwav_uint64 fr return totalFramesRead; } -static drwav_uint64 drwav_read_pcm_frames_s32__mulaw(drwav* pWav, drwav_uint64 framesToRead, drwav_int32* pBufferOut) +DRWAV_PRIVATE drwav_uint64 drwav_read_pcm_frames_s32__mulaw(drwav* pWav, drwav_uint64 framesToRead, drwav_int32* pBufferOut) { drwav_uint64 totalFramesRead; drwav_uint8 sampleData[4096]; - drwav_uint32 bytesPerFrame = drwav_get_bytes_per_pcm_frame(pWav); + if (bytesPerFrame == 0) { return 0; } @@ -5424,7 +5375,7 @@ DRWAV_API void drwav_mulaw_to_s32(drwav_int32* pOut, const drwav_uint8* pIn, siz -static drwav_int16* drwav__read_pcm_frames_and_close_s16(drwav* pWav, unsigned int* channels, unsigned int* sampleRate, drwav_uint64* totalFrameCount) +DRWAV_PRIVATE drwav_int16* drwav__read_pcm_frames_and_close_s16(drwav* pWav, unsigned int* channels, unsigned int* sampleRate, drwav_uint64* totalFrameCount) { drwav_uint64 sampleDataSize; drwav_int16* pSampleData; @@ -5466,7 +5417,7 @@ static drwav_int16* drwav__read_pcm_frames_and_close_s16(drwav* pWav, unsigned i return pSampleData; } -static float* drwav__read_pcm_frames_and_close_f32(drwav* pWav, unsigned int* channels, unsigned int* sampleRate, drwav_uint64* totalFrameCount) +DRWAV_PRIVATE float* drwav__read_pcm_frames_and_close_f32(drwav* pWav, unsigned int* channels, unsigned int* sampleRate, drwav_uint64* totalFrameCount) { drwav_uint64 sampleDataSize; float* pSampleData; @@ -5508,7 +5459,7 @@ static float* drwav__read_pcm_frames_and_close_f32(drwav* pWav, unsigned int* ch return pSampleData; } -static drwav_int32* drwav__read_pcm_frames_and_close_s32(drwav* pWav, unsigned int* channels, unsigned int* sampleRate, drwav_uint64* totalFrameCount) +DRWAV_PRIVATE drwav_int32* drwav__read_pcm_frames_and_close_s32(drwav* pWav, unsigned int* channels, unsigned int* sampleRate, drwav_uint64* totalFrameCount) { drwav_uint64 sampleDataSize; drwav_int32* pSampleData; @@ -5820,43 +5771,56 @@ DRWAV_API void drwav_free(void* p, const drwav_allocation_callbacks* pAllocation DRWAV_API drwav_uint16 drwav_bytes_to_u16(const drwav_uint8* data) { - return drwav__bytes_to_u16(data); + return (data[0] << 0) | (data[1] << 8); } DRWAV_API drwav_int16 drwav_bytes_to_s16(const drwav_uint8* data) { - return drwav__bytes_to_s16(data); + return (short)drwav_bytes_to_u16(data); } DRWAV_API drwav_uint32 drwav_bytes_to_u32(const drwav_uint8* data) { - return drwav__bytes_to_u32(data); + return (data[0] << 0) | (data[1] << 8) | (data[2] << 16) | (data[3] << 24); } DRWAV_API drwav_int32 drwav_bytes_to_s32(const drwav_uint8* data) { - return drwav__bytes_to_s32(data); + return (drwav_int32)drwav_bytes_to_u32(data); } DRWAV_API drwav_uint64 drwav_bytes_to_u64(const drwav_uint8* data) { - return drwav__bytes_to_u64(data); + return + ((drwav_uint64)data[0] << 0) | ((drwav_uint64)data[1] << 8) | ((drwav_uint64)data[2] << 16) | ((drwav_uint64)data[3] << 24) | + ((drwav_uint64)data[4] << 32) | ((drwav_uint64)data[5] << 40) | ((drwav_uint64)data[6] << 48) | ((drwav_uint64)data[7] << 56); } DRWAV_API drwav_int64 drwav_bytes_to_s64(const drwav_uint8* data) { - return drwav__bytes_to_s64(data); + return (drwav_int64)drwav_bytes_to_u64(data); } DRWAV_API drwav_bool32 drwav_guid_equal(const drwav_uint8 a[16], const drwav_uint8 b[16]) { - return drwav__guid_equal(a, b); + int i; + for (i = 0; i < 16; i += 1) { + if (a[i] != b[i]) { + return DRWAV_FALSE; + } + } + + return DRWAV_TRUE; } DRWAV_API drwav_bool32 drwav_fourcc_equal(const drwav_uint8* a, const char* b) { - return drwav__fourcc_equal(a, b); + return + a[0] == b[0] && + a[1] == b[1] && + a[2] == b[2] && + a[3] == b[3]; } #endif /* dr_wav_c */ @@ -6050,6 +6014,24 @@ two different ways to initialize a drwav object. /* REVISION HISTORY ================ +v0.12.19 - 2021-02-21 + - Fix a warning due to referencing _MSC_VER when it is undefined. + - Minor improvements to the management of some internal state concerning the data chunk cursor. + +v0.12.18 - 2021-01-31 + - Clean up some static analysis warnings. + +v0.12.17 - 2021-01-17 + - Minor fix to sample code in documentation. + - Correctly qualify a private API as private rather than public. + - Code cleanup. + +v0.12.16 - 2020-12-02 + - Fix a bug when trying to read more bytes than can fit in a size_t. + +v0.12.15 - 2020-11-21 + - Fix compilation with OpenWatcom. + v0.12.14 - 2020-11-13 - Minor code clean up. From 45823a36eb641bf7fa4dc70e6509edaffc73e1ab Mon Sep 17 00:00:00 2001 From: Ray Date: Wed, 14 Apr 2021 21:07:04 +0200 Subject: [PATCH 019/121] Added some OpenGL extensions comments --- src/rlgl.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/rlgl.h b/src/rlgl.h index ac6810dcc..4288bf8d3 100644 --- a/src/rlgl.h +++ b/src/rlgl.h @@ -825,17 +825,17 @@ typedef struct rlglData { } State; // Renderer state struct { bool vao; // VAO support (OpenGL ES2 could not support VAO extension) (GL_ARB_vertex_array_object) - bool instancing; // Instancing supported + bool instancing; // Instancing supported (GL_ANGLE_instanced_arrays, GL_EXT_draw_instanced + GL_EXT_instanced_arrays) bool texNPOT; // NPOT textures full support (GL_ARB_texture_non_power_of_two, GL_OES_texture_npot) - bool texDepth; // Depth textures supported (GL_ARB_depth_texture, GL_WEBGL_depth_texture) + bool texDepth; // Depth textures supported (GL_ARB_depth_texture, GL_WEBGL_depth_texture, GL_OES_depth_texture) bool texFloat32; // float textures support (32 bit per channel) (GL_OES_texture_float) - bool texCompDXT; // DDS texture compression support (GL_EXT_texture_compression_s3tc) - bool texCompETC1; // ETC1 texture compression support - bool texCompETC2; // ETC2/EAC texture compression support - bool texCompPVRT; // PVR texture compression support - bool texCompASTC; // ASTC texture compression support - bool texMirrorClamp; // Clamp mirror wrap mode supported - bool texAnisoFilter; // Anisotropic texture filtering support + bool texCompDXT; // DDS texture compression support (GL_EXT_texture_compression_s3tc, GL_WEBGL_compressed_texture_s3tc, GL_WEBKIT_WEBGL_compressed_texture_s3tc) + bool texCompETC1; // ETC1 texture compression support (GL_OES_compressed_ETC1_RGB8_texture, GL_WEBGL_compressed_texture_etc1) + bool texCompETC2; // ETC2/EAC texture compression support (GL_ARB_ES3_compatibility) + bool texCompPVRT; // PVR texture compression support (GL_IMG_texture_compression_pvrtc) + bool texCompASTC; // ASTC texture compression support (GL_KHR_texture_compression_astc_hdr, GL_KHR_texture_compression_astc_ldr) + bool texMirrorClamp; // Clamp mirror wrap mode supported (GL_EXT_texture_mirror_clamp) + bool texAnisoFilter; // Anisotropic texture filtering support (GL_EXT_texture_filter_anisotropic) float maxAnisotropicLevel; // Maximum anisotropy level supported (minimum is 2.0f) int maxDepthBits; // Maximum bits for depth component From ac95a2e27c8facd1ead7a3d6160439b58f916e02 Mon Sep 17 00:00:00 2001 From: Ray Date: Wed, 14 Apr 2021 21:14:55 +0200 Subject: [PATCH 020/121] Update CMakeOptions.txt --- CMakeOptions.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/CMakeOptions.txt b/CMakeOptions.txt index ebdba0c9b..c024965e9 100644 --- a/CMakeOptions.txt +++ b/CMakeOptions.txt @@ -37,15 +37,11 @@ cmake_dependent_option(SUPPORT_SCREEN_CAPTURE "Allow automatic screen capture of cmake_dependent_option(SUPPORT_GIF_RECORDING "Allow automatic gif recording of current screen pressing CTRL+F12, defined in KeyCallback()" ON CUSTOMIZE_BUILD ON) cmake_dependent_option(SUPPORT_BUSY_WAIT_LOOP "Use busy wait loop for timing sync instead of a high-resolution timer" OFF CUSTOMIZE_BUILD OFF) cmake_dependent_option(SUPPORT_EVENTS_WAITING "Wait for events passively (sleeping while no events) instead of polling them actively every frame" OFF CUSTOMIZE_BUILD OFF) -cmake_dependent_option(SUPPORT_HIGH_DPI "Support high DPI displays" OFF CUSTOMIZE_BUILD OFF) +cmake_dependent_option(SUPPORT_WINMM_HIGHRES_TIMER "Setting a higher resolution can improve the accuracy of time-out intervals in wait functions" OFF CUSTOMIZE_BUILD OFF) cmake_dependent_option(SUPPORT_DATA_STORAGE "Support for persistent data storage" ON CUSTOMIZE_BUILD ON) cmake_dependent_option(SUPPORT_COMPRESSION_API "Support for compression API" ON CUSTOMIZE_BUILD ON) -# rlgl.h -cmake_dependent_option(SUPPORT_VR_SIMULATOR "Support VR simulation functionality (stereo rendering)" ON CUSTOMIZE_BUILD ON) - # shapes.c -cmake_dependent_option(SUPPORT_FONT_TEXTURE "Draw rectangle shapes using font texture white character instead of default white texture. Allows drawing rectangles and text with a single draw call, very useful for GUI systems!" ON CUSTOMIZE_BUILD ON) cmake_dependent_option(SUPPORT_QUADS_DRAW_MODE "Use QUADS instead of TRIANGLES for drawing when possible. Some lines-based shapes could still use lines" ON CUSTOMIZE_BUILD ON) # textures.c From fbf1f328079800e304447ea74ff0836247854ce8 Mon Sep 17 00:00:00 2001 From: Ray Date: Wed, 14 Apr 2021 21:16:04 +0200 Subject: [PATCH 021/121] Update CONTRIBUTING.md --- CONTRIBUTING.md | 60 ------------------------------------------------- 1 file changed, 60 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8fc4f5e45..ff17f4414 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -74,63 +74,3 @@ You can write me a direct mail but you can also contact me on the following netw - [raylib web](http://www.raylib.com/) - On top-right corner there is a bunch of networks where you can find me. Thank you very much for your time! :) - ----- - -Here is a list of raylib contributors, these people have invested part of their time -contributing (in some way or another) to make the raylib project better. Huge thanks to all of them! - - - [Zopokx](https://github.com/Zopokx) for testing the web. - - [Elendow](http://www.elendow.com) for testing and helping on web development. - - Victor Dual for implementing and testing 3D shapes functions. - - Marc Palau for implementing and testing 3D shapes functions and contribute on camera and gestures modules. - - Kevin Gato for improving texture internal formats support and helping on raygui development. - - Daniel Nicolas for improving texture internal formats support and helping on raygui development. - - Marc Agüera for testing and using raylib on a real product ([Koala Seasons](http://www.koalaseasons.com)) - - Daniel Moreno for testing and using raylib on a real product ([Koala Seasons](http://www.koalaseasons.com)) - - Daniel Gomez for testing and using raylib on a real product ([Koala Seasons](http://www.koalaseasons.com)) - - [Sergio Martinez](https://github.com/anidealgift) for helping on raygui development and tools development (raygui_styler). - - [Victor Fisac](https://github.com/victorfisac) for developing physics raylib module (physac) and implementing PBR materials and lighting systems... among multiple other improvements and multiple tools and games. - - Albert Martos for helping on raygui and porting examples and game-templates to Android and HTML5. - - Ian Eito for helping on raygui and porting examples and game-templates to Android and HTML5. - - [procedural](https://github.com/procedural) for testing raylib on Linux, correcting some bugs and adding several mouse functions. - - [Chris Hemingway](https://github.com/cHemingway) for improving raylib on OSX build system. - - [Emanuele Petriglia](https://github.com/LelixSuper) for working on multiple GNU/Linux improvements and developing [TicTacToe](https://github.com/LelixSuper/TicTacToe) raylib game. - - [Joshua Reisenauer](https://github.com/kd7tck) for adding audio modules support (XM, MOD) and reviewing audio system. - - [Marcelo Paez](https://github.com/paezao) for helping on OSX High DPI display issue. - - [Ghassan Al-Mashareqa](https://github.com/ghassanpl) for an amazing contribution to raylib Lua module. - - [Teodor Stoenescu](https://github.com/teodor-stoenescu) for improvements on OBJ object loading. - - [RDR8](https://github.com/RDR8) for helping with Linux build improvements. - - [Saggi Mizrahi](https://github.com/ficoos) for multiple fixes on Linux and audio system. - - [Daniel Lemos](https://github.com/xspager) for fixing issues on Linux games building. - - [Joel Davis](https://github.com/joeld42) for adding raycast picking utilities and a [great example](https://github.com/raysan5/raylib/blob/master/examples/models/models_mesh_picking.c) - - [Richard Goodwin](https://github.com/AudioMorphology) for adding RPI touchscreen support. - - [Milan Nikolic](https://github.com/gen2brain) for adding Android build support with custom standalone toolchain. - - [Michael Vetter](https://github.com/jubalh) for improvements on build system and his work on Suse Linux package... and multiple fixes! - - [Wilhem Barbier](https://github.com/nounoursheureux) for adding Image generation functions, shaders work and some fixes. - - [Benjamin Summerton](https://github.com/define-private-public) for improving OSX building and his amazing work on CMake build sytem. - - [MartinFX](https://github.com/Martinfx) for adding compilation support for FreeBSD OS and derivatives. - - [Ahmad Fatoum](https://github.com/a3f) for implementing CI support for raylib (Travis and AppVeyor) and great improvements on build system. - - [SamNChiet](https://github.com/SamNChiet) for a greatly improved UWP input implementation. - - [David Reid](https://github.com/mackron) for a complete review of audio module to support his amazing miniaudio library. - - [Kai](https://github.com/questor) for multiple code reviews and improvements. - - [Max Danielsson](https://github.com/autious) for adding support for orthographic 3d camera projection - - [Lumaio](https://github.com/TheLumaio) for his great work on GBuffers and GetCollisionRayModel(). - - [Jonas Daeyaert](https://github.com/culacant) for an amazing work on IQM animated models support. - - [Seth Archambault](https://github.com/SethArchambault) for the work on Android Gamepad support (SNES model). - - [D3nX](https://github.com/D3nX) for adding Code::Blocks project template. - - [Jak Barnes](https://github.com/Syphonx) for a great work on `rnet`, new raylib network module - - [Vlad Adrian](https://github.com/Demizdor) for an amazing work on Unicode support, new shapes functions and raygui. - - [Reece Mackie](https://github.com/Rover656) for a great work on improving UWP support - - [flashback-fx](flashback-fx) for improving easings library and example - - [Jorge A. Gomes](https://github.com/overdev) for adding nine-patch textures support and example - - [Berni8k](https://github.com/Berni8k) for improving Raspberry Pi input system, using evdev - - [Wilhem Barbier](https://github.com/wbrbr) for implementing glTF loading support and solving several issues - - [Marco Lizza](https://github.com/MarcoLizza) for improving logging system and multiple issues - - [Anata](https://github.com/anatagawa) for creating amazing examples and contributing with them - - [Narice](https://github.com/narice) made easings.h includable as standalone header - - [Eric J.](https://github.com/ProfJski) for shaders_eratosthenes example contribution - - [PompPenguin](https://github.com/PompPenguin) for reviewing 3rd person camera - - [Mohamed Shazan](https://github.com/msmshazan) for adding support for ANGLE graphics backend - -Please, if I forget someone in this list, excuse me and send me a PR! From 68f664afa49e4c4f43d93c9ba6b6737b5bc0c326 Mon Sep 17 00:00:00 2001 From: Ray Date: Wed, 14 Apr 2021 21:18:54 +0200 Subject: [PATCH 022/121] Create CONTRIBUTORS.md --- CONTRIBUTORS.md | 63 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 CONTRIBUTORS.md diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md new file mode 100644 index 000000000..5673507db --- /dev/null +++ b/CONTRIBUTORS.md @@ -0,0 +1,63 @@ +### WARNING: This file is unmaintained! This list of contributors is uncomplete! + +### Check CHANGELOG for some of the contributors details or just the official contributors list of the repo + +--- + +Here is a list of raylib contributors, these people have invested part of their time +contributing (in some way or another) to make the raylib project better. Huge thanks to all of them! + + - [Zopokx](https://github.com/Zopokx) for testing the web. + - [Elendow](http://www.elendow.com) for testing and helping on web development. + - Victor Dual for implementing and testing 3D shapes functions. + - Marc Palau for implementing and testing 3D shapes functions and contribute on camera and gestures modules. + - Kevin Gato for improving texture internal formats support and helping on raygui development. + - Daniel Nicolas for improving texture internal formats support and helping on raygui development. + - Marc Agüera for testing and using raylib on a real product ([Koala Seasons](http://www.koalaseasons.com)) + - Daniel Moreno for testing and using raylib on a real product ([Koala Seasons](http://www.koalaseasons.com)) + - Daniel Gomez for testing and using raylib on a real product ([Koala Seasons](http://www.koalaseasons.com)) + - [Sergio Martinez](https://github.com/anidealgift) for helping on raygui development and tools development (raygui_styler). + - [Victor Fisac](https://github.com/victorfisac) for developing physics raylib module (physac) and implementing PBR materials and lighting systems... among multiple other improvements and multiple tools and games. + - Albert Martos for helping on raygui and porting examples and game-templates to Android and HTML5. + - Ian Eito for helping on raygui and porting examples and game-templates to Android and HTML5. + - [procedural](https://github.com/procedural) for testing raylib on Linux, correcting some bugs and adding several mouse functions. + - [Chris Hemingway](https://github.com/cHemingway) for improving raylib on OSX build system. + - [Emanuele Petriglia](https://github.com/LelixSuper) for working on multiple GNU/Linux improvements and developing [TicTacToe](https://github.com/LelixSuper/TicTacToe) raylib game. + - [Joshua Reisenauer](https://github.com/kd7tck) for adding audio modules support (XM, MOD) and reviewing audio system. + - [Marcelo Paez](https://github.com/paezao) for helping on OSX High DPI display issue. + - [Ghassan Al-Mashareqa](https://github.com/ghassanpl) for an amazing contribution to raylib Lua module. + - [Teodor Stoenescu](https://github.com/teodor-stoenescu) for improvements on OBJ object loading. + - [RDR8](https://github.com/RDR8) for helping with Linux build improvements. + - [Saggi Mizrahi](https://github.com/ficoos) for multiple fixes on Linux and audio system. + - [Daniel Lemos](https://github.com/xspager) for fixing issues on Linux games building. + - [Joel Davis](https://github.com/joeld42) for adding raycast picking utilities and a [great example](https://github.com/raysan5/raylib/blob/master/examples/models/models_mesh_picking.c) + - [Richard Goodwin](https://github.com/AudioMorphology) for adding RPI touchscreen support. + - [Milan Nikolic](https://github.com/gen2brain) for adding Android build support with custom standalone toolchain. + - [Michael Vetter](https://github.com/jubalh) for improvements on build system and his work on Suse Linux package... and multiple fixes! + - [Wilhem Barbier](https://github.com/nounoursheureux) for adding Image generation functions, shaders work and some fixes. + - [Benjamin Summerton](https://github.com/define-private-public) for improving OSX building and his amazing work on CMake build sytem. + - [MartinFX](https://github.com/Martinfx) for adding compilation support for FreeBSD OS and derivatives. + - [Ahmad Fatoum](https://github.com/a3f) for implementing CI support for raylib (Travis and AppVeyor) and great improvements on build system. + - [SamNChiet](https://github.com/SamNChiet) for a greatly improved UWP input implementation. + - [David Reid](https://github.com/mackron) for a complete review of audio module to support his amazing miniaudio library. + - [Kai](https://github.com/questor) for multiple code reviews and improvements. + - [Max Danielsson](https://github.com/autious) for adding support for orthographic 3d camera projection + - [Lumaio](https://github.com/TheLumaio) for his great work on GBuffers and GetCollisionRayModel(). + - [Jonas Daeyaert](https://github.com/culacant) for an amazing work on IQM animated models support. + - [Seth Archambault](https://github.com/SethArchambault) for the work on Android Gamepad support (SNES model). + - [D3nX](https://github.com/D3nX) for adding Code::Blocks project template. + - [Jak Barnes](https://github.com/Syphonx) for a great work on `rnet`, new raylib network module + - [Vlad Adrian](https://github.com/Demizdor) for an amazing work on Unicode support, new shapes functions and raygui. + - [Reece Mackie](https://github.com/Rover656) for a great work on improving UWP support + - [flashback-fx](flashback-fx) for improving easings library and example + - [Jorge A. Gomes](https://github.com/overdev) for adding nine-patch textures support and example + - [Berni8k](https://github.com/Berni8k) for improving Raspberry Pi input system, using evdev + - [Wilhem Barbier](https://github.com/wbrbr) for implementing glTF loading support and solving several issues + - [Marco Lizza](https://github.com/MarcoLizza) for improving logging system and multiple issues + - [Anata](https://github.com/anatagawa) for creating amazing examples and contributing with them + - [Narice](https://github.com/narice) made easings.h includable as standalone header + - [Eric J.](https://github.com/ProfJski) for shaders_eratosthenes example contribution + - [PompPenguin](https://github.com/PompPenguin) for reviewing 3rd person camera + - [Mohamed Shazan](https://github.com/msmshazan) for adding support for ANGLE graphics backend + +Please, if I forget someone in this list, excuse me and send me a PR! From 4badff1c2f38d57728d2a611e05d749815bcd68f Mon Sep 17 00:00:00 2001 From: Ray Date: Thu, 15 Apr 2021 12:31:55 +0200 Subject: [PATCH 023/121] Update CONTRIBUTING.md --- CONTRIBUTING.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ff17f4414..644a89bf4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,22 +4,22 @@ Hello contributors! Welcome to raylib! Do you enjoy raylib and want to contribute? Nice! You can help with the following points: -- C programming - Can you write/review/test/improve the code? -- Documentation/Tutorials/Example - Can you write some tutorial/example? -- Porting to other platforms - Can you port and compile raylib on other systems? -- Web Development - Can you help [with the website](https://github.com/raysan5/raylib.com)? -- Testing - Can you find some bugs in raylib? +- `C programming` - Can you write/review/test/improve the code? +- `Documentation/Tutorials/Example` - Can you write some tutorial/example? +- `Porting to other platforms` - Can you port/adapt/compile raylib on other systems? +- `Web Development` - Can you help [with the website](https://github.com/raysan5/raylib.com)? +- `Testing` - Can you find some bugs in raylib? This document contains a set of guidelines to contribute to the project. These are mostly guidelines, not rules. Use your best judgement, and feel free to propose changes to this document in a pull request. ### raylib philosophy - - raylib is a tool to enjoy videogames programming, every single function in raylib should be a tutorial on itself. - - raylib is **SIMPLE** and **EASY-TO-USE**, I tried to keep it compact with a small set of functions, if a function is too complex or is not clearly useful, better not including it. + - raylib is a tool to **ENJOY** videogames programming, every function in raylib is designed as a mini-tutorial on itself. + - raylib is **SIMPLE** and **EASY-TO-USE**, I tried to keep it compact with a small set of functions, if a function is too complex, better not including it. - raylib is open source and free; educators and institutions can use this tool to **TEACH** videogames programming completely for free. - raylib is collaborative; contribution of tutorials / code examples / bug fixes / code comments are highly appreciated. - - raylib's license (and its external libs respective licenses) allow using it on commercial projects. + - raylib's license (and its external libs respective licenses) allow using raylib on commercial projects. ### Some interesting reads to start with @@ -40,9 +40,9 @@ to make it easier for students/users to read, write and understand code. Source code is extensively commented for that purpose, raylib primary learning method is: - > learn by reading code and examples + > `Learn by reading code and examples` -For detailed information on building raylib and examples, please see [raylib Wiki](https://github.com/raysan5/raylib/wiki). +For detailed information on building raylib and examples, please check [raylib Wiki](https://github.com/raysan5/raylib/wiki). ### Opening new Issues @@ -68,9 +68,9 @@ To open new issue for raylib (bug, enhancement, discussion...), just try to foll If you have any doubt, don't hesitate to [contact me](mailto:ray@raylib.com)!. You can write me a direct mail but you can also contact me on the following networks: - - [raylib reddit](https://www.reddit.com/r/raylib/) - A good place for discussions or to ask for help. - [raylib Discord](https://discord.gg/raylib) - A direct communication channel for project discussions. - [raylib twitter](https://twitter.com/raysan5) - My personal twitter account, I usually post about raylib, you can send me PMs. + - [raylib reddit](https://www.reddit.com/r/raylib/) - A good place for discussions or to ask for help. - [raylib web](http://www.raylib.com/) - On top-right corner there is a bunch of networks where you can find me. Thank you very much for your time! :) From 8453ff837b55b35f121be918ee70f5b5fdf96e38 Mon Sep 17 00:00:00 2001 From: noloop Date: Thu, 15 Apr 2021 19:25:40 -0300 Subject: [PATCH 024/121] Fix old directories used and windows/linux portability (#1722) * Fix olds directories used and windows/linux portability * Fix windows/linux portability --- examples/Makefile.Android | 110 ++++++++++++++++++++++++++++++++------ 1 file changed, 93 insertions(+), 17 deletions(-) diff --git a/examples/Makefile.Android b/examples/Makefile.Android index afa3024ac..bb6d4497b 100644 --- a/examples/Makefile.Android +++ b/examples/Makefile.Android @@ -57,8 +57,7 @@ endif # Required path variables # NOTE: JAVA_HOME must be set to JDK (using OpenJDK 13) JAVA_HOME ?= C:/open-jdk -ANDROID_HOME = C:/android-sdk -ANDROID_TOOLCHAIN = C:/android-ndk/toolchains/llvm/prebuilt/windows-x86_64 +ANDROID_HOME ?= C:/android-sdk ANDROID_BUILD_TOOLS = $(ANDROID_HOME)/build-tools/29.0.3 ANDROID_PLATFORM_TOOLS = $(ANDROID_HOME)/platform-tools @@ -81,9 +80,9 @@ APP_COMPANY_NAME ?= raylib APP_PRODUCT_NAME ?= rgame APP_VERSION_CODE ?= 1 APP_VERSION_NAME ?= 1.0 -APP_ICON_LDPI ?= $(RAYLIB_PATH)\logo\raylib_36x36.png -APP_ICON_MDPI ?= $(RAYLIB_PATH)\logo\raylib_48x48.png -APP_ICON_HDPI ?= $(RAYLIB_PATH)\logo\raylib_72x72.png +APP_ICON_LDPI ?= $(RAYLIB_PATH)/logo/raylib_36x36.png +APP_ICON_MDPI ?= $(RAYLIB_PATH)/logo/raylib_48x48.png +APP_ICON_HDPI ?= $(RAYLIB_PATH)/logo/raylib_72x72.png APP_SCREEN_ORIENTATION ?= landscape APP_KEYSTORE_PASS ?= raylib @@ -91,7 +90,7 @@ APP_KEYSTORE_PASS ?= raylib RAYLIB_LIBTYPE ?= STATIC # Library path for libraylib.a/libraylib.so -RAYLIB_LIB_PATH = $(RAYLIB_PATH)\src +RAYLIB_LIB_PATH = $(RAYLIB_PATH)/src # Shared libs must be added to APK if required # NOTE: Generated NativeLoader.java automatically load those libraries @@ -124,7 +123,7 @@ CFLAGS += -Wall -Wa,--noexecstack -Wformat -Werror=format-security -no-canonical CFLAGS += -DANDROID -DPLATFORM_ANDROID -D__ANDROID_API__=$(ANDROID_API_VERSION) # Paths containing required header files -INCLUDE_PATHS = -I. -I$(RAYLIB_PATH)/src -I$(RAYLIB_PATH)/src/external/android/native_app_glue +INCLUDE_PATHS = -I. -I$(RAYLIB_PATH)/src -I$(ANDROID_NDK)/sources/android/native_app_glue # Linker options LDFLAGS = -Wl,-soname,lib$(PROJECT_LIBRARY_NAME).so -Wl,--exclude-libs,libatomic.a @@ -159,8 +158,10 @@ all: create_temp_project_dirs \ # Create required temp directories for APK building create_temp_project_dirs: +ifeq ($(OS),Windows_NT) if not exist $(PROJECT_BUILD_PATH) mkdir $(PROJECT_BUILD_PATH) if not exist $(PROJECT_BUILD_PATH)\obj mkdir $(PROJECT_BUILD_PATH)\obj + if not exist $(PROJECT_BUILD_PATH)\obj mkdir $(PROJECT_BUILD_PATH)\obj\src if not exist $(PROJECT_BUILD_PATH)\src mkdir $(PROJECT_BUILD_PATH)\src if not exist $(PROJECT_BUILD_PATH)\src\com mkdir $(PROJECT_BUILD_PATH)\src\com if not exist $(PROJECT_BUILD_PATH)\src\com\$(APP_COMPANY_NAME) mkdir $(PROJECT_BUILD_PATH)\src\com\$(APP_COMPANY_NAME) @@ -176,36 +177,68 @@ create_temp_project_dirs: if not exist $(PROJECT_BUILD_PATH)\assets mkdir $(PROJECT_BUILD_PATH)\assets if not exist $(PROJECT_BUILD_PATH)\assets\$(PROJECT_RESOURCES_PATH) mkdir $(PROJECT_BUILD_PATH)\assets\$(PROJECT_RESOURCES_PATH) if not exist $(PROJECT_BUILD_PATH)\obj\screens mkdir $(PROJECT_BUILD_PATH)\obj\screens +else + mkdir -p $(PROJECT_BUILD_PATH) + mkdir -p $(PROJECT_BUILD_PATH)/obj + mkdir -p $(PROJECT_BUILD_PATH)/obj/src + mkdir -p $(PROJECT_BUILD_PATH)/src + mkdir -p $(PROJECT_BUILD_PATH)/src/com + mkdir -p $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME) + mkdir -p $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME) + mkdir -p $(PROJECT_BUILD_PATH)/lib + mkdir -p $(PROJECT_BUILD_PATH)/lib/$(ANDROID_ARCH_NAME) + mkdir -p $(PROJECT_BUILD_PATH)/bin + mkdir -p $(PROJECT_BUILD_PATH)/res + mkdir -p $(PROJECT_BUILD_PATH)/res/drawable-ldpi + mkdir -p $(PROJECT_BUILD_PATH)/res/drawable-mdpi + mkdir -p $(PROJECT_BUILD_PATH)/res/drawable-hdpi + mkdir -p $(PROJECT_BUILD_PATH)/res/values + mkdir -p $(PROJECT_BUILD_PATH)/assets + mkdir -p $(PROJECT_BUILD_PATH)/assets/$(PROJECT_RESOURCES_PATH) + mkdir -p $(PROJECT_BUILD_PATH)/obj/screens +endif $(foreach dir, $(PROJECT_SOURCE_DIRS), $(call create_dir, $(dir))) define create_dir - if not exist $(PROJECT_BUILD_PATH)\obj\$(1) mkdir $(PROJECT_BUILD_PATH)\obj\$(1) + mkdir -p $(PROJECT_BUILD_PATH)/obj/$(1) endef +ifeq ($(OS),Windows_NT) + COPY_COMMAND ?= copy /Y +else + COPY_COMMAND ?= cp -f +endif + # Copy required shared libs for integration into APK # NOTE: If using shared libs they are loaded by generated NativeLoader.java copy_project_required_libs: ifeq ($(RAYLIB_LIBTYPE),SHARED) - copy /Y $(RAYLIB_LIB_PATH)\libraylib.so $(PROJECT_BUILD_PATH)\lib\$(ANDROID_ARCH_NAME)\libraylib.so + $(COPY_COMMAND) $(RAYLIB_LIB_PATH)/libraylib.so $(PROJECT_BUILD_PATH)/lib/$(ANDROID_ARCH_NAME)/libraylib.so endif ifeq ($(RAYLIB_LIBTYPE),STATIC) - copy /Y $(RAYLIB_LIB_PATH)\libraylib.a $(PROJECT_BUILD_PATH)\lib\$(ANDROID_ARCH_NAME)\libraylib.a + $(COPY_COMMAND) $(RAYLIB_LIB_PATH)/libraylib.a $(PROJECT_BUILD_PATH)/lib/$(ANDROID_ARCH_NAME)/libraylib.a endif # Copy project required resources: strings.xml, icon.png, assets # NOTE: Required strings.xml is generated and game resources are copied to assets folder -# TODO: Review xcopy usage, it can not be found in some systems! copy_project_resources: - copy $(APP_ICON_LDPI) $(PROJECT_BUILD_PATH)\res\drawable-ldpi\icon.png /Y - copy $(APP_ICON_MDPI) $(PROJECT_BUILD_PATH)\res\drawable-mdpi\icon.png /Y - copy $(APP_ICON_HDPI) $(PROJECT_BUILD_PATH)\res\drawable-hdpi\icon.png /Y + $(COPY_COMMAND) $(APP_ICON_LDPI) $(PROJECT_BUILD_PATH)/res/drawable-ldpi/icon.png + $(COPY_COMMAND) $(APP_ICON_MDPI) $(PROJECT_BUILD_PATH)/res/drawable-mdpi/icon.png + $(COPY_COMMAND) $(APP_ICON_HDPI) $(PROJECT_BUILD_PATH)/res/drawable-hdpi/icon.png +ifeq ($(OS),Windows_NT) @echo ^ > $(PROJECT_BUILD_PATH)/res/values/strings.xml @echo ^^$(APP_LABEL_NAME)^^ >> $(PROJECT_BUILD_PATH)/res/values/strings.xml if exist $(PROJECT_RESOURCES_PATH) C:\Windows\System32\xcopy $(PROJECT_RESOURCES_PATH) $(PROJECT_BUILD_PATH)\assets\$(PROJECT_RESOURCES_PATH) /Y /E /F +else + @echo "" > $(PROJECT_BUILD_PATH)/res/values/strings.xml + @echo "$(APP_LABEL_NAME)" >> $(PROJECT_BUILD_PATH)/res/values/strings.xml + @[ -d "$(PROJECT_RESOURCES_PATH)" ] || cp -rf $(PROJECT_RESOURCES_PATH) $(PROJECT_BUILD_PATH)/assets/$(PROJECT_RESOURCES_PATH) +endif # Generate NativeLoader.java to load required shared libraries # NOTE: Probably not the bet way to generate this file... but it works. generate_loader_script: +ifeq ($(OS),Windows_NT) @echo package com.$(APP_COMPANY_NAME).$(APP_PRODUCT_NAME); > $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/NativeLoader.java @echo. >> $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/NativeLoader.java @echo public class NativeLoader extends android.app.NativeActivity { >> $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/NativeLoader.java @@ -216,10 +249,23 @@ endif @echo System.loadLibrary("$(PROJECT_LIBRARY_NAME)"); >> $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/NativeLoader.java @echo } >> $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/NativeLoader.java @echo } >> $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/NativeLoader.java - +else + @echo "package com.$(APP_COMPANY_NAME).$(APP_PRODUCT_NAME);" > $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/NativeLoader.java + @echo "" >> $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/NativeLoader.java + @echo "public class NativeLoader extends android.app.NativeActivity {" >> $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/NativeLoader.java + @echo " static {" >> $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/NativeLoader.java +ifeq ($(RAYLIB_LIBTYPE),SHARED) + @echo " System.loadLibrary(\"raylib\");" >> $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/NativeLoader.java +endif + @echo " System.loadLibrary(\"$(PROJECT_LIBRARY_NAME)\");" >> $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/NativeLoader.java + @echo " }" >> $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/NativeLoader.java + @echo "}" >> $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/NativeLoader.java +endif + # Generate AndroidManifest.xml with all the required options # NOTE: Probably not the bet way to generate this file... but it works. generate_android_manifest: +ifeq ($(OS),Windows_NT) @echo ^ > $(PROJECT_BUILD_PATH)/AndroidManifest.xml @echo ^> $(PROJECT_BUILD_PATH)/AndroidManifest.xml @echo package="com.$(APP_COMPANY_NAME).$(APP_PRODUCT_NAME)" >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml @@ -240,11 +286,37 @@ generate_android_manifest: @echo ^ >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml @echo ^ >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml @echo ^ >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml +else + @echo "" > $(PROJECT_BUILD_PATH)/AndroidManifest.xml + @echo "> $(PROJECT_BUILD_PATH)/AndroidManifest.xml + @echo " package=\"com.$(APP_COMPANY_NAME).$(APP_PRODUCT_NAME)\" " >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml + @echo " android:versionCode=\"$(APP_VERSION_CODE)\" android:versionName=\"$(APP_VERSION_NAME)\" >" >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml + @echo " " >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml + @echo " " >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml + @echo " " >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml + @echo " > $(PROJECT_BUILD_PATH)/AndroidManifest.xml + @echo " android:theme=\"@android:style/Theme.NoTitleBar.Fullscreen\"" >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml + @echo " android:configChanges=\"orientation|keyboardHidden|screenSize\"" >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml + @echo " android:screenOrientation=\"$(APP_SCREEN_ORIENTATION)\" android:launchMode=\"singleTask\"" >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml + @echo " android:clearTaskOnLaunch=\"true\">" >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml + @echo " " >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml + @echo " " >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml + @echo " " >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml + @echo " " >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml + @echo " " >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml + @echo " " >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml + @echo " " >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml + @echo "" >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml +endif # Generate storekey for APK signing: $(PROJECT_NAME).keystore # NOTE: Configure here your Distinguished Names (-dname) if required! generate_apk_keystore: +ifeq ($(OS),Windows_NT) if not exist $(PROJECT_BUILD_PATH)/$(PROJECT_NAME).keystore $(JAVA_HOME)/bin/keytool -genkeypair -validity 10000 -dname "CN=$(APP_COMPANY_NAME),O=Android,C=ES" -keystore $(PROJECT_BUILD_PATH)/$(PROJECT_NAME).keystore -storepass $(APP_KEYSTORE_PASS) -keypass $(APP_KEYSTORE_PASS) -alias $(PROJECT_NAME)Key -keyalg RSA +else + @[ -f "$(PROJECT_BUILD_PATH)/$(PROJECT_NAME).keystore" ] || $(JAVA_HOME)/bin/keytool -genkeypair -validity 10000 -dname "CN=$(APP_COMPANY_NAME),O=Android,C=ES" -keystore $(PROJECT_BUILD_PATH)/$(PROJECT_NAME).keystore -storepass $(APP_KEYSTORE_PASS) -keypass $(APP_KEYSTORE_PASS) -alias $(PROJECT_NAME)Key -keyalg RSA +endif # Config project package and resource using AndroidManifest.xml and res/values/strings.xml # NOTE: Generates resources file: src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/R.java @@ -253,7 +325,7 @@ config_project_package: # Compile native_app_glue code as static library: obj/libnative_app_glue.a compile_native_app_glue: - $(CC) -c $(RAYLIB_PATH)/src/external/android/native_app_glue/android_native_app_glue.c -o $(PROJECT_BUILD_PATH)/obj/native_app_glue.o $(CFLAGS) + $(CC) -c $(ANDROID_NDK)/sources/android/native_app_glue/android_native_app_glue.c -o $(PROJECT_BUILD_PATH)/obj/native_app_glue.o $(CFLAGS) $(AR) rcs $(PROJECT_BUILD_PATH)/obj/libnative_app_glue.a $(PROJECT_BUILD_PATH)/obj/native_app_glue.o # Compile project code into a shared library: lib/lib$(PROJECT_LIBRARY_NAME).so @@ -267,7 +339,7 @@ $(PROJECT_BUILD_PATH)/obj/%.o:%.c # Compile project .java code into .class (Java bytecode) compile_project_class: - $(JAVA_HOME)/bin/javac -verbose -source 1.7 -target 1.7 -d $(PROJECT_BUILD_PATH)/obj -bootclasspath $(JAVA_HOME)/jre/lib/rt.jar -classpath $(ANDROID_HOME)/platforms/android-$(ANDROID_API_VERSION)/android.jar;$(PROJECT_BUILD_PATH)/obj -sourcepath $(PROJECT_BUILD_PATH)/src $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/R.java $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/NativeLoader.java + $(JAVA_HOME)/bin/javac -verbose -source 1.7 -target 1.7 -d $(PROJECT_BUILD_PATH)/obj -bootclasspath $(JAVA_HOME)/jre/lib/rt.jar -classpath $(ANDROID_HOME)/platforms/android-$(ANDROID_API_VERSION)/android.jar -d $(PROJECT_BUILD_PATH)/obj $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/R.java $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/NativeLoader.java # Compile .class files into Dalvik executable bytecode (.dex) # NOTE: Since Android 5.0, Dalvik interpreter (JIT) has been replaced by ART (AOT) @@ -313,6 +385,10 @@ deploy: # Clean everything clean: +ifeq ($(OS),Windows_NT) del $(PROJECT_BUILD_PATH)\* /f /s /q rmdir $(PROJECT_BUILD_PATH) /s /q +else + rm -r $(PROJECT_BUILD_PATH) +endif @echo Cleaning done From c96304c83ff6861ef4459a8aa07f0683da6f7b63 Mon Sep 17 00:00:00 2001 From: Ray Date: Fri, 16 Apr 2021 11:23:19 +0200 Subject: [PATCH 025/121] Update HISTORY.md --- HISTORY.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index fd2f60dd7..e659b4857 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -307,18 +307,18 @@ Let's start with some numbers: Highlights for `raylib 3.7`: - - REDESIGNED `rlgl` module for a greater abstraction level. Mesh and Materials structs references have been moved to a higher level, to `models` module as well as `DrawMesh()` and `DrawMeshInstanced()` functions. Some shaders functionality has also been moved to a higher level, to `core` module. Several `rlgl` functions names have been reviewed for consistency, following the `rl*()` prefix convention. Reorganized all functions by categories. GenTexture*() functions removal. Reiewed instancing and stereo rendering. + - **REDESIGNED: `rlgl` module for greater abstraction level**. This suppose an **important change in raylib architecture**, now `rlgl` functionality is self-contained in the module and used by higher-level layers (specially by `core` module), those upper layers are the ones that expose functionality to the main API when required, for example the `Shaders`, `Mesh` and `Materials` functionality. Multiple `rlgl` functions have been renamed for consistency, in this case, following the `rl*()` prefix convention. Functions have also been reorganized internally by categories and `GenTexture*()` functions have been removed from the library and moved to [`models_material_pbr`](https://github.com/raysan5/raylib/blob/master/examples/models/models_material_pbr.c) example. - - REDESIGNED VR simulator along with stereo rendering mechanism, a new API has been added more comprehensive and better integrated with raylib, now stereo rendering can be combined with `RenderTexture` and `Shader` API allowing the user manage fbo and distortion shader directly. + - **REDESIGNED: VR simulator and stereo rendering mechanism**. A **brand new API** has been added, more comprehensive and better integrated with raylib, the **new stereo rendering** can be combined with `RenderTexture` and `Shader` API allowing the user to **manage fbo and distortion shader directly**. Also, the new rendering mechanism supports **instancing on stereo rendering**! Check the updated [`core_vr_simulator`](https://github.com/raysan5/raylib/blob/master/examples/core/core_vr_simulator.c) example for reference! - - ADDED file access callbacks system + - **ADDED: New file access callbacks system**. Several new callback functions have been added to the API to allow custom file loaders. A [nice example](https://github.com/RobLoach/raylib-physfs) it's the **raylib integration with a virtual file system** [PhysFS](https://icculus.org/physfs/). - - ADDED: glTF animations support (#1551) by @object71 + - **ADDED: glTF animations support**. glTF is the preferred models file format to be used with raylib and along the addition of a models animation API on latest raylib versions, now animations support for glTF format has come to raylib, thanks for this great contribution to [Hristo Stamenov](@object71) - - ADDED: Music streaming support from memory (#1606) by @nezvers + - **ADDED: Music streaming support from memory**. raylib has been adding the `Load*FromMemory()` option to all its supported file formats but **music streaming** was not supported yet... until now. Thanks to this great contribution by [Agnis "NeZvērs" Aldiņš](@nezvers), now raylib supports music streamming from memory data for all supported file formats: WAV, OGG, MP3, FLAC, XM and MOD. - - RENAMED: enums values renamed for consistency + - **RENAMED: enums values for consistency**. Most raylib enums names and values names have been renamed for consistency, now all value names start with the type of data they represent. It increases clarity and readability when using those values and also **improves overall library consistency**. -Beside those key changes, many functions have been reviewed with improvements and bug fixes, many of them contributed by the community! Again, this release represents is a **great improvement for raylib and marks the way forward** for the library. Make sure to check [CHANGELOG](CHANGELOG) for detailed list of changes! Hope you enjoy this new raylib installment! +Beside those key changes, many functions have been reviewed with improvements and bug fixes, many of them contributed by the community! Thanks! And again, this release sets a **new milestone for raylib library**. Make sure to check [CHANGELOG](CHANGELOG) for detailed list of changes! Hope you enjoy this new raylib installment! Happy gamedev/tools/graphics programming! :) From 929ff455682f7b9022a92d08280e53305015fefa Mon Sep 17 00:00:00 2001 From: Ray Date: Fri, 16 Apr 2021 11:57:33 +0200 Subject: [PATCH 026/121] Update ROADMAP.md --- ROADMAP.md | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/ROADMAP.md b/ROADMAP.md index e11e898b3..94c96846b 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -1,21 +1,25 @@ roadmap ------- -Here it is a wish-list with features and ideas to improve the library. Note that features listed here are quite high-level and could be long term additions for the library. Current version of raylib is complete and functional but there is a lot of room for improvement. +Here it is a wish-list with features and ideas to improve the library. Note that features listed here are usually long term additions for the library. Current version of raylib is complete and functional but there is a lot of room for improvement. -[raylib source code](https://github.com/raysan5/raylib/tree/master/src) has some *TODO* marks around code with pending things to review and improve. Check also [GitHub Issues](https://github.com/raysan5/raylib/issues) for further details! +Also note that [raylib source code](https://github.com/raysan5/raylib/tree/master/src) has multiple *TODO* comments around code with pending things to review or improve. Check also [GitHub Issues](https://github.com/raysan5/raylib/issues) for further details! -**raylib 3.x** - - [ ] Network module (UDP): `rnet` ([info](https://github.com/raysan5/raylib/issues/753)) - - [ ] Custom raylib resource packer: `rres` ([info](https://github.com/raysan5/rres)) - - [ ] Basic CPU/GPU stats system (memory, draws, time...) +There is also a [Discussions Wishlist](https://github.com/raysan5/raylib/discussions/1502) open to everyone, feel free to check and comment. + +**raylib 4.0** + - [ ] Network module (UDP): `rnet` ([#753](https://github.com/raysan5/raylib/issues/753)) + - [ ] Custom raylib resource packer: `rres` ([link](https://github.com/raysan5/rres)) + - [ ] Basic CPU/GPU stats system (memory, draws, time...) ([#1295](https://github.com/raysan5/raylib/issues/1295)) + - [ ] Software rendering backend (avoiding OpenGL) ([#1370](https://github.com/raysan5/raylib/issues/1370)) + - [ ] Redesigned camera module (more flexible) ([#1143](https://github.com/raysan5/raylib/issues/1143)) - [x] Continuous Deployment using GitHub Actions **raylib 3.0** - [x] Custom memory allocators support - [x] Global variables moved to global context - [x] Optimize data structures for pass-by-value - - [x] Trace log messages redesign ([info](https://github.com/raysan5/raylib/issues/1065)) + - [x] Trace log messages redesign ([#1065](https://github.com/raysan5/raylib/issues/1065)) - [x] Continuous Integration using GitHub Actions **raylib 2.5** From 815a064abe7ccad416c864887d67aab778585ce2 Mon Sep 17 00:00:00 2001 From: Ray Date: Fri, 16 Apr 2021 12:33:54 +0200 Subject: [PATCH 027/121] Update SPONSORS.md --- SPONSORS.md | 49 ++++++++++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/SPONSORS.md b/SPONSORS.md index 19e8abb43..965337b90 100644 --- a/SPONSORS.md +++ b/SPONSORS.md @@ -1,47 +1,54 @@ -The following people has contributed with a generous donation to the raylib project. +## raylib GitHub Sponsors -## 🥇 Gold Contributors +### Current raylib GitHub Sponsors -... +The following people is currently [**sponsoring raylib**](https://github.com/sponsors/raysan5) with a generous donation to allow improving and growing the project! -## 🥈 Silver Contributors +Note that Sponsors donations vary between sponsors, I just decided not to make any distinction while listing them. + +**If you are a raylib Sponsor reading this list, feel free to send a PR to add your website link if desired.** - - Jonathan Johnson ([@ecton](https://github.com/ecton)) - Eric J. ([@ProfJski](https://github.com/ProfJski)) - - Rudy Faile ([@rfaile313](https://github.com/rfaile313)) - https://rudyfaile.com/ - devdad ([@devdad](https://github.com/devdad)) - - frithrah ([@frithrah](https://github.com/frithrah)) - Zach Geis ([@zacgeis](https://github.com/zacgeis)) - -## 🥉 Bronze Contributors - - minirop ([@minirop](https://github.com/minirop)) - Daniel Gómez ([@Koocachookies](https://github.com/Koocachookies)) - Sergio ([@anidealgift](https://github.com/anidealgift)) - - JFons ([@JFonS](https://github.com/JFonS)) - Marc Agüera ([@maguera93](https://github.com/maguera93)) - Pau Fernández ([@pauek](https://github.com/pauek)) - - Jens Pitkänen ([@neonmoe](https://github.com/neonmoe)) - Snowminx ([@Gamerfiend](https://github.com/Gamerfiend)) - NimbusFox ([@NimbusFox](https://github.com/NimbusFox)) - Robin Mattheussen ([@romatthe](https://github.com/romatthe)) - - Rahul Nair ([@rahulunair](https://github.com/rahulunair)) - Grant Haywood ([@cinterloper](https://github.com/cinterloper)) - Terry Nguyen ([@terrehbyte](https://github.com/terrehbyte)) - - albatros-hmd ([@albatros-hmd](https://github.com/albatros-hmd)) - - Benjamin Stigsen ([@BenStigsen](https://github.com/BenStigsen)) - - Louis Johnson ([@louisgjohnson](https://github.com/louisgjohnson)) - - Dani Martin ([@danimartin82](https://github.com/danimartin82)) - Tommi Sinivuo ([@TommiSinivuo](https://github.com/TommiSinivuo)) - - Joakim Wennergren ([@joakimwennergren](https://github.com/joakimwennergren)) - Richard Urbanec ([@Poryg1](https://github.com/Poryg1)) - pmgl ([@pmgl](https://github.com/pmgl)) - cob ([@majorcob](https://github.com/majorcob)) - Samuel Batista ([@gamedevsam](https://github.com/gamedevsam)) + - Merlyn Morgan-Graham ([@kavika13](https://github.com/kavika13)) + - Toby4213 ([@Toby4213](https://github.com/Toby4213)) + - linus ([@hochbaum](https://github.com/hochbaum)) + - Allan Regush ([@AllanRegush](https://github.com/AllanRegush)) + + + +### Past raylib GitHub Sponsors + +The following people has **sponsored raylib** in the past, allowing the project to reach current amazing state. + + - Jonathan Johnson ([@ecton](https://github.com/ecton)) + - Rudy Faile ([@rfaile313](https://github.com/rfaile313)) - https://rudyfaile.com/ + - frithrah ([@frithrah](https://github.com/frithrah)) + - Jens Pitkänen ([@neonmoe](https://github.com/neonmoe)) + - Rahul Nair ([@rahulunair](https://github.com/rahulunair)) + - albatros-hmd ([@albatros-hmd](https://github.com/albatros-hmd)) + - Benjamin Stigsen ([@BenStigsen](https://github.com/BenStigsen)) + - Louis Johnson ([@louisgjohnson](https://github.com/louisgjohnson)) + - Dani Martin ([@danimartin82](https://github.com/danimartin82)) + - Joakim Wennergren ([@joakimwennergren](https://github.com/joakimwennergren)) - Alexandre Chêne ([@kooparse](https://github.com/kooparse)) - daddio69 ([@daddio69](https://github.com/daddio69)) - James Ghawaly ([@jghawaly](https://github.com/jghawaly)) - jack ([@Jack-Ji](https://github.com/Jack-Ji)) - - Merlyn Morgan-Graham ([@kavika13](https://github.com/kavika13)) - - + From a3a9416b33c4cebbb53a9e07f77b07ee6b2695fe Mon Sep 17 00:00:00 2001 From: Ray Date: Fri, 16 Apr 2021 12:37:04 +0200 Subject: [PATCH 028/121] Update SPONSORS.md --- SPONSORS.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/SPONSORS.md b/SPONSORS.md index 965337b90..909f5dcdc 100644 --- a/SPONSORS.md +++ b/SPONSORS.md @@ -29,8 +29,6 @@ Note that Sponsors donations vary between sponsors, I just decided not to make a - Merlyn Morgan-Graham ([@kavika13](https://github.com/kavika13)) - Toby4213 ([@Toby4213](https://github.com/Toby4213)) - linus ([@hochbaum](https://github.com/hochbaum)) - - Allan Regush ([@AllanRegush](https://github.com/AllanRegush)) - ### Past raylib GitHub Sponsors From e91eabdb096519707755277ede5e0a615d1a89ea Mon Sep 17 00:00:00 2001 From: Ray Date: Fri, 16 Apr 2021 12:45:01 +0200 Subject: [PATCH 029/121] Update SPONSORS.md --- SPONSORS.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/SPONSORS.md b/SPONSORS.md index 909f5dcdc..d7e5a709e 100644 --- a/SPONSORS.md +++ b/SPONSORS.md @@ -49,4 +49,6 @@ The following people has **sponsored raylib** in the past, allowing the project - daddio69 ([@daddio69](https://github.com/daddio69)) - James Ghawaly ([@jghawaly](https://github.com/jghawaly)) - jack ([@Jack-Ji](https://github.com/Jack-Ji)) + - Guido Offermans ([@jghawaly](https://github.com/GuidoOffermans)) + - Tommi Sinivuo ([@TommiSinivuo](https://github.com/TommiSinivuo)) From 74fc4b1a03fd3afc4421dd58a761ef42a4d59c94 Mon Sep 17 00:00:00 2001 From: Ray Date: Fri, 16 Apr 2021 12:47:33 +0200 Subject: [PATCH 030/121] Update SPONSORS.md --- SPONSORS.md | 1 - 1 file changed, 1 deletion(-) diff --git a/SPONSORS.md b/SPONSORS.md index d7e5a709e..6f0bf70ba 100644 --- a/SPONSORS.md +++ b/SPONSORS.md @@ -50,5 +50,4 @@ The following people has **sponsored raylib** in the past, allowing the project - James Ghawaly ([@jghawaly](https://github.com/jghawaly)) - jack ([@Jack-Ji](https://github.com/Jack-Ji)) - Guido Offermans ([@jghawaly](https://github.com/GuidoOffermans)) - - Tommi Sinivuo ([@TommiSinivuo](https://github.com/TommiSinivuo)) From 657b527bc676256a627c9fb28d3b298a360e171b Mon Sep 17 00:00:00 2001 From: Ray Date: Fri, 16 Apr 2021 12:52:22 +0200 Subject: [PATCH 031/121] Update SPONSORS.md --- SPONSORS.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/SPONSORS.md b/SPONSORS.md index 6f0bf70ba..c4822d0e0 100644 --- a/SPONSORS.md +++ b/SPONSORS.md @@ -6,8 +6,6 @@ The following people is currently [**sponsoring raylib**](https://github.com/spo Note that Sponsors donations vary between sponsors, I just decided not to make any distinction while listing them. -**If you are a raylib Sponsor reading this list, feel free to send a PR to add your website link if desired.** - - Eric J. ([@ProfJski](https://github.com/ProfJski)) - devdad ([@devdad](https://github.com/devdad)) - Zach Geis ([@zacgeis](https://github.com/zacgeis)) @@ -51,3 +49,9 @@ The following people has **sponsored raylib** in the past, allowing the project - jack ([@Jack-Ji](https://github.com/Jack-Ji)) - Guido Offermans ([@jghawaly](https://github.com/GuidoOffermans)) +### Notes for Current/Past raylib Sponsor + + - **If you are not on the list, feel free to send a PR to add you if desired.** + - **If you want your personal webpage listed along your GitHub account, feel free to send a PR to add it.** + - **If you prefer not to listed in this list, feel free to send a PR to remove it.** + From 640fc4d0a08b637732f8ca8df3715ba40f831c61 Mon Sep 17 00:00:00 2001 From: Ray Date: Fri, 16 Apr 2021 21:19:28 +0200 Subject: [PATCH 032/121] Minor tweaks --- src/text.c | 2 +- src/utils.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/text.c b/src/text.c index 784cec4aa..3a49963a7 100644 --- a/src/text.c +++ b/src/text.c @@ -1611,7 +1611,7 @@ int GetCodepointsCount(const char *text) // Total number of bytes processed are returned as a parameter // NOTE: the standard says U+FFFD should be returned in case of errors // but that character is not supported by the default font in raylib -// TODO: optimize this code for speed!! +// TODO: Optimize this code for speed!! int GetNextCodepoint(const char *text, int *bytesProcessed) { /* diff --git a/src/utils.c b/src/utils.c index 7912b876d..66804fb2c 100644 --- a/src/utils.c +++ b/src/utils.c @@ -372,11 +372,11 @@ void InitAssetManager(AAssetManager *manager, const char *dataPath) internalDataPath = dataPath; } -// Replacement for fopen +// Replacement for fopen() // Ref: https://developer.android.com/ndk/reference/group/asset FILE *android_fopen(const char *fileName, const char *mode) { - if (mode[0] == 'w') // TODO: Test! + if (mode[0] == 'w') { // TODO: fopen() is mapped to android_fopen() that only grants read access // to assets directory through AAssetManager but we want to also be able to From 2ad3eb1d57056f42d553c53671188fda051ce238 Mon Sep 17 00:00:00 2001 From: Peter Arato Date: Sat, 17 Apr 2021 11:58:25 -0400 Subject: [PATCH 033/121] Update and fix android linux makefile template (#1725) --- templates/simple_game/Makefile.Android.linux | 47 ++++++++++++-------- 1 file changed, 29 insertions(+), 18 deletions(-) diff --git a/templates/simple_game/Makefile.Android.linux b/templates/simple_game/Makefile.Android.linux index 1fbdc3146..324f3b546 100644 --- a/templates/simple_game/Makefile.Android.linux +++ b/templates/simple_game/Makefile.Android.linux @@ -47,15 +47,16 @@ endif # Required path variables # no need to define JAVA_HOME , JAVA_BIN in linux environment (binaries are in $PATH) #JAVA_HOME ?= C:/JavaJDK/ -#JAVA_BIN ?= $(JAVA_HOME)/bin/ +#JAVA_BIN ?= $(JAVA_HOME)/bin/ ANDROID_HOME ?= /opt/android-sdk -#ANDROID_TOOLCHAIN = C:/android_toolchain_$(ANDROID_ARCH)_API$(ANDROID_API_VERSION) -ANDROID_TOOLCHAIN ?= /opt/android-ndk/toolchains/llvm/prebuilt/linux-x86_64/ +ANDROID_NDK ?= /opt/android-ndk +ANDROID_TOOLCHAIN ?= $(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/ # find the highest version available of build tools ANDROID_BUILD_TOOLS = $(shell ls -1d $(ANDROID_HOME)/build-tools/* | tail -n 1)/ # and extracts the API version ANDROID_API_VERSION = $(shell echo $(ANDROID_BUILD_TOOLS) | sed 's/.*\/\([0-9]\+\).*/\1/') +NATIVE_APP_GLUE = $(ANDROID_NDK)/sources/android/native_app_glue $(warning [*] Using $(ANDROID_BUILD_TOOLS) , API version: $(ANDROID_API_VERSION)) @@ -107,19 +108,25 @@ endif # Compiler and archiver ifeq ($(ANDROID_ARCH),ARM) - CC = $(ANDROID_TOOLCHAIN)/bin/arm-linux-androideabi-clang - AR = $(ANDROID_TOOLCHAIN)/bin/arm-linux-androideabi-ar + CC = $(ANDROID_TOOLCHAIN)/bin/armv7a-linux-androideabi$(ANDROID_API_VERSION)-clang + AR = $(ANDROID_TOOLCHAIN)/bin/armv7a-linux-androideabi-ar endif ifeq ($(ANDROID_ARCH),ARM64) - #CC = $(ANDROID_TOOLCHAIN)/bin/aarch64-linux-android-clang - #AR = $(ANDROID_TOOLCHAIN)/bin/aarch64-linux-android-ar CC = $(ANDROID_TOOLCHAIN)/bin/aarch64-linux-android$(ANDROID_API_VERSION)-clang AR = $(ANDROID_TOOLCHAIN)/bin/aarch64-linux-android-ar endif +ifeq ($(ANDROID_ARCH),x86) + CC = $(ANDROID_TOOLCHAIN)/bin/i686-linux-android$(ANDROID_API_VERSION)-clang + AR = $(ANDROID_TOOLCHAIN)/bin/i686-linux-android-ar +endif +ifeq ($(ANDROID_ARCH),x86_64) + CC = $(ANDROID_TOOLCHAIN)/bin/x86_64-linux-android$(ANDROID_API_VERSION)-clang + AR = $(ANDROID_TOOLCHAIN)/bin/x86_64-linux-android-ar +endif # Compiler flags for arquitecture ifeq ($(ANDROID_ARCH),ARM) - CFLAGS = -std=c99 -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 + CFLAGS = -std=c99 -march=armv7a -mfloat-abi=softfp -mfpu=vfpv3-d16 endif ifeq ($(ANDROID_ARCH),ARM64) CFLAGS = -std=c99 -target aarch64 -mfix-cortex-a53-835769 @@ -132,7 +139,7 @@ CFLAGS += -Wall -Wa,--noexecstack -Wformat -Werror=format-security -no-canonical CFLAGS += -DANDROID -DPLATFORM_ANDROID -D__ANDROID_API__=$(ANDROID_API_VERSION) # Paths containing required header files -INCLUDE_PATHS = -I. -I$(RAYLIB_PATH)/src -I$(RAYLIB_PATH)/src/external/android/native_app_glue +INCLUDE_PATHS = -I. -I$(RAYLIB_PATH)/src -I$(NATIVE_APP_GLUE) # Linker options LDFLAGS = -Wl,-soname,lib$(PROJECT_LIBRARY_NAME).so -Wl,--exclude-libs,libatomic.a @@ -162,8 +169,8 @@ all: create_temp_project_dirs \ compile_project_class \ compile_project_class_dex \ create_project_apk_package \ - sign_project_apk_package \ - zipalign_project_apk_package + zipalign_project_apk_package \ + sign_project_apk_package # Create required temp directories for APK building create_temp_project_dirs: @@ -175,7 +182,9 @@ create_temp_project_dirs: mkdir -p $(PROJECT_BUILD_PATH)/obj/screens; \ mkdir -p $(PROJECT_BUILD_PATH)/lib/$(ANDROID_ARCH_NAME); \ mkdir -p $(PROJECT_BUILD_PATH)/bin; \ - mkdir -p $(PROJECT_BUILD_PATH)/res/drawable-{l,m,h}dpi; \ + mkdir -p $(PROJECT_BUILD_PATH)/res/drawable-ldpi; \ + mkdir -p $(PROJECT_BUILD_PATH)/res/drawable-mdpi; \ + mkdir -p $(PROJECT_BUILD_PATH)/res/drawable-hdpi; \ mkdir -p $(PROJECT_BUILD_PATH)/res/values; \ mkdir -p $(PROJECT_BUILD_PATH)/assets/$(PROJECT_RESOURCES_PATH); \ $(foreach dir, $(PROJECT_SOURCE_DIRS), mkdir -p $(PROJECT_BUILD_PATH)/obj/$(dir) ); \ @@ -223,7 +232,7 @@ copy_project_resources: cp $(APP_ICON_LDPI) $(PROJECT_BUILD_PATH)/res/drawable-ldpi/icon.png cp $(APP_ICON_MDPI) $(PROJECT_BUILD_PATH)/res/drawable-mdpi/icon.png cp $(APP_ICON_HDPI) $(PROJECT_BUILD_PATH)/res/drawable-hdpi/icon.png - @echo -e "\n\ + @echo "\n\ \n\ \n\ $(APP_LABEL_NAME)\n\ @@ -251,7 +260,7 @@ else nativeloader_sharedlib= endif generate_loader_script: - @echo -e "package com.$(APP_COMPANY_NAME).$(APP_PRODUCT_NAME);\n\n\ + @echo "package com.$(APP_COMPANY_NAME).$(APP_PRODUCT_NAME);\n\n\ public class NativeLoader extends android.app.NativeActivity {\n\ static {\n\ $(nativeloader_sharedlib);\n\ @@ -272,7 +281,7 @@ generate_loader_script: # TODO jseb : replacing @drawable/icon with @mipmap/icon ? # https://stackoverflow.com/questions/23796414/error-no-resource-found-that-matches-the-given-name-at-icon-with-value-dr generate_android_manifest: - @echo -e "\n\ + @echo "\n\ \n\ @@ -336,7 +345,7 @@ config_project_package: # Compile native_app_glue code as static library: obj/libnative_app_glue.a compile_native_app_glue: - $(CC) -c $(RAYLIB_PATH)/src/external/android/native_app_glue/android_native_app_glue.c -o $(PROJECT_BUILD_PATH)/obj/native_app_glue.o $(CFLAGS) + $(CC) -c $(NATIVE_APP_GLUE)/android_native_app_glue.c -o $(PROJECT_BUILD_PATH)/obj/native_app_glue.o $(CFLAGS) $(AR) rcs $(PROJECT_BUILD_PATH)/obj/libnative_app_glue.a $(PROJECT_BUILD_PATH)/obj/native_app_glue.o # Compile project code into a shared library: lib/lib$(PROJECT_LIBRARY_NAME).so @@ -369,11 +378,13 @@ create_project_apk_package: sign_project_apk_package: #keytool -genkey -v -keystore debug.keystore -storepass android -alias androiddebugkey -keypass android -keyalg RSA -keysize 2048 -validity 10000 - $(JAVA_BIN)jarsigner -keystore $(PROJECT_BUILD_PATH)/$(PROJECT_NAME).keystore -storepass $(APP_KEYSTORE_PASS) -keypass $(APP_KEYSTORE_PASS) -signedjar $(PROJECT_BUILD_PATH)/bin/$(PROJECT_NAME).signed.apk $(PROJECT_BUILD_PATH)/bin/$(PROJECT_NAME).unsigned.apk $(PROJECT_NAME)Key + $(ANDROID_BUILD_TOOLS)/apksigner sign --ks $(PROJECT_BUILD_PATH)/$(PROJECT_NAME).keystore --ks-pass pass:$(APP_KEYSTORE_PASS) --out $(PROJECT_BUILD_PATH)/bin/$(PROJECT_NAME).signed.apk $(PROJECT_BUILD_PATH)/bin/$(PROJECT_NAME).zipaligned.apk + rm $(PROJECT_BUILD_PATH)/bin/$(PROJECT_NAME).zipaligned.apk # Create zip-aligned APK package: $(PROJECT_NAME).apk zipalign_project_apk_package: - $(ANDROID_BUILD_TOOLS)/zipalign -f 4 $(PROJECT_BUILD_PATH)/bin/$(PROJECT_NAME).signed.apk $(PROJECT_NAME).apk + $(ANDROID_BUILD_TOOLS)/zipalign -f 4 $(PROJECT_BUILD_PATH)/bin/$(PROJECT_NAME).unsigned.apk $(PROJECT_BUILD_PATH)/bin/$(PROJECT_NAME).zipaligned.apk + rm $(PROJECT_BUILD_PATH)/bin/$(PROJECT_NAME).unsigned.apk # Install $(PROJECT_NAME).apk to default emulator/device # NOTE: Use -e (emulator) or -d (device) parameters if required From d4ccca81dbb7f8300aa0b7a6b0f195b1814dc9fc Mon Sep 17 00:00:00 2001 From: Ray Date: Sun, 18 Apr 2021 20:24:19 +0200 Subject: [PATCH 034/121] WARNING: REDESIGNED: rlLoadExtensions() #1295 Added config flag: SUPPORT_GL_DETAILS_INFO --- src/config.h | 3 + src/core.c | 11 +- src/rlgl.h | 488 +++++++++++++++++++++++++++++++-------------------- 3 files changed, 306 insertions(+), 196 deletions(-) diff --git a/src/config.h b/src/config.h index 55834fcd5..99cb1d48b 100644 --- a/src/config.h +++ b/src/config.h @@ -80,6 +80,9 @@ //------------------------------------------------------------------------------------ // Module: rlgl - Configuration values //------------------------------------------------------------------------------------ +// Show OpenGL extensions and capabilities detailed logs on init +//#define SUPPORT_GL_DETAILS_INFO 1 + #if defined(GRAPHICS_API_OPENGL_11) || defined(GRAPHICS_API_OPENGL_33) #define DEFAULT_BATCH_BUFFER_ELEMENTS 8192 // Default internal render batch limits #elif defined(GRAPHICS_API_OPENGL_ES2) diff --git a/src/core.c b/src/core.c index f4d64b7f5..a80a3c558 100644 --- a/src/core.c +++ b/src/core.c @@ -3770,12 +3770,6 @@ static bool InitGraphicsDevice(int width, int height) glfwSwapInterval(0); // No V-Sync by default #endif -#if defined(PLATFORM_DESKTOP) - // Load OpenGL 3.3 extensions - // NOTE: GLFW loader function is passed as parameter - rlLoadExtensions(glfwGetProcAddress); -#endif - // Try to enable GPU V-Sync, so frames are limited to screen refresh rate (60Hz -> 60 FPS) // NOTE: V-Sync can be enabled by graphic driver configuration if (CORE.Window.flags & FLAG_VSYNC_HINT) @@ -4357,6 +4351,11 @@ static bool InitGraphicsDevice(int width, int height) } #endif // PLATFORM_ANDROID || PLATFORM_RPI || PLATFORM_DRM || PLATFORM_UWP + // Load OpenGL extensions + // NOTE: GLFW loader function is required by GLAD but only used for OpenGL 2.1 and 3.3, + // OpenGL ES 2.0 extensions (and entry points) are loaded manually using eglGetProcAddress() + rlLoadExtensions(glfwGetProcAddress); + // Initialize OpenGL context (states and resources) // NOTE: CORE.Window.screen.width and CORE.Window.screen.height not used, just stored as globals in rlgl rlglInit(CORE.Window.screen.width, CORE.Window.screen.height); diff --git a/src/rlgl.h b/src/rlgl.h index 4288bf8d3..19f503bec 100644 --- a/src/rlgl.h +++ b/src/rlgl.h @@ -28,6 +28,8 @@ * #define RLGL_STANDALONE * Use rlgl as standalone library (no raylib dependency) * +* #define SUPPORT_GL_DETAILS_INFO +* Show OpenGL extensions and capabilities detailed logs on init * * DEPENDENCIES: * raymath - 3D math functionality (Vector3, Matrix, Quaternion) @@ -837,7 +839,7 @@ typedef struct rlglData { bool texMirrorClamp; // Clamp mirror wrap mode supported (GL_EXT_texture_mirror_clamp) bool texAnisoFilter; // Anisotropic texture filtering support (GL_EXT_texture_filter_anisotropic) - float maxAnisotropicLevel; // Maximum anisotropy level supported (minimum is 2.0f) + float maxAnisotropyLevel; // Maximum anisotropy level supported (minimum is 2.0f) int maxDepthBits; // Maximum bits for depth component } ExtSupported; // Extensions supported flags @@ -869,6 +871,9 @@ static PFNGLVERTEXATTRIBDIVISOREXTPROC glVertexAttribDivisor = NULL; #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) static void rlLoadShaderDefault(void); // Load default shader (RLGL.State.defaultShader) static void rlUnloadShaderDefault(void); // Unload default shader (RLGL.State.defaultShader) +#if defined(SUPPORT_GL_DETAILS_INFO) +static char *rlGetCompressedFormatName(int format); // Get compressed format official GL identifier name +#endif // SUPPORT_GL_DETAILS_INFO #endif // GRAPHICS_API_OPENGL_33 || GRAPHICS_API_OPENGL_ES2 #if defined(GRAPHICS_API_OPENGL_11) static int rlGenerateMipmapsData(unsigned char *data, int baseWidth, int baseHeight); // Generate mipmaps data on CPU side @@ -1346,10 +1351,10 @@ void rlTextureParameters(unsigned int id, int param, int value) case RL_TEXTURE_FILTER_ANISOTROPIC: { #if !defined(GRAPHICS_API_OPENGL_11) - if (value <= RLGL.ExtSupported.maxAnisotropicLevel) glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, (float)value); - else if (RLGL.ExtSupported.maxAnisotropicLevel > 0.0f) + if (value <= RLGL.ExtSupported.maxAnisotropyLevel) glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, (float)value); + else if (RLGL.ExtSupported.maxAnisotropyLevel > 0.0f) { - TRACELOG(LOG_WARNING, "GL: Maximum anisotropic filter level supported is %iX", id, RLGL.ExtSupported.maxAnisotropicLevel); + TRACELOG(LOG_WARNING, "GL: Maximum anisotropic filter level supported is %iX", id, RLGL.ExtSupported.maxAnisotropyLevel); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, (float)value); } else TRACELOG(LOG_WARNING, "GL: Anisotropic filtering not supported"); @@ -1577,72 +1582,141 @@ void rlSetBlendFactors(int glSrcFactor, int glDstFactor, int glEquation) // Initialize rlgl: OpenGL extensions, default buffers/shaders/textures, OpenGL states void rlglInit(int width, int height) { - // Check OpenGL information and capabilities - //------------------------------------------------------------------------------ - // Print current OpenGL and GLSL version - TRACELOG(LOG_INFO, "GL: OpenGL device information:"); - TRACELOG(LOG_INFO, " > Vendor: %s", glGetString(GL_VENDOR)); - TRACELOG(LOG_INFO, " > Renderer: %s", glGetString(GL_RENDERER)); - TRACELOG(LOG_INFO, " > Version: %s", glGetString(GL_VERSION)); - TRACELOG(LOG_INFO, " > GLSL: %s", glGetString(GL_SHADING_LANGUAGE_VERSION)); +#if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) + // Init default white texture + unsigned char pixels[4] = { 255, 255, 255, 255 }; // 1 pixel RGBA (4 bytes) + RLGL.State.defaultTextureId = rlLoadTexture(pixels, 1, 1, PIXELFORMAT_UNCOMPRESSED_R8G8B8A8, 1); - // NOTE: We can get a bunch of extra information about GPU capabilities (glGet*) - //int maxTexSize; - //glGetIntegerv(GL_MAX_TEXTURE_SIZE, &maxTexSize); - //TRACELOG(LOG_INFO, "GL: Maximum texture size: %i", maxTexSize); + if (RLGL.State.defaultTextureId != 0) TRACELOG(LOG_INFO, "TEXTURE: [ID %i] Default texture loaded successfully", RLGL.State.defaultTextureId); + else TRACELOG(LOG_WARNING, "TEXTURE: Failed to load default texture"); - //GL_MAX_TEXTURE_IMAGE_UNITS - //GL_MAX_VIEWPORT_DIMS + // Init default Shader (customized for GL 3.3 and ES2) + rlLoadShaderDefault(); // RLGL.State.defaultShader + RLGL.State.currentShader = RLGL.State.defaultShader; - //int numAuxBuffers; - //glGetIntegerv(GL_AUX_BUFFERS, &numAuxBuffers); - //TRACELOG(LOG_INFO, "GL: Number of aixiliar buffers: %i", numAuxBuffers); + // Init default vertex arrays buffers + RLGL.defaultBatch = rlLoadRenderBatch(DEFAULT_BATCH_BUFFERS, DEFAULT_BATCH_BUFFER_ELEMENTS); + RLGL.currentBatch = &RLGL.defaultBatch; - //GLint numComp = 0; - //GLint format[32] = { 0 }; - //glGetIntegerv(GL_NUM_COMPRESSED_TEXTURE_FORMATS, &numComp); - //glGetIntegerv(GL_COMPRESSED_TEXTURE_FORMATS, format); - //for (int i = 0; i < numComp; i++) TRACELOG(LOG_INFO, "GL: Supported compressed format: 0x%x", format[i]); + // Init stack matrices (emulating OpenGL 1.1) + for (int i = 0; i < MAX_MATRIX_STACK_SIZE; i++) RLGL.State.stack[i] = MatrixIdentity(); - // NOTE: We don't need that much data on screen... right now... + // Init internal matrices + RLGL.State.transform = MatrixIdentity(); + RLGL.State.projection = MatrixIdentity(); + RLGL.State.modelview = MatrixIdentity(); + RLGL.State.currentMatrix = &RLGL.State.modelview; +#endif // GRAPHICS_API_OPENGL_33 || GRAPHICS_API_OPENGL_ES2 - // TODO: Automatize extensions loading using rlLoadExtensions() and GLAD - // Actually, when rlglInit() is called in InitWindow() in core.c, - // OpenGL context has already been created and required extensions loaded + // Initialize OpenGL default states + //---------------------------------------------------------- + // Init state: Depth test + glDepthFunc(GL_LEQUAL); // Type of depth testing to apply + glDisable(GL_DEPTH_TEST); // Disable depth testing for 2D (only used for 3D) + + // Init state: Blending mode + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // Color blending function (how colors are mixed) + glEnable(GL_BLEND); // Enable color blending (required to work with transparencies) + + // Init state: Culling + // NOTE: All shapes/models triangles are drawn CCW + glCullFace(GL_BACK); // Cull the back face (default) + glFrontFace(GL_CCW); // Front face are defined counter clockwise (default) + glEnable(GL_CULL_FACE); // Enable backface culling + + // Init state: Cubemap seamless +#if defined(GRAPHICS_API_OPENGL_33) + glEnable(GL_TEXTURE_CUBE_MAP_SEAMLESS); // Seamless cubemaps (not supported on OpenGL ES 2.0) +#endif + +#if defined(GRAPHICS_API_OPENGL_11) + // Init state: Color hints (deprecated in OpenGL 3.0+) + glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST); // Improve quality of color and texture coordinate interpolation + glShadeModel(GL_SMOOTH); // Smooth shading between vertex (vertex colors interpolation) +#endif #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) - // Get supported extensions list - GLint numExt = 0; + // Store screen size into global variables + RLGL.State.framebufferWidth = width; + RLGL.State.framebufferHeight = height; -#if defined(GRAPHICS_API_OPENGL_33) && !defined(GRAPHICS_API_OPENGL_21) + TRACELOG(LOG_INFO, "RLGL: Default OpenGL state initialized successfully"); + //---------------------------------------------------------- +#endif + + // Init state: Color/Depth buffers clear + glClearColor(0.0f, 0.0f, 0.0f, 1.0f); // Set clear color (black) + glClearDepth(1.0f); // Set clear depth value (default) + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); // Clear color and depth buffers (depth buffer required for 3D) +} + +// Vertex Buffer Object deinitialization (memory free) +void rlglClose(void) +{ +#if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) + rlUnloadRenderBatch(RLGL.defaultBatch); + + rlUnloadShaderDefault(); // Unload default shader + + glDeleteTextures(1, &RLGL.State.defaultTextureId); // Unload default texture + TRACELOG(LOG_INFO, "TEXTURE: [ID %i] Default texture unloaded successfully", RLGL.State.defaultTextureId); +#endif +} + +// Load OpenGL extensions +// NOTE: External loader function could be passed as a pointer +void rlLoadExtensions(void *loader) +{ +#if defined(GRAPHICS_API_OPENGL_33) // Also defined for GRAPHICS_API_OPENGL_21 + // NOTE: glad is generated and contains only required OpenGL 3.3 Core extensions (and lower versions) + #if !defined(__APPLE__) + if (!gladLoadGLLoader((GLADloadproc)loader)) TRACELOG(LOG_WARNING, "GLAD: Cannot load OpenGL extensions"); + else TRACELOG(LOG_INFO, "GLAD: OpenGL extensions loaded successfully"); + #endif + + // Get number of supported extensions + GLint numExt = 0; + glGetIntegerv(GL_NUM_EXTENSIONS, &numExt); + TRACELOG(LOG_INFO, "GL: Supported extensions count: %i", numExt); + +#if defined(SUPPORT_GL_DETAILS_INFO) + // Get supported extensions list + // WARNING: glGetStringi() not available on OpenGL 2.1 + char **extList = RL_MALLOC(sizeof(char *)*numExt); + TRACELOG(LOG_INFO, "GL: OpenGL extensions:"); + for (int i = 0; i < numExt; i++) + { + extList[i] = (char *)glGetStringi(GL_EXTENSIONS, i); + TRACELOG(LOG_INFO, " %s", extList[i]); + } + RL_FREE(extList); // Free extensions pointers +#endif + + // Register supported extensions flags // OpenGL 3.3 extensions supported by default (core) RLGL.ExtSupported.vao = true; RLGL.ExtSupported.instancing = true; RLGL.ExtSupported.texNPOT = true; RLGL.ExtSupported.texFloat32 = true; RLGL.ExtSupported.texDepth = true; + RLGL.ExtSupported.maxDepthBits = 32; + RLGL.ExtSupported.texAnisoFilter = true; + RLGL.ExtSupported.texMirrorClamp = true; + // NOTE: With GLAD, we can check if an extension is supported using the GLAD_GL_xxx booleans + if (GLAD_GL_EXT_texture_compression_s3tc) RLGL.ExtSupported.texCompDXT = true; // Texture compression: DXT + if (GLAD_GL_ARB_ES3_compatibility) RLGL.ExtSupported.texCompETC2 = true; // Texture compression: ETC2/EAC +#endif // GRAPHICS_API_OPENGL_33 - // We get a list of available extensions and we check for some of them (compressed textures) - // NOTE: We don't need to check again supported extensions but we do (GLAD already dealt with that) - glGetIntegerv(GL_NUM_EXTENSIONS, &numExt); - - // Allocate numExt strings pointers - char **extList = RL_MALLOC(sizeof(char *)*numExt); - - // Get extensions strings - for (int i = 0; i < numExt; i++) extList[i] = (char *)glGetStringi(GL_EXTENSIONS, i); -#endif -#if defined(GRAPHICS_API_OPENGL_ES2) || defined(GRAPHICS_API_OPENGL_21) - // Allocate 512 strings pointers (2 KB) - const char **extList = RL_MALLOC(512*sizeof(const char *)); - +#if defined(GRAPHICS_API_OPENGL_ES2) + // Get supported extensions list + GLint numExt = 0; + const char **extList = RL_MALLOC(512*sizeof(const char *)); // Allocate 512 strings pointers (2 KB) const char *extensions = (const char *)glGetString(GL_EXTENSIONS); // One big const string // NOTE: We have to duplicate string because glGetString() returns a const string int len = strlen(extensions) + 1; char *extensionsDup = (char *)RL_CALLOC(len, sizeof(char)); strcpy(extensionsDup, extensions); - extList[numExt] = extensionsDup; for (int i = 0; i < len; i++) @@ -1650,24 +1724,21 @@ void rlglInit(int width, int height) if (extensionsDup[i] == ' ') { extensionsDup[i] = '\0'; - numExt++; extList[numExt] = &extensionsDup[i + 1]; } } - - // NOTE: Duplicated string (extensionsDup) must be deallocated -#endif - + TRACELOG(LOG_INFO, "GL: Supported extensions count: %i", numExt); - // Show supported extensions - //for (int i = 0; i < numExt; i++) TRACELOG(LOG_INFO, "Supported extension: %s", extList[i]); +#if defined(SUPPORT_GL_DETAILS_INFO) + TRACELOG(LOG_INFO, "GL: OpenGL extensions:"); + for (int i = 0; i < numExt; i++) TRACELOG(LOG_INFO, " %s", extList[i]); +#endif // Check required extensions for (int i = 0; i < numExt; i++) { -#if defined(GRAPHICS_API_OPENGL_ES2) // Check VAO support // NOTE: Only check on OpenGL ES, OpenGL 3.3 has VAO support as core feature if (strcmp(extList[i], (const char *)"GL_OES_vertex_array_object") == 0) @@ -1717,162 +1788,98 @@ void rlglInit(int width, int height) if (strcmp(extList[i], (const char *)"GL_OES_depth24") == 0) RLGL.ExtSupported.maxDepthBits = 24; if (strcmp(extList[i], (const char *)"GL_OES_depth32") == 0) RLGL.ExtSupported.maxDepthBits = 32; -#endif - // DDS texture compression support + + // Check texture compression support: DXT if ((strcmp(extList[i], (const char *)"GL_EXT_texture_compression_s3tc") == 0) || (strcmp(extList[i], (const char *)"GL_WEBGL_compressed_texture_s3tc") == 0) || (strcmp(extList[i], (const char *)"GL_WEBKIT_WEBGL_compressed_texture_s3tc") == 0)) RLGL.ExtSupported.texCompDXT = true; - // ETC1 texture compression support + // Check texture compression support: ETC1 if ((strcmp(extList[i], (const char *)"GL_OES_compressed_ETC1_RGB8_texture") == 0) || (strcmp(extList[i], (const char *)"GL_WEBGL_compressed_texture_etc1") == 0)) RLGL.ExtSupported.texCompETC1 = true; - // ETC2/EAC texture compression support + // Check texture compression support: ETC2/EAC if (strcmp(extList[i], (const char *)"GL_ARB_ES3_compatibility") == 0) RLGL.ExtSupported.texCompETC2 = true; - // PVR texture compression support + // Check texture compression support: PVR if (strcmp(extList[i], (const char *)"GL_IMG_texture_compression_pvrtc") == 0) RLGL.ExtSupported.texCompPVRT = true; - // ASTC texture compression support + // Check texture compression support: ASTC if (strcmp(extList[i], (const char *)"GL_KHR_texture_compression_astc_hdr") == 0) RLGL.ExtSupported.texCompASTC = true; - // Anisotropic texture filter support - if (strcmp(extList[i], (const char *)"GL_EXT_texture_filter_anisotropic") == 0) - { - RLGL.ExtSupported.texAnisoFilter = true; - glGetFloatv(0x84FF, &RLGL.ExtSupported.maxAnisotropicLevel); // GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT - } + // Check anisotropic texture filter support + if (strcmp(extList[i], (const char *)"GL_EXT_texture_filter_anisotropic") == 0) RLGL.ExtSupported.texAnisoFilter = true; - // Clamp mirror wrap mode supported + // Check clamp mirror wrap mode support if (strcmp(extList[i], (const char *)"GL_EXT_texture_mirror_clamp") == 0) RLGL.ExtSupported.texMirrorClamp = true; } // Free extensions pointers RL_FREE(extList); - -#if defined(GRAPHICS_API_OPENGL_ES2) || defined(GRAPHICS_API_OPENGL_21) RL_FREE(extensionsDup); // Duplicated string must be deallocated -#endif +#endif // GRAPHICS_API_OPENGL_ES2 -#if defined(GRAPHICS_API_OPENGL_ES2) - if (RLGL.ExtSupported.vao) TRACELOG(LOG_INFO, "GL: VAO extension detected, VAO functions initialized successfully"); + // Check OpenGL information and capabilities + //------------------------------------------------------------------------------ + // Show current OpenGL and GLSL version + TRACELOG(LOG_INFO, "GL: OpenGL device information:"); + TRACELOG(LOG_INFO, " > Vendor: %s", glGetString(GL_VENDOR)); + TRACELOG(LOG_INFO, " > Renderer: %s", glGetString(GL_RENDERER)); + TRACELOG(LOG_INFO, " > Version: %s", glGetString(GL_VERSION)); + TRACELOG(LOG_INFO, " > GLSL: %s", glGetString(GL_SHADING_LANGUAGE_VERSION)); + + // NOTE: Anisotropy levels capability is an extension + #ifndef GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT + #define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF + #endif + glGetFloatv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &RLGL.ExtSupported.maxAnisotropyLevel); + +#if defined(SUPPORT_GL_DETAILS_INFO) + // Show some OpenGL GPU capabilities + TRACELOG(LOG_INFO, "GL: OpenGL capabilities:"); + GLint capability = 0; + glGetIntegerv(GL_MAX_TEXTURE_SIZE, &capability); + TRACELOG(LOG_INFO, " GL_MAX_TEXTURE_SIZE: %i", capability); + glGetIntegerv(GL_MAX_CUBE_MAP_TEXTURE_SIZE, &capability); + TRACELOG(LOG_INFO, " GL_MAX_CUBE_MAP_TEXTURE_SIZE: %i", capability); + glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &capability); + TRACELOG(LOG_INFO, " GL_MAX_TEXTURE_IMAGE_UNITS: %i", capability); + glGetIntegerv(GL_MAX_VERTEX_ATTRIBS, &capability); + TRACELOG(LOG_INFO, " GL_MAX_VERTEX_ATTRIBS: %i", capability); + #if !defined(GRAPHICS_API_OPENGL_ES2) + glGetIntegerv(GL_MAX_UNIFORM_BLOCK_SIZE, &capability); + TRACELOG(LOG_INFO, " GL_MAX_UNIFORM_BLOCK_SIZE: %i", capability); + glGetIntegerv(GL_MAX_DRAW_BUFFERS, &capability); + TRACELOG(LOG_INFO, " GL_MAX_DRAW_BUFFERS: %i", capability); + if (RLGL.ExtSupported.texAnisoFilter) TRACELOG(LOG_INFO, " GL_MAX_TEXTURE_MAX_ANISOTROPY: %.0f", RLGL.ExtSupported.maxAnisotropyLevel); + #endif + glGetIntegerv(GL_NUM_COMPRESSED_TEXTURE_FORMATS, &capability); + TRACELOG(LOG_INFO, " GL_NUM_COMPRESSED_TEXTURE_FORMATS: %i", capability); + GLint format[32] = { 0 }; + glGetIntegerv(GL_COMPRESSED_TEXTURE_FORMATS, format); + for (int i = 0; i < capability; i++) TRACELOG(LOG_INFO, " %s", rlGetCompressedFormatName(format[i])); + + /* + // Following capabilities are only supported by OpenGL 4.3 or greater + glGetIntegerv(GL_MAX_VERTEX_ATTRIB_BINDINGS, &capability); + TRACELOG(LOG_INFO, " GL_MAX_VERTEX_ATTRIB_BINDINGS: %i", capability); + glGetIntegerv(GL_MAX_UNIFORM_LOCATIONS, &capability); + TRACELOG(LOG_INFO, " GL_MAX_UNIFORM_LOCATIONS: %i", capability); + */ +#else // SUPPORT_GL_DETAILS_INFO + + // Show some basic info about GL supported features + #if defined(GRAPHICS_API_OPENGL_ES2) + if (RLGL.ExtSupported.vao) TRACELOG(LOG_INFO, "GL: VAO extension detected, VAO functions loaded successfully"); else TRACELOG(LOG_WARNING, "GL: VAO extension not found, VAO not supported"); - if (RLGL.ExtSupported.texNPOT) TRACELOG(LOG_INFO, "GL: NPOT textures extension detected, full NPOT textures supported"); else TRACELOG(LOG_WARNING, "GL: NPOT textures extension not found, limited NPOT support (no-mipmaps, no-repeat)"); -#endif - + #endif if (RLGL.ExtSupported.texCompDXT) TRACELOG(LOG_INFO, "GL: DXT compressed textures supported"); if (RLGL.ExtSupported.texCompETC1) TRACELOG(LOG_INFO, "GL: ETC1 compressed textures supported"); if (RLGL.ExtSupported.texCompETC2) TRACELOG(LOG_INFO, "GL: ETC2/EAC compressed textures supported"); if (RLGL.ExtSupported.texCompPVRT) TRACELOG(LOG_INFO, "GL: PVRT compressed textures supported"); if (RLGL.ExtSupported.texCompASTC) TRACELOG(LOG_INFO, "GL: ASTC compressed textures supported"); - - if (RLGL.ExtSupported.texAnisoFilter) TRACELOG(LOG_INFO, "GL: Anisotropic textures filtering supported (max: %.0fX)", RLGL.ExtSupported.maxAnisotropicLevel); - if (RLGL.ExtSupported.texMirrorClamp) TRACELOG(LOG_INFO, "GL: Mirror clamp wrap texture mode supported"); - - // Initialize buffers, default shaders and default textures - //---------------------------------------------------------- - // Init default white texture - unsigned char pixels[4] = { 255, 255, 255, 255 }; // 1 pixel RGBA (4 bytes) - RLGL.State.defaultTextureId = rlLoadTexture(pixels, 1, 1, PIXELFORMAT_UNCOMPRESSED_R8G8B8A8, 1); - - if (RLGL.State.defaultTextureId != 0) TRACELOG(LOG_INFO, "TEXTURE: [ID %i] Default texture loaded successfully", RLGL.State.defaultTextureId); - else TRACELOG(LOG_WARNING, "TEXTURE: Failed to load default texture"); - - // Init default Shader (customized for GL 3.3 and ES2) - rlLoadShaderDefault(); // RLGL.State.defaultShader - RLGL.State.currentShader = RLGL.State.defaultShader; - - // Init default vertex arrays buffers - RLGL.defaultBatch = rlLoadRenderBatch(DEFAULT_BATCH_BUFFERS, DEFAULT_BATCH_BUFFER_ELEMENTS); - RLGL.currentBatch = &RLGL.defaultBatch; - - // Init stack matrices (emulating OpenGL 1.1) - for (int i = 0; i < MAX_MATRIX_STACK_SIZE; i++) RLGL.State.stack[i] = MatrixIdentity(); - - // Init internal matrices - RLGL.State.transform = MatrixIdentity(); - RLGL.State.projection = MatrixIdentity(); - RLGL.State.modelview = MatrixIdentity(); - RLGL.State.currentMatrix = &RLGL.State.modelview; - -#endif // GRAPHICS_API_OPENGL_33 || GRAPHICS_API_OPENGL_ES2 - - // Initialize OpenGL default states - //---------------------------------------------------------- - // Init state: Depth test - glDepthFunc(GL_LEQUAL); // Type of depth testing to apply - glDisable(GL_DEPTH_TEST); // Disable depth testing for 2D (only used for 3D) - - // Init state: Blending mode - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // Color blending function (how colors are mixed) - glEnable(GL_BLEND); // Enable color blending (required to work with transparencies) - - // Init state: Culling - // NOTE: All shapes/models triangles are drawn CCW - glCullFace(GL_BACK); // Cull the back face (default) - glFrontFace(GL_CCW); // Front face are defined counter clockwise (default) - glEnable(GL_CULL_FACE); // Enable backface culling - - // Init state: Cubemap seamless -#if defined(GRAPHICS_API_OPENGL_33) - glEnable(GL_TEXTURE_CUBE_MAP_SEAMLESS); // Seamless cubemaps (not supported on OpenGL ES 2.0) -#endif - -#if defined(GRAPHICS_API_OPENGL_11) - // Init state: Color hints (deprecated in OpenGL 3.0+) - glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST); // Improve quality of color and texture coordinate interpolation - glShadeModel(GL_SMOOTH); // Smooth shading between vertex (vertex colors interpolation) -#endif - -#if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) - // Store screen size into global variables - RLGL.State.framebufferWidth = width; - RLGL.State.framebufferHeight = height; - - TRACELOG(LOG_INFO, "RLGL: Default state initialized successfully"); -#endif - - // Init state: Color/Depth buffers clear - glClearColor(0.0f, 0.0f, 0.0f, 1.0f); // Set clear color (black) - glClearDepth(1.0f); // Set clear depth value (default) - glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); // Clear color and depth buffers (depth buffer required for 3D) -} - -// Vertex Buffer Object deinitialization (memory free) -void rlglClose(void) -{ -#if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) - rlUnloadRenderBatch(RLGL.defaultBatch); - - rlUnloadShaderDefault(); // Unload default shader - glDeleteTextures(1, &RLGL.State.defaultTextureId); // Unload default texture - - TRACELOG(LOG_INFO, "TEXTURE: [ID %i] Unloaded default texture data from VRAM (GPU)", RLGL.State.defaultTextureId); -#endif -} - -// Load OpenGL extensions -// NOTE: External loader function could be passed as a pointer -void rlLoadExtensions(void *loader) -{ -#if defined(GRAPHICS_API_OPENGL_33) - // NOTE: glad is generated and contains only required OpenGL 3.3 Core extensions (and lower versions) - #if !defined(__APPLE__) - if (!gladLoadGLLoader((GLADloadproc)loader)) TRACELOG(LOG_WARNING, "GLAD: Cannot load OpenGL extensions"); - else TRACELOG(LOG_INFO, "GLAD: OpenGL extensions loaded successfully"); - - #if defined(GRAPHICS_API_OPENGL_21) - if (GLAD_GL_VERSION_2_1) TRACELOG(LOG_INFO, "GL: OpenGL 2.1 profile supported"); - #else - if (GLAD_GL_VERSION_3_3) TRACELOG(LOG_INFO, "GL: OpenGL 3.3 Core profile supported"); - else TRACELOG(LOG_ERROR, "GL: OpenGL 3.3 Core profile not supported"); - #endif - #endif - - // With GLAD, we can check if an extension is supported using the GLAD_GL_xxx booleans - //if (GLAD_GL_ARB_vertex_array_object) // Use GL_ARB_vertex_array_object #endif } @@ -1991,7 +1998,7 @@ RenderBatch rlLoadRenderBatch(int numBuffers, int bufferElements) batch.vertexBuffer[i].cCounter = 0; } - TRACELOG(LOG_INFO, "RLGL: Internal vertex buffers initialized successfully in RAM (CPU)"); + TRACELOG(LOG_INFO, "RLGL: Render batch vertex buffers loaded successfully in RAM (CPU)"); //-------------------------------------------------------------------------------------------- // Upload to GPU (VRAM) vertex data and initialize VAOs/VBOs @@ -2038,7 +2045,7 @@ RenderBatch rlLoadRenderBatch(int numBuffers, int bufferElements) #endif } - TRACELOG(LOG_INFO, "RLGL: Render batch vertex buffers loaded successfully"); + TRACELOG(LOG_INFO, "RLGL: Render batch vertex buffers loaded successfully in VRAM (GPU)"); // Unbind the current VAO if (RLGL.ExtSupported.vao) glBindVertexArray(0); @@ -2480,7 +2487,7 @@ unsigned int rlLoadTexture(void *data, int width, int height, int format, int mi // Unbind current texture glBindTexture(GL_TEXTURE_2D, 0); - if (id > 0) TRACELOG(LOG_INFO, "TEXTURE: [ID %i] Texture created successfully (%ix%i - %i mipmaps)", id, width, height, mipmapCount); + if (id > 0) TRACELOG(LOG_INFO, "TEXTURE: [ID %i] Texture loaded successfully (%ix%i - %i mipmaps)", id, width, height, mipmapCount); else TRACELOG(LOG_WARNING, "TEXTURE: Failed to load texture"); return id; @@ -2611,7 +2618,7 @@ unsigned int rlLoadTextureCubemap(void *data, int size, int format) glBindTexture(GL_TEXTURE_CUBE_MAP, 0); #endif - if (id > 0) TRACELOG(LOG_INFO, "TEXTURE: [ID %i] Cubemap texture created successfully (%ix%i)", id, size, size); + if (id > 0) TRACELOG(LOG_INFO, "TEXTURE: [ID %i] Cubemap texture loaded successfully (%ix%i)", id, size, size); else TRACELOG(LOG_WARNING, "TEXTURE: Failed to load cubemap texture"); return id; @@ -3245,7 +3252,14 @@ unsigned int rlCompileShader(const char *shaderCode, int type) if (success == GL_FALSE) { - TRACELOG(LOG_WARNING, "SHADER: [ID %i] Failed to compile shader code", shader); + switch (type) + { + case GL_VERTEX_SHADER: TRACELOG(LOG_WARNING, "SHADER: [ID %i] Failed to compile vertex shader code", shader); break; + case GL_FRAGMENT_SHADER: TRACELOG(LOG_WARNING, "SHADER: [ID %i] Failed to compile fragment shader code", shader); break; + //case GL_GEOMETRY_SHADER: + //case GL_COMPUTE_SHADER: + default: break; + } int maxLength = 0; glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &maxLength); @@ -3259,7 +3273,17 @@ unsigned int rlCompileShader(const char *shaderCode, int type) RL_FREE(log); } } - else TRACELOG(LOG_INFO, "SHADER: [ID %i] Compiled successfully", shader); + else + { + switch (type) + { + case GL_VERTEX_SHADER: TRACELOG(LOG_INFO, "SHADER: [ID %i] Vertex shader compiled successfully", shader); break; + case GL_FRAGMENT_SHADER: TRACELOG(LOG_INFO, "SHADER: [ID %i] Fragment shader compiled successfully", shader); break; + //case GL_GEOMETRY_SHADER: + //case GL_COMPUTE_SHADER: + default: break; + } + } #endif return shader; @@ -3313,7 +3337,7 @@ unsigned int rlLoadShaderProgram(unsigned int vShaderId, unsigned int fShaderId) program = 0; } - else TRACELOG(LOG_INFO, "SHADER: [ID %i] Program loaded successfully", program); + else TRACELOG(LOG_INFO, "SHADER: [ID %i] Program shader loaded successfully", program); #endif return program; } @@ -3777,7 +3801,91 @@ static void rlUnloadShaderDefault(void) glDeleteProgram(RLGL.State.defaultShader.id); RL_FREE(RLGL.State.defaultShader.locs); + + TRACELOG(LOG_INFO, "SHADER: [ID %i] Default shader unloaded successfully", RLGL.State.defaultShader.id); } + +#if defined(SUPPORT_GL_DETAILS_INFO) +// Get compressed format official GL identifier name +static char *rlGetCompressedFormatName(int format) +{ + static char compName[64] = { 0 }; + memset(compName, 0, 64); + + switch (format) + { + // GL_EXT_texture_compression_s3tc + case 0x83F0: strcpy(compName, "GL_COMPRESSED_RGB_S3TC_DXT1_EXT"); break; + case 0x83F1: strcpy(compName, "GL_COMPRESSED_RGBA_S3TC_DXT1_EXT"); break; + case 0x83F2: strcpy(compName, "GL_COMPRESSED_RGBA_S3TC_DXT3_EXT"); break; + case 0x83F3: strcpy(compName, "GL_COMPRESSED_RGBA_S3TC_DXT5_EXT"); break; + // GL_3DFX_texture_compression_FXT1 + case 0x86B0: strcpy(compName, "GL_COMPRESSED_RGB_FXT1_3DFX"); break; + case 0x86B1: strcpy(compName, "GL_COMPRESSED_RGBA_FXT1_3DFX"); break; + // GL_IMG_texture_compression_pvrtc + case 0x8C00: strcpy(compName, "GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG"); break; + case 0x8C01: strcpy(compName, "GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG"); break; + case 0x8C02: strcpy(compName, "GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG"); break; + case 0x8C03: strcpy(compName, "GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG"); break; + // GL_OES_compressed_ETC1_RGB8_texture + case 0x8D64: strcpy(compName, "GL_ETC1_RGB8_OES"); break; + // GL_ARB_texture_compression_rgtc + case 0x8DBB: strcpy(compName, "GL_COMPRESSED_RED_RGTC1"); break; + case 0x8DBC: strcpy(compName, "GL_COMPRESSED_SIGNED_RED_RGTC1"); break; + case 0x8DBD: strcpy(compName, "GL_COMPRESSED_RG_RGTC2"); break; + case 0x8DBE: strcpy(compName, "GL_COMPRESSED_SIGNED_RG_RGTC2"); break; + // GL_ARB_texture_compression_bptc + case 0x8E8C: strcpy(compName, "GL_COMPRESSED_RGBA_BPTC_UNORM_ARB"); break; + case 0x8E8D: strcpy(compName, "GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_ARB"); break; + case 0x8E8E: strcpy(compName, "GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_ARB"); break; + case 0x8E8F: strcpy(compName, "GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_ARB"); break; + // GL_ARB_ES3_compatibility + case 0x9274: strcpy(compName, "GL_COMPRESSED_RGB8_ETC2"); break; + case 0x9275: strcpy(compName, "GL_COMPRESSED_SRGB8_ETC2"); break; + case 0x9276: strcpy(compName, "GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2"); break; + case 0x9277: strcpy(compName, "GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2"); break; + case 0x9278: strcpy(compName, "GL_COMPRESSED_RGBA8_ETC2_EAC"); break; + case 0x9279: strcpy(compName, "GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC"); break; + case 0x9270: strcpy(compName, "GL_COMPRESSED_R11_EAC"); break; + case 0x9271: strcpy(compName, "GL_COMPRESSED_SIGNED_R11_EAC"); break; + case 0x9272: strcpy(compName, "GL_COMPRESSED_RG11_EAC"); break; + case 0x9273: strcpy(compName, "GL_COMPRESSED_SIGNED_RG11_EAC"); break; + // GL_KHR_texture_compression_astc_hdr + case 0x93B0: strcpy(compName, "GL_COMPRESSED_RGBA_ASTC_4x4_KHR"); break; + case 0x93B1: strcpy(compName, "GL_COMPRESSED_RGBA_ASTC_5x4_KHR"); break; + case 0x93B2: strcpy(compName, "GL_COMPRESSED_RGBA_ASTC_5x5_KHR"); break; + case 0x93B3: strcpy(compName, "GL_COMPRESSED_RGBA_ASTC_6x5_KHR"); break; + case 0x93B4: strcpy(compName, "GL_COMPRESSED_RGBA_ASTC_6x6_KHR"); break; + case 0x93B5: strcpy(compName, "GL_COMPRESSED_RGBA_ASTC_8x5_KHR"); break; + case 0x93B6: strcpy(compName, "GL_COMPRESSED_RGBA_ASTC_8x6_KHR"); break; + case 0x93B7: strcpy(compName, "GL_COMPRESSED_RGBA_ASTC_8x8_KHR"); break; + case 0x93B8: strcpy(compName, "GL_COMPRESSED_RGBA_ASTC_10x5_KHR"); break; + case 0x93B9: strcpy(compName, "GL_COMPRESSED_RGBA_ASTC_10x6_KHR"); break; + case 0x93BA: strcpy(compName, "GL_COMPRESSED_RGBA_ASTC_10x8_KHR"); break; + case 0x93BB: strcpy(compName, "GL_COMPRESSED_RGBA_ASTC_10x10_KHR"); break; + case 0x93BC: strcpy(compName, "GL_COMPRESSED_RGBA_ASTC_12x10_KHR"); break; + case 0x93BD: strcpy(compName, "GL_COMPRESSED_RGBA_ASTC_12x12_KHR"); break; + case 0x93D0: strcpy(compName, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR"); break; + case 0x93D1: strcpy(compName, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR"); break; + case 0x93D2: strcpy(compName, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR"); break; + case 0x93D3: strcpy(compName, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR"); break; + case 0x93D4: strcpy(compName, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR"); break; + case 0x93D5: strcpy(compName, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR"); break; + case 0x93D6: strcpy(compName, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR"); break; + case 0x93D7: strcpy(compName, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR"); break; + case 0x93D8: strcpy(compName, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR"); break; + case 0x93D9: strcpy(compName, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR"); break; + case 0x93DA: strcpy(compName, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR"); break; + case 0x93DB: strcpy(compName, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR"); break; + case 0x93DC: strcpy(compName, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR"); break; + case 0x93DD: strcpy(compName, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR"); break; + default: strcpy(compName, "GL_COMPRESSED_UNKNOWN"); break; + } + + return compName; +} +#endif // SUPPORT_GL_DETAILS_INFO + #endif // GRAPHICS_API_OPENGL_33 || GRAPHICS_API_OPENGL_ES2 #if defined(GRAPHICS_API_OPENGL_11) From 223091f44c95ae41241939d5fb25c8a7734b1895 Mon Sep 17 00:00:00 2001 From: Ray Date: Sun, 18 Apr 2021 20:33:49 +0200 Subject: [PATCH 035/121] Review extensions issue on macOS --- src/rlgl.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/rlgl.h b/src/rlgl.h index 19f503bec..ab12cc0e7 100644 --- a/src/rlgl.h +++ b/src/rlgl.h @@ -1702,9 +1702,11 @@ void rlLoadExtensions(void *loader) RLGL.ExtSupported.maxDepthBits = 32; RLGL.ExtSupported.texAnisoFilter = true; RLGL.ExtSupported.texMirrorClamp = true; + #if !defined(__APPLE__) // NOTE: With GLAD, we can check if an extension is supported using the GLAD_GL_xxx booleans if (GLAD_GL_EXT_texture_compression_s3tc) RLGL.ExtSupported.texCompDXT = true; // Texture compression: DXT if (GLAD_GL_ARB_ES3_compatibility) RLGL.ExtSupported.texCompETC2 = true; // Texture compression: ETC2/EAC + #endif #endif // GRAPHICS_API_OPENGL_33 #if defined(GRAPHICS_API_OPENGL_ES2) From 63432724c7a345b175eb56c227666f6e305e91d0 Mon Sep 17 00:00:00 2001 From: Ray Date: Sun, 18 Apr 2021 21:18:53 +0200 Subject: [PATCH 036/121] Update CHANGELOG --- CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index aff48fa9f..f6a084416 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -40,8 +40,10 @@ Detailed changes: [core] REDESIGNED: GetFileExtension(), includes the .dot [core] REDESIGNED: IsFileExtension(), includes the .dot [core] REDESIGNED: Compresion API to use sdefl/sinfl libs +[rlgl] ADDED: SUPPORT_GL_DETAILS_INFO config flag [rlgl] REMOVED: GenTexture*() functions (#721) [rlgl] REVIEWED: rlLoadShaderDefault() +[rlgl] REDESIGNED: rlLoadExtensions(), more details exposed [raymath] REVIEWED: QuaternionFromEuler() (#1651) [raymath] REVIEWED: MatrixRotateZYX() (#1642) [shapes] ADDED: DrawLineBezierQuad() (#1468) by @epsilon-phase From 581bd0eb020c730dd5f14fee7867629c1cd9c8c0 Mon Sep 17 00:00:00 2001 From: Ray Date: Sun, 18 Apr 2021 23:50:32 +0200 Subject: [PATCH 037/121] Remove trailing spaces --- src/core.c | 36 +++++++++++++-------------- src/models.c | 2 +- src/raudio.c | 2 +- src/rlgl.h | 66 +++++++++++++++++++++++++------------------------- src/textures.c | 2 +- 5 files changed, 54 insertions(+), 54 deletions(-) diff --git a/src/core.c b/src/core.c index a80a3c558..3e9fcf8c7 100644 --- a/src/core.c +++ b/src/core.c @@ -1040,7 +1040,7 @@ void ToggleFullscreen(void) GLFWmonitor** monitors = glfwGetMonitors(&monitorCount); int monitorIndex = GetCurrentMonitor(); - + // Use current monitor, so we correctly get the display the window is on GLFWmonitor* monitor = monitorIndex < monitorCount ? monitors[monitorIndex] : NULL; @@ -1089,7 +1089,7 @@ void ToggleFullscreen(void) // Option 1: Request fullscreen for the canvas element // This option does not seem to work at all //emscripten_request_fullscreen("#canvas", false); - + // Option 2: Request fullscreen for the canvas element with strategy // This option does not seem to work at all // Ref: https://github.com/emscripten-core/emscripten/issues/5124 @@ -1101,8 +1101,8 @@ void ToggleFullscreen(void) // .canvasResizedCallbackUserData = NULL // }; //emscripten_request_fullscreen_strategy("#canvas", EM_FALSE, &strategy); - - // Option 3: Request fullscreen for the canvas element with strategy + + // Option 3: Request fullscreen for the canvas element with strategy // It works as expected but only inside the browser (client area) EmscriptenFullscreenStrategy strategy = { .scaleMode = EMSCRIPTEN_FULLSCREEN_SCALE_ASPECT, @@ -1121,10 +1121,10 @@ void ToggleFullscreen(void) { //emscripten_exit_fullscreen(); emscripten_exit_soft_fullscreen(); - + int width, height; emscripten_get_canvas_element_size("#canvas", &width, &height); - TRACELOG(LOG_WARNING, "Emscripten: Exit fullscreen: Canvas size: %i x %i", width, height); + TRACELOG(LOG_WARNING, "Emscripten: Exit fullscreen: Canvas size: %i x %i", width, height); } */ @@ -2070,7 +2070,7 @@ void EndScissorMode(void) void BeginVrStereoMode(VrStereoConfig config) { rlEnableStereoRender(); - + // Set stereo render matrices rlSetMatrixProjectionStereo(config.projection[0], config.projection[1]); rlSetMatrixViewOffsetStereo(config.viewOffset[0], config.viewOffset[1]); @@ -2086,7 +2086,7 @@ void EndVrStereoMode(void) VrStereoConfig LoadVrStereoConfig(VrDeviceInfo device) { VrStereoConfig config = { 0 }; - + #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) // Compute aspect ratio float aspect = ((float)device.hResolution*0.5f)/(float)device.vResolution; @@ -2126,7 +2126,7 @@ VrStereoConfig LoadVrStereoConfig(VrDeviceInfo device) // Compute camera projection matrices float projOffset = 4.0f*lensShift; // Scaled to projection space coordinates [-1..1] Matrix proj = MatrixPerspective(fovy, aspect, RL_CULL_DISTANCE_NEAR, RL_CULL_DISTANCE_FAR); - + config.projection[0] = MatrixMultiply(proj, MatrixTranslate(projOffset, 0.0f, 0.0f)); config.projection[1] = MatrixMultiply(proj, MatrixTranslate(-projOffset, 0.0f, 0.0f)); @@ -2156,7 +2156,7 @@ VrStereoConfig LoadVrStereoConfig(VrDeviceInfo device) return config; } -// Unload VR stereo config properties +// Unload VR stereo config properties void UnloadVrStereoConfig(VrStereoConfig config) { //... @@ -3778,7 +3778,7 @@ static bool InitGraphicsDevice(int width, int height) glfwSwapInterval(1); TRACELOG(LOG_INFO, "DISPLAY: Trying to enable VSYNC"); } -#endif // PLATFORM_DESKTOP || PLATFORM_WEB +#endif // PLATFORM_DESKTOP || PLATFORM_WEB #if defined(PLATFORM_ANDROID) || defined(PLATFORM_RPI) || defined(PLATFORM_DRM) || defined(PLATFORM_UWP) CORE.Window.fullscreen = true; @@ -4349,7 +4349,7 @@ static bool InitGraphicsDevice(int width, int height) TRACELOG(LOG_INFO, " > Screen size: %i x %i", CORE.Window.screen.width, CORE.Window.screen.height); TRACELOG(LOG_INFO, " > Viewport offsets: %i, %i", CORE.Window.renderOffset.x, CORE.Window.renderOffset.y); } -#endif // PLATFORM_ANDROID || PLATFORM_RPI || PLATFORM_DRM || PLATFORM_UWP +#endif // PLATFORM_ANDROID || PLATFORM_RPI || PLATFORM_DRM || PLATFORM_UWP // Load OpenGL extensions // NOTE: GLFW loader function is required by GLAD but only used for OpenGL 2.1 and 3.3, @@ -4745,7 +4745,7 @@ static void PollInputEvents(void) #else glfwPollEvents(); // Register keyboard/mouse events (callbacks)... and window events! #endif -#endif //defined(PLATFORM_DESKTOP) +#endif // PLATFORM_DESKTOP // Gamepad support using emscripten API // NOTE: GLFW3 joystick functionality not available in web @@ -4908,8 +4908,8 @@ static void SwapBuffers(void) gbm_surface_release_buffer(CORE.Window.gbmSurface, CORE.Window.prevBO); } CORE.Window.prevBO = bo; -#endif // defined(PLATFORM_DRM) -#endif // defined(PLATFORM_ANDROID) || defined(PLATFORM_RPI) || defined(PLATFORM_DRM) || defined(PLATFORM_UWP) +#endif // PLATFORM_DRM +#endif // PLATFORM_ANDROID || PLATFORM_RPI || PLATFORM_DRM || PLATFORM_UWP } #if defined(PLATFORM_DESKTOP) || defined(PLATFORM_WEB) @@ -5653,7 +5653,7 @@ static void RestoreKeyboard(void) // Reconfigure keyboard to default mode ioctl(STDIN_FILENO, KDSKBMODE, CORE.Input.Keyboard.defaultMode); } -#endif //SUPPORT_SSH_KEYBOARD_RPI +#endif // SUPPORT_SSH_KEYBOARD_RPI // Initialise user input from evdev(/dev/input/event) this means mouse, keyboard or gamepad devices static void InitEvdevInput(void) @@ -6237,7 +6237,7 @@ static void *GamepadThread(void *arg) return NULL; } -#endif // PLATFORM_RPI || PLATFORM_DRM +#endif // PLATFORM_RPI || PLATFORM_DRM #if defined(PLATFORM_UWP) // UWP function pointers @@ -6509,7 +6509,7 @@ void UWPGestureTouch(int pointer, float x, float y, bool touch) #endif } -#endif // PLATFORM_UWP +#endif // PLATFORM_UWP #if defined(PLATFORM_DRM) // Search matching DRM mode in connector's mode list diff --git a/src/models.c b/src/models.c index 4e3273948..81f27f385 100644 --- a/src/models.c +++ b/src/models.c @@ -1519,7 +1519,7 @@ Mesh GenMeshDefault(int vertexCount) // Upload vertex data to GPU (static mesh) // NOTE: mesh.vboId array is allocated inside UploadMesh() UploadMesh(&mesh, false); - + return mesh; } diff --git a/src/raudio.c b/src/raudio.c index a25245ec3..2b6b0a19b 100644 --- a/src/raudio.c +++ b/src/raudio.c @@ -1235,7 +1235,7 @@ Music LoadMusicStream(const char *fileName) bits = 16; else if (AUDIO_DEVICE_FORMAT == ma_format_u8) bits = 8; - + // NOTE: Only stereo is supported for XM music.stream = InitAudioStream(AUDIO.System.device.sampleRate, bits, AUDIO_DEVICE_CHANNELS); music.sampleCount = (unsigned int)jar_xm_get_remaining_samples(ctxXm)*2; // 2 channels diff --git a/src/rlgl.h b/src/rlgl.h index ab12cc0e7..6d6218ec2 100644 --- a/src/rlgl.h +++ b/src/rlgl.h @@ -1606,7 +1606,7 @@ void rlglInit(int width, int height) RLGL.State.projection = MatrixIdentity(); RLGL.State.modelview = MatrixIdentity(); RLGL.State.currentMatrix = &RLGL.State.modelview; -#endif // GRAPHICS_API_OPENGL_33 || GRAPHICS_API_OPENGL_ES2 +#endif // GRAPHICS_API_OPENGL_33 || GRAPHICS_API_OPENGL_ES2 // Initialize OpenGL default states //---------------------------------------------------------- @@ -1684,7 +1684,7 @@ void rlLoadExtensions(void *loader) // WARNING: glGetStringi() not available on OpenGL 2.1 char **extList = RL_MALLOC(sizeof(char *)*numExt); TRACELOG(LOG_INFO, "GL: OpenGL extensions:"); - for (int i = 0; i < numExt; i++) + for (int i = 0; i < numExt; i++) { extList[i] = (char *)glGetStringi(GL_EXTENSIONS, i); TRACELOG(LOG_INFO, " %s", extList[i]); @@ -1730,7 +1730,7 @@ void rlLoadExtensions(void *loader) extList[numExt] = &extensionsDup[i + 1]; } } - + TRACELOG(LOG_INFO, "GL: Supported extensions count: %i", numExt); #if defined(SUPPORT_GL_DETAILS_INFO) @@ -1829,7 +1829,7 @@ void rlLoadExtensions(void *loader) TRACELOG(LOG_INFO, " > Renderer: %s", glGetString(GL_RENDERER)); TRACELOG(LOG_INFO, " > Version: %s", glGetString(GL_VERSION)); TRACELOG(LOG_INFO, " > GLSL: %s", glGetString(GL_SHADING_LANGUAGE_VERSION)); - + // NOTE: Anisotropy levels capability is an extension #ifndef GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT #define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF @@ -2393,7 +2393,7 @@ unsigned int rlLoadTexture(void *data, int width, int height, int format, int mi return id; } #endif -#endif // GRAPHICS_API_OPENGL_11 +#endif // GRAPHICS_API_OPENGL_11 glPixelStorei(GL_UNPACK_ALIGNMENT, 1); @@ -3738,7 +3738,7 @@ static void rlLoadShaderDefault(void) "{ \n" " vec4 texelColor = texture2D(texture0, fragTexCoord); \n" " gl_FragColor = texelColor*colDiffuse*fragColor; \n" - "} \n"; + "} \n"; #elif defined(GRAPHICS_API_OPENGL_33) "#version 330 \n" "in vec2 fragTexCoord; \n" @@ -3803,7 +3803,7 @@ static void rlUnloadShaderDefault(void) glDeleteProgram(RLGL.State.defaultShader.id); RL_FREE(RLGL.State.defaultShader.locs); - + TRACELOG(LOG_INFO, "SHADER: [ID %i] Default shader unloaded successfully", RLGL.State.defaultShader.id); } @@ -3813,7 +3813,7 @@ static char *rlGetCompressedFormatName(int format) { static char compName[64] = { 0 }; memset(compName, 0, 64); - + switch (format) { // GL_EXT_texture_compression_s3tc @@ -3853,37 +3853,37 @@ static char *rlGetCompressedFormatName(int format) case 0x9272: strcpy(compName, "GL_COMPRESSED_RG11_EAC"); break; case 0x9273: strcpy(compName, "GL_COMPRESSED_SIGNED_RG11_EAC"); break; // GL_KHR_texture_compression_astc_hdr - case 0x93B0: strcpy(compName, "GL_COMPRESSED_RGBA_ASTC_4x4_KHR"); break; - case 0x93B1: strcpy(compName, "GL_COMPRESSED_RGBA_ASTC_5x4_KHR"); break; - case 0x93B2: strcpy(compName, "GL_COMPRESSED_RGBA_ASTC_5x5_KHR"); break; - case 0x93B3: strcpy(compName, "GL_COMPRESSED_RGBA_ASTC_6x5_KHR"); break; - case 0x93B4: strcpy(compName, "GL_COMPRESSED_RGBA_ASTC_6x6_KHR"); break; - case 0x93B5: strcpy(compName, "GL_COMPRESSED_RGBA_ASTC_8x5_KHR"); break; - case 0x93B6: strcpy(compName, "GL_COMPRESSED_RGBA_ASTC_8x6_KHR"); break; - case 0x93B7: strcpy(compName, "GL_COMPRESSED_RGBA_ASTC_8x8_KHR"); break; + case 0x93B0: strcpy(compName, "GL_COMPRESSED_RGBA_ASTC_4x4_KHR"); break; + case 0x93B1: strcpy(compName, "GL_COMPRESSED_RGBA_ASTC_5x4_KHR"); break; + case 0x93B2: strcpy(compName, "GL_COMPRESSED_RGBA_ASTC_5x5_KHR"); break; + case 0x93B3: strcpy(compName, "GL_COMPRESSED_RGBA_ASTC_6x5_KHR"); break; + case 0x93B4: strcpy(compName, "GL_COMPRESSED_RGBA_ASTC_6x6_KHR"); break; + case 0x93B5: strcpy(compName, "GL_COMPRESSED_RGBA_ASTC_8x5_KHR"); break; + case 0x93B6: strcpy(compName, "GL_COMPRESSED_RGBA_ASTC_8x6_KHR"); break; + case 0x93B7: strcpy(compName, "GL_COMPRESSED_RGBA_ASTC_8x8_KHR"); break; case 0x93B8: strcpy(compName, "GL_COMPRESSED_RGBA_ASTC_10x5_KHR"); break; case 0x93B9: strcpy(compName, "GL_COMPRESSED_RGBA_ASTC_10x6_KHR"); break; case 0x93BA: strcpy(compName, "GL_COMPRESSED_RGBA_ASTC_10x8_KHR"); break; case 0x93BB: strcpy(compName, "GL_COMPRESSED_RGBA_ASTC_10x10_KHR"); break; case 0x93BC: strcpy(compName, "GL_COMPRESSED_RGBA_ASTC_12x10_KHR"); break; case 0x93BD: strcpy(compName, "GL_COMPRESSED_RGBA_ASTC_12x12_KHR"); break; - case 0x93D0: strcpy(compName, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR"); break; - case 0x93D1: strcpy(compName, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR"); break; - case 0x93D2: strcpy(compName, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR"); break; - case 0x93D3: strcpy(compName, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR"); break; - case 0x93D4: strcpy(compName, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR"); break; - case 0x93D5: strcpy(compName, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR"); break; - case 0x93D6: strcpy(compName, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR"); break; - case 0x93D7: strcpy(compName, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR"); break; - case 0x93D8: strcpy(compName, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR"); break; - case 0x93D9: strcpy(compName, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR"); break; - case 0x93DA: strcpy(compName, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR"); break; - case 0x93DB: strcpy(compName, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR"); break; - case 0x93DC: strcpy(compName, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR"); break; - case 0x93DD: strcpy(compName, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR"); break; - default: strcpy(compName, "GL_COMPRESSED_UNKNOWN"); break; + case 0x93D0: strcpy(compName, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR"); break; + case 0x93D1: strcpy(compName, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR"); break; + case 0x93D2: strcpy(compName, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR"); break; + case 0x93D3: strcpy(compName, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR"); break; + case 0x93D4: strcpy(compName, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR"); break; + case 0x93D5: strcpy(compName, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR"); break; + case 0x93D6: strcpy(compName, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR"); break; + case 0x93D7: strcpy(compName, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR"); break; + case 0x93D8: strcpy(compName, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR"); break; + case 0x93D9: strcpy(compName, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR"); break; + case 0x93DA: strcpy(compName, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR"); break; + case 0x93DB: strcpy(compName, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR"); break; + case 0x93DC: strcpy(compName, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR"); break; + case 0x93DD: strcpy(compName, "GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR"); break; + default: strcpy(compName, "GL_COMPRESSED_UNKNOWN"); break; } - + return compName; } #endif // SUPPORT_GL_DETAILS_INFO @@ -4016,7 +4016,7 @@ static Color *rlGenNextMipmapData(Color *srcData, int srcWidth, int srcHeight) return mipmap; } -#endif // GRAPHICS_API_OPENGL_11 +#endif // GRAPHICS_API_OPENGL_11 // Get pixel data size in bytes (image or texture) // NOTE: Size depends on pixel format diff --git a/src/textures.c b/src/textures.c index 5db786f62..de0d76ba8 100644 --- a/src/textures.c +++ b/src/textures.c @@ -3236,7 +3236,7 @@ void DrawTexturePro(Texture2D texture, Rectangle source, Rectangle dest, Vector2 bottomRight.x = x + (dx + dest.width)*cosRotation - (dy + dest.height)*sinRotation; bottomRight.y = y + (dx + dest.width)*sinRotation + (dy + dest.height)*cosRotation; } - + rlCheckRenderBatchLimit(4); // Make sure there is enough free space on the batch buffer rlSetTexture(texture.id); From 1c45a882f753f2fb5f9f9646688d1125de196b2b Mon Sep 17 00:00:00 2001 From: nathants Date: Mon, 19 Apr 2021 09:26:40 -0700 Subject: [PATCH 038/121] use bone weights for animation (#1728) --- src/models.c | 66 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 39 insertions(+), 27 deletions(-) diff --git a/src/models.c b/src/models.c index 81f27f385..3dc6c3d5f 100644 --- a/src/models.c +++ b/src/models.c @@ -1425,41 +1425,53 @@ void UpdateModelAnimation(Model model, ModelAnimation anim, int frame) int vCounter = 0; int boneCounter = 0; int boneId = 0; + float boneWeight = 0.0; for (int i = 0; i < model.meshes[m].vertexCount; i++) { - boneId = model.meshes[m].boneIds[boneCounter]; - inTranslation = model.bindPose[boneId].translation; - inRotation = model.bindPose[boneId].rotation; - //inScale = model.bindPose[boneId].scale; - outTranslation = anim.framePoses[frame][boneId].translation; - outRotation = anim.framePoses[frame][boneId].rotation; - outScale = anim.framePoses[frame][boneId].scale; + model.meshes[m].animVertices[vCounter] = 0; + model.meshes[m].animVertices[vCounter + 1] = 0; + model.meshes[m].animVertices[vCounter + 2] = 0; - // Vertices processing - // NOTE: We use meshes.vertices (default vertex position) to calculate meshes.animVertices (animated vertex position) - animVertex = (Vector3){ model.meshes[m].vertices[vCounter], model.meshes[m].vertices[vCounter + 1], model.meshes[m].vertices[vCounter + 2] }; - animVertex = Vector3Multiply(animVertex, outScale); - animVertex = Vector3Subtract(animVertex, inTranslation); - animVertex = Vector3RotateByQuaternion(animVertex, QuaternionMultiply(outRotation, QuaternionInvert(inRotation))); - animVertex = Vector3Add(animVertex, outTranslation); - model.meshes[m].animVertices[vCounter] = animVertex.x; - model.meshes[m].animVertices[vCounter + 1] = animVertex.y; - model.meshes[m].animVertices[vCounter + 2] = animVertex.z; + model.meshes[m].animNormals[vCounter] = 0; + model.meshes[m].animNormals[vCounter + 1] = 0; + model.meshes[m].animNormals[vCounter + 2] = 0; - // Normals processing - // NOTE: We use meshes.baseNormals (default normal) to calculate meshes.normals (animated normals) - if (model.meshes[m].normals != NULL) + for (int j = 0; j < 4; j++) { - animNormal = (Vector3){ model.meshes[m].normals[vCounter], model.meshes[m].normals[vCounter + 1], model.meshes[m].normals[vCounter + 2] }; - animNormal = Vector3RotateByQuaternion(animNormal, QuaternionMultiply(outRotation, QuaternionInvert(inRotation))); - model.meshes[m].animNormals[vCounter] = animNormal.x; - model.meshes[m].animNormals[vCounter + 1] = animNormal.y; - model.meshes[m].animNormals[vCounter + 2] = animNormal.z; - } + boneId = model.meshes[m].boneIds[boneCounter]; + boneWeight = model.meshes[m].boneWeights[boneCounter]; + inTranslation = model.bindPose[boneId].translation; + inRotation = model.bindPose[boneId].rotation; + //inScale = model.bindPose[boneId].scale; + outTranslation = anim.framePoses[frame][boneId].translation; + outRotation = anim.framePoses[frame][boneId].rotation; + outScale = anim.framePoses[frame][boneId].scale; + // Vertices processing + // NOTE: We use meshes.vertices (default vertex position) to calculate meshes.animVertices (animated vertex position) + animVertex = (Vector3){ model.meshes[m].vertices[vCounter], model.meshes[m].vertices[vCounter + 1], model.meshes[m].vertices[vCounter + 2] }; + animVertex = Vector3Multiply(animVertex, outScale); + animVertex = Vector3Subtract(animVertex, inTranslation); + animVertex = Vector3RotateByQuaternion(animVertex, QuaternionMultiply(outRotation, QuaternionInvert(inRotation))); + animVertex = Vector3Add(animVertex, outTranslation); + model.meshes[m].animVertices[vCounter] += animVertex.x * boneWeight; + model.meshes[m].animVertices[vCounter + 1] += animVertex.y * boneWeight; + model.meshes[m].animVertices[vCounter + 2] += animVertex.z * boneWeight; + + // Normals processing + // NOTE: We use meshes.baseNormals (default normal) to calculate meshes.normals (animated normals) + if (model.meshes[m].normals != NULL) + { + animNormal = (Vector3){ model.meshes[m].normals[vCounter], model.meshes[m].normals[vCounter + 1], model.meshes[m].normals[vCounter + 2] }; + animNormal = Vector3RotateByQuaternion(animNormal, QuaternionMultiply(outRotation, QuaternionInvert(inRotation))); + model.meshes[m].animNormals[vCounter] += animNormal.x * boneWeight; + model.meshes[m].animNormals[vCounter + 1] += animNormal.y * boneWeight; + model.meshes[m].animNormals[vCounter + 2] += animNormal.z * boneWeight; + } + boneCounter += 1; + } vCounter += 3; - boneCounter += 4; } // Upload new vertex data to GPU for model drawing From 7f1068ef96685b174883b2bd1c9781fe7c1ad0d4 Mon Sep 17 00:00:00 2001 From: Stephan Soller Date: Mon, 19 Apr 2021 19:40:34 +0200 Subject: [PATCH 039/121] Added zoom independent sharp edges to the SDF text example. (#1727) --- examples/text/resources/shaders/glsl330/sdf.fs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/text/resources/shaders/glsl330/sdf.fs b/examples/text/resources/shaders/glsl330/sdf.fs index 44d33e9b1..45e1cabea 100644 --- a/examples/text/resources/shaders/glsl330/sdf.fs +++ b/examples/text/resources/shaders/glsl330/sdf.fs @@ -12,14 +12,14 @@ uniform vec4 colDiffuse; out vec4 finalColor; // NOTE: Add here your custom variables -const float smoothing = 1.0/16.0; void main() { // Texel color fetching from texture sampler // NOTE: Calculate alpha using signed distance field (SDF) - float distance = texture(texture0, fragTexCoord).a; - float alpha = smoothstep(0.5 - smoothing, 0.5 + smoothing, distance); + float distanceFromOutline = texture(texture0, fragTexCoord).a - 0.5; + float distanceChangePerFragment = length(vec2(dFdx(distanceFromOutline), dFdy(distanceFromOutline))); + float alpha = smoothstep(-distanceChangePerFragment, distanceChangePerFragment, distanceFromOutline); // Calculate final fragment color finalColor = vec4(fragColor.rgb, fragColor.a*alpha); From 899afcbdcaa25ff856e698eaecaa9c4ec395159e Mon Sep 17 00:00:00 2001 From: Ray Date: Mon, 19 Apr 2021 19:41:32 +0200 Subject: [PATCH 040/121] Minor tweaks --- src/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core.c b/src/core.c index 3e9fcf8c7..247a79322 100644 --- a/src/core.c +++ b/src/core.c @@ -513,7 +513,7 @@ extern void UnloadFontDefault(void); // [Module: text] Unloads default fo static bool InitGraphicsDevice(int width, int height); // Initialize graphics device static void SetupFramebuffer(int width, int height); // Setup main framebuffer static void SetupViewport(int width, int height); // Set viewport for a provided width and height -static void SwapBuffers(void); // Copy back buffer to front buffers +static void SwapBuffers(void); // Copy back buffer to front buffer static void InitTimer(void); // Initialize timer static void Wait(float ms); // Wait for some milliseconds (stop program execution) @@ -4517,7 +4517,7 @@ static void InitTimer(void) #endif #if defined(PLATFORM_ANDROID) || defined(PLATFORM_RPI) || defined(PLATFORM_DRM) - struct timespec now; + struct timespec now = { 0 }; if (clock_gettime(CLOCK_MONOTONIC, &now) == 0) // Success { From 93d3212914393f89c545848c7489441d5274b4da Mon Sep 17 00:00:00 2001 From: Stephan Soller Date: Mon, 19 Apr 2021 20:28:14 +0200 Subject: [PATCH 041/121] [examples] Added an example for raylib OpenGL interop (#1726) * Added an example for raylib OpenGL interop. * Removed C99 variable-length array to fix MSVC errors * Moved the opengl interop example from shaders to others. --- examples/others/opengl_interop.c | 132 ++++++++++++++++++ examples/others/opengl_interop.png | Bin 0 -> 268859 bytes .../shaders/glsl100/point_particle.fs | 16 +++ .../shaders/glsl100/point_particle.vs | 24 ++++ .../shaders/glsl330/point_particle.fs | 17 +++ .../shaders/glsl330/point_particle.vs | 24 ++++ 6 files changed, 213 insertions(+) create mode 100644 examples/others/opengl_interop.c create mode 100644 examples/others/opengl_interop.png create mode 100644 examples/others/resources/shaders/glsl100/point_particle.fs create mode 100644 examples/others/resources/shaders/glsl100/point_particle.vs create mode 100644 examples/others/resources/shaders/glsl330/point_particle.fs create mode 100644 examples/others/resources/shaders/glsl330/point_particle.vs diff --git a/examples/others/opengl_interop.c b/examples/others/opengl_interop.c new file mode 100644 index 000000000..50003de05 --- /dev/null +++ b/examples/others/opengl_interop.c @@ -0,0 +1,132 @@ +/******************************************************************************************* +* +* raylib [shaders] example - OpenGL point particle system +* +* This example has been created using raylib 2ad3eb1 (www.raylib.com) +* raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details) +* +* Example contributed by Stephan Soller (@arkanis - http://arkanis.de/) +* and reviewed by Ramon Santamaria (@raysan5) +* +* Copyright (c) 2021 Stephan Soller (@arkanis) and Ramon Santamaria (@raysan5) +* +******************************************************************************************** +* +* Mixes raylib and plain OpenGL code to draw a GL_POINTS based particle system. The +* primary point is to demonstrate raylib and OpenGL interop. +* +* rlgl batched draw operations internally so we have to flush the current batch before +* doing our own OpenGL work (rlDrawRenderBatchActive()). +* +* The example also demonstrates how to get the current model view projection matrix of +* raylib. That way raylib cameras and so on work as expected. +* +********************************************************************************************/ + +#include "raylib.h" +#include "rlgl.h" +#include "glad.h" + +#if defined(PLATFORM_DESKTOP) + #define GLSL_VERSION 330 +#else // PLATFORM_RPI, PLATFORM_ANDROID, PLATFORM_WEB + #define GLSL_VERSION 100 +#endif + +int main() +{ + // Initialization + //-------------------------------------------------------------------------------------- + const int screenWidth = 800; + const int screenHeight = 450; + + InitWindow(screenWidth, screenHeight, "raylib - point particles"); + + Shader shader = LoadShader( + TextFormat("resources/shaders/glsl%i/point_particle.vs", GLSL_VERSION), + TextFormat("resources/shaders/glsl%i/point_particle.fs", GLSL_VERSION)); + int currentTimeLoc = GetShaderLocation(shader, "currentTime"); + int colorLoc = GetShaderLocation(shader, "color"); + + // Initialize the vertex buffer for the particles and assign each particle random values + struct { float x, y, period; } particles[10000]; + const size_t particleCount = sizeof(particles) / sizeof(particles[0]); + for (size_t i = 0; i < particleCount; i++) + { + particles[i].x = GetRandomValue(20, screenWidth - 20); + particles[i].y = GetRandomValue(50, screenHeight - 20); + // Give each particle a slightly different period. But don't spread it to much. This way the particles line up + // every so often and you get a glimps of what is going on. + particles[i].period = GetRandomValue(10, 30) / 10.0f; + } + + // Create a plain OpenGL vertex buffer with the data and an vertex array object that feeds the data from the buffer + // into the vertexPosition shader attribute. + GLuint vao = 0, vbo = 0; + glGenVertexArrays(1, &vao); + glBindVertexArray(vao); + glGenBuffers(1, &vbo); + glBindBuffer(GL_ARRAY_BUFFER, vbo); + glBufferData(GL_ARRAY_BUFFER, sizeof(particles), particles, GL_STATIC_DRAW); + // Note: LoadShader() automatically fetches the attribute index of "vertexPosition" and saves it in shader.locs[SHADER_LOC_VERTEX_POSITION] + glVertexAttribPointer(shader.locs[SHADER_LOC_VERTEX_POSITION], 3, GL_FLOAT, GL_FALSE, 0, 0); + glEnableVertexAttribArray(0); + glBindBuffer(GL_ARRAY_BUFFER, 0); + glBindVertexArray(0); + + // Allows the vertex shader to set the point size of each particle individually + glEnable(GL_PROGRAM_POINT_SIZE); + + SetTargetFPS(60); + //-------------------------------------------------------------------------------------- + + // Main game loop + while (!WindowShouldClose()) // Detect window close button or ESC key + { + // Draw + //---------------------------------------------------------------------------------- + BeginDrawing(); + ClearBackground(WHITE); + + DrawRectangle(10, 10, 210, 30, MAROON); + DrawText(TextFormat("%zu particles in one vertex buffer", particleCount), 20, 20, 10, RAYWHITE); + + // Switch to plain OpenGL + //------------------------------------------------------------------------------ + // rlglDraw() in raylib 3.5 + rlDrawRenderBatchActive(); + glUseProgram(shader.id); + glUniform1f(currentTimeLoc, GetTime()); + + Vector4 color = ColorNormalize((Color){ 255, 0, 0, 128 }); + glUniform4fv(colorLoc, 1, (float*)&color); + + // The the current model view projection matrix so the particle system is displayed and transformed + // (e.g. by cameras) just like everything else. + // GetMatrixModelview() and GetMatrixProjection() in raylib 3.5 + Matrix modelViewProjection = MatrixMultiply(rlGetMatrixModelview(), rlGetMatrixProjection()); + glUniformMatrix4fv(shader.locs[SHADER_LOC_MATRIX_MVP], 1, false, MatrixToFloat(modelViewProjection)); + + glBindVertexArray(vao); + glDrawArrays(GL_POINTS, 0, particleCount); + glBindVertexArray(0); + glUseProgram(0); + + // And back to raylib again + //------------------------------------------------------------------------------ + DrawFPS(screenWidth - 100, 10); + EndDrawing(); + //---------------------------------------------------------------------------------- + } + + // De-Initialization + //-------------------------------------------------------------------------------------- + glDeleteBuffers(1, &vbo); + glDeleteVertexArrays(1, &vao); + + UnloadShader(shader); + CloseWindow(); // Close window and OpenGL context + //-------------------------------------------------------------------------------------- + + return 0; +} \ No newline at end of file diff --git a/examples/others/opengl_interop.png b/examples/others/opengl_interop.png new file mode 100644 index 0000000000000000000000000000000000000000..74d7acaeab3a3896715945a6408aa682eb83cef9 GIT binary patch literal 268859 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

{Yj~Rlz3`sa1iofR2yRf!ybk`1R@GDev61G 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 D2qNk- From f21e520c9c8df5a4024c3dc137b49db4c25591ad Mon Sep 17 00:00:00 2001 From: Ray Date: Mon, 19 Apr 2021 23:29:40 +0200 Subject: [PATCH 045/121] Update README.md --- README.md | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/README.md b/README.md index bcfd0bd0d..5c6e27094 100644 --- a/README.md +++ b/README.md @@ -47,19 +47,7 @@ features - Bindings to [+50 programming languages](https://github.com/raysan5/raylib/blob/master/BINDINGS.md)! - Free and open source. -raylib uses on its [core](https://github.com/raysan5/raylib/blob/master/src/core.c) module the outstanding [GLFW3](http://www.glfw.org/) library, embedded in the form of [rglfw](https://github.com/raysan5/raylib/blob/master/src/rglfw.c) module, to avoid external dependencies. - -raylib uses on its [raudio](https://github.com/raysan5/raylib/blob/master/src/raudio.c) module, the amazing [miniaudio](https://github.com/dr-soft/miniaudio) library to support multiple platforms and multiple audio backends. - -raylib uses internally several single-file header-only libraries to support different fileformats loading and saving, all those libraries are embedded with raylib and available in [src/external](https://github.com/raysan5/raylib/tree/master/src/external) directory. Check [raylib Wiki](https://github.com/raysan5/raylib/wiki/raylib-dependencies) for a detailed list. - -*On Android platform, `native_app_glue` module (provided by Android NDK) and native Android libraries are used to manage window/context, inputs and activity life cycle.* - -*On Raspberry Pi 0,1,2,3 platform (native mode), `Videocore API` and `EGL` libraries are used for window/context management. Inputs are processed using `evdev` Linux libraries* - -*On Raspberry Pi 4 platform (native mode), `DRM subsystem` and `GBM API` libraries are used for window/context management. Inputs are processed using `evdev` Linux libraries* - -*On Web platform, raylib uses `emscripten` provided libraries for several input events management, specially noticeable the touch events support.* +raylib uses internally several libraries for window/graphics/inputs management and also to support different fileformats loading and saving, all those libraries are embedded with raylib and available in [src/external](https://github.com/raysan5/raylib/tree/master/src/external) directory. Check [raylib dependencies](https://github.com/raysan5/raylib/wiki/raylib-dependencies) page on [raylib Wiki](https://github.com/raysan5/raylib/wiki) for a detailed list. build and installation ---------------------- From f90368606026697d55e7d91a71d114cbc1680f82 Mon Sep 17 00:00:00 2001 From: Ray Date: Mon, 19 Apr 2021 23:51:19 +0200 Subject: [PATCH 046/121] Update README.md --- README.md | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 5c6e27094..6b646502c 100644 --- a/README.md +++ b/README.md @@ -29,25 +29,49 @@ Ready to learn? Jump to [code examples!](http://www.raylib.com/examples.html) features -------- - - **NO external dependencies**, all required libraries are bundled into raylib + - **NO external dependencies**, all required libraries are [bundled into raylib](https://github.com/raysan5/raylib/tree/master/src/external) - Multiple platforms supported: **Windows, Linux, MacOS, RPI, Android, HTML5... and more!** - Written in plain C code (C99) in PascalCase/camelCase notation - Hardware accelerated with OpenGL (**1.1, 2.1, 3.3 or ES 2.0**) - **Unique OpenGL abstraction layer** (usable as standalone module): [rlgl](https://github.com/raysan5/raylib/blob/master/src/rlgl.h) - Multiple **Fonts** formats supported (TTF, XNA fonts, AngelCode fonts) - - Outstanding texture formats support, including compressed formats (DXT, ETC, ASTC) + - Multiple texture formats supported, including **compressed formats** (DXT, ETC, ASTC) - **Full 3D support**, including 3D Shapes, Models, Billboards, Heightmaps and more! - Flexible Materials system, supporting classic maps and **PBR maps** - - **Animated 3D models** supported (skeletal bones animation) + - **Animated 3D models** supported (skeletal bones animation) (IQM, glTF) - Shaders support, including model and **postprocessing** shaders. - **Powerful math module** for Vector, Matrix and Quaternion operations: [raymath](https://github.com/raysan5/raylib/blob/master/src/raymath.h) - Audio loading and playing with streaming support (WAV, OGG, MP3, FLAC, XM, MOD) - **VR stereo rendering** support with configurable HMD device parameters - Huge examples collection with [+120 code examples](https://github.com/raysan5/raylib/tree/master/examples)! - Bindings to [+50 programming languages](https://github.com/raysan5/raylib/blob/master/BINDINGS.md)! - - Free and open source. + - **Free and open source**. -raylib uses internally several libraries for window/graphics/inputs management and also to support different fileformats loading and saving, all those libraries are embedded with raylib and available in [src/external](https://github.com/raysan5/raylib/tree/master/src/external) directory. Check [raylib dependencies](https://github.com/raysan5/raylib/wiki/raylib-dependencies) page on [raylib Wiki](https://github.com/raysan5/raylib/wiki) for a detailed list. +raylib uses internally some libraries for window/graphics/inputs management and also to support different fileformats loading, all those libraries are embedded with raylib and are available in [src/external](https://github.com/raysan5/raylib/tree/master/src/external) directory. Check [raylib dependencies](https://github.com/raysan5/raylib/wiki/raylib-dependencies) on [raylib Wiki](https://github.com/raysan5/raylib/wiki) for a detailed list. + +basic example +-------------- +This is a basic raylib example, it creates a window and it draws the text `"Congrats! You created your first window!"` in the middle of the screen. This example can be seen [running live in web here](https://www.raylib.com/examples/web/core/loader.html?name=core_basic_window). +```c +#include "raylib.h" + +int main(void) +{ + InitWindow(800, 450, "raylib [core] example - basic window"); + + while (!WindowShouldClose()) + { + BeginDrawing(); + ClearBackground(RAYWHITE); + DrawText("Congrats! You created your first window!", 190, 200, 20, LIGHTGRAY); + EndDrawing(); + } + + CloseWindow(); + + return 0; +} +``` build and installation ---------------------- From d533183b7ff63fd41077a645b500e70155b735c1 Mon Sep 17 00:00:00 2001 From: Ray Date: Tue, 20 Apr 2021 00:43:48 +0200 Subject: [PATCH 047/121] Update README.md --- README.md | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 6b646502c..686d992d4 100644 --- a/README.md +++ b/README.md @@ -123,21 +123,27 @@ raylib has been developed on Windows platform using [Notepad++](https://notepad- *Note that there are lots of IDEs supported, some of the provided templates could require some review, please, if you find some issue with some template or you think they could be improved, feel free to send a PR or open a related issue.* -more info ----------- +learning +-------- -TODO. + - [raylib cheatsheet](https://www.raylib.com/cheatsheet/cheatsheet.html) + - [raylib architecture](https://github.com/raysan5/raylib/wiki/raylib-architecture) + - [raylib library design](https://github.com/raysan5/raylib/wiki) + - [raylib examples collection](https://github.com/raysan5/raylib/tree/master/examples) + - [raylib games collection](https://github.com/raysan5/raylib-games) + - [raylib Wiki](https://github.com/raysan5/raylib/wiki) -contact -------- - * Webpage: [http://www.raylib.com](http://www.raylib.com) - * Discord: [https://discord.gg/raylib](https://discord.gg/raylib) - * Twitter: [http://www.twitter.com/raysan5](http://www.twitter.com/raysan5) - * Twitch: [http://www.twitch.tv/raysan5](http://www.twitch.tv/raysan5) - * Reddit: [https://www.reddit.com/r/raylib](https://www.reddit.com/r/raylib) - * Patreon: [https://www.patreon.com/raylib](https://www.patreon.com/raylib) - * YouTube: [https://www.youtube.com/channel/raylib](https://www.youtube.com/c/raylib) +contact and networks +--------------------- + + - Webpage: [http://www.raylib.com](http://www.raylib.com) + - Discord: [https://discord.gg/raylib](https://discord.gg/raylib) + - Twitter: [http://www.twitter.com/raysan5](http://www.twitter.com/raysan5) + - Twitch: [http://www.twitch.tv/raysan5](http://www.twitch.tv/raysan5) + - Reddit: [https://www.reddit.com/r/raylib](https://www.reddit.com/r/raylib) + - Patreon: [https://www.patreon.com/raylib](https://www.patreon.com/raylib) + - YouTube: [https://www.youtube.com/channel/raylib](https://www.youtube.com/c/raylib) If you are using raylib and enjoying it, please, join our [Discord server](https://discord.gg/raylib) and let us know! :) From bb743e8c6ec1ab50bd5ab0f12e10a48da702d76a Mon Sep 17 00:00:00 2001 From: Ray Date: Tue, 20 Apr 2021 12:16:16 +0200 Subject: [PATCH 048/121] ADDED: UpdateMeshBuffer() --- src/models.c | 24 +++++++++++++++--------- src/raylib.h | 3 ++- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/models.c b/src/models.c index 3dc6c3d5f..d03d10403 100644 --- a/src/models.c +++ b/src/models.c @@ -829,13 +829,13 @@ void UploadMesh(Mesh *mesh, bool dynamic) mesh->vboId = (unsigned int *)RL_CALLOC(MAX_MESH_VERTEX_BUFFERS, sizeof(unsigned int)); mesh->vaoId = 0; // Vertex Array Object - mesh->vboId[0] = 0; // Vertex positions VBO - mesh->vboId[1] = 0; // Vertex texcoords VBO - mesh->vboId[2] = 0; // Vertex normals VBO - mesh->vboId[3] = 0; // Vertex colors VBO - mesh->vboId[4] = 0; // Vertex tangents VBO - mesh->vboId[5] = 0; // Vertex texcoords2 VBO - mesh->vboId[6] = 0; // Vertex indices VBO + mesh->vboId[0] = 0; // Vertex buffer: positions + mesh->vboId[1] = 0; // Vertex buffer: texcoords + mesh->vboId[2] = 0; // Vertex buffer: normals + mesh->vboId[3] = 0; // Vertex buffer: colors + mesh->vboId[4] = 0; // Vertex buffer: tangents + mesh->vboId[5] = 0; // Vertex buffer: texcoords2 + mesh->vboId[6] = 0; // Vertex buffer: indices #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) mesh->vaoId = rlLoadVertexArray(); @@ -925,6 +925,12 @@ void UploadMesh(Mesh *mesh, bool dynamic) #endif } +// Update mesh vertex data in GPU for a specific buffer index +void UpdateMeshBuffer(Mesh mesh, int index, void *data, int dataSize, int offset) +{ + rlUpdateVertexBuffer(mesh->vboId[index], data, dataSize, offset); +} + // Draw a 3d mesh with material and transform void DrawMesh(Mesh mesh, Material material, Matrix transform) { @@ -1528,9 +1534,9 @@ Mesh GenMeshDefault(int vertexCount) mesh.normals = (float *)RL_CALLOC(mesh.vertexCount*3, sizeof(float)); mesh.colors = (unsigned char *)RL_CALLOC(mesh.vertexCount*4, sizeof(unsigned char)); - // Upload vertex data to GPU (static mesh) + // Upload vertex data to GPU (dynamic mesh) // NOTE: mesh.vboId array is allocated inside UploadMesh() - UploadMesh(&mesh, false); + UploadMesh(&mesh, true); return mesh; } diff --git a/src/raylib.h b/src/raylib.h index 4c70e48af..abe7d8a1d 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -1381,7 +1381,8 @@ RLAPI void UnloadModel(Model model); RLAPI void UnloadModelKeepMeshes(Model model); // Unload model (but not meshes) from memory (RAM and/or VRAM) // Mesh loading/unloading functions -RLAPI void UploadMesh(Mesh *mesh, bool dynamic); // Upload vertex data into GPU and provided VAO/VBO ids +RLAPI void UploadMesh(Mesh *mesh, bool dynamic); // Upload mesh vertex data in GPU and provide VAO/VBO ids +RLAPI void UpdateMeshBuffer(Mesh mesh, int index, void *data, int dataSize, int offset); // Update mesh vertex data in GPU for a specific buffer index RLAPI void DrawMesh(Mesh mesh, Material material, Matrix transform); // Draw a 3d mesh with material and transform RLAPI void DrawMeshInstanced(Mesh mesh, Material material, Matrix *transforms, int instances); // Draw multiple mesh instances with material and different transforms RLAPI void UnloadMesh(Mesh mesh); // Unload mesh data from CPU and GPU From a599fd1095352ed51db31ca2bfb3bad0e3abe3c6 Mon Sep 17 00:00:00 2001 From: Ray Date: Tue, 20 Apr 2021 12:17:06 +0200 Subject: [PATCH 049/121] Update CHANGELOG --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index f6a084416..16ca949a4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -62,6 +62,7 @@ Detailed changes: [textures] REVIEWED: DrawTexturePro() and DrawRectanglePro() transformations (#1632) by @ChrisDill [text] REDESIGNED: DrawFPS() [models] ADDED: UploadMesh() (#1529) +[models] ADDED: UpdateMeshBuffer() [models] ADDED: DrawMesh() [models] ADDED: DrawMeshInstanced() [models] ADDED: UnloadModelAnimations() (#1648) by @object71 From 1e65817d057053460ea045b59954286d3cefe1f5 Mon Sep 17 00:00:00 2001 From: Ray Date: Tue, 20 Apr 2021 12:19:04 +0200 Subject: [PATCH 050/121] Update models.c --- src/models.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/models.c b/src/models.c index d03d10403..b970a4838 100644 --- a/src/models.c +++ b/src/models.c @@ -928,7 +928,7 @@ void UploadMesh(Mesh *mesh, bool dynamic) // Update mesh vertex data in GPU for a specific buffer index void UpdateMeshBuffer(Mesh mesh, int index, void *data, int dataSize, int offset) { - rlUpdateVertexBuffer(mesh->vboId[index], data, dataSize, offset); + rlUpdateVertexBuffer(mesh.vboId[index], data, dataSize, offset); } // Draw a 3d mesh with material and transform From ca8329c3302b182b1689071a2dc03bd989a69337 Mon Sep 17 00:00:00 2001 From: Ray Date: Tue, 20 Apr 2021 12:29:54 +0200 Subject: [PATCH 051/121] Update raylib_logo_animation.gif --- logo/raylib_logo_animation.gif | Bin 42100 -> 41633 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/logo/raylib_logo_animation.gif b/logo/raylib_logo_animation.gif index 28ccba1f5971f6cd0c650cf98d09c07f7909929f..25dbc45714315d6275733ce75373b6d94f19cf78 100644 GIT binary patch delta 6120 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 C_Ts$& delta 6614 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 JwdaFr{ From 8812213c01bbc4869864fce0c3ea025d827c1dc7 Mon Sep 17 00:00:00 2001 From: Ray Date: Tue, 20 Apr 2021 12:30:31 +0200 Subject: [PATCH 052/121] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 686d992d4..3f24b78fe 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ - + **raylib is a simple and easy-to-use library to enjoy videogames programming.** From 52f91bc6529d79649f616b12ca295da31856f34f Mon Sep 17 00:00:00 2001 From: Ray Date: Tue, 20 Apr 2021 12:31:12 +0200 Subject: [PATCH 053/121] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 3f24b78fe..4ff98af14 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,8 @@ raylib is highly inspired by Borland BGI graphics lib and by XNA framework and i Ready to learn? Jump to [code examples!](http://www.raylib.com/examples.html) +--- +
[![GitHub contributors](https://img.shields.io/github/contributors/raysan5/raylib)](https://github.com/raysan5/raylib/graphs/contributors) From 0a6694708da08919be8edb70ff8d0134ed67f473 Mon Sep 17 00:00:00 2001 From: Ray Date: Tue, 20 Apr 2021 23:57:04 +0200 Subject: [PATCH 054/121] Update README.md --- README.md | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 4ff98af14..29156f70c 100644 --- a/README.md +++ b/README.md @@ -102,7 +102,7 @@ You can download and install raylib using the [conan](https://conan.io) dependen *The raylib recipe in conan is kept up to date by conan team members and community contributors. If the version is out of date, please [create an issue or pull request](https://github.com/conan-io/conan-center-index) on the conan-center-index repository.* -#### Building raylib on multiple platforms +#### Installing and building raylib on multiple platforms [raylib Wiki](https://github.com/raysan5/raylib/wiki#development-platforms) contains detailed instructions on building and usage on multiple platforms. @@ -117,7 +117,7 @@ You can download and install raylib using the [conan](https://conan.io) dependen *Note that Wiki is open for edit, if you find some issue while building raylib for your target platform, feel free to edit the Wiki or open and issue related to it.* -#### Using raylib with multiple IDEs +#### Setup raylib with multiple IDEs raylib has been developed on Windows platform using [Notepad++](https://notepad-plus-plus.org/) and [MinGW GCC](http://mingw-w64.org/doku.php) compiler but it can be used with other IDEs on multiple platforms. @@ -125,25 +125,28 @@ raylib has been developed on Windows platform using [Notepad++](https://notepad- *Note that there are lots of IDEs supported, some of the provided templates could require some review, please, if you find some issue with some template or you think they could be improved, feel free to send a PR or open a related issue.* -learning --------- +learning and docs +------------------ + +raylib is designed to be learned using the examples as the main reference. There is no a standard API documentation, just a **cheatsheet** containing all the functions available on the library and a short description of each one, input parameters and result value should be intuitive just seing the naming. Some additional documentation about raylib design can be found in raylib GitHub Wiki. Here the more relevant links: - [raylib cheatsheet](https://www.raylib.com/cheatsheet/cheatsheet.html) - [raylib architecture](https://github.com/raysan5/raylib/wiki/raylib-architecture) - [raylib library design](https://github.com/raysan5/raylib/wiki) - [raylib examples collection](https://github.com/raysan5/raylib/tree/master/examples) - [raylib games collection](https://github.com/raysan5/raylib-games) - - [raylib Wiki](https://github.com/raysan5/raylib/wiki) contact and networks --------------------- +raylib is present in several networks and raylib community is growing everyday. Feel free to join us in any of these networks. + - Webpage: [http://www.raylib.com](http://www.raylib.com) - Discord: [https://discord.gg/raylib](https://discord.gg/raylib) - Twitter: [http://www.twitter.com/raysan5](http://www.twitter.com/raysan5) - - Twitch: [http://www.twitch.tv/raysan5](http://www.twitch.tv/raysan5) - - Reddit: [https://www.reddit.com/r/raylib](https://www.reddit.com/r/raylib) + - Twitch: [http://www.twitch.tv/raysan5](http://www.twitch.tv/raysan5) + - Reddit: [https://www.reddit.com/r/raylib](https://www.reddit.com/r/raylib) - Patreon: [https://www.patreon.com/raylib](https://www.patreon.com/raylib) - YouTube: [https://www.youtube.com/channel/raylib](https://www.youtube.com/c/raylib) From ac79d22a9bf20bc19f456ac03cae5cf963e2183f Mon Sep 17 00:00:00 2001 From: Ray Date: Wed, 21 Apr 2021 00:41:55 +0200 Subject: [PATCH 055/121] Reviewed file comments --- src/raylib.h | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/src/raylib.h b/src/raylib.h index abe7d8a1d..ec6c0fbfd 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -4,7 +4,8 @@ * * FEATURES: * - NO external dependencies, all required libraries included with raylib -* - Multiplatform: Windows, Linux, FreeBSD, OpenBSD, NetBSD, DragonFly, MacOS, UWP, Android, Raspberry Pi, HTML5. +* - Multiplatform: Windows, Linux, FreeBSD, OpenBSD, NetBSD, DragonFly, +* MacOS, Haiku, UWP, Android, Raspberry Pi, HTML5. * - Written in plain C code (C99) in PascalCase/camelCase notation * - Hardware accelerated with OpenGL (1.1, 2.1, 3.3 or ES2 - choose at compile) * - Unique OpenGL abstraction layer (usable as standalone module): [rlgl] @@ -12,7 +13,7 @@ * - Outstanding texture formats support, including compressed formats (DXT, ETC, ASTC) * - Full 3d support for 3d Shapes, Models, Billboards, Heightmaps and more! * - Flexible Materials system, supporting classic maps and PBR maps -* - Skeletal Animation support (CPU bones-based animation) +* - Animated 3D models supported (skeletal bones animation) (IQM, glTF) * - Shaders support, including Model shaders and Postprocessing shaders * - Powerful math module for Vector, Matrix and Quaternion operations: [raymath] * - Audio loading and playing with streaming support (WAV, OGG, MP3, FLAC, XM, MOD) @@ -20,17 +21,20 @@ * - Bindings to multiple programming languages available! * * NOTES: -* One custom font is loaded by default when InitWindow() [core] -* If using OpenGL 3.3 or ES2, one default shader is loaded automatically (internally defined) [rlgl] -* If using OpenGL 3.3 or ES2, several vertex buffers (VAO/VBO) are created to manage lines-triangles-quads +* One default Font is loaded on InitWindow()->LoadFontDefault() [core, text] +* One default Texture2D is loaded on rlglInit() [rlgl] (OpenGL 3.3 or ES2) +* One default Shader is loaded on rlglInit()->rlLoadShaderDefault() [rlgl] (OpenGL 3.3 or ES2) +* One default RenderBatch is loaded on rlglInit()->rlLoadRenderBatch() [rlgl] (OpenGL 3.3 or ES2) * * DEPENDENCIES (included): -* [core] rglfw (github.com/glfw/glfw) for window/context management and input (only PLATFORM_DESKTOP) -* [rlgl] glad (github.com/Dav1dde/glad) for OpenGL 3.3 extensions loading (only PLATFORM_DESKTOP) -* [raudio] miniaudio (github.com/dr-soft/miniaudio) for audio device/context management +* [core] rglfw (Camilla Löwy - github.com/glfw/glfw) for window/context management and input (PLATFORM_DESKTOP) +* [rlgl] glad (David Herberth - github.com/Dav1dde/glad) for OpenGL 3.3 extensions loading (PLATFORM_DESKTOP) +* [raudio] miniaudio (David Reid - github.com/dr-soft/miniaudio) for audio device/context management * * OPTIONAL DEPENDENCIES (included): -* [core] rgif (Charlie Tangora, Ramon Santamaria) for GIF recording +* [core] msf_gif (Miles Fogle) for GIF recording +* [core] sinfl (Micha Mettke) for DEFLATE decompression algorythm +* [core] sdefl (Micha Mettke) for DEFLATE compression algorythm * [textures] stb_image (Sean Barret) for images loading (BMP, TGA, PNG, JPEG, HDR...) * [textures] stb_image_write (Sean Barret) for image writting (BMP, TGA, PNG, JPG) * [textures] stb_image_resize (Sean Barret) for image resizing algorithms @@ -40,9 +44,10 @@ * [models] par_shapes (Philip Rideout) for parametric 3d shapes generation * [models] tinyobj_loader_c (Syoyo Fujita) for models loading (OBJ, MTL) * [models] cgltf (Johannes Kuhlmann) for models loading (glTF) -* [raudio] stb_vorbis (Sean Barret) for OGG audio loading +* [raudio] dr_wav (David Reid) for WAV audio file loading * [raudio] dr_flac (David Reid) for FLAC audio file loading * [raudio] dr_mp3 (David Reid) for MP3 audio file loading +* [raudio] stb_vorbis (Sean Barret) for OGG audio loading * [raudio] jar_xm (Joshua Reisenauer) for XM audio module loading * [raudio] jar_mod (Joshua Reisenauer) for MOD audio module loading * From 5ef777219ada151db696208f16973a1aec53fb3e Mon Sep 17 00:00:00 2001 From: Ray Date: Wed, 21 Apr 2021 21:23:04 +0200 Subject: [PATCH 056/121] Reviewed templates Makefiles --- examples/Makefile.Android | 67 ++++++----- templates/advance_game/Makefile | 9 +- templates/advance_game/Makefile.Android | 71 +++++------ templates/simple_game/Makefile.Android | 69 +++++------ templates/simple_game/Makefile.Android.linux | 120 ++++--------------- templates/simple_game/Makefile.Android.macos | 37 +++--- templates/standard_game/Makefile.Android | 71 +++++------ 7 files changed, 193 insertions(+), 251 deletions(-) diff --git a/examples/Makefile.Android b/examples/Makefile.Android index bb6d4497b..b5480473e 100644 --- a/examples/Makefile.Android +++ b/examples/Makefile.Android @@ -42,55 +42,64 @@ else endif ifeq ($(ANDROID_ARCH),ARM) - ANDROID_ARCH_NAME = armeabi-v7a + ANDROID_ARCH_NAME = armeabi-v7a endif ifeq ($(ANDROID_ARCH),ARM64) - ANDROID_ARCH_NAME = arm64-v8a + ANDROID_ARCH_NAME = arm64-v8a endif ifeq ($(ANDROID_ARCH),x86) - ANDROID_ARCH_NAME = i686 + ANDROID_ARCH_NAME = i686 endif ifeq ($(ANDROID_ARCH),x86_64) - ANDROID_ARCH_NAME = x86_64 + ANDROID_ARCH_NAME = x86_64 endif # Required path variables # NOTE: JAVA_HOME must be set to JDK (using OpenJDK 13) JAVA_HOME ?= C:/open-jdk ANDROID_HOME ?= C:/android-sdk -ANDROID_BUILD_TOOLS = $(ANDROID_HOME)/build-tools/29.0.3 +ANDROID_BUILD_TOOLS ?= $(ANDROID_HOME)/build-tools/29.0.3 ANDROID_PLATFORM_TOOLS = $(ANDROID_HOME)/platform-tools # Android project configuration variables PROJECT_NAME ?= raylib_game PROJECT_LIBRARY_NAME ?= main -PROJECT_BUILD_PATH ?= android.$(PROJECT_NAME) +PROJECT_BUILD_ID ?= android +PROJECT_BUILD_PATH ?= $(PROJECT_BUILD_ID).$(PROJECT_NAME) PROJECT_RESOURCES_PATH ?= resources PROJECT_SOURCE_FILES ?= raylib_game.c +NATIVE_APP_GLUE_PATH = $(ANDROID_NDK)/sources/android/native_app_glue # Some source files are placed in directories, when compiling to some # output directory other than source, that directory must pre-exist. # Here we get a list of required folders that need to be created on # code output folder $(PROJECT_BUILD_PATH)\obj to avoid GCC errors. -PROJECT_SOURCE_DIRS = $(sort $(dir $(PROJECT_SOURCE_FILES))) +PROJECT_SOURCE_DIRS = $(sort $(dir $(PROJECT_SOURCE_FILES))) # Android app configuration variables -APP_LABEL_NAME ?= rGame -APP_COMPANY_NAME ?= raylib -APP_PRODUCT_NAME ?= rgame -APP_VERSION_CODE ?= 1 -APP_VERSION_NAME ?= 1.0 -APP_ICON_LDPI ?= $(RAYLIB_PATH)/logo/raylib_36x36.png -APP_ICON_MDPI ?= $(RAYLIB_PATH)/logo/raylib_48x48.png -APP_ICON_HDPI ?= $(RAYLIB_PATH)/logo/raylib_72x72.png +APP_LABEL_NAME ?= rGame +APP_COMPANY_NAME ?= raylib +APP_PRODUCT_NAME ?= rgame +APP_VERSION_CODE ?= 1 +APP_VERSION_NAME ?= 1.0 +APP_ICON_LDPI ?= $(RAYLIB_PATH)/logo/raylib_36x36.png +APP_ICON_MDPI ?= $(RAYLIB_PATH)/logo/raylib_48x48.png +APP_ICON_HDPI ?= $(RAYLIB_PATH)/logo/raylib_72x72.png APP_SCREEN_ORIENTATION ?= landscape -APP_KEYSTORE_PASS ?= raylib +APP_KEYSTORE_PASS ?= raylib # Library type used for raylib: STATIC (.a) or SHARED (.so/.dll) -RAYLIB_LIBTYPE ?= STATIC +RAYLIB_LIBTYPE ?= STATIC # Library path for libraylib.a/libraylib.so -RAYLIB_LIB_PATH = $(RAYLIB_PATH)/src +RAYLIB_LIB_PATH = $(RAYLIB_PATH)/src + +# Define copy command depending on OS +ifeq ($(OS),Windows_NT) + COPY_COMMAND ?= copy /Y +else + COPY_COMMAND ?= cp -f +endif # Shared libs must be added to APK if required # NOTE: Generated NativeLoader.java automatically load those libraries @@ -107,6 +116,14 @@ ifeq ($(ANDROID_ARCH),ARM64) CC = $(ANDROID_TOOLCHAIN)/bin/aarch64-linux-android$(ANDROID_API_VERSION)-clang AR = $(ANDROID_TOOLCHAIN)/bin/aarch64-linux-android-ar endif +ifeq ($(ANDROID_ARCH),x86) + CC = $(ANDROID_TOOLCHAIN)/bin/i686-linux-android$(ANDROID_API_VERSION)-clang + AR = $(ANDROID_TOOLCHAIN)/bin/i686-linux-android-ar +endif +ifeq ($(ANDROID_ARCH),x86_64) + CC = $(ANDROID_TOOLCHAIN)/bin/x86_64-linux-android$(ANDROID_API_VERSION)-clang + AR = $(ANDROID_TOOLCHAIN)/bin/x86_64-linux-android-ar +endif # Compiler flags for arquitecture ifeq ($(ANDROID_ARCH),ARM) @@ -123,7 +140,7 @@ CFLAGS += -Wall -Wa,--noexecstack -Wformat -Werror=format-security -no-canonical CFLAGS += -DANDROID -DPLATFORM_ANDROID -D__ANDROID_API__=$(ANDROID_API_VERSION) # Paths containing required header files -INCLUDE_PATHS = -I. -I$(RAYLIB_PATH)/src -I$(ANDROID_NDK)/sources/android/native_app_glue +INCLUDE_PATHS = -I. -I$(RAYLIB_PATH)/src -I$(NATIVE_APP_GLUE_PATH) # Linker options LDFLAGS = -Wl,-soname,lib$(PROJECT_LIBRARY_NAME).so -Wl,--exclude-libs,libatomic.a @@ -153,8 +170,8 @@ all: create_temp_project_dirs \ compile_project_class \ compile_project_class_dex \ create_project_apk_package \ - sign_project_apk_package \ - zipalign_project_apk_package + zipalign_project_apk_package \ + sign_project_apk_package # Create required temp directories for APK building create_temp_project_dirs: @@ -203,12 +220,6 @@ define create_dir mkdir -p $(PROJECT_BUILD_PATH)/obj/$(1) endef -ifeq ($(OS),Windows_NT) - COPY_COMMAND ?= copy /Y -else - COPY_COMMAND ?= cp -f -endif - # Copy required shared libs for integration into APK # NOTE: If using shared libs they are loaded by generated NativeLoader.java copy_project_required_libs: @@ -325,7 +336,7 @@ config_project_package: # Compile native_app_glue code as static library: obj/libnative_app_glue.a compile_native_app_glue: - $(CC) -c $(ANDROID_NDK)/sources/android/native_app_glue/android_native_app_glue.c -o $(PROJECT_BUILD_PATH)/obj/native_app_glue.o $(CFLAGS) + $(CC) -c $(NATIVE_APP_GLUE_PATH)/android_native_app_glue.c -o $(PROJECT_BUILD_PATH)/obj/native_app_glue.o $(CFLAGS) $(AR) rcs $(PROJECT_BUILD_PATH)/obj/libnative_app_glue.a $(PROJECT_BUILD_PATH)/obj/native_app_glue.o # Compile project code into a shared library: lib/lib$(PROJECT_LIBRARY_NAME).so diff --git a/templates/advance_game/Makefile b/templates/advance_game/Makefile index 8875f379c..8983ab262 100644 --- a/templates/advance_game/Makefile +++ b/templates/advance_game/Makefile @@ -246,6 +246,7 @@ ifeq ($(PLATFORM),PLATFORM_WEB) # --profiling # include information for code profiling # --memory-init-file 0 # to avoid an external memory initialization code file (.mem) # --preload-file resources # specify a resources folder for data compilation + # --source-map-base # allow debugging in browser with source map CFLAGS += -s USE_GLFW=3 -s TOTAL_MEMORY=67108864 -s FORCE_FILESYSTEM=1 --preload-file resources # Define a custom shell .html and output extension @@ -274,9 +275,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) INCLUDE_PATHS += -I/usr/local/include endif ifeq ($(PLATFORM_OS),LINUX) - # Reset everything. - # Precedence: immediately local, installed version, raysan5 provided libs -I$(RAYLIB_H_INSTALL_PATH) -I$(RAYLIB_PATH)/release/include - INCLUDE_PATHS = -I$(RAYLIB_H_INSTALL_PATH) -I. -I$(RAYLIB_PATH)/src -I$(RAYLIB_PATH)/release/include -I$(RAYLIB_PATH)/src/external + INCLUDE_PATHS = -I$(RAYLIB_H_INSTALL_PATH) -I. -I$(RAYLIB_PATH)/src -I$(RAYLIB_PATH)/src/external endif endif @@ -307,10 +306,6 @@ ifeq ($(PLATFORM),PLATFORM_RPI) LDFLAGS += -L/opt/vc/lib endif -ifeq ($(PLATFORM),PLATFORM_DRM) - LDFLAGS += -lGLESv2 -lEGL -ldrm -lgbm -endif - # Define any libraries required on linking # if you want to link libraries (libname.so or libname.a), use the -lname ifeq ($(PLATFORM),PLATFORM_DESKTOP) diff --git a/templates/advance_game/Makefile.Android b/templates/advance_game/Makefile.Android index afa3024ac..5d1373fb1 100644 --- a/templates/advance_game/Makefile.Android +++ b/templates/advance_game/Makefile.Android @@ -31,67 +31,60 @@ RAYLIB_PATH ?= ..\.. ANDROID_ARCH ?= ARM64 ANDROID_API_VERSION = 29 -# Android required path variables -# NOTE: Starting with Android NDK r21, no more toolchain generation is required, NDK is the toolchain on itself -ifeq ($(OS),Windows_NT) - ANDROID_NDK = C:/android-ndk - ANDROID_TOOLCHAIN = $(ANDROID_NDK)/toolchains/llvm/prebuilt/windows-x86_64 -else - ANDROID_NDK ?= /usr/lib/android/ndk - ANDROID_TOOLCHAIN = $(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64 -endif - ifeq ($(ANDROID_ARCH),ARM) - ANDROID_ARCH_NAME = armeabi-v7a + ANDROID_ARCH_NAME = armeabi-v7a endif ifeq ($(ANDROID_ARCH),ARM64) - ANDROID_ARCH_NAME = arm64-v8a + ANDROID_ARCH_NAME = arm64-v8a endif ifeq ($(ANDROID_ARCH),x86) - ANDROID_ARCH_NAME = i686 + ANDROID_ARCH_NAME = i686 endif ifeq ($(ANDROID_ARCH),x86_64) - ANDROID_ARCH_NAME = x86_64 + ANDROID_ARCH_NAME = x86_64 endif # Required path variables # NOTE: JAVA_HOME must be set to JDK (using OpenJDK 13) JAVA_HOME ?= C:/open-jdk -ANDROID_HOME = C:/android-sdk -ANDROID_TOOLCHAIN = C:/android-ndk/toolchains/llvm/prebuilt/windows-x86_64 -ANDROID_BUILD_TOOLS = $(ANDROID_HOME)/build-tools/29.0.3 +ANDROID_HOME ?= C:/android-sdk +ANDROID_NDK ?= C:/android-ndk +ANDROID_TOOLCHAIN ?= $(ANDROID_NDK)/toolchains/llvm/prebuilt/windows-x86_64 +ANDROID_BUILD_TOOLS ?= $(ANDROID_HOME)/build-tools/29.0.3 ANDROID_PLATFORM_TOOLS = $(ANDROID_HOME)/platform-tools # Android project configuration variables PROJECT_NAME ?= raylib_game PROJECT_LIBRARY_NAME ?= main -PROJECT_BUILD_PATH ?= android.$(PROJECT_NAME) +PROJECT_BUILD_ID ?= android +PROJECT_BUILD_PATH ?= $(PROJECT_BUILD_ID).$(PROJECT_NAME) PROJECT_RESOURCES_PATH ?= resources -PROJECT_SOURCE_FILES ?= raylib_game.c +PROJECT_SOURCE_FILES ?= simple_game.c +NATIVE_APP_GLUE_PATH = $(ANDROID_NDK)/sources/android/native_app_glue # Some source files are placed in directories, when compiling to some # output directory other than source, that directory must pre-exist. # Here we get a list of required folders that need to be created on # code output folder $(PROJECT_BUILD_PATH)\obj to avoid GCC errors. -PROJECT_SOURCE_DIRS = $(sort $(dir $(PROJECT_SOURCE_FILES))) +PROJECT_SOURCE_DIRS = $(sort $(dir $(PROJECT_SOURCE_FILES))) # Android app configuration variables -APP_LABEL_NAME ?= rGame -APP_COMPANY_NAME ?= raylib -APP_PRODUCT_NAME ?= rgame -APP_VERSION_CODE ?= 1 -APP_VERSION_NAME ?= 1.0 -APP_ICON_LDPI ?= $(RAYLIB_PATH)\logo\raylib_36x36.png -APP_ICON_MDPI ?= $(RAYLIB_PATH)\logo\raylib_48x48.png -APP_ICON_HDPI ?= $(RAYLIB_PATH)\logo\raylib_72x72.png +APP_LABEL_NAME ?= rGame +APP_COMPANY_NAME ?= raylib +APP_PRODUCT_NAME ?= rgame +APP_VERSION_CODE ?= 1 +APP_VERSION_NAME ?= 1.0 +APP_ICON_LDPI ?= $(RAYLIB_PATH)\logo\raylib_36x36.png +APP_ICON_MDPI ?= $(RAYLIB_PATH)\logo\raylib_48x48.png +APP_ICON_HDPI ?= $(RAYLIB_PATH)\logo\raylib_72x72.png APP_SCREEN_ORIENTATION ?= landscape -APP_KEYSTORE_PASS ?= raylib +APP_KEYSTORE_PASS ?= raylib # Library type used for raylib: STATIC (.a) or SHARED (.so/.dll) -RAYLIB_LIBTYPE ?= STATIC +RAYLIB_LIBTYPE ?= STATIC # Library path for libraylib.a/libraylib.so -RAYLIB_LIB_PATH = $(RAYLIB_PATH)\src +RAYLIB_LIB_PATH = $(RAYLIB_PATH)\src # Shared libs must be added to APK if required # NOTE: Generated NativeLoader.java automatically load those libraries @@ -108,6 +101,14 @@ ifeq ($(ANDROID_ARCH),ARM64) CC = $(ANDROID_TOOLCHAIN)/bin/aarch64-linux-android$(ANDROID_API_VERSION)-clang AR = $(ANDROID_TOOLCHAIN)/bin/aarch64-linux-android-ar endif +ifeq ($(ANDROID_ARCH),x86) + CC = $(ANDROID_TOOLCHAIN)/bin/i686-linux-android$(ANDROID_API_VERSION)-clang + AR = $(ANDROID_TOOLCHAIN)/bin/i686-linux-android-ar +endif +ifeq ($(ANDROID_ARCH),x86_64) + CC = $(ANDROID_TOOLCHAIN)/bin/x86_64-linux-android$(ANDROID_API_VERSION)-clang + AR = $(ANDROID_TOOLCHAIN)/bin/x86_64-linux-android-ar +endif # Compiler flags for arquitecture ifeq ($(ANDROID_ARCH),ARM) @@ -124,7 +125,7 @@ CFLAGS += -Wall -Wa,--noexecstack -Wformat -Werror=format-security -no-canonical CFLAGS += -DANDROID -DPLATFORM_ANDROID -D__ANDROID_API__=$(ANDROID_API_VERSION) # Paths containing required header files -INCLUDE_PATHS = -I. -I$(RAYLIB_PATH)/src -I$(RAYLIB_PATH)/src/external/android/native_app_glue +INCLUDE_PATHS = -I. -I$(RAYLIB_PATH)/src -I$(NATIVE_APP_GLUE_PATH) # Linker options LDFLAGS = -Wl,-soname,lib$(PROJECT_LIBRARY_NAME).so -Wl,--exclude-libs,libatomic.a @@ -154,8 +155,8 @@ all: create_temp_project_dirs \ compile_project_class \ compile_project_class_dex \ create_project_apk_package \ - sign_project_apk_package \ - zipalign_project_apk_package + zipalign_project_apk_package \ + sign_project_apk_package # Create required temp directories for APK building create_temp_project_dirs: @@ -253,7 +254,7 @@ config_project_package: # Compile native_app_glue code as static library: obj/libnative_app_glue.a compile_native_app_glue: - $(CC) -c $(RAYLIB_PATH)/src/external/android/native_app_glue/android_native_app_glue.c -o $(PROJECT_BUILD_PATH)/obj/native_app_glue.o $(CFLAGS) + $(CC) -c $(NATIVE_APP_GLUE_PATH)/android_native_app_glue.c -o $(PROJECT_BUILD_PATH)/obj/native_app_glue.o $(CFLAGS) $(AR) rcs $(PROJECT_BUILD_PATH)/obj/libnative_app_glue.a $(PROJECT_BUILD_PATH)/obj/native_app_glue.o # Compile project code into a shared library: lib/lib$(PROJECT_LIBRARY_NAME).so diff --git a/templates/simple_game/Makefile.Android b/templates/simple_game/Makefile.Android index afa3024ac..4cfd1f5f0 100644 --- a/templates/simple_game/Makefile.Android +++ b/templates/simple_game/Makefile.Android @@ -31,67 +31,60 @@ RAYLIB_PATH ?= ..\.. ANDROID_ARCH ?= ARM64 ANDROID_API_VERSION = 29 -# Android required path variables -# NOTE: Starting with Android NDK r21, no more toolchain generation is required, NDK is the toolchain on itself -ifeq ($(OS),Windows_NT) - ANDROID_NDK = C:/android-ndk - ANDROID_TOOLCHAIN = $(ANDROID_NDK)/toolchains/llvm/prebuilt/windows-x86_64 -else - ANDROID_NDK ?= /usr/lib/android/ndk - ANDROID_TOOLCHAIN = $(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64 -endif - ifeq ($(ANDROID_ARCH),ARM) - ANDROID_ARCH_NAME = armeabi-v7a + ANDROID_ARCH_NAME = armeabi-v7a endif ifeq ($(ANDROID_ARCH),ARM64) - ANDROID_ARCH_NAME = arm64-v8a + ANDROID_ARCH_NAME = arm64-v8a endif ifeq ($(ANDROID_ARCH),x86) - ANDROID_ARCH_NAME = i686 + ANDROID_ARCH_NAME = i686 endif ifeq ($(ANDROID_ARCH),x86_64) - ANDROID_ARCH_NAME = x86_64 + ANDROID_ARCH_NAME = x86_64 endif # Required path variables # NOTE: JAVA_HOME must be set to JDK (using OpenJDK 13) JAVA_HOME ?= C:/open-jdk -ANDROID_HOME = C:/android-sdk -ANDROID_TOOLCHAIN = C:/android-ndk/toolchains/llvm/prebuilt/windows-x86_64 -ANDROID_BUILD_TOOLS = $(ANDROID_HOME)/build-tools/29.0.3 +ANDROID_HOME ?= C:/android-sdk +ANDROID_NDK ?= C:/android-ndk +ANDROID_TOOLCHAIN ?= $(ANDROID_NDK)/toolchains/llvm/prebuilt/windows-x86_64 +ANDROID_BUILD_TOOLS ?= $(ANDROID_HOME)/build-tools/29.0.3 ANDROID_PLATFORM_TOOLS = $(ANDROID_HOME)/platform-tools # Android project configuration variables PROJECT_NAME ?= raylib_game PROJECT_LIBRARY_NAME ?= main -PROJECT_BUILD_PATH ?= android.$(PROJECT_NAME) +PROJECT_BUILD_ID ?= android +PROJECT_BUILD_PATH ?= $(PROJECT_BUILD_ID).$(PROJECT_NAME) PROJECT_RESOURCES_PATH ?= resources PROJECT_SOURCE_FILES ?= raylib_game.c +NATIVE_APP_GLUE_PATH = $(ANDROID_NDK)/sources/android/native_app_glue # Some source files are placed in directories, when compiling to some # output directory other than source, that directory must pre-exist. # Here we get a list of required folders that need to be created on # code output folder $(PROJECT_BUILD_PATH)\obj to avoid GCC errors. -PROJECT_SOURCE_DIRS = $(sort $(dir $(PROJECT_SOURCE_FILES))) +PROJECT_SOURCE_DIRS = $(sort $(dir $(PROJECT_SOURCE_FILES))) # Android app configuration variables -APP_LABEL_NAME ?= rGame -APP_COMPANY_NAME ?= raylib -APP_PRODUCT_NAME ?= rgame -APP_VERSION_CODE ?= 1 -APP_VERSION_NAME ?= 1.0 -APP_ICON_LDPI ?= $(RAYLIB_PATH)\logo\raylib_36x36.png -APP_ICON_MDPI ?= $(RAYLIB_PATH)\logo\raylib_48x48.png -APP_ICON_HDPI ?= $(RAYLIB_PATH)\logo\raylib_72x72.png +APP_LABEL_NAME ?= rGame +APP_COMPANY_NAME ?= raylib +APP_PRODUCT_NAME ?= rgame +APP_VERSION_CODE ?= 1 +APP_VERSION_NAME ?= 1.0 +APP_ICON_LDPI ?= $(RAYLIB_PATH)\logo\raylib_36x36.png +APP_ICON_MDPI ?= $(RAYLIB_PATH)\logo\raylib_48x48.png +APP_ICON_HDPI ?= $(RAYLIB_PATH)\logo\raylib_72x72.png APP_SCREEN_ORIENTATION ?= landscape -APP_KEYSTORE_PASS ?= raylib +APP_KEYSTORE_PASS ?= raylib # Library type used for raylib: STATIC (.a) or SHARED (.so/.dll) -RAYLIB_LIBTYPE ?= STATIC +RAYLIB_LIBTYPE ?= STATIC # Library path for libraylib.a/libraylib.so -RAYLIB_LIB_PATH = $(RAYLIB_PATH)\src +RAYLIB_LIB_PATH = $(RAYLIB_PATH)\src # Shared libs must be added to APK if required # NOTE: Generated NativeLoader.java automatically load those libraries @@ -108,6 +101,14 @@ ifeq ($(ANDROID_ARCH),ARM64) CC = $(ANDROID_TOOLCHAIN)/bin/aarch64-linux-android$(ANDROID_API_VERSION)-clang AR = $(ANDROID_TOOLCHAIN)/bin/aarch64-linux-android-ar endif +ifeq ($(ANDROID_ARCH),x86) + CC = $(ANDROID_TOOLCHAIN)/bin/i686-linux-android$(ANDROID_API_VERSION)-clang + AR = $(ANDROID_TOOLCHAIN)/bin/i686-linux-android-ar +endif +ifeq ($(ANDROID_ARCH),x86_64) + CC = $(ANDROID_TOOLCHAIN)/bin/x86_64-linux-android$(ANDROID_API_VERSION)-clang + AR = $(ANDROID_TOOLCHAIN)/bin/x86_64-linux-android-ar +endif # Compiler flags for arquitecture ifeq ($(ANDROID_ARCH),ARM) @@ -124,7 +125,7 @@ CFLAGS += -Wall -Wa,--noexecstack -Wformat -Werror=format-security -no-canonical CFLAGS += -DANDROID -DPLATFORM_ANDROID -D__ANDROID_API__=$(ANDROID_API_VERSION) # Paths containing required header files -INCLUDE_PATHS = -I. -I$(RAYLIB_PATH)/src -I$(RAYLIB_PATH)/src/external/android/native_app_glue +INCLUDE_PATHS = -I. -I$(RAYLIB_PATH)/src -I$(NATIVE_APP_GLUE_PATH) # Linker options LDFLAGS = -Wl,-soname,lib$(PROJECT_LIBRARY_NAME).so -Wl,--exclude-libs,libatomic.a @@ -154,8 +155,8 @@ all: create_temp_project_dirs \ compile_project_class \ compile_project_class_dex \ create_project_apk_package \ - sign_project_apk_package \ - zipalign_project_apk_package + zipalign_project_apk_package \ + sign_project_apk_package # Create required temp directories for APK building create_temp_project_dirs: @@ -253,7 +254,7 @@ config_project_package: # Compile native_app_glue code as static library: obj/libnative_app_glue.a compile_native_app_glue: - $(CC) -c $(RAYLIB_PATH)/src/external/android/native_app_glue/android_native_app_glue.c -o $(PROJECT_BUILD_PATH)/obj/native_app_glue.o $(CFLAGS) + $(CC) -c $(NATIVE_APP_GLUE_PATH)/android_native_app_glue.c -o $(PROJECT_BUILD_PATH)/obj/native_app_glue.o $(CFLAGS) $(AR) rcs $(PROJECT_BUILD_PATH)/obj/libnative_app_glue.a $(PROJECT_BUILD_PATH)/obj/native_app_glue.o # Compile project code into a shared library: lib/lib$(PROJECT_LIBRARY_NAME).so diff --git a/templates/simple_game/Makefile.Android.linux b/templates/simple_game/Makefile.Android.linux index 324f3b546..a358b3bbf 100644 --- a/templates/simple_game/Makefile.Android.linux +++ b/templates/simple_game/Makefile.Android.linux @@ -2,7 +2,10 @@ # # raylib makefile for Android project (APK building) # -# Copyright (c) 2017 Ramon Santamaria (@raysan5) +# NOTE: Ported by Jean-Sébastien Lebarbier (@jseb) to *nix platform. +# For comments, you can contact me: raylib(at)finiderire.com +# +# Copyright (c) 2017-2021 Ramon Santamaria (@raysan5) # # 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. @@ -21,9 +24,6 @@ # #************************************************************************************************** -# Note : ported by Jean-Sébastien Lebarbier (@jseb) to *nix by using the Ramon Santamaria ms-windows version. -# For comments, you can contact me : raylib(at)finiderire.com - # debug : adb logcat *:W | grep -i raylib # Define required raylib variables @@ -31,55 +31,53 @@ PLATFORM ?= PLATFORM_ANDROID RAYLIB_PATH ?= ../../ # Define Android architecture (armeabi-v7a, arm64-v8a, x86, x86-64) and API version +# Starting in 2019 using ARM64 is mandatory for published apps, +# Starting on August 2020, minimum required target API is Android 10 (API level 29) ANDROID_ARCH ?= ARM64 ifeq ($(ANDROID_ARCH),ARM) ANDROID_ARCH_NAME = armeabi-v7a - # [JSEB] i have added ANDROID_TOOLCHAIN_LIBS for linking + # @jseb: Added ANDROID_TOOLCHAIN_LIBS for linking ANDROID_TOOLCHAIN_LIBS = arm-linux-androideabi endif ifeq ($(ANDROID_ARCH),ARM64) ANDROID_ARCH_NAME = arm64-v8a - # [JSEB] i have added ANDROID_TOOLCHAIN_LIBS for linking + # @jseb: Added ANDROID_TOOLCHAIN_LIBS for linking ANDROID_TOOLCHAIN_LIBS = aarch64-linux-android endif # Required path variables -# no need to define JAVA_HOME , JAVA_BIN in linux environment (binaries are in $PATH) +# NOTE: No need to define JAVA_HOME, JAVA_BIN in linux environment (binaries are in $PATH) #JAVA_HOME ?= C:/JavaJDK/ #JAVA_BIN ?= $(JAVA_HOME)/bin/ ANDROID_HOME ?= /opt/android-sdk ANDROID_NDK ?= /opt/android-ndk ANDROID_TOOLCHAIN ?= $(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/ -# find the highest version available of build tools +# Find the highest version available of build tools ANDROID_BUILD_TOOLS = $(shell ls -1d $(ANDROID_HOME)/build-tools/* | tail -n 1)/ # and extracts the API version ANDROID_API_VERSION = $(shell echo $(ANDROID_BUILD_TOOLS) | sed 's/.*\/\([0-9]\+\).*/\1/') -NATIVE_APP_GLUE = $(ANDROID_NDK)/sources/android/native_app_glue + $(warning [*] Using $(ANDROID_BUILD_TOOLS) , API version: $(ANDROID_API_VERSION)) # ANDROID_PLATFORM_TOOLS should be in $PATH too with linux (see /etc/profile.d/android* ) -# but anyway, let's define it here ANDROID_PLATFORM_TOOLS = $(ANDROID_HOME)/platform-tools - - - # Android project configuration variables PROJECT_NAME ?= raylib_game PROJECT_LIBRARY_NAME ?= main -PROJECT_BUILD_ID ?= android +PROJECT_BUILD_ID ?= android PROJECT_BUILD_PATH ?= $(PROJECT_BUILD_ID).$(PROJECT_NAME) PROJECT_RESOURCES_PATH ?= resources PROJECT_SOURCE_FILES ?= simple_game.c +NATIVE_APP_GLUE_PATH = $(ANDROID_NDK)/sources/android/native_app_glue # Some source files are placed in directories, when compiling to some # output directory other than source, that directory must pre-exist. # Here we get a list of required folders that need to be created on # code output folder $(PROJECT_BUILD_PATH)\obj to avoid GCC errors. -#PROJECT_SOURCE_DIRS = $(sort $(dir $(PROJECT_SOURCE_FILES))) PROJECT_SOURCE_DIRS = $(dir $(PROJECT_SOURCE_FILES)) # Android app configuration variables @@ -139,7 +137,7 @@ CFLAGS += -Wall -Wa,--noexecstack -Wformat -Werror=format-security -no-canonical CFLAGS += -DANDROID -DPLATFORM_ANDROID -D__ANDROID_API__=$(ANDROID_API_VERSION) # Paths containing required header files -INCLUDE_PATHS = -I. -I$(RAYLIB_PATH)/src -I$(NATIVE_APP_GLUE) +INCLUDE_PATHS = -I. -I$(RAYLIB_PATH)/src -I$(NATIVE_APP_GLUE_PATH) # Linker options LDFLAGS = -Wl,-soname,lib$(PROJECT_LIBRARY_NAME).so -Wl,--exclude-libs,libatomic.a @@ -189,42 +187,13 @@ create_temp_project_dirs: mkdir -p $(PROJECT_BUILD_PATH)/assets/$(PROJECT_RESOURCES_PATH); \ $(foreach dir, $(PROJECT_SOURCE_DIRS), mkdir -p $(PROJECT_BUILD_PATH)/obj/$(dir) ); \ fi - -# if not exist $(PROJECT_BUILD_PATH) mkdir $(PROJECT_BUILD_PATH) -# if not exist $(PROJECT_BUILD_PATH)\obj mkdir $(PROJECT_BUILD_PATH)\obj -# if not exist $(PROJECT_BUILD_PATH)\src mkdir $(PROJECT_BUILD_PATH)\src -# if not exist $(PROJECT_BUILD_PATH)\src\com mkdir $(PROJECT_BUILD_PATH)\src\com -# if not exist $(PROJECT_BUILD_PATH)\src\com\$(APP_COMPANY_NAME) mkdir $(PROJECT_BUILD_PATH)\src\com\$(APP_COMPANY_NAME) -# if not exist $(PROJECT_BUILD_PATH)\src\com\$(APP_COMPANY_NAME)\$(APP_PRODUCT_NAME) mkdir $(PROJECT_BUILD_PATH)\src\com\$(APP_COMPANY_NAME)\$(APP_PRODUCT_NAME) -# if not exist $(PROJECT_BUILD_PATH)\lib mkdir $(PROJECT_BUILD_PATH)\lib -# if not exist $(PROJECT_BUILD_PATH)\lib\$(ANDROID_ARCH_NAME) mkdir $(PROJECT_BUILD_PATH)\lib\$(ANDROID_ARCH_NAME) -# if not exist $(PROJECT_BUILD_PATH)\bin mkdir $(PROJECT_BUILD_PATH)\bin -# if not exist $(PROJECT_BUILD_PATH)\res mkdir $(PROJECT_BUILD_PATH)\res -# if not exist $(PROJECT_BUILD_PATH)\res\drawable-ldpi mkdir $(PROJECT_BUILD_PATH)\res\drawable-ldpi -# if not exist $(PROJECT_BUILD_PATH)\res\drawable-mdpi mkdir $(PROJECT_BUILD_PATH)\res\drawable-mdpi -# if not exist $(PROJECT_BUILD_PATH)\res\drawable-hdpi mkdir $(PROJECT_BUILD_PATH)\res\drawable-hdpi -# if not exist $(PROJECT_BUILD_PATH)\res\values mkdir $(PROJECT_BUILD_PATH)\res\values -# if not exist $(PROJECT_BUILD_PATH)\assets mkdir $(PROJECT_BUILD_PATH)\assets -# if not exist $(PROJECT_BUILD_PATH)\assets\$(PROJECT_RESOURCES_PATH) mkdir $(PROJECT_BUILD_PATH)\assets\$(PROJECT_RESOURCES_PATH) -# if not exist $(PROJECT_BUILD_PATH)\obj\screens mkdir $(PROJECT_BUILD_PATH)\obj\screens -# $(foreach dir, $(PROJECT_SOURCE_DIRS), $(call create_dir, $(dir))) - -#define create_dir -# if not exist $(PROJECT_BUILD_PATH)\obj\$(1) mkdir $(PROJECT_BUILD_PATH)\obj\$(1) -#endef # Copy required shared libs for integration into APK # NOTE: If using shared libs they are loaded by generated NativeLoader.java # -# FIXME really necessary to copy libraylib.a , which will be put into exe at link step ? +# FIXME! Really required to copy libraylib.a, which will be put into exe at link step? copy_project_required_libs: cp $(RAYLIB_LIB_PATH)/libraylib.* $(PROJECT_BUILD_PATH)/lib/$(ANDROID_ARCH_NAME) -#ifeq ($(RAYLIB_LIBTYPE),SHARED) -# copy /Y $(RAYLIB_LIB_PATH)\libraylib.so $(PROJECT_BUILD_PATH)\lib\$(ANDROID_ARCH_NAME)\libraylib.so -#endif -#ifeq ($(RAYLIB_LIBTYPE),STATIC) -# copy /Y $(RAYLIB_LIB_PATH)\libraylib.a $(PROJECT_BUILD_PATH)\lib\$(ANDROID_ARCH_NAME)\libraylib.a -#endif # Copy project required resources: strings.xml, icon.png, assets # NOTE: Required strings.xml is generated and game resources are copied to assets folder @@ -238,18 +207,12 @@ copy_project_resources: $(APP_LABEL_NAME)\n\ \n\ " > $(PROJECT_BUILD_PATH)/res/values/strings.xml -# copy $(APP_ICON_LDPI) $(PROJECT_BUILD_PATH)\res\drawable-ldpi\icon.png /Y -# copy $(APP_ICON_MDPI) $(PROJECT_BUILD_PATH)\res\drawable-mdpi\icon.png /Y -# copy $(APP_ICON_HDPI) $(PROJECT_BUILD_PATH)\res\drawable-hdpi\icon.png /Y -# @echo ^ > $(PROJECT_BUILD_PATH)/res/values/strings.xml -# @echo ^^$(APP_LABEL_NAME)^^ >> $(PROJECT_BUILD_PATH)/res/values/strings.xml @if [ -d $(PROJECT_RESOURCES_PATH) ]; then \ cp -a $(PROJECT_RESOURCES_PATH) $(PROJECT_BUILD_PATH)/assets/; \ - else \ + else \ echo " [*] Project resources path not found: $(PROJECT_RESOURCES_PATH)"; \ - fi + fi -# if exist $(PROJECT_RESOURCES_PATH) C:\Windows\System32\xcopy $(PROJECT_RESOURCES_PATH) $(PROJECT_BUILD_PATH)\assets\$(PROJECT_RESOURCES_PATH) /Y /E /F # Generate NativeLoader.java to load required shared libraries @@ -260,28 +223,20 @@ else nativeloader_sharedlib= endif generate_loader_script: - @echo "package com.$(APP_COMPANY_NAME).$(APP_PRODUCT_NAME);\n\n\ + @echo "package com.$(APP_COMPANY_NAME).$(APP_PRODUCT_NAME);\n\n\ public class NativeLoader extends android.app.NativeActivity {\n\ static {\n\ $(nativeloader_sharedlib);\n\ System.loadLibrary(\"$(PROJECT_LIBRARY_NAME)\");\n\ }\n\ }\n" > $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/NativeLoader.java -# @echo package com.$(APP_COMPANY_NAME).$(APP_PRODUCT_NAME); > $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/NativeLoader.java -# @echo. >> $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/NativeLoader.java -# @echo public class NativeLoader extends android.app.NativeActivity { >> $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/NativeLoader.java -# @echo static { >> $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/NativeLoader.java -# @echo System.loadLibrary("$(PROJECT_LIBRARY_NAME)"); >> $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/NativeLoader.java -# @echo } >> $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/NativeLoader.java -# @echo } >> $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/NativeLoader.java - # Generate AndroidManifest.xml with all the required options # NOTE: Probably not the bet way to generate this file... but it works. -# TODO jseb : replacing @drawable/icon with @mipmap/icon ? +# TODO @jseb: Replace @drawable/icon with @mipmap/icon? # https://stackoverflow.com/questions/23796414/error-no-resource-found-that-matches-the-given-name-at-icon-with-value-dr generate_android_manifest: - @echo "\n\ + @echo "\n\ \n\ @@ -302,41 +257,19 @@ generate_android_manifest: \n\ " > $(PROJECT_BUILD_PATH)/AndroidManifest.xml -# @echo ^ > $(PROJECT_BUILD_PATH)/AndroidManifest.xml -# @echo ^> $(PROJECT_BUILD_PATH)/AndroidManifest.xml -# @echo package="com.$(APP_COMPANY_NAME).$(APP_PRODUCT_NAME)" >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml -# @echo android:versionCode="$(APP_VERSION_CODE)" android:versionName="$(APP_VERSION_NAME)" ^> >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml -# @echo ^ >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml -# @echo ^ >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml -# @echo ^ >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml -# @echo ^> $(PROJECT_BUILD_PATH)/AndroidManifest.xml -# @echo android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml -# @echo android:configChanges="orientation|keyboardHidden|screenSize" >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml -# @echo android:screenOrientation="$(APP_SCREEN_ORIENTATION)" android:launchMode="singleTask" >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml -# @echo android:clearTaskOnLaunch="true"^> >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml -# @echo ^ >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml -# @echo ^ >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml -# @echo ^ >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml -# @echo ^ >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml -# @echo ^ >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml -# @echo ^ >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml -# @echo ^ >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml -# @echo ^ >> $(PROJECT_BUILD_PATH)/AndroidManifest.xml - # Generate storekey for APK signing: $(PROJECT_NAME).keystore # NOTE: Configure here your Distinguished Names (-dname) if required! generate_apk_keystore: -# if not exist $(PROJECT_BUILD_PATH)/$(PROJECT_NAME).keystore $(JAVA_BIN)keytool -genkeypair -validity 1000 -dname "CN=$(APP_COMPANY_NAME),O=Android,C=ES" -keystore $(PROJECT_BUILD_PATH)/$(PROJECT_NAME).keystore -storepass $(APP_KEYSTORE_PASS) -keypass $(APP_KEYSTORE_PASS) -alias $(PROJECT_NAME)Key -keyalg RSA -# infos sur keytools ici: https://coderwall.com/p/r09hoq/android-generate-release-debug-keystores -# keytool -genkey -v -keystore debug.keystore -storepass android -alias androiddebugkey -keypass android -keyalg RSA -keysize 2048 -validity 10000 +# NOTE: https://coderwall.com/p/r09hoq/android-generate-release-debug-keystores +# keytool -genkey -v -keystore debug.keystore -storepass android -alias androiddebugkey -keypass android -keyalg RSA -keysize 2048 -validity 10000 @if [ -s $(PROJECT_BUILD_PATH)/$(PROJECT_NAME).keystore ]; then \ echo " [*] $(PROJECT_NAME).keystore already exists."; \ - else \ + else \ echo " [*] $(PROJECT_NAME).keystore : generating now."; \ $(JAVA_BIN)keytool -genkeypair -validity 1000 -dname "CN=$(APP_COMPANY_NAME),O=Android,C=ES" -keystore $(PROJECT_BUILD_PATH)/$(PROJECT_NAME).keystore -storepass $(APP_KEYSTORE_PASS) -keypass $(APP_KEYSTORE_PASS) -alias $(PROJECT_NAME)Key -keyalg RSA; \ - fi + fi # Config project package and resource using AndroidManifest.xml and res/values/strings.xml # NOTE: Generates resources file: src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/R.java @@ -345,7 +278,7 @@ config_project_package: # Compile native_app_glue code as static library: obj/libnative_app_glue.a compile_native_app_glue: - $(CC) -c $(NATIVE_APP_GLUE)/android_native_app_glue.c -o $(PROJECT_BUILD_PATH)/obj/native_app_glue.o $(CFLAGS) + $(CC) -c $(NATIVE_APP_GLUE_PATH)/android_native_app_glue.c -o $(PROJECT_BUILD_PATH)/obj/native_app_glue.o $(CFLAGS) $(AR) rcs $(PROJECT_BUILD_PATH)/obj/libnative_app_glue.a $(PROJECT_BUILD_PATH)/obj/native_app_glue.o # Compile project code into a shared library: lib/lib$(PROJECT_LIBRARY_NAME).so @@ -358,7 +291,6 @@ $(PROJECT_BUILD_PATH)/obj/%.o:%.c $(CC) -c $^ -o $@ $(INCLUDE_PATHS) $(CFLAGS) --sysroot=$(ANDROID_TOOLCHAIN)/sysroot # Compile project .java code into .class (Java bytecode) -# pour Unix, le séparateur pour les chemins indiqués dans -cp (-classpath) est ':' (pour windows: ';') compile_project_class: $(JAVA_BIN)javac -verbose -source 1.7 -target 1.7 -d $(PROJECT_BUILD_PATH)/obj -bootclasspath $(JAVA_HOME)/jre/lib/rt.jar -classpath $(ANDROID_HOME)/platforms/android-$(ANDROID_API_VERSION)/android.jar:$(PROJECT_BUILD_PATH)/obj -sourcepath $(PROJECT_BUILD_PATH)/src $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/R.java $(PROJECT_BUILD_PATH)/src/com/$(APP_COMPANY_NAME)/$(APP_PRODUCT_NAME)/NativeLoader.java @@ -408,7 +340,7 @@ deploy: #$(ANDROID_PLATFORM_TOOLS)/adb logcat *:W -# [JSEB] Clean everything, but avoid accidental removing of root dir, or $HOME, or whatever important +# @jseb: Clean everything, but avoid accidental removing of root dir, or $HOME, or whatever important clean: @if [ "$(shell echo $(PROJECT_BUILD_PATH) | grep "$(PROJECT_BUILD_ID)")" != "" ]; then \ rm -rf $(PROJECT_BUILD_PATH); \ diff --git a/templates/simple_game/Makefile.Android.macos b/templates/simple_game/Makefile.Android.macos index 77ac4778a..16f65c1d3 100644 --- a/templates/simple_game/Makefile.Android.macos +++ b/templates/simple_game/Makefile.Android.macos @@ -73,7 +73,7 @@ APP_KEYSTORE_PASS ?= raylib RAYLIB_LIBTYPE ?= STATIC # Library path for libraylib.a/libraylib.so -RAYLIB_LIB_PATH = $(RAYLIB_PATH)/src +RAYLIB_LIB_PATH = $(RAYLIB_PATH)/src/ # Shared libs must be added to APK if required # NOTE: Generated NativeLoader.java automatically load those libraries @@ -82,20 +82,26 @@ ifeq ($(RAYLIB_LIBTYPE),SHARED) endif # Compiler and archiver -# NOTE: GCC is being deprecated in Android NDK r16 -# NOTE: For some old androild device, maybe you should the CC to arm-linux-androideabi-clang ifeq ($(ANDROID_ARCH),ARM) - CC = $(ANDROID_TOOLCHAIN)/bin/armv7a-linux-androideabi29-clang - AR = $(ANDROID_TOOLCHAIN)/bin/arm-linux-androideabi-ar + CC = $(ANDROID_TOOLCHAIN)/bin/armv7a-linux-androideabi$(ANDROID_API_VERSION)-clang + AR = $(ANDROID_TOOLCHAIN)/bin/armv7a-linux-androideabi-ar endif ifeq ($(ANDROID_ARCH),ARM64) - CC = $(ANDROID_TOOLCHAIN)/bin/aarch64-linux-android-clang + CC = $(ANDROID_TOOLCHAIN)/bin/aarch64-linux-android$(ANDROID_API_VERSION)-clang AR = $(ANDROID_TOOLCHAIN)/bin/aarch64-linux-android-ar endif +ifeq ($(ANDROID_ARCH),x86) + CC = $(ANDROID_TOOLCHAIN)/bin/i686-linux-android$(ANDROID_API_VERSION)-clang + AR = $(ANDROID_TOOLCHAIN)/bin/i686-linux-android-ar +endif +ifeq ($(ANDROID_ARCH),x86_64) + CC = $(ANDROID_TOOLCHAIN)/bin/x86_64-linux-android$(ANDROID_API_VERSION)-clang + AR = $(ANDROID_TOOLCHAIN)/bin/x86_64-linux-android-ar +endif # Compiler flags for arquitecture ifeq ($(ANDROID_ARCH),ARM) - CFLAGS = -std=c99 -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 + CFLAGS = -std=c99 -march=armv7a -mfloat-abi=softfp -mfpu=vfpv3-d16 endif ifeq ($(ANDROID_ARCH),ARM64) CFLAGS = -std=c99 -target aarch64 -mfix-cortex-a53-835769 @@ -108,7 +114,7 @@ CFLAGS += -Wall -Wa,--noexecstack -Wformat -Werror=format-security -no-canonical CFLAGS += -DANDROID -DPLATFORM_ANDROID -D__ANDROID_API__=$(ANDROID_API_VERSION) # Paths containing required header files -INCLUDE_PATHS = -I. -I$(RAYLIB_PATH)/src -I$(RAYLIB_PATH)/src/external/android/native_app_glue +INCLUDE_PATHS = -I. -I$(RAYLIB_PATH)/src -I$(NATIVE_APP_GLUE) # Linker options LDFLAGS = -Wl,-soname,lib$(PROJECT_LIBRARY_NAME).so -Wl,--exclude-libs,libatomic.a @@ -116,12 +122,10 @@ LDFLAGS += -Wl,--build-id -Wl,--no-undefined -Wl,-z,noexecstack -Wl,-z,relro -Wl # Force linking of library module to define symbol LDFLAGS += -u ANativeActivity_onCreate # Library paths containing required libs -LDFLAGS += -L. -L$(PROJECT_BUILD_PATH)/obj -L$(PROJECT_BUILD_PATH)/lib/$(ANDROID_ARCH_NAME) -L$(ANDROID_TOOLCHAIN)/sysroot/usr/lib +LDFLAGS += -L. -L$(PROJECT_BUILD_PATH)/obj -L$(PROJECT_BUILD_PATH)/lib/$(ANDROID_ARCH_NAME) # Define any libraries to link into executable # if you want to link libraries (libname.so or libname.a), use the -lname - -#LDLIBS = -lraylib -lnative_app_glue -llog -landroid -lEGL -lGLESv2 -lOpenSLES -latomic -lc -lm -ldl LDLIBS = -lm -lc -lraylib -llog -landroid -lEGL -lGLESv2 -lOpenSLES -ldl # Generate target objects list from PROJECT_SOURCE_FILES @@ -140,14 +144,10 @@ all: create_temp_project_dirs \ compile_project_class \ compile_project_class_dex \ create_project_apk_package \ - sign_project_apk_package \ - zipalign_project_apk_package + zipalign_project_apk_package \ + sign_project_apk_package -# Create required temp directories - - - -APK building +# Create required temp directories for APK building create_temp_project_dirs: test -d $(PROJECT_BUILD_PATH) || mkdir -p $(PROJECT_BUILD_PATH) test -d $(PROJECT_BUILD_PATH)/obj || mkdir -p $(PROJECT_BUILD_PATH)/obj @@ -275,6 +275,7 @@ create_project_apk_package: cd $(PROJECT_BUILD_PATH) && $(ANDROID_BUILD_TOOLS)/aapt add bin/$(PROJECT_NAME).unsigned.apk lib/$(ANDROID_ARCH_NAME)/lib$(PROJECT_LIBRARY_NAME).so $(PROJECT_SHARED_LIBS) # Create signed APK package using generated Key: bin/$(PROJECT_NAME).signed.apk + sign_project_apk_package: $(JAVA_HOME)/bin/jarsigner -keystore $(PROJECT_BUILD_PATH)/$(PROJECT_NAME).keystore -storepass $(APP_KEYSTORE_PASS) -keypass $(APP_KEYSTORE_PASS) -signedjar $(PROJECT_BUILD_PATH)/bin/$(PROJECT_NAME).signed.apk $(PROJECT_BUILD_PATH)/bin/$(PROJECT_NAME).unsigned.apk $(PROJECT_NAME)Key diff --git a/templates/standard_game/Makefile.Android b/templates/standard_game/Makefile.Android index afa3024ac..5d1373fb1 100644 --- a/templates/standard_game/Makefile.Android +++ b/templates/standard_game/Makefile.Android @@ -31,67 +31,60 @@ RAYLIB_PATH ?= ..\.. ANDROID_ARCH ?= ARM64 ANDROID_API_VERSION = 29 -# Android required path variables -# NOTE: Starting with Android NDK r21, no more toolchain generation is required, NDK is the toolchain on itself -ifeq ($(OS),Windows_NT) - ANDROID_NDK = C:/android-ndk - ANDROID_TOOLCHAIN = $(ANDROID_NDK)/toolchains/llvm/prebuilt/windows-x86_64 -else - ANDROID_NDK ?= /usr/lib/android/ndk - ANDROID_TOOLCHAIN = $(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64 -endif - ifeq ($(ANDROID_ARCH),ARM) - ANDROID_ARCH_NAME = armeabi-v7a + ANDROID_ARCH_NAME = armeabi-v7a endif ifeq ($(ANDROID_ARCH),ARM64) - ANDROID_ARCH_NAME = arm64-v8a + ANDROID_ARCH_NAME = arm64-v8a endif ifeq ($(ANDROID_ARCH),x86) - ANDROID_ARCH_NAME = i686 + ANDROID_ARCH_NAME = i686 endif ifeq ($(ANDROID_ARCH),x86_64) - ANDROID_ARCH_NAME = x86_64 + ANDROID_ARCH_NAME = x86_64 endif # Required path variables # NOTE: JAVA_HOME must be set to JDK (using OpenJDK 13) JAVA_HOME ?= C:/open-jdk -ANDROID_HOME = C:/android-sdk -ANDROID_TOOLCHAIN = C:/android-ndk/toolchains/llvm/prebuilt/windows-x86_64 -ANDROID_BUILD_TOOLS = $(ANDROID_HOME)/build-tools/29.0.3 +ANDROID_HOME ?= C:/android-sdk +ANDROID_NDK ?= C:/android-ndk +ANDROID_TOOLCHAIN ?= $(ANDROID_NDK)/toolchains/llvm/prebuilt/windows-x86_64 +ANDROID_BUILD_TOOLS ?= $(ANDROID_HOME)/build-tools/29.0.3 ANDROID_PLATFORM_TOOLS = $(ANDROID_HOME)/platform-tools # Android project configuration variables PROJECT_NAME ?= raylib_game PROJECT_LIBRARY_NAME ?= main -PROJECT_BUILD_PATH ?= android.$(PROJECT_NAME) +PROJECT_BUILD_ID ?= android +PROJECT_BUILD_PATH ?= $(PROJECT_BUILD_ID).$(PROJECT_NAME) PROJECT_RESOURCES_PATH ?= resources -PROJECT_SOURCE_FILES ?= raylib_game.c +PROJECT_SOURCE_FILES ?= simple_game.c +NATIVE_APP_GLUE_PATH = $(ANDROID_NDK)/sources/android/native_app_glue # Some source files are placed in directories, when compiling to some # output directory other than source, that directory must pre-exist. # Here we get a list of required folders that need to be created on # code output folder $(PROJECT_BUILD_PATH)\obj to avoid GCC errors. -PROJECT_SOURCE_DIRS = $(sort $(dir $(PROJECT_SOURCE_FILES))) +PROJECT_SOURCE_DIRS = $(sort $(dir $(PROJECT_SOURCE_FILES))) # Android app configuration variables -APP_LABEL_NAME ?= rGame -APP_COMPANY_NAME ?= raylib -APP_PRODUCT_NAME ?= rgame -APP_VERSION_CODE ?= 1 -APP_VERSION_NAME ?= 1.0 -APP_ICON_LDPI ?= $(RAYLIB_PATH)\logo\raylib_36x36.png -APP_ICON_MDPI ?= $(RAYLIB_PATH)\logo\raylib_48x48.png -APP_ICON_HDPI ?= $(RAYLIB_PATH)\logo\raylib_72x72.png +APP_LABEL_NAME ?= rGame +APP_COMPANY_NAME ?= raylib +APP_PRODUCT_NAME ?= rgame +APP_VERSION_CODE ?= 1 +APP_VERSION_NAME ?= 1.0 +APP_ICON_LDPI ?= $(RAYLIB_PATH)\logo\raylib_36x36.png +APP_ICON_MDPI ?= $(RAYLIB_PATH)\logo\raylib_48x48.png +APP_ICON_HDPI ?= $(RAYLIB_PATH)\logo\raylib_72x72.png APP_SCREEN_ORIENTATION ?= landscape -APP_KEYSTORE_PASS ?= raylib +APP_KEYSTORE_PASS ?= raylib # Library type used for raylib: STATIC (.a) or SHARED (.so/.dll) -RAYLIB_LIBTYPE ?= STATIC +RAYLIB_LIBTYPE ?= STATIC # Library path for libraylib.a/libraylib.so -RAYLIB_LIB_PATH = $(RAYLIB_PATH)\src +RAYLIB_LIB_PATH = $(RAYLIB_PATH)\src # Shared libs must be added to APK if required # NOTE: Generated NativeLoader.java automatically load those libraries @@ -108,6 +101,14 @@ ifeq ($(ANDROID_ARCH),ARM64) CC = $(ANDROID_TOOLCHAIN)/bin/aarch64-linux-android$(ANDROID_API_VERSION)-clang AR = $(ANDROID_TOOLCHAIN)/bin/aarch64-linux-android-ar endif +ifeq ($(ANDROID_ARCH),x86) + CC = $(ANDROID_TOOLCHAIN)/bin/i686-linux-android$(ANDROID_API_VERSION)-clang + AR = $(ANDROID_TOOLCHAIN)/bin/i686-linux-android-ar +endif +ifeq ($(ANDROID_ARCH),x86_64) + CC = $(ANDROID_TOOLCHAIN)/bin/x86_64-linux-android$(ANDROID_API_VERSION)-clang + AR = $(ANDROID_TOOLCHAIN)/bin/x86_64-linux-android-ar +endif # Compiler flags for arquitecture ifeq ($(ANDROID_ARCH),ARM) @@ -124,7 +125,7 @@ CFLAGS += -Wall -Wa,--noexecstack -Wformat -Werror=format-security -no-canonical CFLAGS += -DANDROID -DPLATFORM_ANDROID -D__ANDROID_API__=$(ANDROID_API_VERSION) # Paths containing required header files -INCLUDE_PATHS = -I. -I$(RAYLIB_PATH)/src -I$(RAYLIB_PATH)/src/external/android/native_app_glue +INCLUDE_PATHS = -I. -I$(RAYLIB_PATH)/src -I$(NATIVE_APP_GLUE_PATH) # Linker options LDFLAGS = -Wl,-soname,lib$(PROJECT_LIBRARY_NAME).so -Wl,--exclude-libs,libatomic.a @@ -154,8 +155,8 @@ all: create_temp_project_dirs \ compile_project_class \ compile_project_class_dex \ create_project_apk_package \ - sign_project_apk_package \ - zipalign_project_apk_package + zipalign_project_apk_package \ + sign_project_apk_package # Create required temp directories for APK building create_temp_project_dirs: @@ -253,7 +254,7 @@ config_project_package: # Compile native_app_glue code as static library: obj/libnative_app_glue.a compile_native_app_glue: - $(CC) -c $(RAYLIB_PATH)/src/external/android/native_app_glue/android_native_app_glue.c -o $(PROJECT_BUILD_PATH)/obj/native_app_glue.o $(CFLAGS) + $(CC) -c $(NATIVE_APP_GLUE_PATH)/android_native_app_glue.c -o $(PROJECT_BUILD_PATH)/obj/native_app_glue.o $(CFLAGS) $(AR) rcs $(PROJECT_BUILD_PATH)/obj/libnative_app_glue.a $(PROJECT_BUILD_PATH)/obj/native_app_glue.o # Compile project code into a shared library: lib/lib$(PROJECT_LIBRARY_NAME).so From 715a46277ec3cafba6bc5d5012e5e1385c7346c9 Mon Sep 17 00:00:00 2001 From: Ray Date: Thu, 22 Apr 2021 18:33:59 +0200 Subject: [PATCH 057/121] Update README.md --- examples/README.md | 85 ++++++++++++++++++++++++---------------------- 1 file changed, 44 insertions(+), 41 deletions(-) diff --git a/examples/README.md b/examples/README.md index 61795a9c5..fec709ade 100644 --- a/examples/README.md +++ b/examples/README.md @@ -20,16 +20,16 @@ Examples using raylib core platform functionality like window creation, inputs, | 12 | [core_3d_camera_first_person](core/core_3d_camera_first_person.c) | core_3d_camera_first_person | ray | | | 13 | [core_3d_picking](core/core_3d_picking.c) | core_3d_picking | ray | | | 14 | [core_world_screen](core/core_world_screen.c) | core_world_screen | ray | | -| 15 | [core_custom_logging](core/core_custom_logging.c) | core_custom_logging | [Pablo Marcos](https://github.com/pamarcos) | | +| 15 | [core_custom_logging](core/core_custom_logging.c) | core_custom_logging | [Pablo Marcos](https://github.com/pamarcos) | | | 16 | [core_window_letterbox](core/core_window_letterbox.c) | core_window_letterbox | [Anata](https://github.com/anatagawa) | | | 17 | [core_drop_files](core/core_drop_files.c) | core_drop_files | ray | | | 18 | [core_random_values](core/core_random_values.c) | core_random_values | ray | | -| 19 | [core_scissor_test](core/core_scissor_test.c) | core_scissor_test | [Chris Dill](https://github.com/MysteriousSpace) | ⭐️ | +| 19 | [core_scissor_test](core/core_scissor_test.c) | core_scissor_test | [Chris Dill](https://github.com/MysteriousSpace) | | | 20 | [core_storage_values](core/core_storage_values.c) | core_storage_values | ray | | -| 21 | [core_vr_simulator](core/core_vr_simulator.c) | core_vr_simulator | ray | | -| 22 | [core_loading_thread](core/core_loading_thread.c) | core_loading_thread | ray | ⭐️ | -| 23 | [core/core_quat_conversion](core/core_quat_conversion.c) | core_quat_conversion | [Chris Camacho](https://github.com/codifies) | ⭐️ | -| 24 | [core/core_window_flags](core/core_window_flags.c) | core_window_flags | ray | ⭐️ | | ⭐️ | +| 21 | [core_vr_simulator](core/core_vr_simulator.c) | core_vr_simulator | ray | ⭐️ | +| 22 | [core_loading_thread](core/core_loading_thread.c) | core_loading_thread | ray | | +| 23 | [core/core_quat_conversion](core/core_quat_conversion.c) | core_quat_conversion | [Chris Camacho](https://github.com/codifies) | | +| 24 | [core/core_window_flags](core/core_window_flags.c) | core_window_flags | ray | | ### category: shapes @@ -38,18 +38,18 @@ Examples using raylib shapes drawing functionality, provided by raylib [shapes]( | ## | example | image | developer | new | |----|----------|--------|:----------:|:---:| | 25 | [shapes_basic_shapes](shapes/shapes_basic_shapes.c) | shapes_basic_shapes | ray | | -| 26 | [shapes_bouncing_ball](shapes/shapes_bouncing_ball.c) | shapes_bouncing_ball | ray | ⭐️ | +| 26 | [shapes_bouncing_ball](shapes/shapes_bouncing_ball.c) | shapes_bouncing_ball | ray | | | 27 | [shapes_colors_palette](shapes/shapes_colors_palette.c) | shapes_colors_palette | ray | | | 28 | [shapes_logo_raylib](shapes/shapes_logo_raylib.c) | shapes_logo_raylib | ray | | | 29 | [shapes_logo_raylib_anim](shapes/shapes_logo_raylib_anim.c) | shapes_logo_raylib_anim | ray | | | 30 | [shapes_rectangle_scaling](shapes/shapes_rectangle_scaling.c) | shapes_rectangle_scaling | [Vlad Adrian](https://github.com/demizdor) | | | 31 | [shapes_lines_bezier](shapes/shapes_lines_bezier.c) | shapes_lines_bezier | ray | | -| 32 | [shapes_collision_area](shapes/shapes_collision_area.c) | shapes_collision_area | ray | ⭐️ | -| 33 | [shapes_following_eyes](shapes/shapes_following_eyes.c) | shapes_following_eyes | ray | ⭐️ | -| 34 | [shapes_easings_ball_anim](shapes/shapes_easings_ball_anim.c) | shapes_easings_ball_anim | ray | ⭐️ | -| 35 | [shapes_easings_box_anim](shapes/shapes_easings_box_anim.c) | shapes_easings_box_anim | ray | ⭐️ | -| 36 | [shapes_easings_rectangle_array](shapes/shapes_easings_rectangle_array.c) | shapes_easings_rectangle_array | ray | ⭐️ | -| 37 | [shapes_draw_ring](shapes/shapes_draw_ring.c) | shapes_draw_ring | [Vlad Adrian](https://github.com/demizdor) | ⭐️ | +| 32 | [shapes_collision_area](shapes/shapes_collision_area.c) | shapes_collision_area | ray | | +| 33 | [shapes_following_eyes](shapes/shapes_following_eyes.c) | shapes_following_eyes | ray | | +| 34 | [shapes_easings_ball_anim](shapes/shapes_easings_ball_anim.c) | shapes_easings_ball_anim | ray | | +| 35 | [shapes_easings_box_anim](shapes/shapes_easings_box_anim.c) | shapes_easings_box_anim | ray | | +| 36 | [shapes_easings_rectangle_array](shapes/shapes_easings_rectangle_array.c) | shapes_easings_rectangle_array | ray | | +| 37 | [shapes_draw_ring](shapes/shapes_draw_ring.c) | shapes_draw_ring | [Vlad Adrian](https://github.com/demizdor) | | | 38 | [shapes_draw_circle_sector](shapes/shapes_draw_circle_sector.c) | shapes_draw_circle_sector | [Vlad Adrian](https://github.com/demizdor) | | | 39 | [shapes_draw_rectangle_rounded](shapes/shapes_draw_rectangle_rounded.c) | shapes_draw_rectangle_rounded | [Vlad Adrian](https://github.com/demizdor) | | @@ -66,18 +66,19 @@ Examples using raylib textures functionality, including image/textures loading/g | 44 | [textures_image_generation](textures/textures_image_generation.c) | textures_image_generation | ray | | | 45 | [textures_image_loading](textures/textures_image_loading.c) | textures_image_loading | ray | | | 46 | [textures_image_processing](textures/textures_image_processing.c) | textures_image_processing | ray | | -| 47 | [textures_image_text](textures/textures_image_text.c) | textures_image_text | ray | | -| 48 | [textures_to_image](textures/textures_to_image.c) | textures_to_image | ray | ⭐️ | +| 47 | [textures_image_text](textures/textures_image_text.c) | textures_image_text | ray | | +| 48 | [textures_to_image](textures/textures_to_image.c) | textures_to_image | ray | | | 49 | [textures_raw_data](textures/textures_raw_data.c) | textures_raw_data | ray | | | 50 | [textures_particles_blending](textures/textures_particles_blending.c) | textures_particles_blending | ray | | | 51 | [textures_npatch_drawing](textures/textures_npatch_drawing.c) | textures_npatch_drawing | [Jorge A. Gomes](https://github.com/overdev) | | -| 52 | [textures_background_scrolling](textures/textures_background_scrolling.c) | textures_background_scrolling | ray | ⭐️ | -| 53 | [textures_sprite_button](textures/textures_sprite_button.c) | textures_sprite_button | ray | ⭐️ | -| 54 | [textures_sprite_explosion](textures/textures_sprite_explosion.c) | textures_sprite_explosion | ray | ⭐️ | -| 55 | [textures_bunnymark](textures/textures_bunnymark.c) | textures_bunnymark | ray | | -| 56 | [textures_mouse_painting](textures/textures_mouse_painting.c) | textures_mouse_painting | [Chris Dill](https://github.com/MysteriousSpace) | | -| 57 | [textures_blend_modes](textures/textures_blend_modes.c) | textures_blend_modes | [Karlo Licudine](https://github.com/accidentalrebel) | ⭐️ | -| 58 | [textures/textures_draw_tiled](textures/textures_draw_tiled.c) | textures_draw_tiled | [Vlad Adrian](https://github.com/demizdor) | ⭐️ | +| 52 | [textures_background_scrolling](textures/textures_background_scrolling.c) | textures_background_scrolling | ray | | +| 53 | [textures_sprite_button](textures/textures_sprite_button.c) | textures_sprite_button | ray | | +| 54 | [textures_sprite_explosion](textures/textures_sprite_explosion.c) | textures_sprite_explosion | ray | | +| 55 | [textures_bunnymark](textures/textures_bunnymark.c) | textures_bunnymark | ray | | +| 56 | [textures_mouse_painting](textures/textures_mouse_painting.c) | textures_mouse_painting | [Chris Dill](https://github.com/MysteriousSpace) | | +| 57 | [textures_blend_modes](textures/textures_blend_modes.c) | textures_blend_modes | [Karlo Licudine](https://github.com/accidentalrebel) | | +| 58 | [textures/textures_draw_tiled](textures/textures_draw_tiled.c) | textures_draw_tiled | [Vlad Adrian](https://github.com/demizdor) | | +| -- | [textures/textures_poly](textures/textures_poly.c) | textures_poly | [Chris Camacho](https://github.com/codifies) | ⭐️ | ### category: text @@ -89,12 +90,13 @@ Examples using raylib text functionality, including sprite fonts loading/generat | 60 | [text_font_spritefont](text/text_font_spritefont.c) | text_font_spritefont | ray | | | 61 | [text_font_filters](text/text_font_filters.c) | text_font_filters | ray | | | 62 | [text_font_loading](text/text_font_loading.c) | text_font_loading | ray | | -| 63 | [text_font_sdf](text/text_font_sdf.c) | text_font_sdf | ray | | +| 63 | [text_font_sdf](text/text_font_sdf.c) | text_font_sdf | ray | | | 64 | [text_format_text](text/text_format_text.c) | text_format_text | ray | | | 65 | [text_input_box](text/text_input_box.c) | text_input_box | ray | | | 66 | [text_writing_anim](text/text_writing_anim.c) | text_writing_anim | ray | | | 67 | [text_rectangle_bounds](text/text_rectangle_bounds.c) | text_rectangle_bounds | [Vlad Adrian](https://github.com/demizdor) | | | 68 | [text_unicode](text/text_unicode.c) | text_unicode | [Vlad Adrian](https://github.com/demizdor) | | +| -- | [text/text_draw_3d](text/text_draw_3d.c) | text_draw_3d | [Vlad Adrian](https://github.com/demizdor) | ⭐️ | ### category: models @@ -102,22 +104,23 @@ Examples using raylib models functionality, including models loading/generation | ## | example | image | developer | new | |----|----------|--------|:----------:|:---:| -| 69 | [models_animation](models/models_animation.c) | models_animation | [culacant](https://github.com/culacant) | | +| 69 | [models_animation](models/models_animation.c) | models_animation | [culacant](https://github.com/culacant) | | | 70 | [models_billboard](models/models_billboard.c) | models_billboard | ray | | | 71 | [models_box_collisions](models/models_box_collisions.c) | models_box_collisions | ray | | | 72 | [models_cubicmap](models/models_cubicmap.c) | models_cubicmap | ray | | -| 73 | [models_first_person_maze](models/models_first_person_maze.c) | models_first_person_maze | ray | | +| 73 | [models_first_person_maze](models/models_first_person_maze.c) | models_first_person_maze | ray | | | 74 | [models_geometric_shapes](models/models_geometric_shapes.c) | models_geometric_shapes | ray | | | 75 | [models_material_pbr](models/models_material_pbr.c) | models_material_pbr | ray | | | 76 | [models_mesh_generation](models/models_mesh_generation.c) | models_mesh_generation | ray | | | 77 | [models_mesh_picking](models/models_mesh_picking.c) | models_mesh_picking | [Joel Davis](https://github.com/joeld42) | | | 78 | [models_loading](models/models_loading.c) | models_loading | ray | | | 79 | [models_orthographic_projection](models/models_orthographic_projection.c) | models_orthographic_projection | [Max Danielsson](https://github.com/autious) | | -| 80 | [models_rlgl_solar_system](models/models_rlgl_solar_system.c) | models_rlgl_solar_system | ray | | +| 80 | [models_rlgl_solar_system](models/models_rlgl_solar_system.c) | models_rlgl_solar_system | ray | | | 81 | [models_skybox](models/models_skybox.c) | models_skybox | ray | | -| 82 | [models_yaw_pitch_roll](models/models_yaw_pitch_roll.c) | models_yaw_pitch_roll | [Berni](https://github.com/Berni8k) | | +| 82 | [models_yaw_pitch_roll](models/models_yaw_pitch_roll.c) | models_yaw_pitch_roll | [Berni](https://github.com/Berni8k) | ⭐️ | | 83 | [models_heightmap](models/models_heightmap.c) | models_heightmap | ray | | -| 84 | [models_waving_cubes](models/models_waving_cubes.c) | models_waving_cubes | [codecat](https://github.com/codecat) | ⭐️ | +| 84 | [models_waving_cubes](models/models_waving_cubes.c) | models_waving_cubes | [codecat](https://github.com/codecat) | | +| -- | [models_gltf_model](models/models_gltf_model.c) | models_gltf_model | [object71](https://github.com/object71) | ⭐️ | ### category: shaders @@ -126,22 +129,22 @@ Examples using raylib shaders functionality, including shaders loading, paramete | ## | example | image | developer | new | |----|----------|--------|:----------:|:---:| | 85 | [shaders_basic_lighting](shaders/shaders_basic_lighting.c) | shaders_basic_lighting | [Chris Camacho](https://github.com/codifies) | | -| 86 | [shaders_model_shader](shaders/shaders_model_shader.c) | shaders_model_shader | ray | | -| 87 | [shaders_shapes_textures](shaders/shaders_shapes_textures.c) | shaders_shapes_textures | ray | | -| 88 | [shaders_custom_uniform](shaders/shaders_custom_uniform.c) | shaders_custom_uniform | ray | | -| 89 | [shaders_postprocessing](shaders/shaders_postprocessing.c) | shaders_postprocessing | ray | | -| 90 | [shaders_palette_switch](shaders/shaders_palette_switch.c) | shaders_palette_switch | [Marco Lizza](https://github.com/MarcoLizza) | | +| 86 | [shaders_model_shader](shaders/shaders_model_shader.c) | shaders_model_shader | ray | | +| 87 | [shaders_shapes_textures](shaders/shaders_shapes_textures.c) | shaders_shapes_textures | ray | | +| 88 | [shaders_custom_uniform](shaders/shaders_custom_uniform.c) | shaders_custom_uniform | ray | | +| 89 | [shaders_postprocessing](shaders/shaders_postprocessing.c) | shaders_postprocessing | ray | | +| 90 | [shaders_palette_switch](shaders/shaders_palette_switch.c) | shaders_palette_switch | [Marco Lizza](https://github.com/MarcoLizza) | | | 91 | [shaders_raymarching](shaders/shaders_raymarching.c) | shaders_raymarching | Shader by Iñigo Quilez | | -| 92 | [shaders_texture_drawing](shaders/shaders_texture_drawing.c) | shaders_texture_drawing | Michał Ciesielski | | +| 92 | [shaders_texture_drawing](shaders/shaders_texture_drawing.c) | shaders_texture_drawing | Michał Ciesielski | | | 93 | [shaders_texture_waves](shaders/shaders_texture_waves.c) | shaders_texture_waves | [Anata](https://github.com/anatagawa) | | | 94 | [shaders_julia_set](shaders/shaders_julia_set.c) | shaders_julia_set | [eggmund](https://github.com/eggmund) | | -| 95 | [shaders_eratosthenes](shaders/shaders_eratosthenes.c) | shaders_eratosthenes | [ProfJski](https://github.com/ProfJski) | | +| 95 | [shaders_eratosthenes](shaders/shaders_eratosthenes.c) | shaders_eratosthenes | [ProfJski](https://github.com/ProfJski) | | | 96 | [shaders_fog](shaders/shaders_fog.c) | shaders_fog | [Chris Camacho](https://github.com/codifies) | | -| 97 | [shaders_simple_mask](shaders/shaders_simple_mask.c) | shaders_simple_mask | [Chris Camacho](https://github.com/codifies) | | -| 98 | [shaders_spotlight](shaders/shaders_spotlight.c) | shaders_spotlight | [Chris Camacho](https://github.com/codifies) | ⭐️ | -| 99 | [shaders_hot_reloading](shaders/shaders_hot_reloading.c) | shaders_hot_reloading | ray | ⭐️ | -| 100 | [shaders_rlgl_mesh_instanced](shaders/shaders_rlgl_mesh_instanced.c) | shaders_rlgl_mesh_instanced | [Chris Camacho](https://github.com/codifies) | ⭐️ | -| 101 | [shaders_multi_sample2d](shaders/shaders_multi_sample2d.c) | shaders_multi_sample2d | ray | ⭐️ | +| 97 | [shaders_simple_mask](shaders/shaders_simple_mask.c) | shaders_simple_mask | [Chris Camacho](https://github.com/codifies) | | +| 98 | [shaders_spotlight](shaders/shaders_spotlight.c) | shaders_spotlight | [Chris Camacho](https://github.com/codifies) | | +| 99 | [shaders_hot_reloading](shaders/shaders_hot_reloading.c) | shaders_hot_reloading | ray | | +| 100 | [shaders_mesh_instancing](shaders/shaders_mesh_instancing.c) | shaders_mesh_instancing | [seanpringle](https://github.com/seanpringle), [moliad](https://github.com/moliad) | ⭐️ | +| 101 | [shaders_multi_sample2d](shaders/shaders_multi_sample2d.c) | shaders_multi_sample2d | ray | | ### category: audio @@ -192,7 +195,7 @@ Examples showing raylib misc functionality that does not fit in other categories | 119 | [raudio_standalone](others/raudio_standalone.c) | | ray | | | 120 | [rlgl_standalone](others/rlgl_standalone.c) | | ray | | | 121 | [easings_testbed](others/easings_testbed.c) | | [Juan Miguel López](https://github.com/flashback-fx) | | -| 122 | [embedded_files_loading](others/embedded_files_loading.c)) | | [Kristian Holmgren](https://github.com/defutura) | | +| 122 | [embedded_files_loading](others/embedded_files_loading.c) | | [Kristian Holmgren](https://github.com/defutura) | | As always contributions are welcome, feel free to send new examples! Here it is an [examples template](examples_template.c) to start with! From 1161df0ee4db9e765339d90b9f5f1ebc6e0e614d Mon Sep 17 00:00:00 2001 From: Ray Date: Thu, 22 Apr 2021 18:34:33 +0200 Subject: [PATCH 058/121] Added screenshots --- examples/models/models_gltf_model.png | Bin 0 -> 21286 bytes examples/textures/textures_poly.png | Bin 0 -> 194233 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 examples/models/models_gltf_model.png create mode 100644 examples/textures/textures_poly.png diff --git a/examples/models/models_gltf_model.png b/examples/models/models_gltf_model.png new file mode 100644 index 0000000000000000000000000000000000000000..654444b848342eff35d72b5243671f1a1243cbf3 GIT binary patch literal 21286 zcmeAS@N?(olHy`uVBq!ia0y~yU{+vYU_8XZ#=yWJp1k%114GbTPZ!6KinwH-+yDRD zAJ&lIZM-OeonW+TVYr;3(cg9;gQEv4!LZjUVGFa-tZQ!02_`Jq2njc9g~gpXB;A}7 zZnPeF!E+*GksK~(EQsdlDRXcWzKzojcOh=Lfz5h|n6<*d*Gw=vR>#Y!~f zmH7cH{l&5qFP<@wV%oyrc#-c!hL$vHfw3T)6*$Ed}tfZJ0D;mHFheD1sMMt)+ow8>h!#YcTw-tr|CEb;Cz=fDb`+*Gh6qCPw zsAb**9>yl`1rAn)-#9*e6)7n9b1+(5+jG&yQi|!YISZ(qTUia(4} z^iEGInU!P`-wQJF0SDLzm%yHf5s3m!Q|2(ZPWe9Zw?xY_b&WSQJXhWvf5GHso8|3K(Aiv)9f|w<(>U$yDkbyoK!Tp#VG0fAH}E71r#iz9W%HX zrvJ&Ujh7eBU>_wGUeH*@vH0-&#hsZ@UvspA1FsjU!dM}o@G2rQqC;R0E5GfF3(Ga#tW_4@ z%!X>X;0&%p)F4GQD8aP3a!lCE(sg60?+N#_eR77@37KgoFWkA;TojP_1@Ylggb$m| zSTgFi=$v@IL`L6wR#;muM~~b=>sdS8og3;PigOW)OL!S~m1wy=o>Hdh@c8V9#no@! zh2Ljz@cajd#j;QEuwd+RPS_Ic_}In8XLU`kr5z;hO-P#a53(g zZIW@vTk35~uiCAP0un+HwJTt14>=`lNj9AIBvXj#!?FJv`UxhjkOToq(p-|zB%LV0 zwB&v`QX5SW@$LzHkRbOltHu~OaPF$5x5!>Uj+S)!`%~{Ihuo7FH@>>qV=l!sL(yQC zzFY9o433^2NW^>rM~tF8(+59RO}j)F>7ZpRoQCUktg@=;t~sRXr6#1 zL>F)}e<8(WvX>>FLzc;O7f-gy2RI5&@HVc0ApdX7MX@b^Ul2{uKCf^AKgtmKx} zZ`o@;EB=KL)8gJs2d7=|h*LXi5S7s*CI)uZ4oFZ~xj83HXlDqW<`kH{LGa2liMK61 z&t_f}kSJ4hsA5kRU^$o(X);UL-8tbz8#vd0>}xyV!PR&%lz;KdS`!wx6pn=Z?S``? zz=7fBoR9!1Nj|~&;6%{@DsGcaIKhd6XDP(B*TE4EB^X){DBP=Rs@cwZ?SxZ&pUJM? zG!tKl@<(9hYUiOUA;swffger}^mv~9V}1PM9(&V9(<+wt8Pnu=8xKM%0})8M28u5O zDJBy>#w4@K{%_iDlOKYsAP-J(0Uad|&5suaBwQ2?Os@0Q{{1ECFCp}N`NZ-QGQE$g zN`BtV=rogJYPJJMO=pP-3tJ^eL*7f-y;EyUX7;rmIMBxMOpYh$nYLU1{KcMcddp1Q zx?3*_NNj?nfj!{RUebCXKx!H5*57W@nu|5(oDfjhaZ&oH%##+=T@_r_0{v~LGoFE~ zy91CMJ;e~}@)L>%x6-7xy=6H2V|wrqkGIiM<43KDo>iVfK{KmTVePrh;F^M!pm`6X;A8&q8` z{M&Ug3(|;Aa7rj)OEGy0F1&a;1tfC!@&0e|dc$)pW11{4V~yg0vuACk9Ke2SwgEfB zvjiN~CM<2a96ak%?H9}PSgCHgc<)!nOi1wrsmbcVeNq6T2m3DBq;TJfH6pUHgikX|{%xpe*!*)TQOmCUNhSaGS z`Mzcd!XkPJBz>L*2Tej7!$GsFFJ3&o;9<6;bcvg_#FHahwbt``PE;0~NcT;<2X=?E z3B={)CM<4Q96fw@`gY9t|LdzUqkaFjJWqd-l5-x;%Pt#69q0*L2iAa;X-rroPGpz# z^6lr_wxs#9TK=*BiwkXLop*O;&}0FXw7z_c6%95((m*3vv$GNl+x1F6X5p0i`|DB_ z*6TCA)iLVp^XgCgj!4>#kcvV}2AVJ(g_subu_-S9<36iG>a9P|wk6h9+7=fKjjGsB zWE9#-F*z%P{h(P23jKz2iUv3MCohdHcyQ~9t(Csv6yt{(%bS1Pkmg-|@l_f~34;)% zC^L{^a#mq!dl##~EPde1n|BkcyF}JRn%xqVl$lw$Wu{M}O~ZBXzP3jhPr(7)U=6lr zWirT&1QV7Hp2qd@`+M518gMpVd}b)BRJ7%|O_Urs@Fz%utyp3VO~W3F4Mmf#WN4R0 zEbG0Pp=uXZ_|?$uyL_+MY;d?tX#p23f5CctRtOxZ4AI>d(6Du%TlAX6J5yL%54<>X zETagV4i=Px8i?cRXWo!vGops6Gxj{?Oq2OEcgz_8i?-?Y|ax7Lf z_yCE5RYf)(q%t306`cO*f%Yx8^u=!8b78S|5v=7b16WH5Z{x+uOWMktq~AtQ z5Z}M}p;?pwxE$+Q0xrjvfg;;U(Lm%KljPfko-;b8w;Gn!?&+V`Y7i9*$!^mj3ZH_^ zXT0RZuu}BP*V8ZdN-)o?`N#aYsqFZ|KC^Q7?lzD-xM$CJ3lfB>VEqf)4rJ^uW?9;C z@x(IUl*Q-Sd)q!|7+OOk15}_eO8W9IRy4TeoUkR=Bqf;PCc=`kqqv041|Xht5mU|Zk>P7sqXW^nLq z6p-+lt+BImhx_I885}$b91T&24Q!+YcQ_}Q%yA1o4l?$@1Fpu4su7Ddi=YV^T>l+- zvBA1f(8NmFc-B;K+n~)2Y;5o=u$~MKo=E}{cjfzamE5f57fXsrF^Q>&6aEXe0G#-FVj#BO2MccCXuQZ6q_n7T%X8C|%T}d}@+#CCE*>^;)82SdK%xqq z=zO<=6P>dai<`Baii^C)1~+TP60i5lmJ14>p1OF%JnAmkWCy2&68;kzUJ|^GiV{qV zXKT7o*3ETd__^cS#dWfUi9A^$$%l^|zp#Nb(=FncQ3JIj7bzN8 ztuvfe;*L4`Va}&{*PUavfd|~+M$alp-J+uC@ciq)#kwi0j{VLkxTGh|dyAVPP^s30wI@s! zY}^r0t1ZQ3D>w!5ycA$Ct#(__DdBtMNXvl?tAny$Er-%dUf#)&1Giijq;d4*Im!F_ zgY}BE9|+jfQ($tdu$5uOO3uTJ7n(>hHJd}K#<`0X4N4&1{0a-T4&KI#sm6;t>p{r@ z+z4s-2k~1e*uce#28)~$wp=!xv8cKv@SUq#GqQMd8hFQxU0*|k`c2ds80Yn<&(TYvG5DY#JOfi!u0 z+(D7dux%%M%{{5y!#!%h7m70}S8QiF$YZ^0a*ByNI7X36KsUt(n`XmXCnbDuIoq?i zNndj|=X0N))He;%utI8W%xFE3alCm42dinn+upW1y;fyJl=NeQ04Z3hJS8?XFbyf$f-yW%#nFBt}p zdDEUKNb82UIWq_{ExxS0cqO=p%3#dmHa($tSrMKm+T9b)t88!7*jUvw_$*({%({5% zl?)D^-QY?@?G?yu#wh{`GKaqY%}DOOa>Qm+blKvUsRH74i|6)ToRw+9(gtZT2>$?i z^#G_yJ*KkpqD4`3+2YI=w#d1KTb3I{wSrUl1UaU~voE*@p9L#L5ED2VL0!ljQs5Hd z5hP_C0w<(q6_$kO8oh3y^07xiVy?A>?@O?RvMIQ^lv!`W(&os)GjDN4=S!CZR~B4e z>{$qkpoT935^s<7ESm-LLgPYlrp46`ZozLsmNM`anYBiPhcQ4%>h2c92PZk+ zi}gFo*n^TMIBo2JWS-W(wgU#7j9EGfi>~nG<;}bJ#YBo}Njt+f&y5!gmIQGGtennZ z#3n0T@-TzH$V3vH{u1~bFG^0h2ne0* z-SgVuR=dPnWpL@0Apnk{6jLdt!v-vFx62owtTJdhka4^8#gfB{!r_ZMv$hmS^EM_5 zg4MOyfU`xBGsBe`l5f`rs{V7o-Rf*C&3mfC`P}5ioY`C2q<9+>A+5v~Td-mTQQ^ek zzr1;NH7H>(v65mstOyRum#~Bl>bmJ_9X8r~fbDMkzXogDS_7+Ei>L~4K{7#{Y4P%e z-eq$x3P`9a8dSY`k`W}w%lODCVTH^t*O+joC0vsI%bG53Dlp;gX*=)$5*Q)iCN5;; z5S0FUt|osz@EiQkEg^kkEny=?~)xEmkt zI9~gOW*42Rvw0rOb}aO0f6XfebTn zFrv1_7b`k=arE$M@!$Spv}BRkn;RGXj%PfCl)xs=;O5OKa3gd<6$j7C$3`EwS|vtD zOn7&mQfORLG}z@;*Wspr(0NXRq4h1TWsyAm8yCp#Wlq^*B+c8nP#97G zyw2d@*(@OOa;m|K$gUoD;U5CLj8l&3SFPzQ)7I<_ZBn$jwO(2mG-hMMk^vbfd;$pp zDJEwFmJ{z%{>n4ydhZZU+$ZC^XojM}Elz1)QE((Xn?nlZdmvAPdJRt$9j-2WmSEk+ zm0q8*rO`KX(~?y8Vv{^K?z12zjHe*AS`#!}5(L@~Y{-4otM^v&Y(Ch;#fk=xAgNvr z+|ZNYZJa2=^xwUjVKHYNsE`BK;t2_m%)^A7c^di@4fco|1nzGJ*8<;UcpD#zGcESs z;1>K9R0cw8?7dwws@vS3H@CSzlDBOt-y$K;+qh7aX|b`wV$CuWmbOF=p0-mJC0B|j zsI3v)$HIN(p~JDotO{uyJ!PjLV~cGJYa!MjgLBTQ$9bT~h6;j{=js+6tYn&KNF8Kz|Puz02af+Nnqv0-v z^c|vt&PtvA&kkd$eKI(BJ|5%Ch(7+}-lvC?d)!l|=WjV|7{%A$cA$f+@uIB)EZmN? zA9!(9V)0B+Kbx2F*Ef+Jl{?%QgS+nu643q@B!_@oJ%_Wl$n4Cu-t~#wf0fK!JqNxy zphBVh19~q3QqJ7ideZ&&MH8<|=BYs^wv?O5_Dnknib^MNLu!#cZ)2hq)8fTV&h|;| zx95sJc&52xBj@48OV7h1rtLrnq*OWt>5@l+3OkRw3w-T2`yO6vloD}0`Xc9GMkl0T z=Yg1O1aYs6V#C@}(_NAY8Y&kTN_jgc-R6|FmR-CvcZ(A^4J~j7_kb?n1X;$=>&$Sa z>d>_{lCq~{eXG9kGsdjU3ozZo9(_&1Rwlt@HMlelumsl+o>`zI*TAP}z+)}F<5%e7 zmzft@4`hT-@6nKa;UGP?OH$X<%{d_g(voRJM0`&h!(69?1-HMlyp{K0UsP)4_I*Nc z+Ubh|63}t-yU-Njkj2r{cdl=lq>(ejl#;eLJv?jI-CnL>-#hP{`7BX)=Y$MMN8l;g zSv_qG3k4+J7Vs=GG1{V>Tw-}6qYzw18b~qm@GL(5p>J8!MFELpiUvXM?3!7N7R{Hn zzV%b$flQN}VzcStrd?vnJF5+61-fZp24_c5R%3%T#(UZrG+5kj`!_4g9(bI%!JQ-5 zO1fupu*%}67eN7cfCDoBWCV^Ni6@E%Rd+-da!6fLG+AO*=e)4o;MQb0-Amvc$yN_Z z_e;UPG~osHr!ERCE8;jH_M7LVtG#oo>(z`^;DQwrLy_PjUTq!7RgiMTU`qJY1-olY zYUUj};&#|HYVqm)Zrz}fdS1pVNP)Q)JTTGI#$dq0_Sk6I!do9D?jAFkwN!(bG3gzH zq-|5V$=u$y0~dI~h2|?H+bmeztYsH>Lgp60F?<8u_**s=WIyArwgWF_&AupNmgJQ1 zLbYsBtj#XFY!i8K>;@RJxS22PS6hBjK;oIA!}nCK#j|_dKZ6>OuLK;^Zy26VJGkMf>~v{2YsbZ| zFTl~2!7%|+us~{211Y8*P6=N!mN$AzKj?dxz+3alT4wRd&Z?7{pjtVp+JvR84AR*G zV~1g8p~en{8sB-nL}6%9O`6G{~3eClX4z3F~+kp+djTiga*DfwIX>srF2ZcZ5B}lEb3esreWz69C zBcJQty9_ic|3%SY*OC&GiG6JcEe z1JbU)!ryq&?^MPrDR5r^P8@(Ve3yV*bPkmqJ!KYd!H}#7cPYa}$bi<$p0)!VoQ$j1 z%~pH-EGsW>-b3L_%^!KLUz}sJ$2nokWcyi%z!|eG5R%cJgIv^jQ9wb2Y4PmK?w3zE zv@q;fBm4mHXC?W$6hf7yHB@;|tE} zkXFDou-ZgvrXyx21HwXjw>{37BbUjM@BbVVP?xS1)JuR4N>`eIRt()}KhW`_ zpuxtnK{sbrn_&i9i`U!<2QR&pc>6~{FU{>egXG#CH|K;WE#Sm+#SYvTSmT^fvMrgz z?L9}#H|Gnd7ke*s^9FbL8WTmpmGBctF9WO?L^vdI^pw4Yb!vYqf~U!C7b_YxIVF_* z{Q??5X3T0ou;BJ7zsDMCFD)7`K7q_jNHIk~nvaLT1ss@g;A*@$G565P#3gTENcajb zc0B@$M}|^JzsnVza4+bxv|Y`8aair{0kEfa)6P7lAa2gN(oWaqvL4aXv zu3JCLQl}-#?2j@I&-}w6%WM6s+-ku_R|TPuXOE$+R=s9VUEZS?HfL%Frx;7D}~09!TrcLqn#1p$Sv!j1Rx zWWE_|E|%q6^|a^WNu?-pqaW3!i#;p1%mR<`NaR3*buuVeof*Q_la}xW9hS;kT)r=G znx>odp2bJCt_eu^N-X9Cx0@KGz}+!5P|izKoUluNt0=>(oCS|33aKoZ;Baj5%*HMRUV+t&ixnMmz{wt3zPC-h@=&7p9oUCO&Iu)kcQbB*v-JW$u+u@~uRU!CHt;uI zoGQP#Qzo1vVB4JuaowUP{SQuA{`cU-YS3KF*~5z!4fa6Vvx~r)3*vp}h8F@0>Xs*e zc(+sP?XLc`9fvQv0vREdadS>!X=C^ms}RE5G_h*si2yHm=9>~rKJH_4 zy6A8-ukYd`aAy$QOmC2abc6cboD*8w7*@!7Y!yt{#its4^{KM)H}@MC{(t!P?uE^{ z3{^;``2q>eEO+MwmUf1nzLirLzg+xw{(`ro@)CaYStjl756wWOfvK$&(_v6kT4C|Z zDiapB3J!tGVzQa1xBq93Ue~iY` zKYTqczN^({#aZK9E2Vz4*iA{F<~P@>Rj45?Ep4$XyQZRn)nmh1ap1Ht0pcG}n1RbI z6PALO11IL*QoQo8;UxdnJ`Vm2fd|Hx%?yieJ1;&;0;y^E1h#eAqKg6&3l$k|-LO1e zxW&+L7UKoyhO%PU=2}j%qUFqclNl#9cPg%4T3K4EVv8YF(O}pA#E#_(zjXZ$?`Fwv_;u)pmF$bn@*6mgUB4-D##rfv zEdLi4?pGZ(fB&RzQGui_UdCOJ)UpwrT6#bYb;e)syADc3$g|Al3%IiQd|AVfAJY;R zmYZEjcVRodNykaHf8m5T?)?vBb?1Tlw~!WWDkM}v-J%PsEC-Agm?f@l=xfrv#8wm_ z&#}|F(N4K3*No+w<3ZEcj;C@?yvSO9@r*gB5H=8kv=`oia~Wt&)A4}b8&i&1cv#6U z=sTYIATvxMr|YSRcEEAQ+c_L3e(p$fad>p&%fT-*`sPh*wf^RQy5-_6(3C(9I6Q>^ zgUj7qr-o&{-4}b+n{99MwfP-yWM)5bFeECBjbAUK{ej7)jk`|F<*PZpI-yNr_3>?n zvXS$|ZZgznUY)KV-|nZ`CZcf1W^s8#Pni8;MS~!S3%@~9?$!6lC1fwkT>P17P-5lK zTOYyBaP8)ccdwEdN}VQH%Wk+S@P$Kp%O0*Ja%PVUx!l#;#5x)7*YU|^IL~|3$FWwa zU`vd|+H|mQFE}*_?l_peB}2kjY_Xz&lXHUE7m2tcZpMh}R++!?`-7@p@nx=64Z7>` z=~m4##|a%CA5|{O$#C=wemk);c=^lFZuEdeGUJ_y-+H{4@njQ!!6v&vWqh@fVmfRL z?i6W)R;yKTOt{5)@Y)}R?aa=R>M2{8nGO$vt=uzIn zlD&o5D9X0K?Z5|K$iN%8*<>Ka6ye11e(l}Gif)qy4wye~*ms^enw`;1nrV`Ad|T_= z7qJ1)7jy4$lwBfcV(hfm?|6cT+>SJp#60Elw8>SMaD?iBoyrP|Aw&HQ3naBHA3aQLi+iosoJ0S}Tvhy=xkdj}oLIXmJ}N~tFbUX5|g?y31}R3)i+b+Y`%x5pf7 z1Qqv5^2N**_)@EMgoWAk*0Cie4jaxkJm_It@HoMI&SP)o9cgwRuOuFF>9{@eJK|I> zZ&>ZXp?grumN9!vk`!;_Ls@WVPqPMGhL=JYj5N8~W;h1|KA#co}~|h9Itj3+V>uhC6;7UcXak@SN)F z)8(J%!}zk|Pr8H7UZYm4ya&mgR}2@d5H>mxC&6=jnp-z`I;L?VWaxZ~J*dcK;Ac#d zRymw|p=8V9Mr~o9kP`{Z42+F0J5CQ~f6Z2s_hM!Ajiml-mD8nu+q-o?0p;Sxhw|Vi zbO^Yq-5>;t{=4 z6_*(g-}vKrCRTCE5BV+2o9`X}*Eh`_Jn8{j-wB%GgY)kLBo@=DfHQ)P8h>wAVq??!1kH zvP_HT@VhV}o6#^2u9ZK%sPrNPRng7&tG518R!nZZ6S(Am&hZzjEsG<;oskAHNc@F^VygWd1Y3)Z3r|32i$@b{hd z2KOS|7AqPQL3$Be!EtuLxgn32A)uOFvj5n@432~rhFT$xoNdhadyWOne=Fe|1NO;c zMS~jCG@fdgmCc-l`$zSZbW11%ciZCnUh{9`I?)*>O0D8+{!jrZ@Fyv zrK{;;=Fy9fKCRyo@!Q6&BC!dpIG(E#2mYX!rd6H3xG=&t)`}ntXWba_d*atmy)M_ZW?$ zE`lRR0ixR$%z41W_+;7njN($0g*;OQB!r4tT+%gO{cIDN?D4V&G=mdm23ChM)Yf3m za^htL&z%`>GgA867?=+)@UJ&{byoTOOoiplN!D^#=6qBzl?7QjtJvK+A*J=e3tNT7 zn&9aT233}z@BQlx<$Z;k^;sNxlUbe}eC?36{J}x1L;s(0e>-jM_|N^=i^i{_xt-dMn>!}uY+lcqQ>52zjb8i{T!AK-uw;mUr&K0i1KR^8 z4zx35h}4y+)FnJlEcyC0!xLP#I4p+@!DYeHlN1v(XgdPms#a@r{__ibkAl*tm;qS& z1tb>tuIk{(2$FwCu;1Od6WtI-v zi7F-c4j?ub^^{`T0-5r=1s)qzkYHMz z`#y1o$BGL=&m?0{xfC6ec(FIM#p+W0zM8gQnP0XvTwDcSDFG_NKucp|!Om}1V{yxO zUY;B>;iiyW%-p_%_f7x(dCKjzBxrTy|EH(JSE)_YkGJoi)&f?&SkYlSxMo({1}WK|jvIaf3uP^qVzhat_gJY+vMP#OsmmEn_|)T1;dkL~PN1RHNMN2j&cPraJao@@eY_-AnN_<;M9!S}#H za87{1)L%pL`?3&w-Nk7JyL-d_x!v{P%dP2)D{#6j#BlprZC;$*hPhi_bO@A|AJ5pI zyyXfwDM~y52cFtNa7gb_bjWh9-I8nkLrCPF@EW!U(~d6OG9&v&%rWy>hVI_KK#Cec z3(jOGTzmrFf#6`k!cpqvcH7K(&E>{-F;*o`Zsikr0;D9*&RMMb2jsQ`3XsXQP2fJg zf)>jKYsJNHXC0hfz;-#cv3c!dLzzpuhSLT3*y@FLF{gZ4(0%a~sK1;C@gJnWd{NP% z-|g&++!xOFj(ufT9zD(($DHoD^yM*aG@swk$I~PB0vw6X(6tq?rQ0h+nUr^YHJ6wk z5om9<;*GZspUe9efz9lxTP_<$wSXI}JX-}M_Ohp#oCVi44|p1{{B=%!YS-5-`a*E~ zf@|_T{Rg(Vyx{9<dREGFdV|?B$6mXbwSO8j z1)BJ~79~d=+%{20#cV?F|AW^)DwM?^aY+4maoy>Rhv2HtK#J)GqzE+v7ojiYnOx2) zD3m+7`33h~;0*gRk5}?dZ%vhYoSa;oRkY=`&@Dz+!Op30X1E{2;_2uf zX5DqAkNs+l_w^9N8GUD2D{DZ7(~JMVo^nrYu(Qarp)bIAAiE@?~6Lc9oN$vK1-PM^LKH-xT^lo$SKXnq0!pv zwPDmma7YVCgS$PMsi0_R&{8xIv6lUkVZ!gSocVrh*@hEr<~=7fS|5KtpYWz-LAg!B zzvWMB4nNnAcMDl*bnBzUS{HDzc|d09W`P_fa6p=A!BU~kGK#vPU)-eETFEYOdwgB- zUWfFHn|wKQ1&aJPDjn6IQsPumv2*1#>B3T*3AzgVgqvQhJa|YTdPc(&w@YvCXBw@z3T{QH5e_LF0(W0ZFe!57?J@3ivo&>2*z(xX!o|B1{WR}!x2@Pq>+JZE*Yg!ZcA%w?MQ6V7`nl=EGa)Q@Vr3krb= zka8Dk;sMmcHegURkV&&{>ymf7lvea)iOsE#61um*Ze_~`mxPy}fh=RFbxJ5Xu5U4? z{cz6lfD=aZ-7j#4z4&MdQho*E>S~Dc7a-*a47eCCmCIj9{(0d=4*TCpH$2`}Tv&CP zv1{kW;I(erkOf0okXENJIFa!@5>R-y=k~#!Pk)}iuJ3G@TKn^p zZa@F#;g0{wCEJp>FhG3L1*t_LQ^PK;2Od~;l?#+u6@2M!^FQAFqvv4r`$ujn$t&)D zR47Z!-16A5CZ-S6$N+6-kYf4*nc263bl9FKGGxExzjrv+-CB0XWP#i?>wQ8~)7-7) zj-Dc&@U$l3R3` z!+XEbUSX%4<;*Gint3u@7cF*etl3fkDNWZwOt}p<#e|#jn4-|O7C(-E_D+{M7CHJi z&p49&#N%B_!=ziF*bjhcdI!<;7_3R9onc?3K#gyxTY~pLd(Pa*yaz>d*2nL=q}sNj z)Tu4&IP(_u*7n)$Zwe02@sy~UzJq7`O}>DX-ZC3E?#JMqFcI1b0uO&UgmEa8J4v*A zO8k>QnAup+Tvt%ya(t6-PiPMX_ zFBe=tI&pD%MUR*Q*nvokKixo6Odfat&rjU;IN^QSfoFzpyWOw&-dIi@2$yZ+1fy6$RW_-U-LSe8F;*3kvLA z10MS^xB|(gY2c*XmcbFQ{xV~hO!4OrJF2Z8n$4C)Z2=lH1G&+<3h+% zgDuddjZO@ePijlHB|lK=*`XS-q{QmQ+v%WqZ-k8JOEED+$BMuuiUDY$;$y=b%3X22 z)kTLAw>&nCx&Y1yJ#7abKr(g~IE=t$m4Xq=hWCt;FJ<|o@^si;&wyOc1F4ViKwQ2I z?D7{FvG5t%=nkUT>O{P}24<0b6T68tzA!LE26w?#Pj& z6(x4(<;+jm9AUBfdwBM| z&4!EJU-pSLfW5F-(E++U8nnZlx3Q6vag$kof0>;}r_QM~;kNP!&|n?+KCoLZ3P|jL zxDCu_+~m}7CsLqbf3mC(slH7}gw;xXS>;%&tQ>HCYNPrGx2*D!$=G3Y_& zB_OSkCjtznThc6zj0A3T{* z*JGCWl-?G-8z2J@fK#pnZ{tE}?gK9*a0uf#(Dz7o#slfOZyor)U+iOly0V}o`DcbB zBy&nJeS!3wv%v0Aux4>+-*IXGN9!H4Zr|Bs!xL{`e^9o~B!=Jg)<=oA6+L3{;4odR zXdnU!v^;R?c_GKN;kLTlbHfwdzaXKz1-kg1w{f8ixGDPu>_LY>4gqU!rsz zJ8Tt@nEO#8r89HOW5Zdy!CnF<2DU_SRX_PDq^jpG4*9)BFMr z7PjZH3eIaU8(Q481_c1poO}i(LP{W$F-M#j?myh?yz;SO#a%0qO6cqxs4a$c(9qUoY>zp!E7$yt=K+` zqUn*1Lf}lf01*%kkh($_To?7UF|2iBxc6M5W^Vt*)Ud@T!NY@~;R)x21(0I-8`xks z=Z0H~1|8uoptcBj)eUHhy{GMf1EfjG3#)pzIwgS8?lh<_uu%;O;1nYa-W>@V7YEhj z{TEHZ6D{C&o`DpTOFM&dLGpta6IB*-g4YW-JQA4k)}u~)&K0K@udlCH*(ILB{PCUg zG27;!ch+7MUh8K31)KuGL;_@E!WT%5+vD8u>#_D?S$?)QkV5WWcn)Rsg7~Tq?7p@H zjt8?ZE;zg79jN4bY#0>+4Hb|h)xily6S6$;fOCUYd4A8Dn|uLFK&kaCq>=)<2R~j7KDNW<1%DuQ-H5=VsYEC7dgi> z+#sbhxZ|z|DR54M%@5&bEJ|~HalLiHe;Hm=rZQ0YIwH!3Hpm%Nm%*XI5bDIRB_&<# zgGOA^?4OID*FWa}1}X@TflDN?10+z|u_fG%7yZ~DE&!$Mv=i`fYJ3RU&2Iu}XnqxN zn9sVf?0EC++3gQsU)NXJHM=n2IH&?KQHI7mXxM!Uq;~xZGKO(h>wyF3D|*VT5++(# zt-6}w25F0f{ig%*UpLr)CY+47%I!Yfl{32ak-_y<#`0v7VrUI|AcKSF7{pM}vSwb$ z3c7xfkJ=#ZYp`)|AjT~Q8|Q4nBGKM*+x>faPueDsOTZ(AjTZ$RAX(ZJ8pjO1kfgc= zoD`r0X!Dn~!s34;dLsD{! zPl79CaKZPy;OEZh`pl6{HNz;^29@+W}N% z%uGbKE(6*cfULoK1R7v4oW+S^8FaJ?av+Yf5zC94FBw=ryjc5mu_S!d6jVSeKw=xT za!ra!S&PLj-P%nUG6D%M3o`)ixSR7i40_oh8yYh>E-10ERUejn zvhU)#;~BS*V+XX*0DQ(5q&X7^p0)S=0JR*F@HRkP1UaBWSqZd@d@(2JSQk(d0sEKD z9bD1|KLSS{XtlN9@eI(mO=z}|;B7nz$pj&gYU2$g3#>q7anR&1WMHloT+H#zhQ!1( zgb^17B>q600@;V)3_5N_ZgD4U(;wI=ZIF4S;MZWMOaLwXKA!OislbO!9)EA>Sq3_r ziI;I!E5lkV4uxWOYx%{Tux1d%s5Ho|HKg0ED9i-fFM0&r&VvMu6ccDiZn}e8@JEns z48G0{QghobO7>rLK~Z&B9Xyu@Uai}9U;$4fsISoi2?_8(6=W?I$e?dvgU&iPOgVQ1 zR8=)0)h4{C%Tf{oS`NJEIiBH!qGTduT1pcfKMi_{4Xc|CK}|UZl%P(5G)<0z3;zqc zEEB91L4D&Eq}GlUlQMLB?jKMTFz#wQ0P2~upenHj`>Yt8nXnNIgW^<128Q@eoNDbB T4aXT67#KWV{an^LB{Ts5l#2th literal 0 HcmV?d00001 diff --git a/examples/textures/textures_poly.png b/examples/textures/textures_poly.png new file mode 100644 index 0000000000000000000000000000000000000000..b977ada829130ec084559e88a4435f92c6320f40 GIT binary patch literal 194233 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�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�#M|D1>4r32ER3O6@!e6Ztr@R#k*pGglU{t*A3Z_tn? z8PUM|t^R*~!}aTjr9Q>)|HJq$y@EgH+m~66d^^IOoWq+PW4u}(vKMUD<=!q(P^>F` zc=dICiFLuj$MWOn!SA{?OnG|jQHKt& zzA?;Xo}R1e{ekKI%LxfHY|B{>3qR0IJl6J$XF>O4J0@$_qyyE;JifgL&1W}%vstl9 z(5*JF$CCBlns={WA3ebH z#$qnZz2Hw=7S<`rd3*nodxyR3P%laTs$@B6AnZImhuN-)*0#31;-f(ok*p$ZVaC)A@TxGKdZ|^NQ zW}RUvyy7v#tcwh19UA&l|8ecv@KL{Di~N-p?DrQl_Hf^5E1FO_;kV0-gWk;ZnfbXA z5>wgUTQbVF|7PEz!*j*qIm@{v49g`X_A%ULvTEf{VLxHJfSb*6v+9DgpBD77ozPXV zZ}{?$?f&^sy^J+0l?`+o{fwAbwwC71aGa~1aHG+D3v=}frvtkk?lD{Q?l}-CQ}#gj z3(tY%tq!NR{%9 z2?Z{hlT#;zB?&OyYxu`pk@;Yw?&-$kPne_wa%^~N4zx+Wc;v|U;M3~(1#XYx^V-Z0 zD3>^H<~wxY>~)^|^Nkw%R@GL$mSbiwaC4Qdn4&5EA+9Suzn&@GvCjCKrc;Xw3jqDqK%S7B{mF$zZKK_BL;*5^^3c-Ir zbr0Vb_iuRj`&_}dU(9TVm6~mbrfEHBebd9^y{yF8W)JI}nT)TVGX3H&vFCh|mglJ% z`Jir6HP8Eo?W>xlp4r#`XMA5jkzKF*lDSz*z{L=TxFC%~A6}h{ZL58K&Df*E+wcyP z?%S$AQyhaLL@c__om;SO;ZX*wws5yNnHv8i-Vf?{F2qXhZ#C zqC2*$?O($5;+Znfb^W*$k5k%d2~1{j@8?+a?(ufvtKj|<-S#?sy}_OR_45y2y(*Vs zru<>bx_+Mbb~Wh%0fDJM*zPP?!)sIYp8Jin-#H%NwJLKp^X1d^ZSo70qZ{Wk z6iP;Z5HjPFlViKU>A%2_!Mxxad&y>Nw>b!+AEsb zW2Su(tvD$AB9G@nW`cc#^kT=;o9{7NyDX4C<|yl+_kgu!!CsRE=a^soh`un7??T`a z`3Cd3&3epFSoJJ_vB~^oFFoY2S#p8JZ;m~$nMxkYtte*5y3j23Zh<$uBX50xI>VKf z39Rzfzvb^JvdFLJzEi+A%dqk7O@`7{33J6RtP#z)#=hm}U-bfhwiV6HmQ%auGn#ZC zV)H3pa93f2t%gFiqW88L5)PY%Huwov>}UT_qBFrJr;K%r4{zBgu@gEs0uL-uja%R> z;Bfq59rHYqW2`m@d6)1_IpKjF9I@c9*|zN>^|^z1v~4+yZZj|4iSv6foZX|Ld=Gfh5BuX5IO}8Ri&1 zWO&!e6sx4Eu73Ojdx->-L63v?fq%^DJ00q(*slcNzHAS#zZfDF4XU`VWgLo*%RUq8)!mg(-kv)p^`I}2D`;@`Dv zwrs^K(aZIGZSp-a2l#mTnb%Jc`OxIV*Y^EDDX2%D%Fz47h}nPLq_7Z%`C>=7W2*lP z?`Uso<*aaLzMaoz$Eo4IQ=lMXYQt-h)HpaI60~24! z$J-gzRQ~0tSSbA=ufLjK;@+OWEHQH5`W=NT+*|f`s~&cLaI~5~|9(ovFOD7OS#}uC zmE2+Y$G%{(bw-F>iTq*r2bWY6A9MyNY~Rq}=l|<_x1)D__rXI~XE{dsc0N43JDq32 zZl9J0@AK#4_ni44yFy7p>&by?_^2VXE@|V$>*~Zd4SUTn_8feT({C$j-WC56>Z`Lp-+}tncrsJIWBX zkJ&1=OM1urC-wy`ayzVecbL4EXBPkPj!*8vByF(=Z8>fWEVu=l{pK>At@_KZm&$av z_@nHOpOPiZxwSRkG%k;6bbA?jeI#zA1Aa z%YV*2D<&}RVBz2Lp0nhRKL3YvQ~VFuDDm$3@KOIm%8vR2qVaPU*jm`zG3u`iVS2`H z_n`2S%mGQ+2Zg&1sFpSzh+NlyAhmbZ0oASrl2hs(3@->d7#0e$U63`NbfEWR`T96^ zJ>}nwb9`%#7l>CJlFZnD^78Wj#?xZ|jd%QH@0&IcTE7{9wwN)4InBl_|NgP)J!X`9 zeTwZ(K@F4Hf;i^>t$#m#Q)SM$tYiIRSz*HBFE3>uOx!sC9+P=TeR4(pd!d4zSESkO z9=!AxGFruBv*&>Hj>hfz_WO&uD;|GSzwp4|1Ivnf9-9Nfvn?8BXXMN8Gy22w?m0v6 zuK$dAE&mv8T)W~OCNP#9;{QCK|9~vde+Tu$Mkh2*Gfe;2u&w(K%e@6>4;4H=E6Zy;zu>R>0o53(0~6~msJ)M`uQ&X_q+iUOd*t7zUsi`7?+$O2 z?N2`-ymlXR|FXZQ8Fu}7%Uy6&;Dy54_4DlvV{DmY*jQz9#n|$a_SgLtJUrKZy<~*M z|7Poe_jYy3KR&*eueio^MMI43oJd1o{ZlrxTT7p$N-PO|D&eqPb0f2K{{ps8D-R!+ z_{VVdGsAaQ2L7U?A8aV1Ka2K2ljG5I&gdYe7kDaIi*4@al3wSStx(v-jO(~)lpza{uA{L zA9YlexNLTbRos*>n9sUG_#m5&2SW+x$@mAF-V2UdX1F~wFQ{i$|IiWs;gZIKMur7! zztbP^oaKLT!fr+JA)Xi}_E#O7nDv!wxbG}K$nT@RAn=E{euKCJleOCa#H&>bMi2ZL3$C>YS74c>X>S3H6CmN=QZ)E=N_2^Sq}{`dPl@(rgWkxQ1<>))CGejejijHk4-GcWmQ7 z@b&-qcXQJ$_P$p5uw;e%fu-gLlB*r1*EPQWSI>C;@c!DLf)!idlz#}^aem$&hWCPr zEccGoK0Q|3W`3ae>4e3}kq3Eyyg$%;dV%lpS+}ANNQ#=Zwfnzov{w1vSRUOVwPBN1 z(Sh3s{~HxBT01u#VEgBO;htbZ^Gx0y{Z7XtWA+xx}S`Dgq?hYTOB1ko;HX}G`*Y5pez52 z|BXozW4ir5M)&viHUIhE#r$R0)BnZ!M&Tnj2gBnZ!ptvjgykhLOJ8aH!Itx<`CCpy zpJ*E6J!7UjX$*I6oH=@ccMdC4ZWQ}nt$(sN4yG`dSvbsIcz=IAyG<@niPg>g569lt zKj{A2uzfPKwbz{kZN@7WGrjX+ILmalqp|N2>s?9aUH)uW4koh3HE?(-FNkcFfAHI) zK{nz656_B^{8@XLWqI!P@XhjMxIc-nL}1C~Lk#nH8CNpSWWL0GyPoNlOoNs30zRIc ze6|XG&JD$^vpyy;&0-8<-nB%q4=6$2|o&8LQ*-O^5Rd7le zxNc&+EU`jZQBCa>LlF0@P^Pz!e=zOp5wxggxi#m%=#7nRCmXG_d=8i#=d@}1&i&y< zrr3hG3AOthWkW9XNSGVgc6fUla4>)GZg>}x$XfR8UW48N7QMO2Y;pU3K06%!;NmeM zo;?Ry-Ww(Ub!b6<|1y52x2j;}1;IjyVSc z6PL-$OFD@Ew`DH#yT>&Bzd`XQ;{r|&<307?rFOh|DSp`g!L9PL1m|hZ@>_P!>0~U) zKlnG=Uvi#(?lhb+R@7Jd9DF3Z^__w;egdJmg)I7WY zXBcj6;geazW_GFGa1TRSgM(~W`GM4k1$%Yv9e*1%@P4*G;K!W7@>~1EwXzFquP#U| zxUh!tMU$=HgBP|1sk{a6Kl!s=c=6?^cevylnK=?m8ouj%=w$kSgyB4sFiYPy=IFKq zwJPNj4!`+DM4w9d$yglwAa-Md=(H&*KREB4R%G7u{E6&_!(VwVycaXw$*BMPjQ2zC z%SQ+LPNzRG-1$B4F6+DSf5!_Rp5lFw`{});NaJrSmqyts`|Ilr8V>!lFWC0jdc)^Z z=@<5OiiK^=?tYB?oC&ODhyEF_c(Ka3AuaV@Z4IxT;>%mT(g&6%*f(z0H{w}vv+MqY zr*1hDo_ZfRW}eY9kG;b1fpx-j#w!Z!x}wabehzaR_8(a4>vJIP5dVd{!Us})7VK4A z@SDwXx%XejbN+=JHZ@OgYLwctfcHtv0m=FD2mXpZm?@ax{7ZksXNFrp&T+hn_`}eq z%iY0t&Z!~I?MH*LntkJMhXd7q4Rf_GMSPJ zjI-7zu)LeVzA;haiX%g*&kP0kDUH&%7M%Xo5G)KDyg#8ZBkIE?ody3L=4uo?XTPDy zSnA_&dcA}DS1(5E#s#Mh9cN#1+$?9`aQaw7a52w;ge$_>#WWi z#xwdn2RwfAzp=Q#qpG)2+QLCWPyHx^)lwdjefo`?lbRka;sFI|K|Qxkm1N0#&w!Xa z853d4yHwg4PG`&jpB~cF#-Qu`;A3w)&!I;L0*j{Y=b3ZBjaRtfRTJxtjSs{V(*%Mi zu=g@EzhBL8Pmys?#01$L=O6NC95yf5^6l^H+dT31dl>Y%t4=al1&NoGXtRH)h~RWJ zW#fF{bIkt1i$6;@FPGfm*vD>`(0D!4pyA#0iq8*CnI|`>Fe?}6A6Wd|Uh;<{@BQ-l zhH487$vUR@=@!L5bPgZfn=a{aIx2+sYC~B~!i2!9i2;|cB`2`vX0hpYGRlUY`utMz zaQ=g5_tMw<8#Y`!w!h-9;EN)+HhY}|-ai_avuLjHV)So+l)mHhM>Xab#|i?P#Y#SJ zoiskt=C6mc%<><01YeM25LC5nJ1wry=)Wc? z`NozcRcDtdt`B@74_tfyyy1y&5I?Y&;at~=lP3*i*v}nm(3|#~C+5{x-W_i|Tzy$< z0w23Sc(JvsQLV!GYyJaUl`5-UJo$~AUEas-O?<$hm&-Kw&X-5JAC71~NGp)@vwM*C zXg^PT0Y00<)0uZHdB*VJMnd9)mr>j0?NS+XQ_P+iGu-=h z?$m)l(H##@?o~f<_IC}B*MWlnoNo;NvFkm2$TD{k%beH;;v#7bKfA>%%8#)x*t@bGa_O zIl`Wx{(--MQ&QjHoujeIgW0DYf6tpS^I&-~M=>{pf6VU#3haCSvzcuE!ew!pZPR1z z0<#y!8#W(fD|zmousl}AVl(TmkV)baYWo|?uQU99$J4XFf!*NGbC!8=swWh*^v)zO}mak4=67?EZ0aay3rkD<&)HE1&-$exs3j=WqE9$!8dC*7ZE)SN^b} zeLc_rhL2Ux|2eZ=;EY)?`J}_Y-~4+lgtpv_7rAk9>V#>D6})pana^(c(3Ixf;CeIAW4^}sg30!4Cj@8G0)k^px42!+d7e{>m-wZ zaT4R*p1-_zYS{JuC#L@3zmxy*(>u<#?f&nX(>3jyq+RwLn0ROXf!-SjP71SKFx>F# z*fO5|4c_(d;&(IIoeGKY5V^7QVOquiulk2qo6Ad7h=?@y)?_9ee=7b#;{NsrfxniE z`!{}Xv8nwflOd_yJh4@H z&%dur=H1_U{==`s{A{(prXMCveeYnp|3EeCKZ6&qUNPl+Tu-j}^g^-V*faUV_x83+ z)-g+;I%PGB=hcDUCr*!;c#;l${o$W~C+Wui*9-+SZ`FVB47P9B%-;BKACLLE_|zXf zG4JzVzhc-k@sDM*PC@Wr^#>;dm=4tH*Eep@YL+@^zAh%Mf_2ZwKleUg=ee}W=)hm2 zIR}X+!f!lC9u;Q0l@8yt+)>>Z^KI=WwDN-uSgWtb4VfX(8?Cp)$aIa~#M zrFLB8d*jiVxghF;k?w`J&ksaSvOka-w%}>;f&%ulH4WcZH~it=BPv`mpU0Yc#buTv z@fRGiiU~4})1EZGb4X;;vt%x9IbbY*U?%&7yK@fkNxYB~x-e-g{{agzmb`!Lxi6kG z-mCa0ZE=~^>e&pz8;nx|r=(V}-C1&8UxDRiLzA8=%ezL#x4w*TMSt=}$+7d8Usxlg z(dV#P^n2q=&MOmHb#FJxit||cNp8u1Aztu}MP%864*_g?N15lI`U=`rsa;U^{O#%T z1J;>!h8&F6R_hyIzTy9n_M{zTvmyy8C;MGu+ZS%MugzMYiJ4 zOZNvagOv{K6?Xq7mt?^|$Mxsm&+>=c*YB5nXIFW40p}h0qJMuR*)FVovA~;YKeM^j z>ld#K=GYcadU);YY@P+a=g&7ho5y-?Rn7lzvmXi@)I6Cowc+@`du(M_?3mMiZ#1a8 z|4n4bZTru%huPW7OQd4TN9zYd`igDO4=j#${B7#sy}hof&-34}K1b<_M^}6o>|Eos zhKIjldF@9g>GLuN&R(1plyu;xpxJ{pN3;``KVz@>#&~5T!_EJ!Tb?uQI4)gsMf=6E z619Z(hvEgo7AqM4aPRmyhjm9d%a)(ATU2^`IV*PCPWaDWbx?(S!{?u}E2hn6zmdVN z_2aL&k?|ppHw*^Gn~fXHRxqCzOkE$x!t!opQC#dw7?)2j`I+(nGvZ#h^6EqI!2bAb2r z0^Y}e4m@pCI^f5$;xi+ttLVF6absnJ_wj#B)?N!#eHZje@n5i+uv5OFkSj`w?N!GI z#;;9jTmCVc_cy;&c=+fsqulR5LT~>2&u=te!E9Z&AX4swoMb{pgeLTZv~*st{|QP5tL@vISdhq95{X%RX@EW=xnZY4Mve>&qX8b>aWNzgGS* zuO*)+Xww95j>rb}Hx1WL*;jv=@$l>6-3JaPpV&0x{DF%l7p%UP=hqq3{P;1|G4%YL zhrf4E=VAK4pV9w+|A_yvN#{bR zBhLZ0f4ABF516mD-&;2Gq44-3mzX|o6kS+o1vk4fn;1Q+dUTEJvJY?3q&NYtQ2B2lX2vIwEe(R*9E(^ zB^rD0uRp*iC|~eJUSvbmtW7*xrzY_%5PWHV!1uF!!|8bu4eI54+4Z=8|NYE=n0vuq z`vc$08Qv=~n*C?`yI11cn)?hkce|u3t{;nU%RkWj^?t*0H%Z3+1AFTp3pp2g=^XxN zTitki{|^Z}#_JE8&Gd{J+#g)MY9jGX){bYM<1g+v1{@zh7@lBEH+;u<`18l^={yH^ zs(x7ee7>XmuO_RE13Mtz^5UE98$>KWOb$IxzdzQPsxp+ZfV$R8(9W#3%kwtN6=xqk+|I*UpBIKNu^f zv%d%{4tV@W{lh!{G_|k~t`ir`Y&|cpn0S)^&YeGheipM`cviaLDUXuSqX)dt7ew#3 zY&d<$;q=XYjPFwz&vrDVaXM^fUU2s50zSnTDcTp_a4KI2e{lMD!$0;|gCD#V%D=zA zUm&R?23pYe|G?tIb2Euetddq{2@n4gLg06yY~~=^foe;O4Ku0H=J)=ex=cGb+fGHANCzG zy}TBW8NJRgh?GcsaB+VS7ZVTbQ^^ClUiT$#RGfA9z6cxJ)CBJ`R8={J~^(|NDm7a~p4$HS+4FJxEJbR0N%(n%cDB*zd)+%_ZXO z>NsM4Df8dqSLCv@3yE=(+>z5U^P%Mj6IHb^xiko}@Z3B`;w}h}+1pVXLvGAAe2bDGM*Ygb< zq*lyt>^-yb)B*c- z=@oGd>FwuYb{$@@hUJd=hnLLE;u&QO7SRmz<}%K+`NnFIy=aLJf8K?zE-vGSJcjfn zws|*>o;tt~#l>QkE3qY=aSK1=o+IoQO#HXbFIc^p|ITEFJrP0`Hx;yBglM?2eb_6% zAhOB-fQ2Y?*%X$>hd<`C7KyV9Ur;D$XRZ*sQU9VyJ>c=r@8{ox`VLnezBTmy_{;w0 zK%<^H%iOT9j5|vBN_PL`fAF-;zVTZDL;6|=>9vlVr4}d`B+l*oe}K)(gJ;W|uFjdF z7TI6q_blla-=WWb<>F6{JsKaGHzc#)Qa-}+#^)cS*^{4*ryt&E+{~~*`u5IB3&&cC z4}tsN98k?s*ze`#ZT#WmXM;VAdgjcnSG^y&POWd0bys`9!zx|CDfvQxDeuACCubDe znZLLEVLo^74|CgL?FaKD)!a_JeYN27-g}JG%^SZZH0T-qVZWn&h;2^cPfi;?NfT!# zuJ8%F9hV3F{ly={$2uqUC(oULbL@8}@L64XsC^-Rfx#rUw~rb1wmxD$#xJ}fScPZT z>&IWSUj!cI;qjNZOJX?d*7z=m@hnec+A4?BdmZNTUO33RpqW{vL3Yvn1AQDTij_EH z_OZ|DNMeXxbdv2(dJ$(u$=0d6Ih(t?jW;a*CBH-DgKqPzmoIcqWSAO(D!T*Vc|R6# zgOpjG>3iQdV*^I%340c8;<0Z${IS%n3MS07M* zXLR7Nu+twIo+>FJ9PeCmU=in<3uo7xu$?`;sbY)VVp$JnpU*1M-!YT1IN&I_6uA{u@t>}c#w z%1mgME^)XL{XmYOaR?x^EwYd7w9AzDND9AA$utX9ygwe(*`| zLL5uthh;?%Cg~}8Kv zls@dJp38WdVMQ@xmdSqxJws;G1OJ)Ky_(Y^9Lkq8_+4k(DLUoXe#Yq-Cb+8x`g(boHrVo=g(uk6To_FGKPy% zow3Yno^8c3hFj4`j{KN>(80U!;FX&_j$v+d9^UDE%(GzfeW&7IZryi~>cn&hH{mnj z`95E#2M;I8waw?r;aTuFqQ3SY!<|cvIbw{`U*op4$e3>U&k||wq{~-H=UtiuYxR{-w{L{WbvY(^i=9%;M_a*H9G4=gqiav8G z$cxA4!0d&Rjox$R;&<}iX<2uAK}rIL%~Z}EB5XSre*f5O%_H6*%kp7XUEYP4e(@6b znB15CXEvY3&FJ5?>+=gq<|k~0oEJKm@{~79pLIN4;?V1JL1+%U|2-!2OaIdo80Wos zA}hmiXY)daIf)hL3%+v|^m7(``TcdW`vGreR*7@5^(Q{OQQdI((1~*jYI-LXIPQFA zxb;AfZI4R8Wru#olFvIj_81)Ye(>zW*6!(sKdN>a%iP#J`QYi(%?}S;+so4*zbCPR z?aiJJCVl@9rhCT~*yh+ym^wX~;qJHEHzyK5e3H?W41BOM;DBn(fny&wi?5f+yIapQ zk8vWS*)RJ&m7FoRzD|FrUtreBZ&Cd)J^#o7HXBB+67HX``Qs(t*;jGix$u9sV~ex} zGs~>4OnTW&rc)#vtIb#%)nhoB^^YX8n%(=^VC?*$R{X$^&?(_8`7Z2pe;r{D`7C#X zQ9$rXDnstMI_4hjyabs>sR#QTkH2fm<7D@1G~B>!Ua^_cdcvFoH`&7yV*azgEoCs9 z-kjik^mZ@vIy~Ae5mt0#MWmNtNRkU+= z{1vm>_ruUFJm*qeAooE)TZQ>&GS3>)$e|7VTa#lCp#X8+pcA7?ql*h?4OW8zm$V4oYuHm8*7 z=VM!g+~&M^_Ooh@RyhkE_c}g2$ZRwBwR(ZV17m|dam>~mcornjd%Cnyec49F(_Q5U z4$JN{lz5e4u!m8vzvk;ZY3Io2FWkOd%t`?_SGNdA+-xuRwHo>^MVFAnXBx8HA2z|fz>synxmS*EtW;Ir9}A{(^_ zLbKuz*oxWPF~4VElym>ZwByQ)Yd^ht*x@$HlT0dK*jqA3zQIX;ppB_fh7B1;-%Tk?5~ z4kUN+e(9B17q|0>0z=LLdHa$UMiXmAt~Xou)coyhWVU#8j!ov|wTssi6WH_C{rmo2 zy;;( z{IggS8Siy6MJ+nQ#N+;8gY}1VVrd2JUE&s-nQr}Oyj8<{YX;w}%mn6N;#ZL#SRt;kfBX6JsgtX$BMO>cn>f5ByQKp#WqybJI;R8_>S#tLIKld z5#bAQ7e4M)Fm{}qbHP?=e#1}4keC+7NY|N;G8Wt)`EUHLV0&iVi^>J@=T6W+i|#=?Xcf@^fcd^O@Lslm0X4O@G9mSMc}OJM99s zriqTBQ4=4^XINh7KYu`aN4&8Cvvl$MhS^KxnbL)KG^#W2WzS1vyQ|Ka^`ekjdSTLm zwsYDKI=(djJ}+@^|BquI<~z@5e0eYZgJ*Dl!{YVq{qd0Kk#h{le?k7&Szs>z>mA{$q2_NLonbGX`jVZU`IiudmhiqnN9NmAOVtUU%aq?sa{mv@xIiWv) zdQW)xZEG~o`g!}4CWKF8ymv(J><5V*bKVIT9P^T_=)Aj}fBwPKbrF${-gE1krGGCt zW+lF1F+-HpQI=hMp31)nNeL^EV!1ECcSl;0VONOIi@b!_vYYZ*Evi{>1%H;W_%u`C z!=$72J`a;u78@EjOsn$b@N7)?KOlXpaqb!aGYgm-8}AxENb5g;z<_zK)X@|F<}+@& z&$`9F#kr&1v8B25p{&8#eGG5EC!{l#H7u1-S*m(qbEuEQUxoUQ%+f#Y9lUonynM!Q zkobpbUfDPK7h#5(o^AgR%v8IOI%UDRd*z@V5Y6I88l^uu{;FfL)|lTo`_E4Y>EkyW z$`>(TzEKZa;Wv5nKj!aWYMAv>MVRII4)DC`Fl4lLi*KA;GNJw}Pl=?1yJ$VD-tQ#F zRlm7;gfApAELhssFK3f5fkCf*ciBfH=8SI>nJfNttuR(rU4DYWYUi7e^SASSYMb@I z_v5Vtk-Qh$K35-@d}l|)+&$UL`;9x8ryEzb?=;xMDA#?KV@_xa>p8BMo->&GOP{5C z@OQDuss5doc)B-z@zNKdb}#54=rRYl%OJY#z=5^{{0}(8?;JSB_2Sd+_j{UnUL6Ro z-^V1~@!bvH4qiTY0{{(I3`(;S9U(M*Db)*%*I%d03k5fo$dh z)A#cme@n#~bujD8r#u!-w5Wb&*Su$$8Z-BXa;B(xUnDA?tWo(;_Wrs4J;MgS4-=W* zZ5CjjcS>ck)^UcY_y4EAHQx}daQwsEM&XkCW*e9fF~=cw_Yc zvsO&HD*xckf%pXHujk{_+RP73Uh42$G^9bg>}W%p0ke7UA4a|CM8-0+eT?6AJ5HT4 zWKlV0yk@3d^TUhX;ymlttvm2EXud;xc%$@97w>aQ`{a_8p4-vJ5<2+kLI)p85 z{hvRTwIoT8`9)aSg*cWEw$cYQr^g@Qeg41U^tF8q=F^++=yJq-W4-m@ue`-trd#=p zQL|X*i87j9s%N+?#4gUgf%y>Qo6Ub1Z=Ghbac|(Znam`0^gox)7KRd4ix(Eri5EB% z4j3@%o@Bb)!1s!wA|-`RSDz}tv`qcNvRuamDTcSH ziHyf|u94<9^XEwhVk6lbqvXyY_z z*8k9SRQ^E4vxiTT7<3mtVptZQ_TV7ff}5NI@f;G%`y1ybUbuLE!P2fb2X=?=X!srG z@Z0Jhvws(JYyakU^$$0m@8&u6EbYP4=mjp!MW7`r-@+aC>Kt(9-p6PjZpdWqwY}l{ zt(qSUHYXZ;XFvRORhTELjfUez3CkFGk zO@F?;7B5IPEeQEzUZD2q-qYDUUca<>-W*6ZvTy9oxUejqPfm}G^TEr&PY0~6LmIbx z$=g;nF`8KMNB!rYAX#AY#3Y8hZ~n6HI4DuV&a%Sr6sL^t|I=q!-;`t;|6#h< zRQK(JBHM*d_oSdpJn8=Ni51K?jAw3LYHDP^@qyKJ!On)$Tk06THh*)fVSRTnfhBKA zUD1Cz<`+k_Gc`FMtPGpOvmn*MzR|nYVe!8OY+Bab;yV(x*kn}O@4P$9u;_zE~-CxnYy6bYG2JC=6gHNpE=F*?nKSM54<%3j6XKHT&OZixb=u}S+?1OIsv^0 z_oiBJe`mC(=9`Fxv(hOA<~b{WGuf>Brd?1e`QnVJqoZS6`2jy(es=xlEpv1ZyFaMw z?mtkg=#;czcetIQ0fV*Xf^JF2O!h4c<*#V6+9Rw-#3<@+mkH7rlNX+gEDa>vj7n%>+fxML2_lV#!uW~yIkWL;3haw@^TVeZBI2bPBKIbds{-zY2V zS;^YQ{{20({+XI%AHK*H@Cy{|yjPu&K9T)~ryxUFRz1V}&dP5*I}XZ}%zSoz{Q*CN z4=x-2`#jjArL4|3=jiX_2Tp#Q|M2JG>pXuBSfnw&Gp^*^^Z%K!fsN~vuaY@`VkNJf z<&jL=E^4$S>}&tDC9vjk31kt14wxUp-}v7Dyg`GW@ozpEUUpsPhpc^4#f<&RsSNYf zz6js=kCL(P4B^94xa-{{d*Q%u50k_zR`HP@`l6lpP!hHhc?J| z*Uzar;LYPIVaKe0jQOtj!etC|L=#!=J!G_D?H1e--qiV$|L}VG`3=1(Vh@Ct#2=W; z^j~6K+@6yRyB_pPRxEiZ{9wg5{s()xdJar{U47uMrhMb#7Yl+X?x?hE_`Uq*LEhlB zgy*l!KX`=HB{WYJ-f`!d^@nqub`Lf#|8$_6-EsP`2{dJB(N|pWI zZ{8TIBZm%f=kzom`XK#b%S!Y0b_`$lr#(n|%w$%_+9+>wIRfum`{3O0%uAbuqAw|yzPfITy@Dut`R`6gA&yNz#2R^JXoa`^W z_*?xzNdJPYsC?sGj)3UDr^O%a)jCk^7;-g4!ohrHx3`C3!!)_S40?i(8SXV7;>l^) z%#^P0(3`g*a>4Br09$GMvI zbpNovX=%{A_n4_H=zzKz<6({`^%sP6FR1p{H+ny5`0JD4{>Au0o*nf9V%b(e=ylO|3IJki?Gk)2X==@G)`oARb#^xSMZZ<2j@S#4U-RW z#?1Tv;h*vY!=3Xb?lDe3{g*BF8Yj>B_yaesE(jgZKQMD?|A88|S24!S)~lQjq~_N* ze&g!kWXeA`J>kcXZ;FS%^S^IUKRh?VVpp<#bNmeT!{rYqp5@oSo3w-3W{uk2K5jX%(Y2DN=0NYhHFp*q(<|`gDF|cOu||H!y*b^D z@)eeH+69-5%{Lf-60MNBrvKo@5A_7)=a;8%=UE?D$E3HF>D~;!n6N{v>@wS!cK5$kPTfHz@a{75bgLF{5 zgdB6f)ZWs+d>f2EG(J4~S^R+8>-q%s$MT1l=f^ixJMJ@XkjlJdl=Q&bKB8gvJ;(CQ znt$I!D=x|uSX+GvStozs?Ck}8!sZ1fk|jR6_8Da?75yw3S0qesAL7Ybv%m63%foL+ zSM!ML$FS;s{mHzin5E*4R)H+P`i8|yoOhld7#*Vn%0mvE@IuB-ijnBkRx2UEKFj>gj^{}`fgFZj#kKi@9#2j85; zUq1x5_;k-~l)hp4h@s6gBc35+^3UV`3!=AJN?zG|MPf&TdaPlS-+ZPhu3IN~vpW7W zzgw}t@VniQb$l1xKHNXxd$s96@7o2n5^o;(o;xu6X``{-{rWm~c@u_PD!jWMF>NV- zz+9lunUUY#yO_CPKl6uo)0Ura^xoTGtm3e>zCrfna(+2R^Mjj>HZcADC46INC1cDt zW~saXS>NasFqyX-Gg-^|9GJN#ynlYvw@JnZPSa%?tu*&H%$>6S0Gri|NzNBE!(UtzDcJ-rsmFtkrmIdU;9~iM?1>bfNITf@X1t<>?=p(j{*+CjOVclE_>p zlwfT7f5G-?&3X3eOlf={Tw5LNo2^t9q=qi|z>>EmvEuVL-X9WiW(n@S!WB%{%oEfl zS{!BdF7Vv3fADFg{etSyhA-j|-mse+@NXz;$eW(ddavMrCu7Oxy_4oJeK_Qp_CfcP zeB*J}=D&O<{o*$`f3wed8pLw%CzDtHf=K7W2W#3pr-~I=K4NY=@}q(+Os%YK?(A>O z{_&gB1z6sB?=1f=#yr2rrl5JB!r|xP`Vw`_`9F8oe`Nb`X^uY6rB#ck3-(>J1Xrs^ z+7G-CT66IVc#hTKs=$OG#(S$7b1wd2h-+fswdbvJLI3gZ{qhnmjoB|8d$r3Rus!cz z;HI@<_5rpzD<@nxNk~Y3npVLb^X}91nZ1l#Dt}!6ex4`hKx9X|xjuvR|M?Abo5FdD zxaLdn$k;Y)XWrB(ovI(dkL_Go4bwaw);q5iR1O^Y(BAv-_ zKi}T)59_?NqsMseB>elvU+|5o!r8LGWsdBQ^e4<8wrE|@z4YEeoP)_aY(Zdo*aN}+ z{~Kg^FR*=oe_(Oq(FS9M<^3|r6WHXswbw0Th?%8)=Fl^A1VUca;+0-sxp<-&k!I*E>OUBqBj#n~G zX)ES2SZ`9;|KZc;#`l4Yx(Auwsx$6ldC}UX ztbXP4jiVe*B5>8$gzj-D1^vvFYD^5*QxyHg*Yy6MfM9lk!{!Gpwv zfGq*(KNw^FEnAh&vrpg)cfqqKcdwW8^w_gBs26G)#8?+kJ9wpdi-IiZv;hfT#z)Qx zC7jnXvLJogERH+2JEuKV->~uL%cH?H~*Ed!R-D7s2P|p}$7vET|+VHxw;d{yl zW_>x4qzM55jD4G$zZw2#DsyV6Hf~t_V8QK`I~%>7_AyW2W>ZnXUh(C*eB1g1-OTry zr}zCyXS%1uWHa|U{{@)~nU4N)_mX#%KUZYV$Q02pV0$3_q3D41b$x>l2J@)dvn7l> zx(f^&`Yc6R_2iSD3o_ihd+^AIM^DY!JRfMh(|_=+Fwd{e}gfH|GT@XKmPudK71`yTJjvjd-0zPG1t$t-LXH! zD6{cDZ^(b%9Xf1VWPD>o8yQP-*6!J*b$DKEb%S~pr*Ta!x6LAn9cl6wE$0i~-|}ty ztnP2ThvA)a#jhWtht(hG2&^bP$F)zMdB>dBKZV=c`{j&lSn_KAaa##;TWn^?+VU@% zA%vL^K548)nv0aH|`1z2(;H6Lo=lS@A!?Gofk5@lmFX>S37h_S*S@G+7_=7hW z(?7(`&Ug4<%c}SFA^W>TMqTq?%rXC1ZtZ5e^@i`&jYhxZU(9ndA2Qy1c#y4x`^6Q5 z3vyGQ9}r&TP;KsT`udT^)B79R6AT;jTGLsMy{vz*!kRh5Q+PumZ&LHL9NX$Ya~QWw z;ViMTcZ=AdA{(-$3XAVTp zTmSyPVM7|DgRJL;-XHaio2_JW=I|(3+cWknrLmMrgEE=-sTmH-!x^o8>KlGJxa&1r zWiROFmS^zqVS34`dsb)~Q<+(#BD<9ZLy4n&#(Ulje}4H7CFU0d_bQy>x$}Y1s+DU? zplr#^2k8%r%>5obD`XWFWy^bDxPQS-nF~IgE0URZ-Dh$6&(vm^ah^A0KYPZvX2z=H zydE+plRwI5sB>>H<}Fh8u+89LGJCRH%U9Q!J; zqyLHJhR?rwD>zm3Kk&_uKM;KL-28ovHoJbQH}|&x&+xQ@4nDcGA9&%~vbZx9JT050 zSditc%dA|mlh3$d$!zu=_KqH&j1_Nmv=0YA=sD>A;8(F>rXic#1CQU;3C)sQ*0`|k zu>5Xapnqtyxjtw+^}(8&|J{zPJN%u393^dpKmECw+m^jt->8Fm`i>JC9!&3#F_`r= zR$Co7UD#mEuiqfP+O~>mPAp?y$n}e1$rY?Ii&QjE99qC_vzD{O*(zh@nfwQzMB4WI z@I;5_r&jRWY!lznJe|=*SwU0vJj1Oc)xW-Eeh^YjEoFURBpkb z?_{;Ie2f{$25KZUWPVK;}1plxw@fj$;G*C z#>>we+0^}Lat!j3sVG@x@ET;RRS|9*c`#XrG{B=HT0kFtX9 zy1e-lwAI13psfjX3u#aYgUxP+U8*u$zOe6DBflq8W{XR=4c2oEdERDV2ke9;v_AG{s}RZQio4U+;3WrCli8{Xlrl zKf{JAb!>Tm*zR6s+_i?kq)H^iMed3q!&#w*emgd^I>$VQT%G5So}@frEz@#5J?|gm zU!JTRp!+qe`39bvhf$&otU+Ymh`J7|4Sr;L&BfYt|m$PP;#1D>?gyo)IUTusfx0$RM zU$Yln<4iGAE-*GPsOn%8xwhbUii7uihu>ii|5$U|*k}HhtB{(xp@XBq@`^WGfJNgY z$(kuf1#X-rbBtCT)=)Wg{)5;J#b<1CP7JTE{9(L*lj)8r%bN#<%+sx!9x;?yTd5aJ zn9hI=|$<+M3e^zb+I$V4ck`snYP1 zdCI*wChMQi!nX0OIgr|4-zaWnxA*@9#w(00ekw+LSf0IJEiP|lQ~Pn+!!ym(5#3Y) zS*FF_8{C9XgSxE@SDhG2t}{w+n0S&^<|FG}yT5Wbemr9|Tcpyk_?Ca(z0?X;o4W82 zHqY-Vv1I&k)3jt$TD{5z=?963Mkv-E9Pm0_Q5U}l%;sHere}jxXbt7kzJ9|+WXfmhmH9>{0$G8tyDXiD~fKIKUj14YWH-BI%erBXAVfp z3qDXQxWL1dk$Khr!o;-)jJxU?->-d;&T1O}-=INitxx<6$98>2^W6Vw4CN&a-)$Sr zjOy9?n(XVpG4BX}V&5$FVO?MTf|;@j%U@ofzy837zlRvC3b{%=ALuXm@93`DEOlW) z^oy;H4|#7H{CoA){ezL2-h)jl7h3DzIPCw>Y!=L%8J1xF`rF&vJPQJABQ-S_+^;vj zv!_OK&m1p4i)5Bt`3G6wtSMx;`~T5PW3~Ww-YY9ond4JVoMMP-I>NO#MnL5_`=0Nt zF3o8M4!?c(G5QxVneK7)KJtz^fA4fAxniDKu0Q|%6=r_H5gDNVgnL6XqtsjWy9Vc& z?)+zXWwL?s@DJ_}KT#clhUzO&RapWE{%vEt(c<{iREnBKgxW!BryT>8bq*vq~#k3IGr$E%Qf#)5K%DKC_n)_A7nBrVGcDcKRgiLYd zym63S_v7#HucZ&4zAfIcx#Yd%Kc?xawzVH-JTxn)RC;l5f_!`(lluLC1{MtcA4OTp z?EW$LU#t82)YyPyzflBJ|HOa4`)59s{E#=V{QNhg7zRDYDN|YQ*?#_WIU^HZqe6~O zUI;!zGC-HbqSaOMAJcnwhF+=v%w}@)?JLh7V2-h4-4)``b;IE)x`*HBWgUrJUD(ep(V3OJUmo=xw`xJA!X+t%mU2Wajf~Q{$ z**p`NLqsYjTOE#np!@KX63_ic<*)to7_R^L&z6_PR>mb!zdt>JRc<$z)l)7LHxaaa?#SO+RSs`AG>FO314dT}rt(oi_s|D;B(&Zhp-|cKH zkNU%M&;6794$TOske-L<_PRf?Rej&EnR)*|2I=AhijVaVqy}s{l*4oAz~Z)8t*S6txGF3>N%c zP^%Vm;56e;%f{}Oe@%X$fAPMl`IGpAVNNK6>4~2|cSx!<@aC63sMP@7oN^#niD!M| zW?lYyc1aVa2_*ga_R#up_yZ%o3zwAY9&D1I5Zm*=qS4slzl4K%RkPkbVbQ1QKRyZG z@MemY;@orP{qyzfK_{!4f9QB>@38Uw0p3eI3sO@KxM|9NIB_%oz~q^B%-`8IFik(- z_)avDHE-8H&L{Wx{ujHW$oQJIO*O;+u>FO3ycbTgI21cp3pjT@|l54}m^ z$!}1fWXSmacmtmxgKj=^tlkgFjOiR7zGw%uKT+Nw{6+kQ`-P|V_Zxn0b zAXm!$>HGBfe2F@S{FTp{^mLhXS3PGxcdOyuFNXOnY`a2bt9DJ7_#ih|{y=K``9}9= zO=h>7(-a)G&#`BpSM*JC$9|5IQ`gED*#2*L$NKiLAj2>2E$2I=Ek1wz@>7{D(M*v| z^TA!61-_pbM9S$sI9Zq)P} zSjfj-{yr&S@^sMYkbL@Fdt!oED(0VVzkXgq?r#0Tf-eUw+qAdKGd1&8TwpY~=iYq@ zwusmays;(|(j?YW{P5`>8=K*Sz}5bZoB8H9EZ3=JH50nopl-= zXF+7|{`d0C)7}0iReXLT$eeNW;!pAA5-m#_Pw%c++R$6c*H-@CQM$8n_QgoYxjbS8 z%@YN0IHf)pOsc5(W>*l_F!7NNPEQ?sMgO7n2OY-Z(*-J0ers>Id{E;Iuie2{-{UX5VOHPJ zdHO_wxW#Kmo8m4<&KL9b5Bz0bP;E1%aWlvLMq|DG`|26ql}}8!sQshD{DO}=@qufZ z&w42oz zg=5(lR#<2JXU$lDRQ|!!R)^D#n{|2~q=x%E=>0Tb!a?~-(}8NOIGfso2RPo?7&5v4 zt*`mZyGP`Me1ZN6`vZ_bk;IJ`#^YO4dk9b~u z(ge1$Z4r&%xHvu;HcaDglzRNXQTp&f@ehR?4Q(oF_-noxX517J-;k)w6f^BOPmYH% zb9MNi1Ck~aZiqj~5zA{=r>k`^LH6 ziVrjc)*Ogr3pgzOojplQhr(fl4v`RT}?0@-#Ap68T!w(-%zH#_{aJrmPb6*bI zxum}gcZEOAck~G9VBC_zQ*uzz_(J~zZf45{cfaPe$qsWb%|GCG?*IRs2a-yP7nYSi zc$u|eruc=whU*))A1!9i_nyuoXZn}(#z7|8RSdgo|GocT{~$GK!A!mjMY<-C)mLCF`-5xmdF0gj|(I9Ir_F$4rSeRT}xWA+Np4tS4yXHw5 zi`e(LyEiyWSWG^C^z69@n-$9f7dj% z!(X$@CBDV&F^HPf*9Knq#Bex+J;g*2TnS$=Wr=7|er&(5J~4rP-kBo@e$Q>>wop37 zyl3@e`GO_!5l-_SexLoE=lQpHDLXjtEYW4l>DkC&%{}SUCZ0D3ev8g%RQ|c9zCrv5 zqqIf5y?x@3!@7(yo6jF)uu^R^y2b7ab-@ZNY+j8F@mU9XW{l2NJ zeqshp>0Cz|UjO{rsQkvhv3FPfg2!Qvy(J%3h8=jE^}p^f`xe;{QK;ydYietopFO-?IVUZ z{tV+k{11Ac#y2ScUU2)6qxpi*jOLZie)de;(i>N|TSz=r=|&6IDJo-l#w zoh5_r+TXl9^%r=A#Xm^ITqx4IFi$Gr@XyD;uOFCw)4t*R+J<+z6WQ)D{AaD0&ZTZ{ ze7OC&zof(O0Eg47TpDKYbS(F4NXz-rU@Saslh}c$3GxTb*V;4XEfZ%rYsF|?yFmJs zWuxu!`~#}t3#>!zY8YZOPO{_#a2q!K;qrRWBy{M2a%a8aABMam2`LP^8-E{Wc;(Wd z*Yor9d+~zzOyWO+4qiXd`>y7|(~>g>{+i?*cqw|J_qn{?-UNoTCmPZgJ8agEIq>D9 zSVjLa^#`oA^$oJ(7uNLfY*?(sa3`E8N{a2)0luhTU)U=Q4%$E1wA}u`qr2&5g9fwn z#f;Ol8{g$r{(K{PWmxG*2%?L9!*G0 zKEbf-uxsS;84uYD{s+YVV`=*?zt3oje@4QF;v$xJ2buH|S@alZ-@VBflFd6ukx}je z!<@p(Zx2`xw_krRxufy-x+AGeCGXVCm3()1&+!jyDoglJWK1;%4N@WRtoy>-c>ln~ zxB%rpA3vKPxV*ff*C~N{(!y!{68cZ**_lWLUtQ?-(vL zDWRh3KjVj@t>!%b^KBD;T0KJfH>^X7o`_Qum^`sAz+9^kiO^km*5 zDPQtP^n*!6akMvEq-iRf*#o0h@&_JwL|Xha_VDaBieb}B{mmD{_Kme-JNt^mpJaDD zoYDH!{)1TMgCYaB0OuJq9eq0b9YX{A7_aPLzZ=eIb?@ur@7E8sy^wxz@kk6$*MZyj zEE|4{JN)MQ$0Ys6$?3pf;WJ~D9IMqs&MTD@8ISR6{E=|@tyNdcJ}=`K`!)V~ zGZTItKXB&U83pZ?XBb{R;9yGUaX8NL|JU#4MtO_XjC=mFR!q<<@MEnw&H=uTxHD*h zx3FWirNd^nI|u&Cu5XzAy0JZ@(ORm$;ke*`#<;eh%ofh9v%V&>n_Y@$zRdH&;S znxR&aqd=YB@%7YlkHEs&gf|3KgI_y=pmeoWC!i2BPK z)5LC-Cy^rmq9QKufe&-WWAhgrulCm~ZtrUTzMbLmPx}x1L?3(+{-BYp)>eNYa>n%h zI40}%H9SH>LJ$5LERf{C&?X%qCBm*J&zzf5&l=OWeA%*tAH*s)$-LOd7r_4bd3_q& zg_p?-p2nPSco`YyIPal$!T-)Zn}j}G*^z%h_^h3=!T%)o<<4;l?$Ra4x$IwDF-(x# zyQSW|dE!DwX5|kmW_1aB?(VH(y0NmJd5`{cac8$om1emD&)eY-5)LLmkk!%_TbsOM z=7sYgz8w{Ai~ha6@%^>R&##n!h<)F_UXJ;DQm4@$#s>4yu17uVHRoi2F&vX+hY!N=7xGE4`!pYJm)sAIb~ zAZx?Q&Gu~hH9sZ zhPnOX2Wt89@!|ckh?LS}D@#a!rd&{eeDUu05)Q}TFl|?7NN=z>Sgr5i{7k;_`;3NfFaEIa`YL*% zCLsOU)!X3@*zD{Jgnz0(;F)ewkn&%&K<(kn$J-xFo@WucL&8DbutlA(POpIdwfTo*RRM>kQ_Q$O z6XE|~{ zH0#B(lr}k>UQ*F8mos1n>G2NJV@{nu z-Rz&So9WIC{#_b^B`XfRuU}B>@c-cQV~x{ha5DJc|MiP;M~}db#_B&m6r1O4Vq$)= z#qt8r;t3lJ3e4EHl)n%^d^UKuobd8VGE}Oq?s0fZ|GSz71UQ|>~el^=V2(1(j+dPnmr4a zTIC$5*7+fEq~UvB4SU~%{S11wKlx&wmArpy%@**um(yYu@2%5}R{J~IceKr61+5`0 zcp`NrBZWcEv-we?xm5%e+ck-7U639qnH8EzedfUl+<3maktKLIKGqwAS z`llX?PGpJOclGE}d zzD#Xo-tpf-YKMO-cSYla<>mR3am@WTe;Hyf75{%E+7=z2$CO@EXI#VHcd6M-=`>Tm zy*O)`mdjC=23dtNwt(aroHsNlgt6#lGr!Ykd~2V;uGgH*dh_5Zj=T@ef4+(Bcqw&- zF=#?)!VlIte;Mx|;=QB)nY&{0H~9xeEA0=s{=46pxH3QKkOIq{)rYv=eA&nl{cAz= zmHo`-?>;k4KhrpkZ)0|G^1cjo1dWZOvxK{8+O_P<>0@dXAj_%gX?>{oU-OVu9NR`8; zOROaLmvjRABlQi38RslvcyCzwQKVwAl|fA0{tCuxHxLeI9(C_21ZlNq;)aT%~Wq7RH|#cYKsDaoIRw0>@$X2S?i%Y)E6jYs|!x z9gyC^D&g;QAi3JH{CvavG{$9~ALgnZn0(&h^jQaS+kK2>i=H%i-@M^qe!ThHdIsx9 zOiTwJH#N!z)jbee?|)!#*n(Q=|BZ8_-4w1Fn=#2np5eY@ee^WLD-I*(@6Tf__so5G z_GvZGf)77A-^{50%d^Kw@J9M0wsTE2RUcwfUWvHf^=u=c|wowx_K*71$TKJoYWvz}XIlYGNq z`}Bi%bZfS_z!q*aDH>QY8_n{7*3gV{58fQ#JbSuCOXKOxd;6>SY)W6L9yY%4(pmnW zLBq5Se;CZR{hac&q1y1CkxgCA+=sj$Qsg8bY!WPeu;NwygWlWn4d!meA5R!@a2FbM zaBCRZu$yuHXYlu|`ust4!@=|C4jflJQtefq{$S$* zpL&Tprs=2u{QcO(ShDBk{QY-$y0mUN7{?j^`B~Q9IK7d(LQ0gmdCo?w4a~}CKCtgN zDYM1=5l_KS@r<>$$_0@;D-t=f=KTMC{Md)T-`NwY`F3Rf{V(3O-~NW=zKu1h40o4* z{P4__t&&+eL7nS{CZm}YFYi}LxqG|$_H6ybT)@v%aFTn2;|Zoa(TsQG&m3USacTB5 zV#=>!lPlFaqk7wctS!X_9}NGnoQqk(bolYhwd_0#_)ZBw=wW`rap(Jin;fc@ zs%_@qG8XGnAasT`BjQOzogG}!Qyx0CWELU&Td-UMxW0rT06Io*S@$Gvmz2y&w zNzyq^8D4f->C;?q4F0g|iT+~G2`%2hoFC1uSG|kZ=GzbE0?zC92@#r_n#}Gy_cKf{ z<1}t?d)WH3MbhDW<{yT#7c=%VT2HuB!*l)ITvj=z4{|$VI$9ltcDTHdE{NxO@kL$j zfzlTC{&@}Qvj3Q*4=?Ebu^^IXfzyYKzh|wtOa5!OZi!?LXspUmNCM z;v#128^14W@G}=?zIQ>7Vb;>h|1%%57KHJca4YF4onp9jnwiJ?f@kdgM)C9}zeP-E z%NW${BxXcNHndCqVJVZVXZU`MA$@5>;wiQ{ven<7SRT%PaCFk41C#GtG|INk|6j-S zmVKTFTTB&)m%BnW=qys%dDqW3=CRK`#~O2seb&sMoNrz`mcTZuKE95R>H~tZH zGXB9|<^7Gaf^iRoY}_6MZWnqqX@Y9z0pAxj2mV@2I6&Z0b zKmLBR`}qOiUokx84eAjyBPj{b>_jl2~v@7X`NxO>6b1OFROdpRio z(!X!VE;s$uIR>kPo(wz6o&EecZfq1x`N1orDHa%_TedipQSX?G4 z`5=eOnmMDBcZJ}OPfy)HJZ&pFP;I%dwoOKqTS|~Ux8xb?J5C1O)rrqo=Q**=dHa*m z=G-)YrivDW4_8*$AGj$S(EL$+!^dx|7Dl{L*S?7C_%<)RVYZ{MkD$e4raOxncclna z?D!!6ppNOn%YX$-z3wdF{qjfVL26+AJ_de0roO)BY5W@*{9CJ7_lWq(?Ks{x^}T(; zYt9Xhf8OdJeq7BjVbNf|!Mmf=@DJ0uYk&U!mb`O;^{pY}yXf>EtaFb3;J1+y-?H$Z zZNdG+@(J!-TlgEho27S{Hcx(d@bGb-1*!!;^^ymEMKrq0HA|iCIl#wi&i_P?>w;Yy z|NMK#9NgYU4WMbJ5B61GIvBU)@NHpvDQ?i$c)ifLgE`$JjwxOFM&si53#wxsyl2`m zS#t;-@V$AzA@hah2e!Zc>wiifY21GO{{CY58VQCIHUaL>tT#;l^!P3N13SUE1gW3r zKm2&<&6f6H(#G-wPvhzjs!#pcAbsY|fk^2KLE0DMcmmXgOAha3`B2a@|3IYHg{LhG z7ME5wR!2HW?{zFZ%(>@^;FI*Q2R%pfAKaTIf51ST`CaA@{x>H!GWq{`#FVF0&unA# zU0?ahB*y^t_qGLQ+*{b0O9GXY3&Q$E?<{7R$HR8#>lfJ-@>duW+0WS(GWo|c$HuKx zP&mY3wUxW%`$^jen~X2;Ol2t$HrM#PaYKU@yA02Q$!qEuzGoU3Gv%v1f5KRHW4=)h zd668`U>@-*PzavcK|k zXCrGx&qjfQvZued`yXJIjc70~is4D>n#8l9HvE0V_pXA^oQ&UpbTquz6r3uUoWOK$ z4kyEB^^D57TbMr7$v?=smQe_sVm{Jx;Dzst#V;XeX*?3Rv46>&hZmdMdDhRXO))UK zoE{Ju$PmBo`@`4nY-$hQuuE^)xO~OBlMGoLbv0ilE6k6xv*|s^Fj+D2+n;Z`Y!_lV zeGbf3T%hc}pW%I3#otf7%o!nf?j4@)=n%niqaZoiqU;&R24|&{2l#CQUrQG->q~QQ zU}o6U|KR`p_XpZ;v$F*}{wn@q$?E+F&hf8s=gyJh#o;FtN&SQQb^W&6) zlH$n^ul|O!UHG_z=>WHoBX8~nwa@woZi+BVv$G{KKA6Xs(ERz{+-jca>u*@@tv`6? z0MDH_yt^LCY`Hl@v_er{|3k{^lnl` zFYgGmO)gi-OF4}si-z9I+1DF3yB)Y#cEOJSf~<7XfxS!%_}Wm7u+^=d37?v|ToL=Ivy{?|+ zTu?*aCic5N>lQ3vkg=`j+xJ&`3)f5bf@fS?8f8qFRn*nl@9g-~$+$&Q-sCjPti4QU z)f#UsSe!qzVK@6ergV3g#?xEsnBJfN!Q`XA;3j_nv)q-9%x`})n11=`FjwY5hmG_G z$MfuORx~ZEb0~T+`%+`IYn*-U83wNGvIqBg0%{DHtc4cv3B1^mG~vF(T*nK0l@$Ir zN!?V~yMT|k;v4IZBVCdb>GciXZ|fM-dk?64GG3m>Q6Sd9yTdS^WykcF>IOD-%<1PG zroRGhY+~@4-!E^UDlmCcnn3uZL;*&*V(#5DK3ISFCw1YUV!-njL5pCvS0)CG-*XL^ z@1Eq@;~->GUHtY_=m*1{le9h^h~#EtyI`dEA+`O#g8J6RZ|fSY(jNG}Jm7MGJw}Pu z>MqZng-m+VEUou1i|Zd;o+%j>ZP4&-;)bSa35?cHgBHc`ERfcGAHVn50p>Sr^k;0B zx$$x`+q^Z)PJR%mkW?{OmM*w#{bAdm`|~9n=0>`ym9bq&WHw)aCxPK^vJ#7p31dmO zmG*|sXLx<$lMXyB?K#l*NBn`#o$m1WjlU;JNV+ssM_BxbXsB+nkhsxcthiwDl9>(R zcQ-Tfb6(iwC$Ad_8~#dwTzNPN+G%!h@@#!5uB^^%|K0jQ#&72bRfP{e$yFM*+0U;t zSTS?9QG=fglkU+ZX0sy}E)Az=*VQKODE`OPyk(PB^DMIu76A#$AGizRk1UQBZ#W&% zp#Fy;x{B#Q?-~Ag^AaCa@$88buu%H{{BwQV?EZMe7qg3*{5zTE`LOO${quOWKF@r+ z{pmmWV?KRm-r@4%v-<2XYbz@#*)jX+LyK4-plW2l0NiaQjXz! z{|AQe+%}APVQh0JvFvJpc<`_KfmE~o67QJu^`1XWWVzq3$ey!iGn4eo1*h5mH=6Bb zp1!=n&+!pMp4C6LJJ&x-?l{i4Me)~d^9O9D4<<=)CM<7|zLBu^`xDN?-VaWET7KSM z!eVE`>FEu}ze+Jn&sv~r>~lbPu0&&9CI6k>9~f^e*jxHr@`J_A{XFj*r7!Gf_75?- zdX*vX*8kH5k8kC+bx&`6{l4*Z(UFF^f_@3k)7W>cdHr;CInRPN%gg`EdEVPGt?x}{ zyVuH;WAdM=uj)UO-r8NIpRINn{$|?oyouA|@khZOEH70z2p?j5bEJm#oZOwgza=XC zJ9U~D?crh0I4P-JV9%5hY_a0;0iHQ~8E5j|65zMG$*uDL;ob5FYlPLAUu@C7@K?CL zQMOHdK`sA*zw-YZp8I=pdK)&RO*r6vqha~*dMn~aA&;Y_>f_q8ynZ{_Xqsm=09kiw*UU$1OY*D=4}uE zH@*+6MuzhSO^+Jn0W_ZxnP zI>^eKJ=m)jbD-99LEqEq{qYj__EsJJz*6yN)0{ar%?t(qFV`ouGjG{AhqL59=Z6-9 z3ooPgJG2Wj++~|}^C5fL9*5Jn_tjS)Ww2Vwt-^0rz)&K%c+Mgw<`tXE-XBtB<9v`- z8d%B6mYT4<^XYZ=50eZTAMERWf55La(O2$6K@!`CT7|L$wZ01?_cosnXY?0iF6(H_ zWV6`MZd3Ksy5O2u!$b8CE^VKuzcVgiNOwBox>k7_+;2R7>L1g&d3$QBr$5yF(6s0Ofxd&*4?b>Q zb;;eFz-3Qd*gqjy2@Xc*bnS6T3@7YB>rN~*~iUj?rLmMY*fRn*Zq*O&#O7D zu8!fVCd2f7dl=`{9pT#}-Xy;xhwaVh??lJY()&6_Izd@NThKnUcpCihN z-R5F9f5l{5`GU!|8Ty<*zAQ_hP%FORX|&COTHX7N?%%l>ul`}xlVmRSaqwOq(ePXO zz;b`a_p2^2p5xlfswe)7@6KYzTb~u!V&<_&X&vRUQ4g2dv7Ox{`hdO$!yfMzQJY=o zx%N1-nN%NSoO83{BbP|I4v*0RUcfmJylf$35D=sQ#m@!vuL!;N)KKuzX3Q*>UE>j9V1{a(@W&3*-z;s7gv} zh_T|Z*~#NFj_0W;mL25z7y%- z&C}>^#@)%y@P5|Aw2I32Y=_eyXokn{-;?}+`CLjt5tmWTzaP^a-Gb*nH2skF?`rWh zM*rWx&Lpf^fBFN{jf=mT?u37qf3dy2Jl=2*+r2CQICmKS{kOQCXU>60Z`lWlY}540 zcouy5B3IFHXz%QP35Vqz`@ty0Cp=55V2xo)Ozz-I$ScPQC7e? zI{U-XQhs^+q#ZR+WhzXfSa$Th{PtCv=k|2Hv;@{Nxt60T5_JvVb~2l@7H{G*`1Ab7 z=?{Vxi;cMpl6R>T6z3Fd5kK74dRiimQTk4Nj#8;T^gqwa4}g2>~A<-x1+(l*Z%hh=1n!6JFfj_E-2n4@!^tFp<-TJzrBO8%p0CN z2i!DH^z1*-C$?hoN0}Rz3GDaweh|CCn9MwDAp>YA?MxMWiL!OU`D4isCT?1=+sa(D_7zr`Qb+Ng}`GE7AH4uc39BzMX18$ zWBP*}LG2HJ?$sY?=7_NT-`H=-_L4Q1rJnQ6ghng11-{o5{@Fjc$ENt8b?W+t*>fFF zPrmn$bzTD7oTE&0SFm0BFSlcTi};NWcGDlJDT>B=F$exC&pB{Y#Vo=3$8-4$o0i%i zxSE^8^S_bzyZ?ciY!_Yz-PvQqvw)9x1vA5|l7rKV8>ek(G;8x_%=coyFUl0-_noCe z#3(~vFk{*){eqi9FFKMhOx(Y~Pcq{_+Y03)Y;yvc?kau~+!5}?ATe*jU)u$Ktn4p} zoD-glmfW_=_-rAa5ypArx7c(u@2KfyeUa~{TJ~UGA3u+OBfFu;$&ZcZcbn5T&uExCKm5Q=iM$2XmX6XF z8^70abbn&DKD}O|W&ggU3KpN!{ta{6zaRKr=3-GPX~$WUTJiapShIzJ{@>q+PkeZC zj+c#5@PV!2tW^&dSN&}Ce)Es%Xgst3)asufc@FQ~d?2~1ac)AITiJ)ZwoZrs@W?m* z?zCf054^|t{$B!XnV&tg|B+vuR-)a(T?bFy?`6DVxVz?=h(Y}S^dAg+*0)RVP|w(6 z0jq?QoD#lB+`Cv}1X>*8P{_d$E@7yVz0z<+<|@Yba|BWa804;UMY-!S$ms5`eaUtB z_wxm|QuY#gclNQ{6n(WkES}&zy<2$4Nl}ZebGpjs7_7cc<*hi*VBT+V_+zuWq}-id z?0f7V$uqxjI?(<-pE+MtJmJDM!;}k#rpXsBUrr4O3QbD*^-Fli!ynAe9TQBL`Gw63 zl7Gjy1s^|eRKxmCw8OtY!C=d!)CmlE6=I^|X*YH~Wnj+8XO{o4E$c#umHm8%A05}8 z9}rA<@Gp@qyV#a3^T8zj3#nc6?d#JkKE9JKSa~^~tyb2Tjq^c~3}~m3=mXYzwYFUc zB$*$$)*fK{@%DGWgoC?EriO;m3P$tVdggOk4E%|y4;bSnu;1EKBW|(#17F6u`UjI_ zE)*@)KfuS4@z{+20`G#wp*tIR|GdBd->ByIzuArA7N->$_dJba+Ocw;w8d)XU2p%0 z7pxQ)FKGE~{-Vg{!LPbJxv~dG^NkLiy{R@vbhH%-82EdAq`x<^`zn**ptps1P=1FR(xJy#IZpxB3E1qe(Xrt7p`HixB@((=q*IA(IzF_wM2H92553qgCf55~4!s1^40yd)! z2X*;){4Y$}^ZdZl#09oW3)=q8xBo9$*N|`boLP>SXU_}48xvC*&D!?Y{p8puJCFT^ z9peL`E&2y$3cEcB(pP)XnY_T(X~9k53wPxg+~f^VVw+pXI_E|r0~0N-XY;AeX=o+?I!E3H~-{! zxJ;1WafQFcOTzwxlZ)B|wlcp5K0+CuH~Al|;nL{uU^x8S_`@Z)x`aB$vpKcw%LFe7 z9{S(#>=T3erT;8tMfOb7@7`sri5H!o7L{~(cO z*2c`}%t{?<5L`QYE8>-zBw>3VgBH+Drces9b$(8yYC*wFX! z?(Q`05C3Mo=TY~IO}Vk{vqAHU6)emd!uvQ3*8H@XA*rLYMRJR;Nn`nk8n$!${w5e~ zG)%AfAym=8vf;4&TybU_Pw%;n{1(v~>(`z?z;Dy**!((@b3>t(EK<#xQBGtp7% zhTsL}xVq)p3pjJmY-0A`%p}*!HRof(U-mtsQWmdxc76RRUeM;`;>%l+crU!odcB?D z9?Jru9q;D%I`Zx?ci`Ib<(dA6ef$r839vDWF|s9UO14FZzc;Y?Ss{HxkTGrrdydII zmOP&S>@uGJ_-sNuTR)03zbIL2ejs?MgR$0vZ_DQGVypP_({#heKYSL_j9D_=%+lM+ z^Y5eu1W!r7z!>+ajJG7&Dq#PtX?o2DALg+dKHzF#1B1Eb{mL&AH-50bOJ>wN_>+Im!=LOnhrYb8zmWU%z(1}H z?jOW=m^TXVu<;PRky**S=S08s4apzpkFdqPQsuT1<$Q7B{DHl~O$TO9@ITOZc>DYL z4ZR2ad6W+LzWY=(iD$u5x0)Ioo&`@G7VsTUPgp#k|AuD*!}dKhB~nt3N;-%uHho*( zkf*{vSL>_1#coC`N$xElrMI**mn=V?|DaahNr;JO(ix!xY_I*<3=`PjXcycR%ZR+9 z{vfq^eIsvj+y%oO2UP7B9Q#?Eu%p3j*JoyPh2|gj4a>V~S}zot!OG$~f#v)LzJqHv&gLEMG5!VCZS3kx;dw8Qm`8vF{FN@GMsMJ4lM_8w=j zn#r}}R7ay=MYP@J|MPkB?>FhOJYg!6sW)_Zr||O}!#m>!zZXeKZ239tcRzk&+!5o& zaN`2|T#s+^7GCGsY)W~ylt0lg*m>E0!ET4o$_xIg^*GqBIdD7jAEUMKfz^K`{xMAN z-pdwO!?DXlaElLj&FsB1EDnbzL^0$pN@v&0W=`c%dtk`6z?*+R^W#VQ1^&V-CNo)? zFmB0|H<|rKe8#joW@`bS17E#siZ1c!H=O=s(YV>y=78ja?fQ+gw>288Z^_A~CzGdg>e|Ilw0#lh>PR!JXdnrjf3jT3z zQ0B4mV65QY)2mxx;OIQl(al%1f@>PnVgCo44&6U+`La`^dVFpDf2lnwZ!AA-^7ni2 zbdk>iNqN5qfd>vu-qPqE@jscN)W^O13MdPMZetcGjLr{~?dut*SIn^9VJvg2s^Q`9`SJ%Y&uo~^{EzM4`hy?mH-42b2xKoP`G5KL z^ar*If4B}L+cqvfU$yPOsI)X3|HLGHs$af_ecqL$2R^V>7(NhxkaOn!ZTkbWpE{}+H|8%86Jd#4 zcbw6#Nu*@eCGH0kH}Tm2H|}7Z&h6RVWxPUTrI8Kuy-WWdA9sJC7XQGG>4C?8*$0JN z7r2?dP|=Zm@X~X^Qmb7DA{WXZsMT3;jxA&5CGQ8dqG`vfcwT84@oaCLe#DU3{Ym_u zzZ`qoAIo3Recw2Hmp$|JsehUDPA4WY$eus-V}2`R$)+pf4?H8Uue+BzVVV$Ip5u?h z47=2y@)yLPs!m{k!q3lNpw`jv$hX7f#I=J=JKWpa8EYElKFs60uyNgjz48m5CfYY{ zc3u$49B??&DTc46N~qva(?j`yKiUQ|4(4<3?`EG<%Tzk0K|Q^eS?=O5){4!x8O+uf zW*(?^v}4j=^qXVO!Czea*jY**U9oSQ|3JCJ@$}TXzszxA?04@o&ic!=^Wn|S=?@B6 z;~9QD=P#J{%Hji`uq4}sXN6{Enr*Yg^Nef$eq**de2DK&Pvg6}45eW^DlHE1CI_%H zmbjlxe~`nmBAH>Ar<}=Z7Bl%9ADQC4IBaH#S1jaY&MV-%zNcrhX_P_u=sm@17dB&D>ipAqTq9 z>v5&`Yh%f{`U>WlcRyw&K6;|pw&#%81JC?;i5ro1hJSwin%^idu}=TJZ6ZTl@%ayO z670{{-A@THH%$8A-^o7D;5e_1q~8q262}+j4;Y#6U998rvhq4`dEGywJ*;JB4w7ex9T;QMF&pmj3S{FxH>{_WzwGmj;Pjm<{thxvx@E0!%jdO*vhO8i8| zR7eK4U~!wC(7OyWs=cb^z@KSR3CEjRZJJK=-VtWH74nbuhJ-M)*%8O>j{h0+^#1eT zx&DE>;uimlXD{9#XuHq;K;w7(gEj0Kl2^hPSQr;@au=v_GiUr~SaId*mrE?+hy}sy})xa%ZIXp zya%i`3oib+y*};-_i}&`|^Y3VRAzjcpS))SDImV^O(bu*0;FTj28rdtBv%hf55)@2iyHL2E$>H;j z#$JoM2hZ}wp55okZ_N9}x#!P2(}Mhi!4D>>KBy63RxkJ>v*qD*S&L79g?DV>Dk+o~ z|G*K&_`vt&g44W?i$B#jK0o!3*=*C!2J<7Q8K%!FWOo0zvvK-)#_iq=->=ssGU&Gd zV&%!duvewNLEUX5!}Pa%SnkdKD7#~StDwbe7Ae#Je?J=+NS;e)lY7u%C9EyX{9;-$ z--D&~2b_BwY6aEUCfquIpyC&Ij1p_qA+}r947*I{h`!Lfu(U3zezJW|5p zd)bDD8TvX-$paSpKrTU(P7|`OhrIlGED-K72Yf{lL>I&_q}}TSbQG zhRtUWAK-tpWFPxEu|meXY`dCSO;&&8-tnJxOUoum$ACQ!g)bwoI@9;~qpx9E_ zfM?3ps}1c;f07ee-*Ga^<|&-fKk-4VqW|Q1{rv~GulUcbXJ5^3v+%9Bf$s-q>o42i z$EE-H{9C%9Y~oZ!6CIX{`;Wuhl-c_X*4*9G?C29U>)@4R9gZv&f_55foPsAw=*`)2 zpdjPD;)jp>rd@O6nfo@C=gpb;hUw1#5*{!v6Rvv@c=pkOT8(Gt_zv7uOSsOx!-VHb zVA_wbeT-XT0wWkJJ}SP@lSp{})wp2i_3Q^{KP?b`>hSZ~&F1GkZw{zt+;41`|MTxt z=R@fUX^e6kby>bF-mrv;dHoEL!)qUlONQ{Qb@#pst)34+)^@5vTHLEz9P;NdR|J1I zfAH(ijWsT8b`Or_1T^zrNnqE#xU=YuPP0)#{=wtwXPWnqIc75du7Y>^ zA2b#oKVU1o;J3Zc9Nh!oYdbVo8*JF{kwMyX4bK9%*I)PEmYf&2|M-U==ae5zS~8z! zLA7KZ!)^bElAb(n*Pijn9ANua{ebPQthSkP0i*w;s_(yS58s`=UE&_IbW3?7@AByf z+P2T0Yr3PkM5;nc^o5fnqn+aewoI|M{|6+yt{+GZS&(YcbAat@_Jc{H0qzG6-(}q~ z@u%>IPap3;kiMbXAkOiRp>NKAhFP3Zc3*gR{9!9ObUFP2Yt@2@Ndb?4D;M1TH~sv6 zNuIMjjnx4v4a@5pXP-LoS71S4-US{OZJS0xu!V+>J@fbA2K|f7W;u?hiL;#S2|#;^5?+p1CHJe4)2&vZ#c?oTnL&U|KO>|fwPAWs0J-a4e&WrFXv*WJt6nL>k&F#S_i?RnMoG;$>zds=RzrK+-`NF-)@9h=;F};2M zlhJ1DYwZmOf3e<(WO#d);r@BXn0>59ueCoU*Kh+1)V$FxIL218dZ$J~8`qW;z7j354eyUI7)httzvxJuaC;x~bi-Qa zzFWo(dDGa<69M3iSRCT5YA0nc=7gXgZrbVY0o(-oALsmrB_r=Z-4l8vpdgwIlJ^9oH+;fv+=1n`{^+C zDs*>p8+A0e{i=+V{KxG6+)?>@PR|{l`iAWW+|21g4vTm9I8^36Sh0W4Dx<@n*~=y5 z;`SX_kiO{X2SJNpf7y3DKXm8pjE86TE#{fuc>LPFzZ_C`pQm29c0K6=tJzACR22z_ z@6IQ@q6{^dzt`+xI+sD-M5y&ID!izEmL3#K!esFaftwr`PW&`};P(2z!~SBX{xhjb zEax~F)0qx@&tWh(Xn1G!kXi44;vasSt(-S5vCS1b$`P}Uf8Tnh8;wcqWe)!sq<`!= z5Zv>RS$gMz)b9s;AK&4bbs(_#gAZ@P&dd4_R+wZwW4%%-z_hNLsa00LphSL4q12Wu zuhc(iB-t(4t-^Zb;AVyeGkF7&Woq2n3szoJf3U11;IVj#l*o%B>wx9XG8Mu$8QY%N z7Zlqvf8bd2{lH93LC?SsC&TC8uV=jf^&|I=!dbEvPC^CQ+{`P2KT6*yU@t9lFb-P~ zymcSbcRhpV?+XnWrf*}M{;%f8F$OCo@sjux>$XW3R`Yvv_-!I`Hz2BbsvOqzs z^oMiZ`UiH-s^?kY`)q;Vz3PBlOmd7ow+`@e* z;K!Ju&-P-A?uCte7Hn->FmrPG`FN(gr%p25+RgY%;@*z03>9{a+{_xfjeXx*?=1N* zxkrR|i-^BO#RG;HN+;jnZ=9aol=iT}IF4t5wM)bIH4OeASmlg9aM$n{S{FP!dhqU) zht?matlpdb-N@%vc3Q^jx6Jn@oIf}rX41(6d^RT5L_oOE)Qf(35x|WaoCxoagto z{L~%%b5x&*KT4i3eJacRQ{O~)xWBmh_&m>ozaiyudzk0iocX}MC4{eH()7tw?V6V@ zn;eGT{yyjAd>aL2My*ICGu_$)G|Kgo;u*iD*izuH1)wJDOXvww*2|=h7Eo_LL!qA z7zu<5ahux=?5pH4w#x9uv8Wk%WI22(AQ^hp>}`c=~WKBu^0aFF8eQY zVCGzZo&|r|k`A2xdEoCgo&~9%IS1IZD(=m7t#wS(?{8q9u4}vZcLU>=^^epGjy+c{Sb0|e!AigR_IsJ%zhyjI z(O|{4ppQM{%RlA~pV@XL&h6~%e#m`c{(^Hy{2$z#+78-GySU78x=@p~)`8^epAEJa z7bY!dKd@I#CT2plvK;8H%Xjw~N_!l>cl=?0=lGLzPVU2m=WKE(b@=?G@9(c;Iu}-G z(2%DuE;ccp;jJ#?(Zjh9dcQuneYsKASU|o+@xk=-_Kn96)iIYb-H_1f?U9tTt2x2& zs>gs)Jgd>lPGNh~y8_0y*^FoP8m&whY+yM%rGV+Z4CCD*eYQESKe^|eWq!$g{sqHh zp(Fn|-&hzjPUn)dt?W5?irGL8;!OT&d1*~ zW?`!`IH7UU&}L8VOh=xIDS1)3s)yYl+%?*`a^eA7>7)aEr`X%pAK0t0{M@`0hTLt> zna-tsU@-q{%y{|Mdi@0)>FE`GchpNiOKmvJ_~uT7(a)pC;s?E1QX4j_&pFViV0_`- z^?XP5Ifh0rX1p|-vHOO>hK96TEk`8xF{MA*rXP8}K=8)I8fKd!$tmnlRF_IPh>NUR zp=D6;iJ|{4Tbb29hRX&SHy_K}DYEHGKG4jrN#gOmcaG=tws*3+k+AXUbjbYiaq#?c zsFTA9jj0d6uGHi?bKtk6-M*h}c^!pZ1x9~Z=2;y%r+DN5-yXxCkK4m}7W`#7b3pL^ z@&0^6jt|_%1&q`888E*$P5AR|+QWBW+j-W%vrRWBXDTylP=CX5vdietzYo(MUax*| zaqoepx^oWj?s>5F$APDI$NA?bGTiMr%Q2_dqW&LW^MnN)hlST|KX7^KkB01b|C#%z z|2=zv(dOCrgMW|nEO=^szES#!Vd zz;Msz@5j&5ZOio=e>*pvZr#yftZ}{J_}f=2G?>g;>e=&du=YJ?mVVxIU?xM_gDuD6 zA81C@90=Yb@qZ(u`4anNhPRJ@@Xgtlz;@60lhlrrGo&q=_+NQ6NUd9N@o)VDKAsOp z^d3yyn}5GHfgx7qhwv72rXBB@w%n8767tf1!$s~WtFK}=Haup0mp*}^Orwr*x^>~F z4NdQZ7)v!A#JM+ZDllqD)4j(e-5%diEp^}-^YLBx_a!DVE=L$yN zB6jtH{frgsnF~$|XGDrAbAR}8yFC9O@7MkI4!ke7^UOK$SNcF>#Roao3qr~lJfjxa zN-t2Zb=)ksp!ezj2JaINvJ?6bOf0*g!VPaUo?i3-h<5M^5ou7Zcu$K6IFlWnqP{)3O=Scm7)anJjFN6;CO%y0t z_CU74Q$XH8?mt6$Wp1(I-pOq5DtCNmn6WI*CY{0bhvQtP3!n5a6mDE_?sE2n)Vds*7@q$Pb>gBT zNfo?%0^Z-<|NQ~)H~ofoRt~1O|9Re2G#PPZxUrbL{vvI$`qQ(s&TPrf${*aSF1&rW zz)ws=#^Kq2rhAOcuW}l#3K!h83OL>+JL8_?X8Zhk`dKdIvXD@*1VVn53d)CMgOewY`#|JVXfo0G3@wN~@! zH*S_#_39PRg1@#-2a=0-E@_dlt6`ga;%mF2hGCl{Lxt5$g%5qRqvSH5X zKmBj-@&lErTOwqkN7mLr_D0Bq*M)>|H_m>ZZ}^9G+pB&VE8ab8XSN^IJ~7kLBW6w` z?~ck}ufLZcV6NV0P*e50i?QSsf5w;phu=@h7)fWU8A6TkT zbH|~$L0owc<2;S8k3aLb%|D=A7}>~M9>DzJ;9k(VBGvK^Z>;(6H>P`4G|b)>Z}XN9%UsswaQt)J&W{Zbc{gl4#bqW-5vP?*3q};sVK@eg|uZYTbQIho!e{ zd2#dc^aJPkw3*pAFdt=!ImPlS#DMAWWZoSgWlN02S8Qf3dR+dX(|181?+W8jvpz% z@dR)FJx)UohWD9_rMu*8_8niaV8Njef4*w71-Scr#)|H!d0~BcF*|=l_ud&24s~od z|Fgfyzp(b<{07;s`~!ZAr_8bW;qgFzL9PCQ9So%lel%-A|V4pPkp~!~G2fuw*W@dj~%O>_fGfvE`jVH|P z7ms~IwXsNJb>KW^{~t`H1&*1YYzyiq_Dte2*jLv)-S;2sIiA{z?*bC`{*BUqc1p@I zevi_P+%)symzTv4X1ZJuGKn)|V^e%^reoharVmQag>BytOy2LHUdPG&dEx>E;}0pj z?(^)AxFN~Ib45aq@%yVDvDM)0x>&J6AADHX%VbcmxFJii;N2PCHuVFGZ6aA)B>vT= zr{381lcjl9pGLVgJkq%Q<(rs|j1`kEySJ4e`0d~@yGym^a502LK91x6EOJM#bSbPtt+F^a~UBuUW9$wBc;}g}T=G15Yg%R3EEnOjnU(OpmQ-+|0^! z;BmSmZ=6`d@rULcgo{633T-QwzsKy~UB&$FN@Jeca|XVR{~7X@)P4PCyy4)4l`z_-KRiE+#E$Kn|(u`?P)Et(Ir#7zFiexp%P zOql7O@<;X^D`&Jnl>ER}TE=(b-yCzEOP7jx6v`W??cB>4*TBBZy+zQXCCI4eV#vHJtg) zv*!fAi8k{r+234ucJSTOX4#b+BT;dkb;W+BtPRFYcULS~b?5`%4i^uO9eX&gBtCfd zD7}LD&58|-`8Daxd2H;Z^A1cGWb*%C#Szo>mD$30*^(tJb_-vrp0Ib=-=tS0A|{sl zgC*t=t5w<$>w;~~Gdo!=oWIR|$Xnp%8W$&6QGV3AKz%yvjo?JKd469RXZSgk&uW;K z^_Q`X#c?jr1bGKpu?v^>xckpz;J13fkbmVlv))an*eNI2V$!~fN-VRvQ^TWlAo`l4 z`RnFs@=enunyj+y8<(%HWz$QqX0>_uL$V;)dd22L?5}1pPk+()PC|1{SNa5od(KR| z+#kz-)@Nf}FhBoZ<%tcow+%nIHgt7;m#k=Yk!(s*mb}O0e`Oczp6!qCawqJnt?ha! ze>uJ_x|N>gl1CcZO(b5=GUVW5e*f*~k6Dha74Cg~ z`?xCdyO+!nDL8Cre7HCHxWtVH?_UnyC+q(HJH_xxSouRhmUr~xi|`>W2{&tn#hnS@ ztZb*KaN_I&75%ddmaaYY;p|9*sp#>~5Yo|?q&Mv>0d(Wx9gE#K*-N;NxNMOBZQ2X+WC)pb%tWmy6f>)QAa_#JzCpXUG{BR_M-&MT|G_e)wdmTMRoZ#Hi5vq=(okibxu zEK#@rAM-nhKTL5y*s>xTt(5jREHB;5eDC4`j+kGcVKXFeB>d*IjO5y}Q@nzit3sdk$0OSZlNO)9 zZ_hma0)xLf)495aH@|po9=;U*a78abIgFv=eTP6n{Hg8v@e&TxU+k^?I*oD56?T)^ z%vPLSS62LGx}&pZ?P5lmga4WLJ^5%{AjYs|qO{2`J?=XS|M_mbNM$_tXahrfd|fST zmD~;!t}QvQj0^0UwYkL$_Oo25TToul^j)OEY;8SrYy-y>W>XKxR}RJsIR{ch7o29S zuldjXuAzomE}F->mg|Yw1zDK|slE%6n;U;$mUJ+0a5kG}+${Zl!Cw9S4G+Ib@6cx| z*(Id^;n|z%-y3@464?8NZ!8pI`z3tkK|S9a87@ZsZ;x5^PFHijIm5L6BinpG)?3-k zQAS@M{!RaIhFRaBwt&I>%V!4j2hH#F650Fqai3zC{)RFA!97O(B~KXNon$Qa*vH7v z$e_#mn?L3->#H>lmoAqlR5Yh)PMLb8(O7W1q{C)`1<9=ktE(H9H+*DTe%ZnM%8?@} z5)P;P9Hjq8N;n=Ds%O3Rx1Z6ZnAIrQMWU!k?8TxZ_5W{5sJN;~IBb?%b0Bi6{ehc{ z?jH!=<~QGhHAYN>?_SDz<~!z$yO#ac-|+Y(myNBL&!m3Gh#?LefRTHEdI za)x(ySI&QUaB?|MeSID4xkVXA6#0qokv_hJ~`p} zW0t(PKTjXvy>@`mEi zQajq)xFz)R8@~4!F!oQZ`~Fh@@Xo*Nk`ncGjCyC8+895~6XZ*1=iGArwPXOV`i9R& zQBR-)TL&`OQ%ravXYQ%8Bu!c@>F}Fn-F*AAA3oiTWizg|{czI${=b@}AO9X19)4V` zFQGSY_xS?$9p@jL7JRvR>=J{8^`b)`xNih7>0L@^&<$p~YjyU-PyQVtFZr7pHaH(X zrh4*#?wNxOd-z%!odf1LwoGT-aqX|v;qK*Y4g}^r=;_>J(>!S(+lI#Pt&011PI>rl ztMvg@B`coy@9r^{740+3xwWO&QJ_M+y??g!2bKlfdD8vk5*SP;HLgu!yRg##z~>bb z_n6Xc^X}Di+&OUW^a8Fo4ts0A^4xjBI@dsz&nEOGd%=Ik7f)0#oH?lcz|(0@%o?5r zzx5q{D>;<=88G+nXT8tIXLInC^@i|+XHFeFz`tk7JKGN-x)(mpkza7R8MGVF+?e@$ zf5W%RhQ9r*y%YX3_VqO9=}u=U>vItQWXNE?t=UZP|4-gM+DsLT&9tS3nO~IX$}O<2 zV>WO4&tB$dSO4$8f#atSCgdjbl^pkH3rLnNNzr}baee-Q%Ln!`zn#i*&Z)6~KdbI( zCbP1G>XR8|d3LSf-{Q`=qqdc?B-mE?GW!F!SMzxk_BW)NJ8b4!aCn1*^esz^8I6zr zAKZSt*({`(;k!4(?Y{?XE#FHzY?fJIz@Yz->D;DKeHGgg^G>>;?V5gtYLP;D^PQ8tF-l**+)RF8rxN$!?7anim+KSQg&0~JImZ@w_ z*^HeMaetq(o8`=C+}?58z`{zB`TFMDOy-;FQW$zy?Pt<^`;-4pfu5@Fd4=_>P8GaA z#`~bPCg;IlrTY!1+g%!rRg(@}{PX_(e1ktv{&B?k6}30=R$GuT)gR{k%m?mgMa&@gdc1+hMXmx_rep7 zGnednCH%mLjr+q34Ydbvj?BI;-`Kmq{DHNgNJDvG4eQ6!No`k^U_Pf{mLWYFtpk~{jFyCQgxML~+}mO%L}S2(w9d}LeD zf9!pH49^19uuVaacoy(}Sm1m8eS@qjr)A-TGbi}j{2t8JI^QsReLbW3!T&#g^1t|B z&m(WYhxwhLAdB9~N69~aJ~S>^f7riG{y^aC_ycWvCu;A=)bPYNmd~pB^P%-2Yr$ok z6a5SP*b1!L7+WMI9ltmJNn^OH@lSe3J*$Z_)2ywGrt2JeD+88uo2+KI<#YDbX>L2K zFo_*MrB(QD86W1qbA{ikP25EL0LL9;W+V1Zb2uwzTW#3P5XHx0)hAZNCHmou&V@Gz ztP^55xIP*;n4SO3RP7qyD1En{Nq=<>_nn@9kIjt_Zw^1OgR$>W^ShkNe{WPj#0e;} zU8oZdST1DZe3Ugt>YH@M6oZVDG6qr-KN@?>0^A?S|43PT|G{2ch3~dizd9P_cci?P z|IlJ~Vc)cT2kVFi{#d3fthS?3&NKIdo1 z*uOE2O|L$gRnPM=Q`w6+X8)|;zy1n;c(S&i=XU=+hO&A4jcb_ipFeSK!4i#g2|Q=A z?d@w==Y9CbZo&MstC4xf%{db}XY@BLpUugXZmpBk+gRRKVBBDJS=@o$`U6A%9JYBr z-}{3b8YL}?KmI(!+IIeZoxvTudf|#+x4a+pbQ?98#&qC!+LEQI2b+0p4j3>T z{VTsU?-YPrGgAfv3rfUEhNSqz`0pBycxg?B;O4d=$iI z2z5^Q`$Xo!OP_kleT@1ue)Gm$Vvdsj$LsN$$^WsS=<`H|+&|M;<@B{yGRhd%{-5fC%?$bWt~D0S8Ot6q zgE~M5&oS91&0wy$Yq6r3@z$K`=W+$kCfe4`GpBKFxcI00A!k9Si1Y^KkE}cXaFxuu z8vfvtet|pF4X*asZ|dwaJI$|NX1VwN!_0>V7pwE!Z!~tOIiTupbAZi|x!~mW>-zg0 z-i9yukbEZ>`(^xy1-$(r9iF)=`zT!UHhlu10I!ziMG7>NF9Jswb{@`!c zDIrf9rFY+yaQN+eM8!oij!EB^<)`qLGaf!30yQN%FM{@oAMh6V&*U%2e4qQ%d;1DC zhLSFk70L|z?#h(Z7!?Gwt+;%E>x;4m&pjsdbtY=)xuK3-|aY{HR{=Lp{N!!Ea-e&dWy$4ChT4rkm6<>3wFp&HUvwSp6C%^@1bu zEz>7EM#i;0eBHmE=aEnl&-C?i$qc0-4vA}*=O190)ySl~_ZPEGAs6VNP)CT;kdnwS^rA)w@<7ak`J-(o5261UHm|; z)dJPfIR|{dGaX0`S|F)$!ADNqz%TD!EeoIcg_n^F3Yc=e*zd+Ny=t(j`ZL8bC`jne z2eyx_jlD$y={^iQIAu(-RW(&lfB1Y|{K3Cj<_|7EIFrL8;Us)W((j$+fr7V(SRb%e zbF!s|x_(%eoB1I3|E{)gJlPG^^R3j*v%P!GkoSh|op=&US=LgQosuf7l@e>dnj9$G z`|pR`jgLQ$A6Tw+dPCM#$AqY#Ck+;^ZEKwVT%6hX!#WAI2fV*~7DRt(yy?cUMNz(D z{h8O{`VGHZ{~32Md=L7|dhGSn!|9TGjMmc2{HF2zZ&+@*XD74GLcR*=f1lm+CFj{x zFxs>{5NB2ww?6!PyS>B|(P&jNq89fc866^wTuv-e9lh~JOhRoTo~vU#h*hqS^A zLbJv58;s=-cwfIV<%wiUqx1vT2KBVRtYt1c8hCB<9-ItW@Rwo1*~<&s%zvn?lRvPz zwPEq~2~XV}%nDfk{l2b$!1jaA0l%Z}ZM(nA8+34gH1c4u7SV5YM-J%{kd@6&v4hdfpY$tp|R4&9m8e zUO`EV(?-*4#zX4@mH*NO{mm>N9=QdyKNY^<7xv&+ZNOuxD~uH!a|#)Awf-~72>xf| z+5Y~(`5)KRU2uZa&*7XnX%bu9jPDa1 zg)2B!GyG5eE}t-SmHmNk*_(~a^Bdn?ulV*xv%sulKBLL2|ExP?di?`L_MGtu;n`u& zT(X`$V68}j7^jIglb7`RxIL*1x{bnuPgu=oIaV9nF-&LQ#CZ6hWC5Emo4oQ>q@L|Y8tEp7D$R-SlYROPvVD)@dH`2`bJ~5>FeTIpD~KDl?95i zrKd-?ZJEQeSKZhr=gu~ z4r`vtf7YJY3f8=A7yd~^KFEFjzu~g~`9|63&}8MdH7i0MOx!z(=k#<2)4=y%i&&JbduN?g$ z>F~SyM#Enev(bDq=wto5FApU++Y#SYA`7h+K zWfcFaPH=z8|G`f9!kQEE3F?e{j=8p6G)(rVD2-Jzt+M>0r#JrKQEQU?%&C zlVS1_M;g5=9Nw|Y7XFdE(I_M;l2-Bgoo%x~!7+x47NNuH5B5o3=wVxN_|uc4+HKbl zsMeM}YvWnqC$3y@jHRU7GJ{j%gzbVK&zas?{`}o8xMS%&#vOa!aDNawa{jts@?xJq}w=j{(U{2|G{oMhs_QP{FwDOG_%e+D8R7ok>mHN z4bv9xWtMw>hWU;=^Q{X0$fj?zAD*1-K7sf3fu$uf2mJJ2EYS-%&UYn|c`nOW&Wfy? z@)vwR`QJBaIK$dHeaj>PXRkCH=8UqG|I>VV-tr1JsL%SF@}XdJngC;&|BeRrij^<2 z4CmO_wmdW~xG%I^z}nfxPl@^P8p{WKdsH_F^F@h$`*}F~!J6aZY?nV&usM52v+*TX zwmpuXW_)9|w!sbt^CiZ{d)VhqQssH)Qp;FY_n#qsN44xB`2%fhEq=_1O-nfZQ+`G9 zf-}bt@b38DOYm(o{<}TW8$|wsHsds?=YRl)GPlYD3*&IX1Be&ocZHocXr2 zKRl}aKvwL4YQVonJ)Zi;*|Yc8{yE36tKkE4LCe33kJS(K9kOS0we)0TE@gcnv|{}M zU9khXFBa?-m*3CizSuFxtbjR|ZO5Ni7nL9M-a63ssrh7zYu(KptDc$OF63NP?5oyc+I^n9>JqCiA`$DP;W z1zOx&G=D38(Bmt6z{8kvtVwb+%{g{A0L-L zkQ#0;;nHB42aS!tufLO+z_iTU z?!iH}7>B>#<>#d`lqOj;%*`=ONRQ#Gn7ngkm(hoBf4=kdH?TX^{QNRG@!6B5JPU#^ z&fD|*&;f=ycYpB5{9?69m7K9XqG9fo`#cM7+QvQm{~&mMO2hK=wXAxttJ!1Lef@9E zeR%r%{StYxI}a9ozh?WOSLuN8{f2-4S$!-QyTTgP54ajH@}0=IB>`IOu^@}1hQaJe z>XF9paUL87HNU@hGMYG@I<3eNC&eOVT3__ti1|gw&He*>1>euFVY>bI?R9B3--LFD zI7gu!_77PL+M0VE&xcHOe6`ntd3y`f;rIvly7x+NXL|qY#|Z`AU5gnjZd=J0bP8nL ze>bD&LD7<8-XgGs7t56-Y=ERo$KDP6*O3)n2m2MOC7uaeMB6R=w8RZ`1ZiCf>S`;oSk`v@CTtC{7+>I z?lT!*s9$i7;YA*&Vq)9_P8WMghu^mM_Ojm7W{Nq^Kd+LZ&*T5UpUf3!R!cCysEEsp z(`(bOca)tS&$D0y^KR-`@@ZsODx8ge#&obupG@G3)W=hwK zv#I60_nP76>W|_#1b?vH%V)TCoXM!Yy`A4?*FW}>DS8`(nWAp7M%8^~wg_f<)ltBd z&f+ka+w#FDwF$eQHX55huvIv)G+kOx-~Q*lBm3{!Uu(7i^%vF!k~jPx zq~-BFSQ&D^A@L+@%&emvHd)?1^Cvfkx->i#-C%r>>&=QH=J#iQ@ZL(`pTo&4`|`Ks zjx9Vjx5PFqW_tC-fa&sy{Dkz^#vi7YTsXs)agE(%_F+bwjjzuB4u9axyra?kT^!^0 z9~+vdu`^aH?{D1xrMrWxS^D~dnGzR@EFB-5%wFL8cth{EM~j?z`sdlCGss^4!(EZ` zf&alJtpKZkAAjocqVoM zBZfCIn#}!YQJTPH4kp zhFM1|819LG6|N{a^x0j$!F%mI1DncUVmD-eu-S#`9Xm9mQMjV||MBVkl6f&zXA0gt zU~N0@A7^}rCGG;J)yg;WujMa@DO{MU$+JMYaX+Jf++&7&PCxixl)FCIH)s0+XDNw) zHR%kpJs%z%VrC17DQ3(MEa(2lsP{D~G2mwDj70Shb@RgyoV$~85q8iec)PHH6w_iw zhv@gD{1KuC!$l^ZkN9^ zs$srYRQK*nWCFW0TSbsafw9SkohoO}v&F=HnfUPQW_F(X23^JE;^emA-F^l!yQ=ti zTxp*FP8(>=su!rW%w*hh<=N}++YdbT*e|)H!Fzi|gLm*gCjC{vx$kHnICSvz zg8YmF1wS9D79{_(-LUu&lg!$GtaChn{O;$pxpa;-#^}q3kI8NO4@l0Ne?YQ3{s8Fy zkU0K;!{K~8mb)-ixU*)Y{FmNvnfaB5L!JtI9v}O?*$2*QpHkr1!_BPnpRHonWQBq) zv!>6T-6&l#Nj&4Soq7SYiM{-b6rHjM8`s7>xc$iSx6+M9>1N0Bi49Ws7ua&21|7F^JG zV)=RbgL5Z-msgxCbRma@<8!kfK?6yc^AF z$quIvBpAys*sCVrxIFtWL)?QCOftUgJ753&y!?U157s-E4{?>S@A%B{W|pT%N8@|Z zi7a_b{{MO_Z_#_Nxh%xN{XZ9z|3;?LZFT>DaBdUd(!;&w;op~&(|JA>UE=xQc=~7@ zv$bZ|fy?LjG38IK|MNz&Vx{Qg|NaLmp0nnEVK1GQ(lGnSeP;9g<~zT*Z#-lyJ>l?d z5A(bU-^45)Gg|!;FUeGVamabXf5}E!kwC-553z>%jpYS@et&0u6CR-cT0G-DS3$h6 z{d@s~y_*ah_@X9Ec$92l5XL-j%Q6ld&!75-#UJRt(b;c#U~_?egZI;a%+v4x{qwcg zQLaMf{qlZ!NxOafjvruuQ?juk?b?nX4eI{2Omee6$nLlqH;1vL`&amblj&;?T;80= z@cuKy(W}J?$G_+ooRsGOuutRyXTtor8kVviIfD}n{3Z;#k3V&FGU+d`=H1i!N44Oj zh%mE!!O6$gZN*EKak3~wj zEV&}Fk3sr#e1rESJ7(#QO9y&yXIZV{G4kpYph_%e?N^a&+Olc4{|%s{e3i3`@m@)Ny(N*<-PYCcAs~wW~^h-U-9?> zTde4b6Cc|;NsET#^P1c?n{K@V zIxG9?zPjqU4{bjrZF_&<*mLoO!yk+bLjK*I9nP~L`hq=^`R?X#%zxP4eSN@i?%W@C zvo${(fBPS4{I1gA)*;VywdtL$AcN_xMq}*-y-ycR{3m~4uVGZwDW3PNKO3tP8rZin zS-USdro~^NBD3YcbHJSWj3u{(mW^Vh&-yRLG3nd(Q zQ`s&YOHW`Hb@|NrwvzA85uSbJ%sblt^L}`u#r9y+hVutDq@*My|M>LN7F3@<6n+s_ z{9xkV0~d?p9?avMQ195u=wi%lEww;W;X+*d`2&7j8ILViT>c=v!{qtlet(DZjST5q z_cdCxF1X3|VP(L9**6_Ovg}&VT(X>Vh4MG)8;QxxdJ})MUSYS=o5_9S!7~=U>_-fD zzwqtZ`}g|x^$%{}tgmH1tFb5f2g96$Om`nMUeac#D^8?k^4%;U- z>uLS@^;!Bbd&2Pt`XAy%0+v5`)@yx0x$3_03C}Kue(h(B^Ei$k{qX2!@rQj`hBm4gKIFS@E97Ajjc%po4lw;~_2+W>z8gxwDS4`&j2UeB^$0N0Z4vg}Hpm z{r!m(CQW60ZS-) z5S}lRM;a18&rM`M{Lp!R!)8kvo&$2i1}hmpb8dLdXl2Pe<7>nBjRwXZ4E#P5!kOOH zGTl3U=oIIkX7-BrT~iuOnprZ+-rX;66X$=&kS-l5aqnN{$py(v4h014PuP+IT@DRy zE=xh0%l;fKrfZUJTo*t6;n6!+w$xnaw*Lp7N=-U2`yy*=YvXbY#_Qe8)8}|FPLJBi zoWIfT+b4^HP9f_LZ13|Aq^kPxED+v&kI7%I>Mzrll$N;^b=7d~^GORJV9ZIcE1e2g{on(hc^{d} zWfmS1GKaC`{K6G278NYNwF}gkOFrJ^e{k%5_4oHiHB5T$Ou9#{3LmjF&+XN$V41;e zAsIFRc0hpjLN(gZCUehIG+yvKEIHEY#rL_MP!Vh+^1-j*rLl z4@}H|;FjW;(9U#aK`M*hb0*n?zkl}3EI~COV zGt5Y9o!rb?^HMe=<&W-%O*{R4E<|!aXnS@2eM7I;g6E3T`)3}UeSPM^%?j@imRB1v zzYk=5`;ehj&q4Zzwi~lc>WDiSF{=r`$_L_Uc!qZG4?5`sBRB`T+d4D&WE%U*= zX88kb-{$||ARANGm4J?eFg&7)$3j{O)m>t8?Ma<+Zo@ z8)x5^lw@gHBKePTdih^=z4Mc&PD*4r>&Ee!IsXd#y>;u?tv;BLviLZ|z4{|(PZcDb zk83MFF!|P#hPgMFzn{l!y=%TiU2S>_!&}LXTec?t`0z^c@Ux@Y2j}uhCb)Y##E7kU zZgH4BA-$_Vyup#RLS$XjHj{$&lUWYmKL1_v9;3DV0bdiI?+u&fCmpa=mN^i-x}w22 z_0OLso>jYE@%(S}KE025`i{M|AA25Nzy6-*dxLt3ZS{xN#LK(x@;raPH;qA-gTYEI zGI(CUV{GUwM^{&t8<{L}Wejs%lNr`-VbWu+;hZybQiwqMgdJy2FJO2Rv**_r`7I9w zb~p*_$mHJfQT_^J=+z177cK@e&3mSL@WbTh_Qv1|!ZV(=9Ps`Y(O7tpEk^45k4vTr z@e(&Y>%LBHEdIi>=Hja~@a&NThe3FFxOq?8CD8EIfeelSV-`7?Xy!Ww+%fa{qAsz- z)P3Qv2omHkP&O<$XjPzVEnKiz=fkA!{_iDsG`#*Zb?X%g6P_)SKP)39mWVu&h+{N= z@{jqP-HFVM2J`0qEO|2Z{CmFMymOIl$IjSB$GA!T519-8{{FSKy3sE!`2y>@rQ!^6 zb>+XW#a`H3#n*YBzqq@G#XDkWPmEN$C@7Co_&u>(=O+Rq@Zo~B( zjnf4^yEu$DFiW3UbKvZ2|M~lqD%fq>z8G(K{84yE<0JKqOyL5{X)_q~Kd|U0H1lk^ z&$Pp&M{vs&)*TmTvsZA53ui<~u8=QboX4PF;QV*}{R6(2^BdHiYFX~pew0?>w$qci z()f#aPT@{&8>_GU80NP=2Xk-)z>~-1nZfbkjaY^GD5nS4COQO=!@&#;o@`J%LqEHHrBhBV)NkgR#Z} zKk*fdKRkP@{eUh1!o|b&2fZKKF`7Saw$i$DVDfT@>0C|kPF8Tvxyhs}&iq!E;cnMC zwmElyd=xIZ`7r;%$EcnIXHOouJVm16^wk#EhRr5P2lzD93y!_e{;)-D!Td(=RWll8 z886uNOn-mRpyA!a2MlFu`)b(Ec5G64-OMu)ody!S#lr@g48PsZ*KdA{b)iSnupt;EXxMwyT;&MDBir zah!Z(lEPQ}dZy`X82y!u+3r2kU#`JvGfnKqPL_EL-`>2lZL>cx)Aam@0=D9W^uxEV z_C7Q&&_93G`+GyNU(A8N)8Yy2EEUo_XG%7&U2opJYNF(aC#$u2_#3<*uVYC66j#eI zx9QlS1FSZ8975xSDq=p%KiDVtpjQ4sYMadg=?6O-y+27b$bP!-u>Aw0wSdlnT9f*^ zI;MBKf1LavUEzPW{K3*$&->#OcNF}RDlq=Z{~)tq5l_s45?#F`2OqqCf9Ap4^z#Zl zG0Tp#y_vCzX?pWtrf2*Y1drG^n$I%+!*JHBF44d|G&LYdAWeYrUd}qL^*nPNMG`Iq zO;0W0E=dV64@egf5l*b&pJV!)^VJ>(|F*~MvaY;$!oPlcSlc!~exIRD)rVORUoU^p zb5pn2of~$F7U-A`?+tFkCqP-7;i~fk^=1R+7a{Yi&)XSoVEXR4r~Y?~BX5P0Xg|jX z5uL_-p8m$;uZ)+Mnnrm^IGVawC|$Cx9rYv)aa4-Do> z`8PH+Gj5so|4;Aq2Y-2M?Ef+QyF5yHz;@3^@4%ts3zn|tjB8WYcy#82WQF{R`UgSt ztIg#NWvmJrYZm{Ie_&N+=qbr&8R^;9f1s~*)hwgK+z(DzDHn8#3V--ye}T384$}f} z(RhP9OnpJkeN9i<$~bm3suwnXYhWm!$MAmJkHa7MZtP&rJ;2uc!1a?3*lH#z&Eb)6udZlFWSjN(2eZvQo;?d?Ex7&*TRdjm_fc9x?*09G#@VdFnK{l!|A_{zl9xs2S&`OI8g3v!0dkBQGH`mn(_hl z9LDJjYybV4=osnQ`OvQ5{(1QaaRQ8HjBEkvp3D_WVk;&eV7Afw@$&L=Q1uhv$^8CC zLi&GxyPqeo-E4hmY;eb6F3W|UW3>-Bqt6^r%>-Ra>UVG|x45KA!)9Tl1HoJ3nA1)2 z7~ju)$W->`AEW-6YSuX$fAY*xWr%&j@oG+E+7dg4@1YITo^E8Yj+1XJ?`+7MIGu6X z{^$Dhj64|gZ?ntJ|1DnOa_#i=1H4ZT_??k|U}SV5R%Su+gw}?SLK1Jd?k%WI`JdXx z{d_%x_2T^!Ay=PBJSuu5+0w9lc_Ejk(Vv?CJU0w~u=$nSHx&M1wa89;{@~03cAx9! zdUKfa`0CGXs68FmR=!_S(&6-@hz4V;{f*wQepseT>|>l>(D<&0@$JP*?ilMIf1Y`> zsq$Jr5OPdo3w!W}`9qTwo81FD^$Tk*@h9x~$Gq(N>gDU1(sLptd>Yve3YhcF#hJ<` z#oJXKIl#MTWsG=5qoQ%fdyWE!2j(CCiC=j8e!MKx=J&?g6zyoe&D@lR}rK>ph{P{Hd;b;4>2SO5ZYyr-b z{X@7a@*6dnmDxY^u|3!)z~&alcH!)k1E!8V+w*PGDn7l?WVSxc-**4NO(svxL^j@H z`M4Qp0oqUw!J1`p1lis~@E0=K1-xop<7$Z?4VZg6|KN zAM6#p-_Uz^`h(v4?;DkO%x^f|b)#|dhyRW0+O_Pv1h;%)D|z@Jf5Gf}Mr+>%4Zk?{ zJZ=`YkUq#8!~S1*#}@W05v;LNKe$gkXWaJ7vSIO+`wi8ua&}dWF`txK_5`!+SkGEf zC8iC!W$DI&Ki^+j9%g^w!(sfvEHCW=57&!%Ja!A_M>JOJg@`_F^j^KM`MX31gT4mK z+13rrPaS$|F2u3QJ*X9xIk433f8+0vhUv)$4bwDhS?3zD&M{>uHE>XmYW$}EhiMk; z&iZD~n)|HUFFIl$*fCwmIaK{XNG(8F=1L)B{3VV#3mM)vGM0MTF}n< z8hlVX8h>D7rPu?VlkN$RWuM4jFj{^8fU5l}s{`B;jmuXwe(CJ$HmG5lx91z@jSc^P zPiNh8=8bK@-X0!#1K!5G|7j@pR2U~|-h z+qYUpDn;%`w{D(_@%eT&2|J2^ z>KxX8aPh#M1AI+;_evhVdt6>Jj_G@sO~prv9g_2BJ4OZ0cxYab&y}(5rS%5qACIn@ zvzaD4voSunxLro)f1~WLdLEtsb%r09(wiNmKRA{zv0+^HH2%O$jyyxg4@+B`xVm`a z8&6-durDgJtOkI{D;EbOb1j8dk$2m|6`u6 zw2w`1>TkX|tju>G{TF<3{{MkL22pdMTO1e+6%TO8l>V}p3W1J&Ih+-k5hcaEXX@<9 z4^Owxe=w8Hv$F6(r~jV=TOS|ry?21^$?f#_5)Q}r#qF+Xekl3jM|c=tBHM*!F@_Ib zSiK0c@_djM6VUvX{X>hg+=EP?_YLl=H!*z=-b7dA6rUu4WEz46Qe zZx%;$mu9p1`&r+)3Oq?q3kaXiKCkXeJL8pxx=)Xc4^LffE)mD%|K{hnx7N%r#Bwfl zylWO;e^C6+UN*gW#@;*s8Q)1KvgyhHI>(kXnX$cMXQR2bH)H-^F-E|wsk z&J;86C}Yl<=4ta94!t(tp!`YNV$yl`Ii-xfKTdmd8a4D4{AGyYJIpv|DdRgS#=J9s z&oWpka$Qkif7{6rdrJMtalSV;87UQa>-0&GkxdC zn|EO!?}Z+=jAf6^3*MiVU+~+p+I?R=dmInvKHE9MH$0y(oD*a8XJS6Z$)L|t!!A?H zUTU|aA(3}hVIrHXJI|dLyt67Fu-rG}yLsY2bBf%B_x~Gu0|V4qw-o+4dO4hD!Q_4a z44a&u%kTKiJS*@AV~iWyD~EePw0lHv)C345e8W zjny&@*Y6rPn0>2fp7-J_U&RE*7ZULk>K*2)Pq^(+UbUz0wBh>B&-`Lrnb-qc$ukGebubn1 zbBP=DIPzwxJ-AwL-*9?k!`{TU`THBbAK&wz&+gwfpLnT?o=qIh)B4m7-(vNabU1x5 zCDc?h&bE$Y&wFRk!OHpvPXBC?Y*A&AT$0-GTczRj;t*3ENk3VegBPw_&s4l{ed@s* z9*j3$vfb<8f0Izi-C?vsYKCDA<2j>P`_f5?$DjS>+5LTP!iGze(>uCK+G8eh#BBS{ z_~QM3huB%$uJJH!%HrYKzu#yBGrvbg)nA?+w}0@@u>Z$2y}p(`&gRFrtJQ7i50rdj zzriUcGClprueY)V`Dfi9$Sr-(bE-&-hreO7)Bnb1Ci%v>35Jn@Y<3TNI6mA-f8g30 zFZqwj|3nh|J;6^u-&V7Q^18CsDb_u>C;H&7<^tg}4UJ#9ZyZcz(A)Woc@Cq<^gsqV zse|VVz8*4ta5CzCV>8=| zd>O4;Uml)5okzc6I@`WFew#jVi$(eQ>)1=q$G2&Jmp8Df{LXme$Di{Dj-NWKz#_9T zok`F77q`u}X@V9>=NNN-Y-Y*~d+=#G|ADrD-U-Zs3_GTr;Q>tw{pVmW*b*mUQT2y; zN6yo;zrPu`w;g!opFy=cnX7=IKTo8y+$2h-awL(JhD+JHdD2t_IJ6$QAh$eE%NUE22G3Ff{?<8PkImHL?_I5=&iqy+P%P_hW|}X!<%31yGrGDxNtxD zzW+eqEB}N!jaD0y9!=u$pJ&f}PXRPSkyg|oD{S^a_gRk4g6Plx8T&U(WzoBt%r38| zz_f=$$mBEgohHUTNBTP-9)7)?=g$FVrZ+h~5?|h~m55`^PupMjkn6DYgEMpX_M0;6 z&lfrD|6u9#-;KZZHWhANfi}uln#GB{#`QShsA;F*)5I# zm`dg9|FV{yYMdL*m*>dF_dxJS{`)(LJ1W1(9R6F~FYzYUr*X630pDfqrLFqWP`%jUxJ>h*AG{kD*S~%i%l2X7$us{Y9A2_txyT~BfWb>x=D@ip ztJCu(k1VN_bZHRJ>Eixq_<`}VM#f25;f$Gb1vAB!4gT(DDw}1;#9#D-`;2*ha58zn#vX-#Ay^?ZK=%JvMJFAc8}4D~OE~S>X~@Bp-}#*7tsvvMJsk}GADDFa zGR4;X6~1w?iuuinTDHEh?ym0Uenqxefghq3Th{GZ!t!B*N?P0W1INq?0%Z1taBZ3V zm$~5o8U6=n*fKhAt1Harz99%&oaKJ2j%^qJl?3*)MH`s=kFc7$9c}dPaX9|3QI%6U8_oWS2>i>W2efW5H|AD`P z2W;&Q{1vS~aQd-@|qo;mqJ_{PiX|Bo!0?F;VrOxeT0EL^Zs z;l&0fy+l4X&d5l%3-h@B5+28h?%3lWy;ePIDMdwNk8BZ*PhxxtcRTw*k3&T?0-Ob z-9Ki12ayzpb=4^hcdZYz^jI@K*ek!kt}b;4^PZJ5C9{9JC(H}H$|n2a!~BQr8-feJ z-(r67>|;8QzI=Ux1>2n+^`E~Lvt3AS7T3Sebnn7>wmB+{WvLCbDZ%FS!S&=YsI5HkfoBKjx0ipP zADH;J{DAl6I7aug`;9+*{J=c@z@MZ5M!DmwmMvwJnaFDP=BA|NKL%-U{`E1eeO}&- z*T4KvVu*GB@$YhU+j9SRMjESEGWlEnI&k3Ed-j6Z|Iuy6;*H9u52$+jy<2ynxv|c$ zf^CO!gmr}RhChFg9r*O${BXCpyoAGard2CX8~kWzGkC$!@12_Zmwn&%NBRYv-0B~W z=$4f|kg9NWTu}F5ufl@v7Y)x1PIhw|wz#n~OE+ur3U%WB%SWA>Z zXEy(N|9}30$#eEK=9m5d&tDRvY5ZeH@P*7s`$k^d)XE2Gi3!P5gm>^i=KfH!#{U4@ zegA~TKNL4y{3}|~ZT{klM&ScZ-#Z7oKRQ$!@syZIR5&u#x^EIYPD{N-5m;A?6-MQf0MfL}t{`C#-m}mYM zzOmyU^B&9J+#g(4xgWTxaUnCZztK3L=D^Llv$r>v$1ya&7A^?h%d+7x%dD@7Oy8zW zY50D~rt%NRj-T`AK2-c*k(!q9{IThWO)jjWqHJmp-f+K&NcBtj!NK(XNCC68oX&xQ zM@(fb4zqtae*DaAk$Uj-dG+qYW^`T z_|M88aF;(J{gvg0#cWo+JSLOQGry79$ngEj2Bvh@Idgd=W$w(8d~@fn$3$Pk3_c3zi(&!f?59w zv+V!f`FF+IHnZz7O=r?FZm?Rh;BmuDiO7bzZTtt?e%rUz@Be4KhyC5$3TB?g*Zbp* z8@^R@a129*DH+E+UGm<}%I-$y7jd4M znh#p1`S4^#&3f=OTq)@iPk&>X{l4Fm9v)a3%){@nd>-TBXUZQ+HmyHkYua<*$ijs> zyfK?J7~fr}VUjzo~^v#-zcogGtu2`u#g)Ho=5ud6T67j1|8wa6kC8JUU#? z*rw)-%no&i9fHgi7o}fBTzCJzj>+F*67#vPn$!fAa}6iFPaA7!pK6*u&wzQi=Jve1 z2|svcSksgKaqbCjnfdS}^8>f!2P-~$KdAcVt{>0juO5`Zpqu=Q*QQFeWQ$(LPEO$h z5t%I;=diy}3pgxU^7|+IgS6PN2Ws)+;ni%WrmSt%<#GmlSj-;OF{Lv{G?bS#Oml4f z#@XO@#<92HLhi-+4bxxjWk2Up!_=F>yqw#i_wI9jNAZ(}h7E3?_A^LNoZoP|Pw#&9 zfe)-Z!sd6*6t!ShKCysRM)NtNUNPg`Uq_hkgdb$RvzWnZDp!f|@AvWX2i*^DV!VF8 zId3gnuG@1Ky_rn9_nC6%r7`N=tm3y3eWUuJB5{JX!|C}Bn|anZ)YX1u*)daI;@JEK z?-YmGzattFIbO*aFnnhP%}6Y;6d(gt@(|=!*4YHW4r5fjyopq7=Mgk*~?3*Yyrn# zXn(j?VEABV#Qz3$vyIH@=N!y;HK%#rXqYbkFP-IXAfpYl*p0*=+;>=b->hzszRYx> z?%TePKouP!(EJKbD-9~e4N@qR%)2i<9{XdIdC)2&w zPtSyzxeGjR)IT^GY817KXHr+uft!MU3C;gS4@Y0vcwT>>(TiIzj5|&-e7E!DX!KuR zRrp`>u=)cdD={^*w*LIa>hQR_)QXb-x`&Gso-CYxV~jsl`R9pm z+wJf78KzIzo6eBCGVp3>$_2A4Ndh9`Nk4u(lVr{~_LRL~{l&Ad^(D5+Tb?aoym8RF z?4Qx$LWSQK4~O$eH-5ho!z_2_!=sDdY=I9pIm89pv1v+Xeh|FjFK?H+gU4p?>x*xX z^W5&6lfrORS$IP;^Q)504E$~nn3tK0R&ugACd``1mY2i+w!M=1%;EaR@*6faJT{T< zuG>GjCmzOjp^-sOvv%>(x6lFQ2{KHJjTIJmLMDIJ6brsS;A(rmUEc5nllyK*b=F2b zD!2vh{W zFMlAk=KTD6!#fpUdLCZ2eh{Slz(_3YL6LUA@#m%mk*DP^#L6Dv-S_5A49^0=)Btvd zD?9%2#po?vqi~GDYUK;#0#E)IW}l+@;~4aNlan4WowI9@x;MXJxpw0;(OSlL|9`OL zT=~bOw_fO>C|jOzTFL{qz9pYOHcQRsIk4Ej@%U1v@1YwSt*j25J#)X#(6ED9UtNSf zPv<%Ny=+#%7#@_juT5eoHQU#0X2bmUFW;Ld9t`^Jduo649aer2tG~d_%)a2~ zOqBw*PWBrg{(kz)U6Ie2VQj~~VKK+7iH!Ho9a3Pq!~RilM-5Mkn0Q8|;09%;S*D38 z$w>@vbsw_Fg=z5GOcLMH-@+|XcIbd=()xz-B^-?A+nO)&t(d%6N%fEd!dp0+BE9xAOs?b#8-*8a>go5(=6AH@erwX1vvu*1R zk2ku*bnnsoXOB-T$WA=P5H*cuSK%L?58wW7PG4vEVpX=$iL7qJ2&-sjYlS49JuyND zRNMDU%)7UjdEbo*{1&HKcRl>0zrncl%@4~q>Fo{2y_l{2oEBZ;iJB(H!*qb}+vVNs zCG}#f&un;pA+qiDb~%Q}Qag6a?(lD8ugE|5I-OrKZ@%sE4`LO!f9`yIy+J*rHYtH! z&or6k-SwY5KH2{pjms8%V4o|@b8GiOZk}fQ12x~oZ&W^in8bGP&_Bi-6aTZ@C@@tN zNp5idBDG^VvxxeF$Zhuj9n^CepW8KT)=rD!;?epPbYL?>!}lHr^X>Hv^RBR-%C~RG zGV%E$QKHi$QM0+q-TOSKN85N&KtY?ut^c8{uLXD**@Uz4X?Hl|dyxl;9GqN97p9pc zJ(w<>zTsn8as_A1dc8GSCkoy_(rn8X*K2rR`GDOlK(cZ1>I0hW587_OcBt*)@r~8x zIkxQ>&-L|lQY~sea2%f7Z7!KNclW^q+;?=&u3-0gx zBvMmsqFj*K!LUIvpT%a?*H2q_^N6pvNf8j9#G-e)>Y#$U?m31izb~&}$G6=-b6>*Y zcxTfz$wn)t1*(o~4lMSKXSCMzm*2;5YNKI8-}R>tnJyhL%m7_Dzv3U;t`!0ndq4cP z{*Wh_@YpZdwUM#J<7N7Tm!1!*4I6k*Zm zgV_(xUIQKY_M#*5L4)y+E6QpQTssy>U%Ag{ez4g}Vb1|SQSO3cPn0)IJi&HH{_yFu z{QGXRY!QqRst9MzuoN*aC_dr+;Dkv=vDu2`gKT>oWw-2ST=I;+;23Mo9^DTSi5~*@ zA247pRdL8;i2Zh)?M@1F)Hk-6N;bQl+$Hxpo`NXZnjSX}RY_VmAuvNxO zDUbKo4>l=WI98Chpzgyyt_N-T7kqd!%vhK7@mpjwW<6*?Q!?$aOB$|)6HMfs4Q^0=(KSG)AYQ( z%yB^{*lltcO73h>C^#vTA=bgWqrJIRc*kLOiEDEX)auILuSpOP6HH{dJL8{B#g%u> z)%=asPB$bQ{@Ojz^o^JNQd%mpk9qo{MyZ>N{=DJ&l=SC-a_W8Ne75W9KmI(hI(+l= zc1b^m_frxlPD_1I`)Q)1cVLI3e|)dw^>a;*Ay+#ZU+OD6`}!z-n4F|hJv29n{l|RI^U%RR(;Yb~cH3#hdV6#*1pm`-<3Aw0^+?K+hV3WzCr^0r zFd^VdNZJNIElFKV=%&DiHv$rK86|yfpm~;2>|6eUZsx5LVLH*L3*LSzWeaGI2=Z%m zjB#bIF#f{-Ahq=V!Po!t@75jrz-qDhAm1C0KP+ZXDp-#;%)S;W`R?9cMwtNiRg8VN zZdu=A%HNunXu&6ASjU=kVdgDMBLhb18_)IPnDSKE)|J-(l-nWrQ~0p_1CO_##osq< z4`xo+ZQxBbd{8UIbinQFX7PLphvUbZ^7gXns{i7Q*>sd^&c+|yF~R)1S_De2v%S!W zyHL2yf8O4t3Wht|KZxz<;Ve0#mr?waKY{rd>xI7S2P7w~uWxYgXOdoG-(bwQAd*Yi zS@uC@{sjds2`Yc%LxIi^7W5tWPjKhllg_+DpZSU=b znHD5RIvQ)gzqf}uZ;m+2xl;`9%h~m|GwC`r%TCtjwvm%4$u?JKSO1XLThF5;bU=Dr zqbvvKgT1nI4sc7m9&u?jW{y9w{ciI$i9&{>EDgQ6b%Km+X%Aio%N#hzUT~YG;FxpA z!-scw^X&O^hi8FuPos2R!|&F*=Ke#hJHJ{NoD?g_;@R{3Isb-R-32I zY7@`Ci~A0E|NPS6{_P*rJN3k*imJCvhySRqZrpzLe?kCboQZ_M87uT6>1H+?iJcoW?IAqnUqK?Qf8NS#P+3 zi^KQ>v;M;?OnHyO!r1gencw;U`uv*v@MP_B$!$4zP8a++lgU<>Xvk*DDp?Sh$R<~H zfP2pmp%M!QjlcgH+!XXT99CVpv>CdOC0_^J-^YoIbL#}9h+Vv%Q+v$-*P-o z2mTt(I>5~ndR0_X?}i@-Je??su$$<$$Xe6 zc_EQ!+JSDXnKSDQPH1&8UKUe694}_Z<`^l-7I35Mv=?K3hab%UI{$QC2>4c!7rg;RWkf^X$3)*qXV(RrJFV%>ZS-3Ze6t z+j*jX?c#ZMO^heru0COgd97N(=U?s*)XG#J+!b0c>F`_gAA>cQ+JR$FZ6Dn0I4yqO zxIyZ{n==dkO753%nErUdUM8mZU=8Dj;)ASvDsMToJNk%h;rwO#;nLyh2i}SuI2w0g zulR%0?;5=KS~QmXY%u=IYBr%!V#^=yimC}JAH+&72&rF~q;O$ba@qyf;scVbY6;H# zR~i{glO!6Kt2Ms6z+k$}vAny6C2tX%>{RZolFv-(#tz5N{QJkb(^U4#!yk-q4lsy+ zHf~5$btr58w!4Pu-Xz}L`OGS8akp4=jy8YGZ!kO1JpJw;##jS(p6Cnvc>Ll5qU9>I zB$a>sn|A)dbbN%wJ%;az9w$y37!>|V{=s<1IYM251zeO zUcQdO-y@mzezKC*A?7z09R?hX)@gej{=B~}-?sjM$yrvO>-!JPXq!@*(=_ILrb_>zITr zg>zag(os3YpL67Y62n_-hFqyM2ED0F=O;0IFY(~$Htt}azR7^meAQS`c{X$V=a~&z^-R(S4;a@-I&5z&E^5$|PDx{U`|ts~nbge2S3euY zbv7}beaL?9!XKtGFNcXAWOp=5Z<#55g;DUqbLRK|fAG$^%9y)=eXf@Z%N}M{lhdCV zD_nFllufw{DlhXtn8y{c_@8*eHrAr1tN9=5_%7Hn1T@Q9g1fePb_J&-!7B+Jl_){q_3~{BnGF zfc1{?VYWF-8Dg7$2)=m#{Xm}td%?FZK?_@^S+R_F#Xs>|Y~p`4r_suLL8SDBhb%S+ zo))feFmI`6Ez_xIv=;kw!1s+!%z>GPat|))Bt-pY+_O`iHp80Wm(;f&5vFcrAE^QK(tZ3w(Hns7k%lQaindSTcZ!qHM^f1hc z+bp-^%X{8}!)E%;%er`)ml$mL{DHNi=;~y1o&`@!{x|5>)!F4e(9F|sH1GP)Smv^y z(OPbQW8vxZAH*wm|NDG;y2OncHx9OoZD9JF$+XA)$dzkdj-jrz9-4nBa!`Bl@z{b| z9ep|bWQN#1Cr>eY?LP2$QKRhf`~$Ym{~I=k)l1efS(n#K{Ak>Myqh6?hDw9*0>%`RhBm#Ow;wf zJej^5GEP7BmtF7u@6WK`Ty{*`-6{r@+D$~qTRjEKs%-jELhyWH}t42 z0`VDVwK}L2%sjodJ6z)5>I`FxU)IJAeVKc!9?3NCY&Sn_pTOKMzvJ5cx%@j=SZ{o& zVti9@XHS7t#q7_;Y@*DzZDGq>dFt!-BwO&j5qNWdOZ&r5OQR2{M(^Q?Vr%1ZbBp4c zem*wk2hSUqHPL(cZk!ZgxVL}d2?i_C@5~=O?uzHzHT9dZ>b|{I{)1&h;kU_*R}#LJ z6|$O%>})g--=F@2$%gUe#mC2a<~Mj(tc%%y_5jzMtv|S9mVN&DH$36_3+=MP%7u({-W;J54no`BlT<- z>N@5x5MIz=%$eV?_+!oiHmwtK5zm=TZZq!U5xSx%AS#;7aQ7nP9F`;o(<}9i{>DtL z%o*p|JpSrGXnUuBVD`hxos|*?s_h!yG3!44$u7cPn&e>Yx}eQ2mKw72xl1E6mW`LpN?mfd%(kZLhiyE_7i?)4>}{{_t!D#n=&f8%D(c*!RX$8YXqlyhIr_C}+i@Ly^G<2%kkhI7{% z&%I=7)l~iv5kLJ#z=Jye2OIYuP^~}TFg-)=);?K_WR(*N%NMcUna#8(a2{vHbasQk zwZG4uV7RBi|Au8l!6u_W3~@FbT+5GtmuG(5Exc#DD^tZM>4K?ZAHJ17u(dp};Rmx# zuaB1_-;J+7&N4*JI?DUz$3KQ!pV=$e``YHIHA@scd;7S(oM->Px>Sa_PRAI(Og1Rs zl**Vdv_knf%Nv$@cDctqvkWWQZIZsT7aVJouK4};Zua*EZ-qwLv3m7VW9^X+_|`;Ff% zKQK$@8Xe$0_P;@0U@!Bz3k91$8#R3McF=qO`{V)MJ1V?cK22tGjG5DI{xO)Jf1R<) zs39-pKU<6+OVqO?ynCXVN(2?S3(VL`bUxZY$YTs}7F1!Mb&x@J>uJ6@noOqq9HsZ& zY*;SWXeD;v;d>8*|8%C@3G6r7tsaS8xybZZkkR#3_=CG53!Zu^SYD75b9}Hekm{326RnT_7@#eaD}-rXS+C%=q-!E_gD|=KpJH=8R=+%r`iH z^4nQ`w`X2a{FQsh9-b%X`VXkaO^|+6-<+Q6@GgZVPlsLh`WcQle`;9Egbr+9&-^{2 zp^uAgCvVAd){ehi6`FDxoU-~C-Y(!1SaFfRXtRd6a>4pz*$)`m!zCQ%TBIfHX_zMW zlKFeW9;S2qV)uORczEaPZ=OX5Yz2prdY+w4{UHUtv#c@Gj`QCsS2@8Db&q|Q@Z-d)3c*m#0xex0$*y>0yuf4qClvtViIodeE7N0zooEOD)r zwA=H8!{>bukAgiX({%5TUYtyq@7lNh7JqN>hcT{b<@=Pw3LG|uz0Ld;F8T)h;_vP| z_kqu1^I^~-WU|G7XLB0${otMPEV424?cLAi2cGsF*zMNf?!2FMS!|@H=YvPv_8&Mb zFW0F5M}$F+?I4d0V~=FXeU1;`O5E7O+PIgmGi-R5dTC@h%i-R_5s&)EYdE!i%- z{aW52`{jOpq(o43dhfJp;MVJ6MTe=7)~pAZZ^F$O`e12h(Sfrk^yBZQ1zg*jU{RdF z|6$q3W}d8DQ9SD3*E02G6dQeDoW8N9;``)>S|3VeB~5wTW{a<5>Yw`ed_ntv#%8S# zeXNQXcn+06I9Bw)W8)kHduDNY`@_x;=CbcD&t+VfAD+MxBhf7HOTV*su>Lt_k+Py4!2Uz3szQ;1`U}xE(D0$;Y9iL2Y zI(x4j^K|uEcD=d3xb8?Z?J}7-S-gVT^uwZq&kv+JEnw5IF1Rv}chAm0)*FNmF~{_N zmA|nfnQ`6K^fZR^UJT|tid)J?lR0%WH{$k!|?8|07Dz6@CS*o3p#8scHG{7K-FZyOy&!k zaSN6vEb!~*`7p`q!ppGwhUy4A#_73@O0rw-w}|hU|Co0}G5f80CNAa+I--~3!yXtZ zm$7+z*0Ej4;aahnDQev};TloK4P~Co1dMiBks-aNQB$jXL#BdPhFR zq$kAAd9#LRf$-is=IK)!^BU6G+LSeT_BH1PvU71T_&YM|sxq}+k56#_Wd5Ndazedj zgSg8-7P+6h)Bl^YU09j0fNhuLhi}!o$)X=P{Z~KJOa1X<^4y1l1({dBK7TJM$1MHe znpqgn`uTM!JL*0f70i@SZ3JQ#}6jY!WSYB$|H+s}5uIwf$5yoUZ#1IzVYtZDZfRY)nxPM_K(_!>mQuqRle}H>3}nfgRI+yr<3yE-A}Aw z-tt=aL&VF^2lmS5H_H0)J=nK6+FahK;9mU^1}m>9&I#&m@;3hGDTZ6}Dr;4^=VY?PHE_(i`(WyH)_eM&WKd||zDJb@wi7n|ufRh5Rhnh(}67{Bni*FT~3heGN3#@@OQ^VlD3 z+_vDDt%i^z?~i^5)A|F(Y=3y}H%$M~Xk{|L!I*c!OcA~ZYgnFW+$}$_xZZKP5|=?k znxq|*c}(-P^^I2={%Er9ac5rQC$giT;YuXa+x(yGHeX*`f3V{$d!TdDIDy?m#^Ui2 zMjNj1;P}Z8^$J!ByjYf-puo_7X)62s`xRe*Nj9?-^mAl9W8Nady@iFx#F}Xi3)9{1 z6AV#x-&l8qH*r?f=>B-3yMX;46F=h*){@Wh4>Y6e8>D|YvU4_k3;4sn&i*%RkF?u^ z(l7u2H=J|$clrR!635>`4&QghSe8ju+7Ir;pz*%uNN`#SlxQWbFlFo4}aeM zbc@;_Oo#m*819yD_^n#Uuyr%Tdo4lcb52WKtC_7C=kVwp@V$HAu0Fkj;Z+Tjwaulj zPdxJ*e-}zL7Bb&TR_32$$`F^x_lAREc}2s^_wpYkZcq1*XPWN2(Rjs5=I^@=n)yW8 z@(S3?*c>*;E_mGVpCR4p9<#oD&A)HfhqtfaFFDVy>gb0rSJl}r%$s@sz>kLvaULgl zZ~bSn$#4vd?rapTI3$sgd58T0&rFR1e)bn`#c~gpmFDH8J&09W!=o>^H*rVBN4vw_ z>gy$!Gc>hIecyblg-vHf2RgV&K>WWr_776m?`P-@bhc! z4|@CwJNB{Y$uqAF7MV0PErI23@L`rcwX!?@vzJI5)PLYJV@HcdbJHfC3w!Mwj!S%I z<}YQKr^D`Z{MWh6#Y>-LaDYc+156<+dso0(vG@7QB~@HiCGXvjWF#U~eJ zzCDwW_xw!3<1cY-`SSCO{;=oNuRD^y2F#__>X7Nft!=( zA2=qQG55dmgNd7U_T=!Wsk!mAx&7jqxO3xy#TEMvZE6`})cN=LFjq{{XU^ahXD|5A z^rC5R_<_sa|Cpvv|HF1JXbMmC zbc66AR-3!8*k5cbesJbQ{DVzO7t-GTKhS2pVgDh9TNdZ|L(cQYOj2R8xfjwgoq5k6 zwk?T&%?s9Zm=|RBNfbDnzmSM~P{O?9FypQ-{9F8)_9)8Sxb~F&ejH!SEtWZ^JGgT^ zjGN4MFk46G-`~&PcjGg|^uK>t<(0W-?)}Mr?>ghFEe&R^{~6!egIbvmn`O=%a8ptL z@af?E1IKhTKHEueNIt^Lvz-6H*&7EYXG=Ov7izLHjc@49(|q8TR`#H9-vV2u1@o9P zraj`{;rwB`V?ad5L(va6VlR9=yr9~@L3^^qk%r@&PBECL|7R$ZyU{2+>Ak{#=I=cn zjQR`yu*OKKGsbv*m)oJ?eE(QL=xM@=Q{4##<=YY>ww6dA?kp~sEQ{ZD{KL!Z@oX1PM%6c-KHu=&-ROn3 zm!Sre`N3%R8%7??-`7gaylJShD%*IDefcy;i5oAueK?X0Hkl>~h>Np+v;Aijv$t}7 zBX`AaYx{!9<^|u`J~-JwSo`9@1_8#llb?@+X4(OO=7ryJ`Gt}?e?#Je1#0IH z95{070Ph|CBV2FZ6fveRbMXHEWQmL94vQHQ^I~?L`yf`)`P}-!$&&5*@yv3Ke_9US zP%YRpMFzAp6|@ka??eXVFc=9b#RIBq4jL?9+4At&-fEt7zxk;@etgkA{C>N>*x?O!7cyTUS7__*LUEzG>fHVUd;Z}2aa-C{qA73DB`s-64~O; zTv7eAx&6E3KL-EBNv!YGe{e6UXPhqI_-_3Vt~+Z^Gs%1sf1JYf?k$5ETYMdh*`a!a zJwN}j-jVpvu;=hY{erSb>Kh*ZfBjvb?Ly#2u>-1+%MRR>6nplcXF=ev`v;EQ$$y~B zd!UZD*`Ppq+oDBG%_}x29Ik%whCzM9L|rDEpB>^i4m^JNlrgrLF@}w0S8&tBhtdVx z9`YAlYhu0e;2(d^jsHyZ%vg7={iDC(FoVn-_Iq0uPB2)_j`Ra5i|vN{=;@YgUZ1@M?;Ge&70WxQi?hUb&D)m z(bK2t47n57-%d|pHT$-oY5KB8D=nD=XU{K~eNvuDdj9;zYTlNH-%&prq)+Z=Jk0VW z+$~@^%ZxV;vQ~BvCg~R@9CwOzZhfe4a7VJCOmpQ4X6YXXp4uO{CoW%5DfQwUhuj6h z-3R!X)i((8Mm=NRwL!4tvCWBl^#@c#>m7n^9gKfAR0lh}`@>$MpAp7fB5a*;Qgnqd z%R3K7YhIlL8-8)^dHnQJ=VhMf{c{sGTry9oDEiO%V*`V4Y;D`@a(SaaY<-{1r!6DWDS2JEdyqKM5x?g<44%RmdPBDFVD`2#qw7@#CrE&Yz zVn%<5>can=hkH+(H+(;DU|_>?j%g#)*}qJ?rU>kK!oTH?57Um9u`)Lj6T~MZRQ!8k zcewOHT-W~tPjmMim?`9~%*w``o65!=?EGL^iD!acLh6pH=d6c=AGkJ^H~gM#SNG@C zhaW$+*$f2@Kg?C%-!Rui^Fhy~mT7#<+8dI8bKJ13;J>rI_|+xR2VQH|AGrN%r^Jtj zk9iDl8a6ccnXr{Tas0mP&)=W(AO3ya&$HmKUwmWU<44bv7~V26zODSp&+|V20JG?f z#?Ck96aI1RQTWXKL1gFd?ea!@nC0gG`T4iJ?aj$-_wL)ETC?$@z=A4{o_CCrzK~6* zCcKTx>hFv@82aNCU)0 z7H1CV9Xnd^@=fJ~OA-%s&u*7vnjXEEC133sv)oH9Elt*YYifQy5oEitNrC%;tirAX z$CmHh$9MRmaC#&2n==O%*Hku~P70Cy(ZE|D_MkKLyqsOag@CZMia#GX5C7(W!}Gmi zcAaFSF~81%yrr9@-zbA9`U(+v%?rEfHNCpv6axZlWYcOk7nFG2Z(bV0Cf z#k7`*vU`qjZt;}bV&ml&!BjCxOqw}^jb+QiU+M*1jiNi&aFmqj>VF8)$&-_7+kRka z+=AJ69K9DG*dE6GJ*L5IeY2JPg3B8mdW!;%v#79J@p5fh&n(ioz>h=2$DzEvVOnD2 zA>k!_Tk4rXTfMo&g$oWFWpG~5e;|0Q=fHK*lJQa&=lrP+0 z&@H*s;q>hWS;Gm|4$A-P8+$_(FHAgk;OzZR2e?%o#jWeuXDM^oT;wwG{vcQ4qn%;T zRd92fMggZx#>(^Y50>Rz5K>5cz$422VISXx-UkcLKA$lA@=ZyHZ_R!mfBku?%$%|L zcYFe~)?Emf8pMo_44zXzqj2<-%wCxM{Y@|Q16(_WRF)y$`;s4;?jOhn%|J~1EKIb#z z-Txo&hCf&tX)k%tuKF}X)S;uyciNBeeNnXju&m1O!5SHZSq-vEybpXH+P7_ZmAQE7 zV`#JXf(i@h@=DHZ&=#16Wr`oZJ~n=^tH$wz9j|5`8z}9`${e^@9~YO_CjS1vp$3Eh zQlmnXRDo$>2?hKg8OoK^u3s~V*;@aJuL&>7!s?-6W4MHmP!^0o(AcRRMGtgGj2y26>R#*@V(|wI>X#mM;K$mm}dPA2%MI( zqx`-3;p6B3OYUeipS_<&u8`a6;Vaz@5C6#DaJYKqO4V^g0uh80M=SIenDxjt1`?f2N$6eT;JLzr}X+$z9QW$kJD1%sBl4 z2b1(Kp96~ZA5$~L@{C7D1 zeR~_t<|ydcVN-BYB*Rj4#bc&h8GNr2{hJJmBQvBcjYI;{c5H?9|CxGaLU^#GsSRylis2DSGzz{EaUN) z^aq&<3;3pXNMwk$@$QL?b98KcXjU+D_MAmRhov7(QVvy3Z3}-NZ+K$0hG7TObn!yw z{L5^mdmP@0u$%33ZLE%sXsnj5W3pCXu(#360W)YQ~tp(jSF?cWeR_vUM*(3&|1CVal*`o>Vz*_r%2Q>eYa`o zi<%ZRAwhsOF0JD0Gg&r9yRf!3Pcj~KM$7P=ZxsJuSX^ZMVRMmjjAgxG#rtF7ZM*Xu z$_pCaJ!Z(;F`ZR!B^SqMhB6*|apY!d75OWtVsZD7ZoZY=V&p}dZP-{1#_jpbYM z4aQsQziYM~Kd@JN*MXbs=O5VclVgvn{1*OBL5chS8#5dHXUu*0W}i1tf1F){0IS?h zZm;$~2UH__4wxL^iP8J^@UHO#C5H#PG6(*O{%^>9#Jr(cbF~6*i1tYZt{(jhCxZ_J zOG@0csbnbmuKQqa{hR~8J?0r1Fk7FqZ`}T+nA!jFu9B~e%}W@>H$2wjI^!NMS;sV; zb6@5ER!3*)3Y`!2rfju)^?82t%}v?Ce<%KvWW}o+)d}p*A{NE0Uh-!S{Iy!3T5-Q| zu6tU-t&l4r$rBi5pL6e-@=^N2oc8VS4F9l}m9R8q3YIKXESS{YD0;&(o%vX}L(<)h zlNO+H9s?;R6Yj=~d?zv<5!F`9hNWQ{r>auxEhl3xyblRl!h{tT7 zB2W1Gm?Vqc>HLS+J?)nKqT3_su>9QzM(O^GD+76q)%95N81^4m&|c3r=PSd#A_f`8 z|GYT~l9I2D8vJ^NL>?toeEMNp@RC#iLx^r@Lh~o?4{h0XZM(1MGxgv3dsKmQ&Q}4Z zJ{SASPh1waKTUclUBGN44I0VdpOR9+78C#f zJHIgViz~_>Vx4H8c`+_j$J15x6s_K~CpISB;t1VEjv}{m5zu;V> zK!F?Uo`+Hz=g#rPtYe)M%Q$cGDTZ093@@vB_N->vQo@;HX8pn9w*3A74er++H%l+r zZ56lo*9ip;4X!Z$sCleWn^D zvitk$*y1jKl;6Q9x8>tJ`HD|B+#fhH`W*09`p;yoTyx;JX`N94!}OY3#-xBB{}|$8 zeoF87-z;ts&1`kvt9UPoR{#Yj^Q0Il0Bvnx-vdFGw_#`F5STnfY4C`}Dd@NG#Q z9-PeY7ysn9VeD&u$bVR!t<+bN&Gi9iA(PN1p6!k9T=7izwldGkWRjhyz+;opC|a?c z>q8DpLVHjD!@twxdAPC;Og`Z7eICQ%z%W0a8{N}bdXh09d-8t z{KfBN*zxCFu-)}nqT={L{SQU*tdWv!(+{X>1syp1_J5;vjcl%O!}i!><2g2EqBYN% zGx|AJ2=d>FV6@{CFM0CT`GMi8`bOo8Jw6B8{>!_uJ+RH^nRDPKui*pDhy|&B-y38Z z3LjkDu)vQc!`D{3M0hJhfZP?vM5c2_4dyeO-)(2;^C)Kg&iR39y6#3M^Nwbz=ldIs zS>hY!N?v%w_JZlae}}>oD+78S_&)VH;CK1^`}l*$muzB8_i>op=6_)FJO}U94&vt< z^BvjW?PmDsn3uqEPOouVX5%!gMk|Z|jmDhk=i9U2KhF57!hrcMyVYB+P1~C!_sBdq zE|@v9p@D<>#Xo_-2S;lboPDNHd138qAD#)x&5m<-EDsG%zoy$ zJg!kM^ba>r_=Pjq>Ju#PSX9q?D7S%G@qju<+_dlF86B1%9xw)^r#<^}^uX`L6v;Vv zdm6RR*ELJupWnDy(CENljR(QI8;rH|@7puqJACNmf)&|3HotyYAMOgh-6*|vK4ZUA zTDnKa_tXnv6IthleVg}?tswcA_=A@r-{qLo=Qhk;;lKZ$am3A;Mj4qW8T41xu zI-9ZNeEYmkN#++$`=t-K{abx~zQjF-{2R|17%CUk_D2U~QFe z%zV##xb#5}YX+yh{D%vS%+9hOCLTHzr1aoi=c;Xd27B%q$K2qL5o6n<66h8pvZwOz z#n0P$Y=nY%Y?_34_DB9R$eCd_{~@=5Uz77*iHgSG$w!X3NH`Rp<-W6l@0R*uhC4I# zdG45;W7sqKnN-2#zf(7dOU$#YJ*J?ib|xWV3C|rVmN~&p^KKktn01MvOeeBYJ+3j$ zYKMiS(kl>KmzEiEsRE$qR(zTV>NP5lo{H(g49z-Bhz z=gby~eRcnj7d$@3obdR)Xu+26=7%3I*O#bh$jp$RUNN~8Z`9j zOq~|abkFKv^TR(+y?O38@FvTeW+t$=3hqdE;n?B-M3DIj%d&c&`3>Uy|CswqR_dNLSX*1>=V1CcW7`Krx zu8Z}RPD5S@yY5V;m5eueZ!O@t#%=SH!-V?~-<<;fR~-$)oCW*2PVnm-uoY4G=l@`n z?u9zR9kK`ZGX8InmUP&xa=%f%uF>sWJ+rxTbKgl;(??fJuN+J~z_aHC-@y=uN3}v}3yvq^Z5_aryuE z+yR!DPb{~#e|r4i`~y$RmQ{R*w{Jf$v2N}jra4cAk_0ABO?e>xFtLI;X46-e9d};6 zTf3d7zVY;~BTJ4n8XNtWa4_F=`n9L=pZ`DSJ`^ty>yq9Pp{``2y`GI8>|9#1_ca~glG8o?XGL{{(u#9M! zF1E?2gCYIKldYl>6^-noHO%wszOvt#`H$mH%s=Uh_#TE0kBfhQWPb2h)`n--w{tuT zW}nrcZ*%m+zmwc;@dx<2I0{zEtXKG;R`y^ao6Lcm-SP)|AK4s`HgI&8tY<#=;Lnd= z?GG=t-sV}r&AwEHMN*}~`>#c%#KF0tY7bgx%x_db(P*`K!PAHZemd40in+YZ7i{^& zu_N=pXhHD*{0DVHkqO6TN)(@dm;Wzu>RFDQZZ2$P>oY}zT`buq6MNeZWN=(CVfiIK zH>soKTB1eG53|Gd50)i~zMXnN`l7Ey9kcYkIR{jA4jnqM+q7Z!g!_Aca@bgY;Xgd@ zZMB5XnNo?k*!n{XN@}M+2=B0YBD_ISlPxBh-|AqyyGO&r2OGN&%svt+na5zxq0Nv# zg-yr^iae825o^m?NynQ8aKMJ#5I2JGYVAqfR2TJvH4xHV# zKyrrq`G(Vt4c<%T3ih(g3F;gTh@5@+!-IdZZ8ImQGyBUjnf;2ZOP#>b=he~Ngny?p`Op7l@6K73hNe!%p5&6@>_{p$@rF!-A?neMQ3>@D#tD`1u@S>M^x!cs9) zFr)Jte?szn&Wd;zjSY^!%^WrhEnu_HXmeoM5ds?Od^Mxd%(B^RT63DHL$B)ui;Vvq z9lW~?{|SGHn{xlaU&iO0zv!!)`5}GTHn|S)m)-1-FU| zODh#B1K3%%xIcaW{r`jHPDl0JzwGno9AVw{MR13D%S_fShJUS@`9B!BfYzniN-d~X zc96b#R5hhx@#pvh>c+Me9~v09w0KMHc+a?{y@m14M~1wcY-S~n)kzKAlMc8mGcQ*; z;C*CA!(0!)2f23_@NvFw59j&5K0d92dym9>{(?*~b#eI(&A(4qTFNkt`@YgV2!j7r` z+|C`%LLR zHyTfWpLehFn8NB4#|pk&;B1@jKcAt0cWQb;$p-d$JHD}2++1wJtX|;u=I`v~Jofwc zv!7cwhgnYlZ@;75jhPRgC$i2LV&C=rne~T%GwTmLo@f8>A79+Oufi7G-(KAFPH=x} zT~H|_eE9l(9iB5bH4iRd`^P+;WfSw|Tk;9&A9X*RlT3TinOpBD8~7mb*qj5ZWeZA} zqSDxRiT)Qa@ah+|xcXJTLg{AlgSgcf9~FScTM|rIUI;RQE{iEK19bx(J_{Ixh@?GW z(Br&lT*{i4^Y8G7cL$}}e3MPta!)I?y+7aR{-UVUpytPyIgQ*qOx*qNw=tS%RdZW7 z7rs5D$|je<+}He(pINu| zE7MGmWf`)JH4S9C#v9*j@8k-o; zGMn1fGfYo3EG}rCezM`p2WIP#2YXcy98=Dy6gn|~0Uz%QW5!)u`g^~ce^F86`>=7h z!e&QVfeS)!J=NJdK3*v@Hq_cD$A{d9A3Xd+LDh31+K{GakNQzJEfuQls?U|IFWC|M~HC+QWOg3uNW@ z8SY`t`!j8VK%#+ZSZc!KAE!V3yqo<%aNqof*~jl2*|6z7wqm_g{YBVf@iG3GtRE~D zBAb^kQ#&l4VDtYm)4lVb{8@JJzv4VxoACS4F42%SeMX~kn0|wL z^xfUxn;se$NJ@U-Fnk~-*vzaXCBNmz z94uh4;8xOJePqGHB?k(gpQ~*Pm%nGwkhlC9o7t_kzFQini`FIW`164Cu=|5r(fy6m zYi2e|Pt1?qd+I?>`hf*pF-AxEav1)zl}Y?-?wiS)H>2*)GttA*4|HGLZ}^_D!o%C} z3#0k5ZiaLYJ{cRXJ?c;7cP#uTc*ElHql7d8hF7&;pQs+zesJPXz1xMAF6SlYF?^p{ zQ}dtm#z96o@zVznD{#!wOh`^-p11Aj$q#RT>$mkgRJSxP{_S(1R!-}{Z-+X@=^ytn z#&A}kO@4keCIA@dJ9;Vns$2oHxn%@~d zWPA6KL0**SPV@mzn`_^0U-v)Y%-AsdOr!Ube@y=8f3esc`+oZ~JJ0-v?>+{M(m(g_ z`RCa4FUJ~GEK(06v?>3_yN;(2xq=h*%*m&Mf^daU+joNn{cSVL3Ou)~|NKkwOt zlpS?X*_it$7#!}8|KH&K>>opZ_W$D_EOartir$HO#vV|7#x> zzi{^F{C^C0&$Gl>9Y3YOVx#Nr)6(q7QNe$TJ>mHy`whXrKUyn)c(O5`=gfY|hVtH; zq#wL!_1AMie2aF~6{mC%OmGfp$~e-KUCQT?6u@Kf#b zhU%I33~lPa@x5r1=h<^-&w<&gHzX}8EG1hSs*CEF-kVl(+uZtY{UK%Z`~x#J^&SWr zg(Xz|V}9dP!>DIl^Z%oC!TU?nY;`BK7{FRf~-W3(aqu=O#(~hxU!mjq8 z*kR`fA5UGMZ>o-CV!_ zFXO$RitKytyk$Imuvxu<_lW+1HVgX?8rST3{PXUnO<>5|B+62zQ1Zn@;!W>X$v#;t z&;`{l+*dgM^U7$ZvCR9S!eZn0MZbXgOZEf7)!!S`J@&Ha<^22cmOW#?-Uk7t2d)kC z?F}Vft~74YQ=cL#ny{njwcUqPTw)(o%NCq|Qpe=aZB_D!>%)nArQ>II9x$v@yye=tulVX?o+j(zjRD^gZ56bSE<*bsQ`C}Y&OFT53A*V7*q z&B{Mu%kA?Z)hE6&k0D-xV@_%U`#ia?(iO@--9Nlx=CAO)UjHC1(Ji6F zHl#JbyYYkjj`JtEir1DeTr@vy+Y6f_gq zof{ZSW?OO>O#WN{z{AFPgD^{!+1ID1)!8a5Ssz?HwqKH^;q>h~MsvsJcl#eO|B~L~ z{?z_-JzLm=I*GIgm$WC?TQ+!a|Ht^XXcOakT{g25^$g!T_ptQ+xNptBCsjtmZT-Bx z2|s@QRA+wiZ_4%e_l-1GY8Z5UEM|Tj-qARhvtp*A!Jdf5@0Ah~D;OUCmHV*hWI9i| z{65CAD0_p7iY(&}=J)>}u#{cNi{F3LAoWwtf*;v!r_b9N+^PH0bnw!d7Duj%E9(qC zFnOCj2t4LqE}K$Oz+WNGQ_wlBXPHs6#D^!EiGp@*@dw(hgbU=JvKK@uXxQv$$PZUZD|k7*r%Q`jzd)?JbuM>B z*B$+~HkH5GZg~DXslfJ1h50VqCT0w8mw-u6u#CotqE2gUKfyvZ8Dwp z05bF`$JDL%&3I4s=Z=N@GL4*_wlN(3+a4}Ck3qlj_cvh^uD>%LzIeHt=Xay|eCbFj zruV)-jut%sW%+>9WxwRU`k!YPC~33D)c@~ujBx5mJbvyjPfg4n9>bM}Ja=BL;^9l% z#pB+1dW#&>^oYH?e~a#kKl1Z)K3i#SF5873wgOx34HLh0JBnBc{g=A2@dxJ}hBGX8 zZ0zz+8MWP5!tmf(d>va@!s4ILx9juFZ^(WU&zvrGug;2HMlqe`o+0C&Xcmh}Zyu(c zFZg@Qw2gQ6HwO1Z`U4k-OKK?#C z+x)?AHwR-*B_*W?lb1RCHaxI>(*H)8!>9T7WHXtpX54p%e@Eh<`}^a06bvuOs{NO2 zEKmI3d}hZVM!oBdr9lUzFE{GmsXs9J#Eu5{BmbDr1vr@PV(u5J``P0tQSo@2O2M`V z@&)qj8TkjSANa5;8$WqgHlglE>ZFoRd=|CUb3qSq~ zKHM+%^~oRj%cWpj-|$;uot!-e0lcQ_&T*j2?76s3m zC2u_3S@KBg!?BO6d72hY;;A{1niyon#B<;Nf5L>Iu!IWkJzqXPczK%Vn3xvNy@PfK zazENPY!19Hd0_jl|4E4zzrJbjP(IFl=kw=3FJ;->qf^_i^UE39?EOFGp=iPVj!C0xBU{!aIiSVFRZ&_sq;fr&p@-&ok~=DL&5GH2(`s?TB{ZX`a~xaWYa`GT1`7aAEB zOg`-J@f26gIyNuvEU7~WY;}BibPfcs?aR4)py1b?+6Vh)*z@o=o?hA@>~rAqwFdJa z%+{HE4xDRLFqpgP&+n5TKE6#)c>bN6c||buuIsJr6`$?(3+8iY+~<@2pjK^{p#JTC zyc*ku-Y@?fPII|7xGQWn`oolWq5j+f-Z^(Gm~H-vKba>z{XK&})9>RSL@O?;NN=^lj8FcSHW}c^I9>vnvb^tUP&#>1yp@c2Pf zBcB)9?E1$ye(XyPF!_`aaQP}ro}L-IUccp$1#8zH5|EZZ`rz5ivkA}NoO-Irvs($@*AYv?$$Uu?Sfv>A0{j74?IqhY+UYL`-?5=|M?RNe0wrJeEqzf$L7Gf zBhC-f5-+R_yx(|wkvf^bB7Dp78~x0TLvHYP2A73zwz`Y zhw4xV=>v|Zr#cw3Cs;n{_>%vC=a_xM>94XM@;ELSuAbjmE$(0}^S^=X9`p2H4SJue z|9_KZeo@D67Ir~1@_+`j-d3i&HRt$Z4zbNT%kcI;gR4r0$$Z`$0{=PglrttZr>Qv1 zWt{MH!D+7l%>ETjI|aAgd8NIf_=~7SUVX#EV~lr{6&YgQ9pU`)+xo%1uKfhH#V^66}MR+U22ZpBq2bN~W z->*-t`1*u*!^SfVHg8`^eNft0&-17#h$ra4x#y?L?@Q{<*?s)O`|Ij#>Fl{|mX?JH z$G`A0XULykug}BtMn{HcdcJMa55AK2sq?r#IC<%^J+Pg^^Sx2}iU0fE963w48LdqZ z%v`pAe}l38{>I*4>v@6>cVq z1A`5XWvYe-9?bc&*C&XkcW{(4&%6F@{zJKflMlEbygBu`{6HVmha+qF4}4*`6@Hi_ zModHLz-a~EIa3V{8F$Ivm|0Wso%8VYetQWAcHRc7;|tD7iGL7Tv;V-kll2dt_02!v z`?Tl4O~bGUmu&eSbVe^ouGg2bKL6p4X2Ggeym$DE`X8DWe17ZxVB(JWhQ)8LH@yCp`ecg4lE%fi z7Ay_8le6IV*2;$7W6}q@pWcv|GIgp%O2hFrP1CFk8Ke{THw5$VZ(RKAf5YOB{c^Uc z6`vZL3O`HH5BGY(#I65sLtv0z2=@44378^w?QO?$w& zE$2Lwx%7P&xx`;mI}&H{?~t3%yrYE6WbsGA9WCrza$cE#*j9XDSy7&!8QX=qO>YjQ z1}?amk@p~nF~d?+zF^63?E>X5{tt|FF5Hz}b6_UVg=g>YA2`P#yy5Ui(F#ua7eNkc z3CBAaZ=7JsjbJ}pRKV~(qT$^KhSDep?^P0@L+6y=-Z{|r()__2z7L;x*)9Z`U08E6 z|AEi>@Pr=?ZjXO9c$YcI&e1=xS7Ob9V}==(*AE{*e_*rCn*)9f+&}Du{2plh41e%O zNc`}3{t33y3v5+-4xF2)u%Vb$YVLpbHy{46mO0&MtoC-0zPq2n{9g06*$r;bcUnY9 zu9LMqRUlf?e*Cz&zJ$xq)`PRRy}w(1W<%X)#kS=RhN7vOZ0{NP**qV-eL3gAUcUN9 zcOiS`GOLJ&+;7tlEcLkFczTYUZ4IZ*!>*Z%DyCB$L!@@Zb5wXf`da*4V&0wI=M|Jr zoE8vy$z-E9eQG1KgqeKf+;h^?5{|!>+fdAzwWGOj$x~*zq5~W@9~$H> zE`N}lp%!ObbE<%U#=d(D)7@)-{+Y|T#pm7Mx7Ix64ds{b>|@>{zU4U6j6Rm5M-R+C zd9<&91?D-03};0Q8K>Xe_}QE3@>ZL}o743hjm_#M z8g`#)l>QSbVItBXUd+`0RaD?%3WMzFKYxy@C(PKJxP#kg@c~Xgwm3O6whM*F7X0|b z7vslalR5LDzQNx=zy63>G&9esWG*wa-}j5_PWWfmnpG0~1(vt<9~@-=^Jl?duQ@z9 z2fPhg8)Wq)9~543tMWRayt46kRKwhm?{iizUJ5%BlE;IiNAIANZw0s|TEf}*+k8Hg zzn@Ub1NOMP1r_I6+iYi>8K3AnY24w>^!^Tm-fST;5ytybf1kbNZFA?3GyXDX{=o^s za}Fh>q@P~E7IV8!yyE5pl?{eDk6$pwSbd(Acz@m91HHTNOXl6(c`_mW`2htrbw(S_ z?tVrSBmP?+wa?GVvUw&velK6}zuBOm<)`k3gIbzO2Ntl{y!(1|vHF3%GCVx_4X@w- zXE?rGa)zbko8B!FIXPz}QdE9Q*fGCf#*iyiUTBaOvGt|G;m6bGH+rvk=uLQ_VViN1 zn_rxn*_gdR*i8DvkIV5q3znK6SbO$>V9kY38VSjQJL(^4uW00ZquU_$V}Z4U!)E=M z1AZ(kjG1;VX1P+Cz-YF_QTnjsT%HRb{(oO@FX3P;8Q;ho&G(?L|NHxUO#U05GTci& z#JkU)#YCBT)>?+Qm5D6p)c&x&GiT6U`-pWH`xVbbwtLx(hyMRFHfngoc=zK+af{td zMw8nc`7MMG^W@ZQVm_P9+`q2b%K5=*uEx3h?GFT&URc`tztMZcKL%?%`^JaIc;3V? z_9j()dt~|Hi9sgYg*cXgbiNYfJq#NZ|4UU^K3UJ-b6{~+e4~H=q{&m+->;o%UoTp~ zdC~pBT^Sjkz=w=H%hY}yNR9X}*(Ymz<^Yq-!+J)W#5dL#{!I73Z*YQPI>TS)dyhW~ zS!_;7S#^3r>H;>KThqH61ue8U*B_T_Yd>&oU-xv*=B`~#%?k3`%r7!-@*h~7|G)0% z$peS~@Yfuizif|ybHohs<|T7fHYEO=%2*P-chf4a0^{up1@k$LnO}4~TkP&{bf@~; zyoaVQ%*qm;_lmx7FH49@U@x=z$E?5Grs@+DbH+0-N9V?e=bzW}teSP{!Ct$j1HV&l zG#(eKXF2!m5Bo9B7a32t>)$grVC*ls#(d9t@rs3~7I4~p^b*s<|a@fBz zL&LC!VVSkqgS+OF4)A{4o`0A5Ui;_fMsAD6Y@7JE?3~ZIw5pc`xfcmTx~_mp{n;VBa|Vr|W_3zh7HNH2Cjiie2#Isp^X#5A}JLJ#*tZ)HR7` ze#6VIpSQPPoRklpeqhsKam#m-_pO0tw@CrqZS33M8)nRsFp#mVW8Sgk8GG~UrAE!$ zrb#ugnWA%e?eFc9Dy^xK=NQe;+SUGVdnj6Pvv1Elqvlm}xSDsiax%X#+W&O(^rrs3 zSDDR1L`6g-TYk1k#OB*$dUuO_wSKiquz2gek zj#F|K8}DjA2$Cs$@Q*3%L8kM8)69+DYkho8CCzefa_-4_r@NzZJy*=UMT~cJ{_s{D zXUp(Ep8sIe-17%|kCitpemK8D`32K~vsarAsCvygAUxOM`1K|$vGWb$s&x!IIKKlb`!H7@P7u_$zPU zFqfat%Kr@PHZq!UD=$>w-FMhI%x&I7r{X1+z`yEA_(@mBl63#q2$rkhAP;Ldu%c z3R*{a?mRwpl;s>lw-`lQvdr8FSE4x z2er}%byFuVUvFr`Zg!!6-tKcBSZ{1(KI=0zg~c#~!Mxg-`7XB)+ku(0rFov8i%HtS za_0))E`Dd{*gi-88-hlgjS?7I|6X=KAUU=Fy`)PcyUYhr<;XB+=8un0?VBY&2zkpr zIK%UzWz+iud{?v|@bIlD)=*SFp}@88=^W7;g3R*@SnsgZef{J6VAHDiJa-PL<}R4I zK7anb=JcC88jedfA9~N7aZ_%C^GCTGmess>uGBre68eC(SzbcqNvgyTmmQKKqN0t3 zpZR3oEjY|*VKGDENQ-O3Z_hgB_o<9?*BxVd*R!$slhFs}?>GK1pZj6RG+ozj@7IQh znjiMb1gJ-Phx1n4(U;yJeB#6du~6HnPvCwWXzw6=HPiR@Z(Q{Hna440cP%k z&u{eG-t#>7pTl~O`QY(_hZoA)+QZ*Bo9B0XpE8cP8DX?y)+{3%MmgD8FXZ`iYF;t) z2Tx5Z;44UGxMz6QK(d6NI)?tcPnqJsEMv=AaoW?< zsDLS5W*)P(0)ON3)Qt?+l^fkoIhGeU^xb1M-LKiZqG1%)yb??#viyk z8LY()NPlQFPN{D={_G#yJJv)7x%a<$D{MZ8KDalb`M~T$_Zj(l7|yIWZB`N!=~wJ80ocUbztzV7-12HOon(l>0pmTq8tHEl=LKcf$q zoYUA64H?<;5}vfUz!e4}jdc6rHtOxBf2kDLxn-pq3F`-U2(x7>_*0slGn^vZ2vcXJY&F(0(t z_ifAtziCGGKnm8wTYP~^EaYJzwQ}dKbYKM2v&*AZVH;-pc&7%Xe&);Xhey~2Jg2!f2 z>HA$*d1MYO4cOn%8y#5qpf#V*j3?;TGM+%bYX@p2A00S*)QxA&o&S;+krtBI@^79m zc=|26ZU2Gjg|V`}jdMkq+g49s-|$`bgjNQVzDY`|Me#S4=6T!LnitK{VOIZb-v(Nv zxQDG&slolryj?|8ADR^efB1g?|G{4G;s=|g3oRuuQ`w!Qgc9ftxAJ2|CM+;0@W(3mI1p8HKq6-R~3>$52^@^0g&%d94z{l}IMel-_K|uNw<$`?9 z7b02#?95j_{@}hKBNjeYZm4F*5VKI$J3tf_NMe4zGL zpU3DxV7a1TV%z%zy_X&xNG`W*bl+vibdHJP_zlS=sYfL17_3F~8;u2%9!=s|&}JsR z!SU~xm(FZyZhUNs4^$`2ne$)L!CmA(i=K1!|CzlHZ!T`i58O1IFuUR4 zIfh;RPq_>F*_c0UEAouZWeZsT>fz1R2l~#Nvzg`9wf#RZ@51Tj2fUf;|0G(}{uN}F z4|ro#(9f|Vc)?=EJPILM@oAR_ zIbXO!NmBm9mM!NGOullXajxBkwV(AHmX|m3i8J^m7_3;i(x9e>agUEc#p9=&m*-15 z6!P6-S5eYBqQG-T-RA(`Yx9KXk3}~mGg;m2X%?^O{(byC&z}Qlzbv>Z;rC#Yc|epP z<1ub&0|sW}TkhU_E<*0MlK3DXaThc?0v;=QA;eUk_b+LNX*Snk+Xt+*lP(2IKGU0f z?8Eot>TG!ro<&^fz0h}WAJ6y3Gch(&|v0%9(>m8$yb03~ty`Lw#kMTVdqnVPc!}K$?KM#I*@vfAu)>*kt{lIRu zAC1z>>>1rxMn?WKI&sp&@DEep1ABI}IrsOl&71J`J^P2S!UxOZ6At%rR&129E=ak5 z^kV13D>Fay=r>dgZz(aAh+{H0mcAurv_veGv7a?B(W08oLW^If_CMR3(gweYN$h4i ztPRtTHR?$|VK^ty(0`OwkNFo{%p_JTrEmHL%a}?^v@*W@l`UBESGs`N(D=i%%nK8D z?r*4j&VKJJ!>(>-lju*}7D@l5cjz;2dHzWELy*gbO)?W?7xo&L31z)IFx4bmSbvrtayp1^0YsGZALY z^7;Sg8_y2?M|y`pZ(rXi{`GHy!NnF+J=RO`pu$qSN&mr$4e~e~ zJK-M%3>SDG?ce{8{a(WVX^pLa?VH!F)jTZy;AE7{0adT#{c)gs$0ZjnQ97x>ILG(F z!$c;tNA^toE)^#}FyD~;%VhIN{02X(o_TTt!?|+94NU9R#98A^PO|dwt39}@wt!Dl zBW`_6JzLDXFOwf~o``u6xVPy~dE@f>zsUm6o+lJ+zMTGm@gB>0_BR{;{QK1Y@X||d zo(0OwBpapowlE9Cp~!hJe5I~i=nHUZ^6y|4YN6UvK+2Y%Z>sWNDOL`2B$I%T-aUc$yB})DCbDigIjlbdK(S$bVw-;-_~( zGXe)PICz=_By8KtO(emS1Q%3UjEpxmasWIxY^-5E*YziH$KN-0A08cSKQOVrkWKzUYu=s%zpduk z)E@ir?5y>NqM6>y{fs>r(^>X0xvz}h&v?&^@68PZ<3_!v-@NWm!XF@KBFt=c?5i^91k#N==g8zd=oYeP*8eBWq-Xn> z*=$+pR8dKmhQz;LkB28Lf6ROMm2Y+9W~KcNn^kpqez{fgY&-DRVmY5|q6O!kxqm)A zbw7~mxrgVS-ZLJX1J;3Zwp9lhxRk>d{C80IGTiWiar>+d%-RAG#khf3WNAKcJkrbxNz`rOnEX=8w9Wr#CY8@3*aLe5n1QB1P_j z9A_M(9ovO7Ov>8q%=_mkF|XgEb67vY{p-1{>^$)eves%3gp?n&a4;`tU~it&$k)7c zy?KG!YyJ;xU$uF}_3kj;vsOBlkiPo(g2l@Gdmi*N*X(&;{$ORup#y%}FUo$Vua7gR zVasz#XZZHdVf)V2r@I*amnSjYt2lr90H@8fpO;i0=$zfXo~QhNO+p3#oW?5Vn15fz zEM|Y?ztJcl{xIFZAS7+VM6t9VAKpkF=6)b6vtTCIgVxtPRo9;Ja2+`N^v(g3Qzs8I z+bo+om9fM~l)WH+62pdKmDLM5ZNh%(8syfcSQJ0iJG`~pzajD8yoW{~j(vK6U<=zU zUSYvUO!ur$oIJpMr}_|g&-DKXex$IzQ)Ifg|75}IZ^~`656nLE-nQac!JlWcZSDtd zUyo<@e^|vA^XePli!i}BKDGzfl-W`r=sY-|pD%Ic%wu=&-LP6tMA5*C*=Uvktd>ic z-}eCV&0E=QgZaE?D96-n{KblhlLG2x-Y@ z=VzYTkoD7sEq=ZNTe-SB+qC~VJj)xVU*F4euImp|+@%`=%1jF~&rXYVmo#at78aS>uvxW!pV6INRs9cj3xW--OG4ts zDvooQv)dnjx|_d2`AdDHx(;LhXSOyu@q&w@#ux0J7Tjce@X~3)Ira=rkqpi=@eguU zj3xz5kUrm-bHQ-ig3C+l7``Vryz6JUCwh)ymL#L@b*8gY4e!_)&sH`3cp$vd!Tk*r zXajVf9^2WjhH2T2X|{FD*0~FAiUy>!iZsd`2&|h>%XHwW^MaYY55mMhd|I-9!R>bq zy*& z7T)pYjWu(|WQ!N;Ca3G)GqPcN*Z70~%W94fNyo0|zca3>shRlD_QQ(!WA%S{`seRw zl2iI1wc|)%|H2hIt&PzW=05zso&UhizV$rTW^dW#T#lU*5D-1`f>Wa|XTOB=)ls zjOh#R*;Jn`_h#$B9@wfaNG_3VT$>lkYs!}D$;npxpsmQ- zyq3+f(vrt;XMR~URLJC{_!X4Cakx=-L9hH;|cDZ zC-K(xQy+>JIPd6~qtM)7VSo5`wtd6t^ZN`K)O{uD7!He;NG@hGSi6D2T5o}*dfR^; zp6`uw(=Ys!Q+-f);J`_#2SLtx9|U(f9eBLpXJg^#zrr6Tc|OpQIBf6NcKkr}569Er z@74S{^+Cqs^jCI?O!>z0);~<&;v)VvZd3fr{x0*^p#!XUmLFkzBlGV!+ZpZywo3eY zwuu$|citDt-biFTTV_-Bb=t%4`fd+uZr8V6x8KjiZ^m%1_5Ul;!-v^z4$Qv&-{=n0 zFV$6PzcM_{p?$VyH5RvY2RC8xc65fjP6w_ibKF=}#kxm^Z^s_?iZ9ySm&@D2`PUh) z$b4xO!+ekT(1{PsJLI2OHcwindpQ5WycX&3bA~ZHYq)Prv^f1h>fPZFzn*$OXw5pH zT+n!Wxl2l@#E;4)5@u^64;*06k@>a5(s0L*pT;>c`y?v9H>ou5Y2s-Xke5EZ^me(V z!}od{_PnTcW<7PQa@LCJhkLDgE*%IgiF_bcRhV%2$EB_6JoSye{ukaH_I=QnW9XRo z!Dw##0n_gb76&>?AF^j~pZ2rCyGV{%x?#c6-~}_;^d9(da2G6NG+BC>Tjt?2CcSRP zQUwQD#tD%N-1ZA(MDj|re^|1d|A27Q%!b(w^#%=nKCE{m&T-svX4zZ zN|c1G3%)UwFe(@q{6A*@;0*r@CReisb!DLAJd2zPma|zr{={7INmS#JgY?{bhW9ND zGg)sr@NSad62e{boc+b6gZ>A+c^!}cZMyRR&rjJs=B@lUIHohs%lrE5ar^^Yb^Auy z1^NdTCyPop1oQLEZ*bqUulj%QL&k!ilI$BEa#@*rdk2eIbTi!fz&Gb%1%u2(_OoJp z*jEXQC8SQ6{EYdY?MJB{f7&H)OsqN1Fe@`LErnHn7+Vyq zyuklpuGATx9G>aauCxH_xhhk&%2sJP)YZeljY5-rmFq3}+=6-rKOx ztvY(>mv}{yuyM1(hp->j2Y%e#R3&`a`hgsu{R7qdH+K$HJ2rSvc9^c=rLoeWVVcfg zwsShRy9;@De4O8U@Q%=phgSlVA28ipdhpcIV+=NFJ&Y#Kg^ylnwz;m}X1IqTuO^+P zY+ps=LtU0B=GTK5@5w43{qW+S^8>q?ofwhqf2ao}a%rx#H_P=?{mT9^8|XZu}wQ(SM%*^|kDB zAAj@juzxDeoU#AJ{Pp&d_iSnp7G%6PY&+gR-ymkse~ufbsjPCgf5bZ+H^=nwBptZC z>B^LphUsxdOw*TeGNy;e8Q$6VvEiZA2fexG`TGoPnBUo3GVdw*U|PWTLj6Mkn^>9K zgREWuC+y*QbJd8^U%7&P&+ImFi_@Xz`JXd1;rUDpa?C>!XxzVHouYzb{t1PZS%(fB z{nzAp|G*r_qerGOZm~IfM^R`;qC~~QyPb!5mh-($t@!mp_i+39`o`V^(;u8>xY;N@ zYiel&Z)B$B1J$bkpy3>ibietma@tx43SRyZZHvDCo^d+IOM{AvT?RH4CG#C4TzVcd zZV)_m{vh+7)yz90*edkihCkr=6rP~`=i%b%JnoI#OS4yJHtWmT)cj#Oy#0Q>V|cy6 z1_pD%<~+0KjByexxMR*K>uaA}uy)En*m*_zTc>X@y?;_Dl~&1T3y!FKln`w^!DPfZRi%>1yA zFYLjwgd4d}7X)wl$7DX|KjXdkjI;hSyuHh??n@Fwsb3w__o+3k@fIf-=J_(74Jlx< zc35zN`R(r?TyrV~S>jG`?8=nA(Z#y@;d5rwS3f1<_EsKcuy~c0nYJUG>+_B}A z_2KFVfk%G(#ii`vopUy5(!(q$_!n03*v$LJR#5Wq_i=rmV+Xor zT8}muvmcnet&Z_J_g=O#vmX{S8t?r(Um(6C<;B_8;XFkLdjCZoh<@hU8Y!`l`R%hu zsZ3@&8s7;Dq--cGP7|0ol{GKxdHRnpOchTpjinFQKG?LQ`LZ6R;Z?BCCH@6kWO9ZO!F`<<`j9JI|rms)-yhy%Uh9tB0NFHmPyX@ zH(SN2E8BY68`S6jP5;4q=lvm`9%1IxR5sbvNVeeI)CWCB&D(BopKnya@I82j#SBL4 z&6jwNH>xk3%k<9kCwosc--5_pT}2M|OqZ1l-XE`jkUHypvRCSh4Z)8hrgHWA2=*JqftGsHjP2o@&}{O@#hUM-(LKCoacYU4oQi|@`DX}l_{*} z;%k_fi9T@E<(YJ#;tJcnJ@22UvhVpD-}cb*!-1Ca12>oOzqd2$=wM2J-tc>xoK5XH zhF3@SvCd-Ov#f=&rQ8Jxwg+7%Y+(=9@F*8N^O3Ts7Me1_F6tC)n12CR}`IYO{-S%d{Vo{ zb1jdLr{}<4ke{`uDWQ2m2Pu%e?JTkV6B z;mejy<5|#s|J(aJ#|qeY9K3F9(cvhw<6_nKb+J6h&&^4!`2Uu_K%Yx|!$S2F6NFwJ z|M2H%a9ibSbK{!-+E`6*bl~=y_@?(?8O{c6VCvtQ zl*)2<@(=lnU03)&$cioSW6R)YXV0*dG7xi^eKB$N`Gf8snXG*m%oMqh>DhDOspW*f za`h5B8oy68VEis`z+`@~InBmF@W&g=g3V?hPQ>~pFh>M*$lI)D6k@--@gPskzSOLR z=NWcsFWFmfSa6?{xq00*p5|>`TpJSq^g1%!xS5pti1Nt^2uU{{BCC;M@o98=1^{!Bsr34j3A;9Ajhde^Ps1 z;oNzaJK4-Oufm)f8k;|w7pxc1W-bU~&(M`VeA#-vWLeI=(+gDeS?|~%JpVy*$9HBE zs-zk@AG+*E@kmNKYuSJV*4+K!%L6*OV%+@e^$uQzi*RSNU{N2-W|5w1N%8`E=`}? zEpD+{@uY&9CR2~|gS)EXat3=?^AyCV3MD46pPTZ5;d|i>s~61Hq6f~tKd`hm-mW(N z2UpCkqr5!cg%9MG+8?-lc^^}Hk{xrpq6^DT35UFYzuuZ3R!?~TM*D+BtXf(co22i9 z)Xq77c)mB5m+H*f+R`Xk;dCv2!4829i(kA+WP0QBxzYb?)pwx^MO9|)4?iC7=egf# z{cbzgiT2dcW*Q8`pvqdsGG4w#e{jo=Y!mPq@T(a9Lw9% z0p0*0!P|IH3_Px%39h>m4mdf)T%D$P;ovk!o*OIvv+sHF*80P~w&?45#((~t<-0Tc zgIvXycd~88>gL8JrsYO|*zeUQyvjJuu#3S@_J-yUu9#DwS$CMbu+FWw*M4kv4}`>Og_GNa5BQzxW-pg`^7N^s&}3nWbIji-*|6W6dypq) z!GGx;JELdxcQ?-WpYZTpv%5oeqw*vB`ljhGKQQ^v{>6Dm;@_8>!EOBVjparR*3xSZ zu>CiGAjfjy4VQUA+XL=`FF*A+>}GjYu!s5HmVd9VNS@->f0no zU)M%Q*$T_V9M_!{|9@RoZ}XS8Gx)=F?hOZn^{i6|f>-@$l;tv2 zeX#M+0lo|IW_oO;x}^{937t@T=YL?w)bOB`fPjf<8w$-*FI);voDe=Ojp1AP!Q%qO zjQTbyjQ18EV%($c!m%T~mA!)d*K~7vNe6MIe=PTQGTr*aKdbl0r@z`Cm}>PB*x7an z%31tYX64CtGXq`UD6ahBMO><>B%83YEgP?_D_dx&C0js64a>Xt47y*Lzi~?bXfU?Z z`R};7X}+YxEWP`c9D8oJF&h15ocEY%t~Hy{dwb>=77vdfNNrwx^ftIg%HZHR208eB zI(V^1vl5Hmx^qbv3OiDF6uvV!e9iQ=q(iSopl4{?hb=*Dd}VTNk$bQ5T=$!kFkxCy zT7dC2_IFANX%=MkPr80=dIf(@jW=_; z!yntXk`;}c<;vgRO}|n4LWTJSACIFPw-5fI;&4cQh^)i{>-et&*Vtad-L3ZY8rZ+Ph`pQ|$of^6v zH!Duyefs~vW;LAy-0%J|w{LY^eD@8=agDs$6aGwJKVQP(S3Se@z{WJ!Dgs!w zE9%}GGQap%YNjWa@HnD3@$WNTo`nk+9$1|2DruH?i)mgdqb@i1m(8gU9*Hr{|4=Hm z!}I@_r|b(3Cp3C*+#%t$DM|9&9E)=w-aSoEXpZN-5yAF$_k@&)&6)g%AG@D#Q1|#~ z!18;y(TY{xjMK$y(|)kOSuJZ(BwF$0t$thg^ak^r-Ngn^p0*fsFr+8&$=aRzAXH(q zX$ez-f9oce4Z#Ok?#P@y$PiWah1Ej)gKUN6e3cCc*D>6ApvyWZHG$>b>z|BsWOr2l zR{g;7bURP+wit%|MdpE%lQ&!oXOGjTarZYo3Rx+x~22W2_+9`LZN`1ntHNBAS{f@MjsZ^<4wcU-^C z|3Ke_$*V;_7`fPe@csS2LHhT827iv<-@eKhgfUf|(JP3Yy=IHX1>5x!Esf%4pO~hn zY%JVt-0ro<{?h7ld&zlB=^XkD-~0Zs+*`mm>np?8V#m3B z7jjPguRjodsquHsIole$s9n(Z9mC-a_7oFA@H&p3Himfu4}R45K2$GA{$~H6$9r4;5Yf4RK%=dho!>BKZzXfZoY(nmb`LZI z{v1elU%Tdv#FZ&eCGwc3Z=GXb&TAq3vC&cHhQ-sg$82VG?~NL!9s9tn|A<+3GS{w` z(J~bi=O|bkGiQ8zWcwkGlk)-ZbH>Jb2WDTn-~3(m55u`hYwp*zJhc1}5q#m32HyiA z$+QPg^UcK4cor}(TX$~oJKhR;XI4QCr`QV{LY`5MWJis_- z;Sa_;J%7Gx7w9t-%oKSMWD(H*NWEZ-{Fa_q`Y+h>FKk?Q;PhVy-iz-KTr3I*Xq*<^ zD7AROO@6Ti?$7)m>^Ls0;ndeRclKDKfB0zj^~Tc|;~1tp?M*HyD@*yoV$)Rm=}jvS z+p%K@_Hq{;nAu^@v+2O(;}H(q^O^fw{&MVTfBInJ<^z|P-!r^Z@n_mY^$#ruu9}$- zHfcV%H#6E?!j7T8C^TqNx&V{h|5MC!E>?W{rG0qQRcXmBjpC0onZB!bF#6ACn!Dqx z^bJ*JU2Ch-Z+wTjFTA}IZ)bGGWtYJWhWDQ;*lp~}53jO4!1lGCjh#Q6?ZVracZ`yF z>KlK{rZjk8ji~#_uCKeR>JJOE@dqJ$U*8M+=I!Sxf7j@jS9NFuV}<>R)$jjHxHKNu zTYb9ISmM^CjdLelKOlMFyMtlC^Y7*>gqeJ#7tA!g@R0SuT{j;7 z#_fOl#mvAJ&SFJ_2*?(fT<~lb&n|%I(I)d#l9K00rBq@<*HUKJ(r^v|kUre5f0s3{>;EAIO_n`#_-`DXFl|D@1g3j0 zcxN32t$n?)_keO#qxS*_-YmX^6^I!OAHcIQV~ry}kbaUenhf?5svI)@4l( zAN9UIV9O!Hv+?1+1IcNsl5w^*#|ro>l79+6U`s7~a8KmIrTO>m?TueZzBKaa`fOOk zdd_B!eRXf5c!B1%yVno!UOLcLvZmd#d0Lkcb3v)(Vey2;a$6juc`CLa-9G<*!`vzS zJnjDTncuZeNH+)#W!m*Zzj=p-H1qxrk;9vxALwR{uTNu`yY1_9{S4#p@@(nh+-wiT zq}tLC>=j)z$LRn!N50_(M)OVHoga-1J{cLUVAStm$<5op>$}C_)#CaGr#o|Xa5GO= zVXWnTGsmFV({K-SS=zHRk<50B!u+FK9fM;V9bMyCEUFpyyk@!aF=hpl{5HQY`9!2rVoAgH9nF5nH+8%?GV7T9yqSD= z9`MJAeS0eYVUnxZgWk92CG7UF=G|a__vji!UXl3Z>8U?>_Pl@m-TXpp`+kXk4ElO0 z>CcjOaLsAlS^r+}aPRAKi9E)1O_7H0IUQY`jQJJftYu}c4cag3j2o=xy>FC$>u7%Q z{?4y68aXYT4;|HKvTOD6@oI4NacW^Kx%gnazI|iazT_VacT&zVyt&Zf1_HGrwfTk6+Bp z`r7gzrtGxm32!Jgj#>k)Yz`#wHD0WCaJ&2*+;m&O%~+Oc&-Tpyb;IJ%_L5r~y(88c z-(iVcaqPIjdG@S?+O&WRn^GVA);OfV5VQR}uZ>oj<%b|=#%=OEJ~sA}S<6d|bRsr1 zJX9@M62n)~6_n-0vZ3+&ti)4WcJh3@Xvp*PZa;m! zA=m!F#~lZP+x{_BGi+aXKULt#qx6OxtLKRm#6%McgeIj_{1B*Uyl4BsaLobb==aRh zJqu=XUs%IZP|e7kajk8#XvmTxgNFBvjPLjv=LUUc+`-=P*j(G9$5EE&L2uoGvlsSD zIJiIk$1b=0^tn^Kb3A`C$K@S4bBtwQ#s}#SJEAflq@{~3t3R+fvl4V>KTkJfx~7U< zm!XHpDFdH5+XQxqykT#iw8g^NxmIt7VLeyH&quG;s!P-{S?BFJa8oSQHI3~8$DT#I zcq*KKo_)>V;Qrb!(Sq$x!(W*jC(J{G+2q!0A9?UN^C-hEn~!!MQdWCUU(bB^B!`Xb z8^!|3=`0(9zqUFu?U;G*P{2gTIpG{H+#bB)El~Ndow1*<;N@lg2XlodJqqGk5LkC% z(q{hk^BDW3{+(CQQ$By-%(2r8jvhMt;SuMD9kCDYN%#g@vaP$%11ifu-DB39D$ID! zWFr^1p#j5mlUl~ua~v^Z$JlI|epnX#oU>|?Msw#vp&vpXu91lk-UwV@F0qsBfRvXLOkT!Nm)EWMp_21n-JyD4)o|?7!yMZ|;)SO5DuW_RcQ z&sqDMa}Hxl((eNbEN?nCZ7ML*Sk-B~LtDdO5Bs@E8V{0w{ z;YCMZOV$~GHrT)6iUt1P`6=Pl@JaO{0g9^)4j%_G>s`Vfy_wj618&=Sd#p|-XI=&4Le{ohY zKIZ!HaYuiHx=Af#S%y!;?Bz#WSR|)3c=x+B%-*)2d3vpjK)F6r!lz+-OY^j)hE4C-8RxzF z+CO*l!=I1Sd2}2$SGclB_W1fV%>I9$G2g2Gtil=XLj~+Rmb|+juhusGz|&aHseeO! zH%qIFH@*M!gKf{$`SLp~?_Iez;i3MA8_8i}4_fOE@UdkG|N5SPhG%|5yO7L%_BR24 z5)&;-zVIC8f1q<+{(;U-`v)6OW*s=K_I1lt37b7SjpcnCjAQHy87mkLq_-)nuQ$HK ze$Hb9<9n@#Z08o#FvhJq!QgZFRu&hJ(Sg1CQ3rOr+-Ph!C}8qm!xWqFLptM{{)01Y z`%UZ({vB;t-uO4A;_n;L4@Jk`AMky7pijFXzkOo2>W=^hw}g1s5`n{qZ}UsoF}zO| zWIuPPLj6kLv&s6LhC;W;4O{4UP&biu1X zschQT?rfqDgcflh;JxY=c8zEHx_QYK^`9)7*X+?MnAvTx!SO8LKJzE01&802n>n^k zoy~7(Q~7_EW5?8~il?r(JI2MfK76+JHIH@K+vE!7J4t?B{~x&~ z9R6!}SUSNuipRq0@6W&53F?lm55H{m<~cuqf65P@I~Hd-_q=#3U*O4;@kO#EO4Rs= z5!(YB_6>=AQF6z)a$*jd&2F~RULbvHXG4`k4ku?FTe5a^+wy)nBN@xO4#(R!CLFwa zuj?W6hh-n`R`VOac>S7jy7fncJ%2yUN<7_V%j0*B@4?e(p98+{{O8*w?_jfGeD$*W zf#AmcdyW2kimn8v2ZV>Ql%1Go{DLw6Q5thz0b6cZJIi zqN1Ns#O&5JHlDD1PfN~Qto6*}aa(p^ccQ~);{&Jp9gV~68#mj^H&!=CupW{8$2k3n zp}_}38|E^OW&ZP+?{NGRt2n4&Y|vY1D3PgYEb&Uq@Wjb3qdjbLxBvY3nBHc6V0YNO zy>-Vwu#PJRw_kzF?Fk%=#+r5s%+n?_ZrP)8D0-%&zjyb;zw&MmW>r5B zQh4C;|J>f+l2;mLU%A<+&Qr)Bo!7KTiD%B61Ki*BV$*gM|1r%Q(A-8#8IL-+86c_QaNi0ruYif6;b z|H2hT7gukWmvmUp+xSlC4|B}?^Cww%ZjF}N(bK_P@kIN@5#^D z!M@(Xd+iNL2la%HA2u0!baWbPoI1_u{w>}x;^r-b8isodFB)W;H7gbHH_o3g&U|_O z_X9IqC!H2wTMLmMW&^_wknBTu=&`tdP<)d}M z&1=OEI>YNFEE=|-+RW6iCnhMEn!vp4_2<*(JWY4@@KmL(Ixz94{DGxm{*B%<>kMqF zf43&S{&$(D|9(B|yiZ3?DzL>QiN08HSU}(UzGwOQ z>9O<&lMVGe_Vs^QXPrHeki6iS0>4e6Z?rq>jvB5CcMgNzMm{x$rP6hLY;0x^&i;P0 zXU_uZc!_uS8Sh0h`D|Xq6~wdPT*r(x63oH|Yn#p1Gl#!3bP@5B&^-y>@$KfEaH8b^ zXq;ywq=!0FU`Kfk>xSTi2QS2ioKj$k`B(DwpKV*mjEc6qzsrqwRPQu?AwAo`rlzL( zp~Z(O>UDmB4~`XAw#{E3Z}f*PR_OS*e#a=MNe^EfoXoQ*$cX26pImCi-)HOvzWXei zH46@J6x<-lk@d%S#?GdPk{d2cW~8#lO#R>g@J;V+9;Z7^Jbml|+0cG~TS$Lz#rcHgOHVFXq;Tegz>b@>&!;};iQo4xRp1HhJqf-$+yamC z&L*U-IsW0#L*};r1y3Chq}uFZis9kW*~4R9CX-&lZ}ToxprUKC%?G(|j|XmFq_686 zzp=0Bdie43d7euLerv2b+avMLZqHeUTVV@UC>#N=G3K)oeEqt;{J>x41JZZz*QP~m ze`~r@ZhO(Tl|6E>-QVpS(JX$EJ*%e%@+B9tyc8G84mjo`?&oc z=)UuBIR5$`d)c`usY@iU@IIBi(V+ZsextGEe+yNKcX#WK8I=BXYvVt_wteF!i)O(B z<;s8-;pRofA18RGw~L7|TPN;6uzb4VpZ{kMoH%%70UwXIoMGUHw_p47?U?c=)gSr5 zup`{V*}JcCX8ZicslpY;b{mp^fyQG>?svA#kviOe--pM)VY7ny`g>_NwvhP z9z*}5RJJ^?M~rfRf4_R||G=l4rCH;HpSWSdtS-HGa=J%hiO{1JoCps>65&n(iw%o9 zAM$_BZ@Vww@Llmv_347ozjPDYTc$FaNH1i3W6|KJaBKf>fy4d}dN00jP#0{}YiG`# zGHvQ)_H%lBk~VDF$`-evyeaYhzs)=gZnC7hRw&t@c1+P4U0c~F-@vEJiCs3P~7nNL-)a}m)UDh zU3{*e-&metld@s6Q5r*U$NarDod*N>E3(ZB_A_TNZ(G>NS|E8jyG{K3eFKAke_8H? z{Ox_nwxO|7yh2jJxS*e-fZwWl+a?}o&orgO&9|2~E`FWEle6a#&zu8~)9%;)Ikq9^ zr_}?UQ~Ycf{&l^3r}aQ%kHFz?xzQ4QO#a_?RXyh|C~Iz1w7W6aG19Mvam(`u%pYFd zFF(M0Ew0heVY7tfJm%@Y_EdbDm-zkOX&##cwH&h!cz-pSlG3pF_x^^>ru7o{>i;p{ zi9dX<;QvYK2QPj68_Zj@8KrkO@zgh-K5bX`=VZa>Z^~?G4_@q63h1{euoPh50J=NS z_-F;gG~bIxAK%T7=CkVyj|iI3$h<>xj;zIF<~yn9KRmsf-S%DIajx$JTe&+n2bdZE zFk+IOU`b-uz>{ zT42ch{c1+G(Fx}CM-JZmZ!|1l`j_?Iw13Pyo%kYNYAJC{XskbU~y3{6-U3Ut({i2<};-on@Ddznje#=imv z{mH*iFW}j8Fj}TU=+giF`z4os`);hEwaTc2!^7By?VLmzRNRz2 zRMS|^Sz;>5Cx7$&0j@h0e}pTPru9q`IxL-VI5fgRVn@v@OXdtuu@@QlwpRNY*RbV% ztNSdu!%((j%9Zc$>m|3Out;_l2}`P#d^N17wlwHqke*p|;MhOw2Y*FYU(ZSY@U0}B zp|oXP{Qgr6b8ax|?f%92<*-=L5Bpx;F7VJ0QH@rD1c5&H>fJ1=1h(|NFx_ zXX~%CA2@dWXDdm%dGhsj$$gCZm(yA0cKs3Ga*lt;&pF%`Sxrm#X&p{VP_NpuMUuDi zB4`KDLg+kv8E6ezf=7G9`k7oGUW7b|<9-mNk@i6|z>CKxN9KUpy?nL@u8$rZTU?)^ zaQLHfc!T?UuZCF#Jmrnw(;3taB>pj3%Un8@#j{|y)W84fDLXjsl;~+G9r^IvI>Yv# zG#l>&-aF^t*)zs{`abXB)9LRYsG2P3{$R&2{XmMko6!%(>9xKyuAKV7wPVW5TUW&o zTwW6)5hcwnu`Xr@!yf-9R)?=fua}5=R&ARQS)!{6gWrhrIWLIzdLZ!~}J&E$z;3o+33t*SepVOCE7K z(lGngOo@LC`KSK=4w=H=5Iru@XLePQK zAR&i8k`*!^q8CW$vul62_9>gE>X{qQqDevrew#K-f5&*8)sXr7>Vi$1jrLT06RZik z)?QvO!IiEfe^&N_zzy5=92E);3?G<|{^z;hP@Q~lf9?4XPe1cNVEenCC+5J@2AKo1 z&$TuhJN6vtJ6Qj~@a&p3a}MlP-Y+rlPUXoB!WAO#s~@oT>o-(qJ9uxXX!t&D10%oV z1aZ-%4MvwzCQNz2{Eqi0b4(Wd9(|UI>zwQ#CLQ^IAXdrUFFtw4|3|!svlG~VsvG3~ zXP;;CjoYI5(2wbjj&cUF@L|G?Vk3h*#~c*?Q@j4vCy*Y z2M2RTN{mE>;N0eB*29NPr5nnl_N4##@zuVdlV6ybeZ#}^d^Vo1gg-2Dtk!03>u|__ zAhcGUhx>UxQ~A10TuKL)JJ&MA$^GE2n4_=$;YZwsORMI`|2LGeC~bQvUU1EY!D97d z_C1C%aZxNazki>dy-drEM;rzj0|P0>sV@5E;PI#m-b-A-uh!l zF3LEhaIATIK6L`iz4M>MDxQ3-PFVi=-rDv9)t+`t`DV|P1(@|N2QkmfI(qgv=ba_z z&mTB*?x=!}*3l1t4tlq-8c$=i-Wo3%$Cy4VqVfB*j8#n2cQa1U`^b>)=W}*z!`zec zJnQ9~tacsXHeR|^a>vhBiFXX|=luLSdv4$l<|Gz

R&K1e-J8R6OQ$4+tU)!cH3N!`T9L>gFneh={vY=V!Z=B z8yq7&yC44A`T0P#@;~F4z2AEte!8p9lXoDJ|H55qX|pwH1%;)I^Q8XFc8qp!e|Yux z_5;Fe^9<&&&O7z>?RS5+um`p>XY3;+lALWC=g!pU+244&WQ)nv2JZv+n5O5?P5JTb zr*w1gTEpgT`_w*6Sz^yKzoFc=!N6Qv{KJuT#RvG#l(S`8sy@hlti!WOsfMTM(juPQ z4YCXP4c~Y34_gc#@ZPSubKq&byu^{CMc@;E8N<`8sSSQ#&1<;$}X4ef~X9zC2U^ z!@a*HZV2w=k11o_<0)5Ry?ad;&tdxnb)hXX+$B-B`t$Eg#@SY!JHWEb+f~HkFzcIy z8g{*%zkbeZOnmw3ERTO?>eSg>`_e1bhVFec>d|_#UHQ*R*KT#GsurXHd3!~ zdT`=W=K7xFFf1D2* zcO3}s-qP#aD9-#ZZO7*ae9i0D@g0_b5cMZr|Gwdeq7O~|7ev|aIq0s}ICg+fW^3K2 z2a3&2O*+ggnhT{XEbo1O{#}w!e(&KAKW;`REdIjmT+zVHoRR$PZgsz89CNyf&)Kz- zKN`iE_f`IHdU(HI{(-8W)PcVW>H2pQDj4^ij0y>v@$hoHI**;5--E~1=jZM``9WyM zn`e)o_w(#*?L4qJ;y<(g!r#X}eEH|yrvJa*$e@mO?wT(hj-Jk)j&ZJ28zn1dU0PR~ zEm2qd_gq5GilYila~OYqduo5!{Q<|{)6dTz5I5e$?7#EZ=lA9t3Uyd*K6Xt$XtXia z+; zK#RujRUF+6>23|;;zb`D{EV3A&0@V1aE|HD8ooUo^BO2ZlaRpv&UokNPnONy%XJT5@7I^G z+yCoC!T*2hZF`TOH~L`_ZJ4n_+t9;{o58&Gf5Hy-H**-KzcS9qdTmtm>rdlD`GUj0 zzv~~6UfU?kX!oFwKkvdz&jZ||_6+7*vR7*x*wlU!swndxH!H^9|C`GYt&> zG3s5e`a0>M?1wzgNM6|l_b1|qYahre*f&($pUL%+bg;g#zvl0$1Bbsz?}+IUub3&% zfB1d>ehE4II=(w8|E51Y^>j9m%o-h@SFb+tEP8b4z~ve9jEezy1tBwdfcz?3s-w(^S;_G=# z{YU?vW7xIv&ZU!V6<$}e+peFFGtQ8HWh8Mcf?>Md-XsmpHB5SQf1Ve3{rJFw#oDI} z*ekvt-!5<8czhv~z7b2A!$0QyP1l&@j$7wG6MAr0=DwuJRTqh<$@x59U59uco;-PAY4CrEck#PV6})<&$i~i{&30ka?EgJyc=YG(OZdT^v%<^M z)3D%^0aHJ7-I)(BK1M&-WGKjHuJ8WfWn8>O*_udxn}1GgW2!{T(uUJ@EjJ`1X3mt@(OS_U{^u{_?Ru^XtxM1K?Iq>*{5Vy>Sy8h=<3m`k zt#0TCpL5O+GUGP)-;?$I7{b%|bh20D_J#i&?wEdl&HX{_*M1(R1GNfwWZoQz-1`4P z^34BD=YoF!Z+8^D;rLYaNh(9BT|~p_H4d4LqB|u2{tkb@+Pc4S`2xoN>wmwASzKnc zQGBTVL4if>L0W0pw*Ne54nzt^vU+~dnLE$>B_d;iMuH$GxAe4ureup>M}Za%vE;?? zIsHMRqHzAKF0~JCU*mb!=ba!7y1XhnDF_uHl3*z--Lnc>5; ze8WP^2W*9IZJWjY4J<6I8sBq1WSKYpcl$^2=6#)vhqwGY%JaTKR)keGwe80jkA&lo z6+V>?0>E&$Cb{+UD9WUXq zTx)OrZ^j+&Po*~`A3Xly(^d7h@&ji-DjtwNWxucf{D!iVQEY{Zh7aZ{F!9tJ*zJ}R z)7zk)%lN+g$CsH8PwYF*vwS_HwZ2ad&;0sLh9{W&OH-dGB!1xEz@BHv9_PlfXX+h= z9c3ml>uc?XUZP_=9jot*!WnN6w6ab!?WYo@~nN zH(i9c7ZQab?FAcfS0KqL;i}35&&UJP2j9o-IkSM{&JkVp^@lbvS7e3M#+x2qTpcdC zZ~xyj7jEyK@bKyJa-RMBjf|g&E-^Ua)y?d`ZWqHm*~EYUXFGbuO>>O!nDX%3)!97j z8+%4bT^VA$T z`=V&orvuVw8n^c{f6v>%^nJkzuWrV4&v{07_LuV4T;9266{&?@o-L9$8kc9)vX=GSv#UM&Alk6nWa(v1mMceEC6+X9mcI5&>%d_y7KtT| z;+~%v%~$_tlUw*lcE|hYx7Xi)5dG%A@g^e!=J&jUlSLTrm;L9f&^Wk1{=eiq=J(%! zaLzGJOnjd3KVaJQ23H zy`YseADHYOWCp*lGd3tTGCFeXhvAA<8ispni{vY2|4@Gr_3u5;wQJXS{Nrqx?mhe{ zb|dr0p${w-oevfUhfBP=#U<(Y=H7XRU9q+*m&A93{Z~KynB8B};)aE!+`USUBm5FB zEv${^+fFm4$J{gIVCp}}8mpnsv8QrQ^H2E-Wn=S#Ex#XMmp@Q#tH+q`Z`Yu&yT#O$ z;hy}**2eITX2;<0xsA?U^B+F{&CgTcC_OthZ2f0ssc-m$e z@u-Tvbl982v%f+7e(m2st%*-()$+*B_Um0%WYyjbo<2qdZVB#7(Mme4uo16p6!IF|CrB@^*{%tViC}4ii%c!?j zP*j*@-FNnR+gNi#n(|`*e|X0GA*{IWfshQ}gG~l%ZNlRD25)RjXFk09yq?EvQ4>#> z(IXz8|No3?D*sDWa7|ZfUNMK|@O%6F5<41>f7?|2!8m4b)$E6yAL=?owaX1UxC;z^ zRNXR|G5dv4$0sA>nu@<|4^Lctd|yqmQ=^OPOsv3m~(JV-sYV4cFD4}v8|V#XVi zx%Yhh_jdR52VXw3SG;+r|KR6tp`xM(sS))OjkC|roGE#){uk?>!>xihehMTDOn8|5 z!T+^{?gH4D_Kns9FL+L5EP^yrH!23a%02Vp(_Qhl<)FC|_Im+$O;`3hMtLmisL0#l8i<#Vg=KLf7{(k0fwkVjp z&!8ZAx$9&C=pI7^rw4x&FVwogEc@53jBc z=h>w7iD%9M$*J=X++cdkZ&CX|qj^h@%whirX{oFiR4WebcCBF9A^9$52jiCStcO1a zZLHdp9shpo7sQ`mKmUL?x1@wj(kyrH<>1k`ivkkU6b(RY0d9b6LuD%#zxA^Z6nuUc z%T~)Q`@l%zf#IqH%7O8F|8eYblr33x#hOi=KmEa7>2gWCz18Oru)S%h`TMcAvAJK| zV)H?MySpzw?>6W0@+#sHIuL#0{{G)5KD@YS+}3(}8?*UFW^=j!zmH$I5pwFl!GF^q z-sueH5o!|R@!3C9!eOqs;)A>LHh-FU)cfYA-`G;e{$a-5cpk0;Pt7tnGV;8N+H|1r zqIcVU`+o*^_Wxtrq4HXGNAr>ui_U!bd0f3sU*68>1+%r@saK~CNMEUE(wD6{_knju z{!{S}hju?dA7|(jTiNsQaQ}TC@%c4UzIU5dSgu`nGu-p{OYcMJ4@o|34-y&wH)J{= zcHp&PK6dmpbIh!xOg8hr>oXf`D_7WaWE|eLE%_jhHe3Nu<4)5?9<8iX2bTKn;pvax zoA%(5Q1XKZ0tpF;e@_=A{4Zp?;Px&*zQH`CxY$@Cdj-??mOlwM_CHrB(B$QAPM=`S zJb#J7;df`NCDz4OA1L_!PMb|HLHW`tr~ZQx@iQGAgm$p7-!QB!`pn48E^N%a+`#-t z9>3*-&dBz@dCc!zD^GoR`7@eLQkAjo#FYXzJwCOz)yMsq^;Q3zEBJmey3M!UukkzI zij$tkKPn=P_f&o7SrOLh80pvJ=ovrvp>@H_>nDA8H~tRaXB4yV7fZ$NU)F7_^Y0tS z)PG7f*~qs^;Dz58mUB&i7|xX$7rjYA`7GvuYoMgEd@8MdfFIFSjx_g|}g zg2iU-sY4F^4-b9)d_ek?q{N&(dnD_O|0G|ya4BU+(NnI&^Uk(Q+A&yb-mkAs&dAVa zn01&pCgkvmg75EY6VxB77wEHpSaDZeUvh~`ON02OlSVexKc+mq{oMWlo4WCjLsrJ+ z!EDq1-9f4OX}HGA1?TJ@bg6r*&~V<=8BzJkhX@!W}SG& zFVPR14({*aIZ#o5>HtqqzFlG*+v|>LNVS11xQ)YN2dxi06eozM9p3Q#L1>%(fv|`C zZS#5BxRQ9}=AGja5=!E^eJzjip3S*a35ogV4lvpre06PZIuCz?`?5H;JcZ}1_g)K3 z7dfWDGUwrs|BtOdG#!|K;M}3`w#Vvv1~vabidVe0R4$19pU$RT%*@8>>G**6rOtz= z!9E9Ul^0lBtBANr?yLWKw&2qb*|y%@e116QNx>b{0b$22LPZ|A1* z)ct$MW554@!jE4Mjhojr=`hQi%QMS=nAiUOfb?p9hW>l0NeO8NS1zY?^pvufYslT* zce>!|tJ(+0KK*`h`pG;-bJ@+CHydyGlbUF7VN%irrZTk|jqaN^ZTyq`;6Yka!t;kr z@irBo4)C@u*S~M@#$M%;b|kZ2my)srq?& z;|`|$TWP7x_k<6gK7Zgxck9DzU!!@d&&SI5o>mlMy7WsiVY*$dS?9y^@9PhoeQ7Vz zup6mo?&bpNng0U!%riI=I2%is=NZ`S+R~SJ-|a%%CwZRtb`0spdUsMbY&2xeGx>j@ z;L8EVwhs>ZY-M3=Y;Iz1Ym6oy5 zXldvYFlQDn$h9;6z@lU8o6BaYY1d}|-_A(lWtOo<#tDN0ru@}uzkbh8JipDEM?Zcq z^F7T^oe%%~H9v6sOug}+)L*9${QIrnym6jX^Q=ug&1+c;F8>IB@G>H24bPf2Iz00C zY8mnh{&U8(eV+L6)me2O^>z0d`I?LkJGcrAHM}?sQq+GKX-H);n6J8@^5fG-?!(Ft zmX*XM^dC8JudA`QxA)=i-{Cy@4X4ZN82$Hb;?I}uJq}Hs65!!4A;|GP0g#rmGlM_J zoyzZ`I@zmN9$2t={ecAwwbeel*XmK&alsTE~!^$v?asGA^NKHqRp_1~F|KXpHt z=*>ILlXQvcz|r{sl6L#+`D0G08c4N+D|Q%>0%`I`Kt0mXAz)GSm+^2@A5)w3^>a-6 zoIEV+uKzz>ko7(h)YCPdV^co=A=if|EA05s%cTM?8)j|M3)M zP2%~!?tW?o*PRFZGM*-W*w?Qg|DWmm!kWZ_a)x{1OnV|@or1a=`@6X-oWzxz_myAG zkO8k*fbNn4uVR1?pcHU7wsdhO=+C`r)cElD^nTF1Pp*tr4P(Whcjat#4>oBQ=Ebqq z%2u{@d~sltlY8*A=)ls*{S9+_{~wqwzoU{>Qbko&QX=Ap#EgH2MtiFNbUAu-%s+VW zT+73g-OqU#6XSSlE;;e!99SCJzy5xD1&d8$_Tgj7JnQ53fY#|h|0us>wTo1R%j$(2 z*_u0hxtJgCzt5B2FPFT*dxpWR3$TVNI4gKSTB}X6;55a{DCB(L$nu7T3TLK1y!6wW zCw|}GBmuF6^cPI$`aW8GAD(PoE+J7FA^D}0S3+XOKjRg~T84j;{~Z1B@on^j+}8*8Djt}9V`oLHy1BnYxW+4?LGyk37(Sz z61J?_CJ&*>grQZjAS2N5N7EtY-{*~N>V8dnc*RIi+_0JWXN`bwdDQ$J&c#X&)b(!@$r%L;iap$OQ@u} zN(5bUme|6(L_#iR-{}u8-@3QSA6WZ*QSK7+OAI+c@J2<;J8-XV?Im^M3Z^E)d zfNA$~F$0_WFD(zB-2Ba>Z(ozVgL%*CX66d>j^#VeoQo2bn3pqrP%CkJ(4`$F_h1bN z`{BRE&kxKMZo9uYOX%?W`u~!3fB&5O@b|U)gVv7q2i{!QpKp|M{-&{1JUCcj#1iL(68;kz z&de^-Ke0@kg@+6b2ZRz~; z4gb{rZ+tj=g~j2??B^x&?(aE$fOF5yI~OiCHTL&+KD@o&p6AYi;4N{sl?Ok_?TC4; zyn*?%@Q(M*Gv{WTtV79^C)&YXNF_)Yl9y4c<-lp}V#yhGe^Y*Zek*-=Z}xV{8x|3g zN1jfVaGCm5!fs#P(GNe4MY8e9IX+n0W-k$EQ+Y~3>C9mTowKJ89MwN{;LxE%A3h!Q zelV~9JWqfA{)8VKdkp8!o!zUL{p{Jr9a50Y-w4TI@{kM$X)jALnea5q20xap*!e?p zORrDE@_0k$bgPE%3ye1#)cpI%UvWfl!)3+QCk`;|dH(p#ytO?3>-HxIOcY5?V7r&L zqw=U(+x`9jjXJ!#3^gP*j4M)m<#t-nf>l}xCM<34kb5vrLgT>Uu)v2CaVI_`+-GUq z?_)3V@88dp2af6S?fKO#Sgn$r z&FAb-src~3^6;sp$0hz5Z33<5I=En|*4YC`zVtu*yn8)Q5myjTU!ECH)1n$4H^-@q z3t=k-AU=?ta1p-pXtAP06~~)7a}HfFs$@PqeZ9S;-T(B&2Pp|j4-yj7E=&+k=lD{T z@E{>Mx#H_T-R2oP1ek@5jho%ezGoQpgNA;=Wl2xlfel=Z7bPcLWU+;2<`O=}Qcc0O z`~UwN{`viTw&I0TEsjhUrxUXl9Q*M9K7X6M{eNQvrtcj&_v&UO{#v(raUpDxGT4!a z^;q1#H}t5z0>}78fd$1JcWS=19SjYg&sd(e=l*ZPnk~<#$Q9u0cZo1^YKR-@> z_-oF6c(1y=+v8Md@PX58TPjD-xrQFKH&CM_4hY=1I`v4w$4jzp-{toi->Lc5`|#@Y z^E~J6_NDIl{poea9+;=VEwc?gjLR-oK&u~63fv)3pgsHehwt+I1=pH;A2NT~bjba^ zyS4n{mxTy>DKD<)*0At2*J1uvdVEIY#I~nZ)DNXpR`o5u-U`@U Date: Thu, 22 Apr 2021 18:39:33 +0200 Subject: [PATCH 059/121] Update CHANGELOG --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 16ca949a4..a25ed3808 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -86,6 +86,7 @@ Detailed changes: [examples] REDESIGNED: models_yaw_pitch_roll [build] ADDED: Config flag: SUPPORT_STANDARD_FILEIO [build] ADDED: Config flag: SUPPORT_WINMM_HIGHRES_TIMER (#1641) +[build] ADDED: Config flag: SUPPORT_GL_DETAILS_INFO [build] ADDED: Examples projects to VS2019 solution [build] REVIEWED: Makefile to support PLATFORM_RPI (#1580) [build] REVIEWED: Multiple typecast warnings by @JeffM2501 From b4e586f272991b83b6952a263d60a670ef316eb8 Mon Sep 17 00:00:00 2001 From: Ray Date: Thu, 22 Apr 2021 18:41:51 +0200 Subject: [PATCH 060/121] Update CHANGELOG --- CHANGELOG | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index a25ed3808..d80f2dc37 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,10 +1,10 @@ changelog --------- -Current Release: raylib 3.7.0 (xx April 2021) +Current Release: raylib 3.7.0 (23 April 2021) ------------------------------------------------------------------------- -Release: raylib 3.7 (xx April 2021) +Release: raylib 3.7 (23 April 2021) ------------------------------------------------------------------------- KEY CHANGES: - [rlgl] REDESIGNED: Greater abstraction level, some functionality moved to core module From 2a9ffcc0a1840565776a4a6e449d2f0d8a364f48 Mon Sep 17 00:00:00 2001 From: Ray Date: Thu, 22 Apr 2021 18:48:36 +0200 Subject: [PATCH 061/121] Update README.md --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 29156f70c..ee100a5d9 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ raylib uses internally some libraries for window/graphics/inputs management and basic example -------------- -This is a basic raylib example, it creates a window and it draws the text `"Congrats! You created your first window!"` in the middle of the screen. This example can be seen [running live in web here](https://www.raylib.com/examples/web/core/loader.html?name=core_basic_window). +This is a basic raylib example, it creates a window and it draws the text `"Congrats! You created your first window!"` in the middle of the screen. Check this example [running live on web here](https://www.raylib.com/examples/web/core/loader.html?name=core_basic_window). ```c #include "raylib.h" @@ -128,7 +128,9 @@ raylib has been developed on Windows platform using [Notepad++](https://notepad- learning and docs ------------------ -raylib is designed to be learned using the examples as the main reference. There is no a standard API documentation, just a **cheatsheet** containing all the functions available on the library and a short description of each one, input parameters and result value should be intuitive just seing the naming. Some additional documentation about raylib design can be found in raylib GitHub Wiki. Here the more relevant links: +raylib is designed to be learned using [the examples](https://github.com/raysan5/raylib/tree/master/examples) as the main reference. There is no standard API documentation but there is a [**cheatsheet**](https://www.raylib.com/cheatsheet/cheatsheet.html) containing all the functions available on the library and a short description of each one of them, input parameters and result value names should be intuitive enough to understand how each function works. + +Some additional documentation about raylib design can be found in raylib GitHub Wiki. Here the more relevant links: - [raylib cheatsheet](https://www.raylib.com/cheatsheet/cheatsheet.html) - [raylib architecture](https://github.com/raysan5/raylib/wiki/raylib-architecture) @@ -140,7 +142,7 @@ raylib is designed to be learned using the examples as the main reference. There contact and networks --------------------- -raylib is present in several networks and raylib community is growing everyday. Feel free to join us in any of these networks. +raylib is present in several networks and raylib community is growing everyday. If you are using raylib and enjoying it, feel free to join us in any of these networks. The most active network is our [Discord server](https://discord.gg/raylib)! :) - Webpage: [http://www.raylib.com](http://www.raylib.com) - Discord: [https://discord.gg/raylib](https://discord.gg/raylib) @@ -150,8 +152,6 @@ raylib is present in several networks and raylib community is growing everyday. - Patreon: [https://www.patreon.com/raylib](https://www.patreon.com/raylib) - YouTube: [https://www.youtube.com/channel/raylib](https://www.youtube.com/c/raylib) -If you are using raylib and enjoying it, please, join our [Discord server](https://discord.gg/raylib) and let us know! :) - license ------- From f92ee46d86b5a0cfb05c10b0c31fb966a4784b44 Mon Sep 17 00:00:00 2001 From: Ray Date: Thu, 22 Apr 2021 18:52:41 +0200 Subject: [PATCH 062/121] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index ee100a5d9..ddfce61a6 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,10 @@ Ready to learn? Jump to [code examples!](http://www.raylib.com/examples.html) [![macOS](https://github.com/raysan5/raylib/workflows/macOS/badge.svg)](https://github.com/raysan5/raylib/actions?query=workflow%3AmacOS) [![Android](https://github.com/raysan5/raylib/workflows/Android/badge.svg)](https://github.com/raysan5/raylib/actions?query=workflow%3AAndroid) [![WebAssembly](https://github.com/raysan5/raylib/workflows/WebAssembly/badge.svg)](https://github.com/raysan5/raylib/actions?query=workflow%3AWebAssembly) + [![CMakeBuilds](https://github.com/raysan5/raylib/workflows/CMakeBuilds/badge.svg)](https://github.com/raysan5/raylib/actions?query=workflow%3ACMakeBuilds) +[![Windows Examples](https://github.com/raysan5/raylib/actions/workflows/windows_examples.yml/badge.svg)](https://github.com/raysan5/raylib/actions/workflows/windows_examples.yml) +[![Linux Examples](https://github.com/raysan5/raylib/actions/workflows/linux_examples.yml/badge.svg)](https://github.com/raysan5/raylib/actions/workflows/linux_examples.yml) features -------- From dcf52c132fb0ca28f37dae9d957155e2541df812 Mon Sep 17 00:00:00 2001 From: Ray Date: Thu, 22 Apr 2021 18:55:24 +0200 Subject: [PATCH 063/121] Remove trail spaces --- examples/audio/audio_module_playing.c | 2 +- examples/audio/audio_multichannel_sound.c | 4 +- examples/core/core_2d_camera.c | 2 +- examples/core/core_2d_camera_platformer.c | 86 ++++----- examples/core/core_basic_window_web.c | 2 +- examples/core/core_quat_conversion.c | 36 ++-- examples/core/core_vr_simulator.c | 30 +-- examples/core/core_window_letterbox.c | 6 +- examples/examples_template.c | 32 +-- examples/models/models_animation.c | 4 +- examples/models/models_gltf_animation.c | 8 +- examples/models/models_gltf_model.c | 10 +- examples/models/models_loading.c | 10 +- examples/models/models_material_pbr.c | 28 +-- examples/models/models_rlgl_solar_system.c | 2 +- examples/models/models_skybox.c | 18 +- examples/models/models_waving_cubes.c | 12 +- examples/models/models_yaw_pitch_roll.c | 10 +- examples/network/network_ping_pong.c | 28 +-- examples/network/network_resolve_host.c | 10 +- examples/network/network_tcp_client.c | 30 +-- examples/network/network_tcp_server.c | 34 ++-- examples/network/network_test.c | 10 +- examples/network/network_udp_client.c | 24 +-- examples/network/network_udp_server.c | 32 +-- examples/others/easings_testbed.c | 2 +- examples/others/embedded_files_loading.c | 14 +- examples/others/opengl_interop.c | 38 ++-- examples/others/raudio_standalone.c | 4 +- examples/others/rlgl_standalone.c | 44 ++--- examples/physics/physics_demo.c | 2 +- examples/physics/physics_restitution.c | 4 +- examples/physics/physics_shatter.c | 4 +- examples/shaders/shaders_basic_lighting.c | 12 +- examples/shaders/shaders_eratosthenes.c | 2 +- examples/shaders/shaders_fog.c | 12 +- examples/shaders/shaders_hot_reloading.c | 18 +- examples/shaders/shaders_julia_set.c | 4 +- examples/shaders/shaders_mesh_instancing.c | 56 +++--- examples/shaders/shaders_multi_sample2d.c | 22 +-- examples/shaders/shaders_raymarching.c | 2 +- examples/shaders/shaders_simple_mask.c | 6 +- examples/shaders/shaders_spotlight.c | 66 +++---- examples/shaders/shaders_texture_waves.c | 12 +- examples/shapes/shapes_draw_circle_sector.c | 18 +- examples/text/text_draw_3d.c | 182 +++++++++--------- examples/text/text_font_loading.c | 2 +- examples/text/text_font_sdf.c | 8 +- examples/text/text_font_spritefont.c | 4 +- examples/text/text_input_box.c | 2 +- examples/text/text_raylib_fonts.c | 2 +- examples/text/text_rectangle_bounds.c | 6 +- examples/textures/textures_blend_modes.c | 12 +- examples/textures/textures_draw_tiled.c | 66 +++---- examples/textures/textures_image_processing.c | 8 +- examples/textures/textures_image_text.c | 2 +- examples/textures/textures_poly.c | 14 +- examples/textures/textures_raw_data.c | 4 +- examples/textures/textures_sprite_explosion.c | 2 +- examples/textures/textures_srcrec_dstrec.c | 2 +- src/raylib.h | 2 +- 61 files changed, 565 insertions(+), 565 deletions(-) diff --git a/examples/audio/audio_module_playing.c b/examples/audio/audio_module_playing.c index 3c10e0698..33a43a8c1 100644 --- a/examples/audio/audio_module_playing.c +++ b/examples/audio/audio_module_playing.c @@ -87,7 +87,7 @@ int main(void) if (IsKeyDown(KEY_DOWN)) pitch -= 0.01f; else if (IsKeyDown(KEY_UP)) pitch += 0.01f; - + SetMusicPitch(music, pitch); // Get timePlayed scaled to bar dimensions diff --git a/examples/audio/audio_multichannel_sound.c b/examples/audio/audio_multichannel_sound.c index 223680933..438cff96c 100644 --- a/examples/audio/audio_multichannel_sound.c +++ b/examples/audio/audio_multichannel_sound.c @@ -26,7 +26,7 @@ int main(void) Sound fxWav = LoadSound("resources/sound.wav"); // Load WAV audio file Sound fxOgg = LoadSound("resources/target.ogg"); // Load OGG audio file - + SetSoundVolume(fxWav, 0.2f); SetTargetFPS(60); // Set our game to run at 60 frames-per-second @@ -46,7 +46,7 @@ int main(void) BeginDrawing(); ClearBackground(RAYWHITE); - + DrawText("MULTICHANNEL SOUND PLAYING", 20, 20, 20, GRAY); DrawText("Press SPACE to play new ogg instance!", 200, 120, 20, LIGHTGRAY); DrawText("Press ENTER to play new wav instance!", 200, 180, 20, LIGHTGRAY); diff --git a/examples/core/core_2d_camera.c b/examples/core/core_2d_camera.c index 0b4754f7e..7336bbbd7 100644 --- a/examples/core/core_2d_camera.c +++ b/examples/core/core_2d_camera.c @@ -54,7 +54,7 @@ int main(void) { // Update //---------------------------------------------------------------------------------- - + // Player movement if (IsKeyDown(KEY_RIGHT)) player.x += 2; else if (IsKeyDown(KEY_LEFT)) player.x -= 2; diff --git a/examples/core/core_2d_camera_platformer.c b/examples/core/core_2d_camera_platformer.c index db8c9f452..9ab204924 100644 --- a/examples/core/core_2d_camera_platformer.c +++ b/examples/core/core_2d_camera_platformer.c @@ -46,7 +46,7 @@ int main(void) //-------------------------------------------------------------------------------------- const int screenWidth = 800; const int screenHeight = 450; - + InitWindow(screenWidth, screenHeight, "raylib [core] example - 2d camera"); Player player = { 0 }; @@ -60,7 +60,7 @@ int main(void) {{ 250, 300, 100, 10 }, 1, GRAY }, {{ 650, 300, 100, 10 }, 1, GRAY } }; - + int envItemsLength = sizeof(envItems)/sizeof(envItems[0]); Camera2D camera = { 0 }; @@ -77,10 +77,10 @@ int main(void) UpdateCameraEvenOutOnLanding, UpdateCameraPlayerBoundsPush }; - + int cameraOption = 0; int cameraUpdatersLength = sizeof(cameraUpdaters)/sizeof(cameraUpdaters[0]); - + char *cameraDescriptions[] = { "Follow player center", "Follow player center, but clamp to map edges", @@ -88,25 +88,25 @@ int main(void) "Follow player center horizontally; updateplayer center vertically after landing", "Player push camera on getting too close to screen edge" }; - + SetTargetFPS(60); //-------------------------------------------------------------------------------------- // Main game loop - while (!WindowShouldClose()) + while (!WindowShouldClose()) { // Update //---------------------------------------------------------------------------------- float deltaTime = GetFrameTime(); - + UpdatePlayer(&player, envItems, envItemsLength, deltaTime); camera.zoom += ((float)GetMouseWheelMove()*0.05f); - + if (camera.zoom > 3.0f) camera.zoom = 3.0f; else if (camera.zoom < 0.25f) camera.zoom = 0.25f; - - if (IsKeyPressed(KEY_R)) + + if (IsKeyPressed(KEY_R)) { camera.zoom = 1.0f; player.position = (Vector2){ 400, 280 }; @@ -125,12 +125,12 @@ int main(void) ClearBackground(LIGHTGRAY); BeginMode2D(camera); - + for (int i = 0; i < envItemsLength; i++) DrawRectangleRec(envItems[i].rect, envItems[i].color); Rectangle playerRect = { player.position.x - 20, player.position.y - 40, 40, 40 }; DrawRectangleRec(playerRect, RED); - + EndMode2D(); DrawText("Controls:", 20, 20, 10, BLACK); @@ -140,7 +140,7 @@ int main(void) DrawText("- C to change camera mode", 40, 100, 10, DARKGRAY); DrawText("Current camera mode:", 20, 120, 10, BLACK); DrawText(cameraDescriptions[cameraOption], 40, 140, 10, DARKGRAY); - + EndDrawing(); //---------------------------------------------------------------------------------- } @@ -157,35 +157,35 @@ void UpdatePlayer(Player *player, EnvItem *envItems, int envItemsLength, float d { if (IsKeyDown(KEY_LEFT)) player->position.x -= PLAYER_HOR_SPD*delta; if (IsKeyDown(KEY_RIGHT)) player->position.x += PLAYER_HOR_SPD*delta; - if (IsKeyDown(KEY_SPACE) && player->canJump) + if (IsKeyDown(KEY_SPACE) && player->canJump) { player->speed = -PLAYER_JUMP_SPD; player->canJump = false; } int hitObstacle = 0; - for (int i = 0; i < envItemsLength; i++) + for (int i = 0; i < envItemsLength; i++) { EnvItem *ei = envItems + i; Vector2 *p = &(player->position); if (ei->blocking && - ei->rect.x <= p->x && + ei->rect.x <= p->x && ei->rect.x + ei->rect.width >= p->x && ei->rect.y >= p->y && - ei->rect.y < p->y + player->speed*delta) + ei->rect.y < p->y + player->speed*delta) { hitObstacle = 1; player->speed = 0.0f; p->y = ei->rect.y; } } - - if (!hitObstacle) + + if (!hitObstacle) { player->position.y += player->speed*delta; player->speed += G*delta; player->canJump = false; - } + } else player->canJump = true; } @@ -200,7 +200,7 @@ void UpdateCameraCenterInsideMap(Camera2D *camera, Player *player, EnvItem *envI camera->target = player->position; camera->offset = (Vector2){ width/2.0f, height/2.0f }; float minX = 1000, minY = 1000, maxX = -1000, maxY = -1000; - + for (int i = 0; i < envItemsLength; i++) { EnvItem *ei = envItems + i; @@ -209,10 +209,10 @@ void UpdateCameraCenterInsideMap(Camera2D *camera, Player *player, EnvItem *envI minY = fminf(ei->rect.y, minY); maxY = fmaxf(ei->rect.y + ei->rect.height, maxY); } - + Vector2 max = GetWorldToScreen2D((Vector2){ maxX, maxY }, *camera); Vector2 min = GetWorldToScreen2D((Vector2){ minX, minY }, *camera); - + if (max.x < width) camera->offset.x = width - (max.x - width/2); if (max.y < height) camera->offset.y = height - (max.y - height/2); if (min.x > 0) camera->offset.x = width/2 - min.x; @@ -224,11 +224,11 @@ void UpdateCameraCenterSmoothFollow(Camera2D *camera, Player *player, EnvItem *e static float minSpeed = 30; static float minEffectLength = 10; static float fractionSpeed = 0.8f; - + camera->offset = (Vector2){ width/2.0f, height/2.0f }; Vector2 diff = Vector2Subtract(player->position, camera->target); float length = Vector2Length(diff); - + if (length > minEffectLength) { float speed = fmaxf(fractionSpeed*length, minSpeed); @@ -241,34 +241,34 @@ void UpdateCameraEvenOutOnLanding(Camera2D *camera, Player *player, EnvItem *env static float evenOutSpeed = 700; static int eveningOut = false; static float evenOutTarget; - + camera->offset = (Vector2){ width/2.0f, height/2.0f }; camera->target.x = player->position.x; - + if (eveningOut) { - if (evenOutTarget > camera->target.y) + if (evenOutTarget > camera->target.y) { camera->target.y += evenOutSpeed*delta; - - if (camera->target.y > evenOutTarget) - { - camera->target.y = evenOutTarget; - eveningOut = 0; - } - } - else - { - camera->target.y -= evenOutSpeed*delta; - - if (camera->target.y < evenOutTarget) + + if (camera->target.y > evenOutTarget) { camera->target.y = evenOutTarget; eveningOut = 0; } } - } - else + else + { + camera->target.y -= evenOutSpeed*delta; + + if (camera->target.y < evenOutTarget) + { + camera->target.y = evenOutTarget; + eveningOut = 0; + } + } + } + else { if (player->canJump && (player->speed == 0) && (player->position.y != camera->target.y)) { @@ -278,7 +278,7 @@ void UpdateCameraEvenOutOnLanding(Camera2D *camera, Player *player, EnvItem *env } } -void UpdateCameraPlayerBoundsPush(Camera2D *camera, Player *player, EnvItem *envItems, int envItemsLength, float delta, int width, int height) +void UpdateCameraPlayerBoundsPush(Camera2D *camera, Player *player, EnvItem *envItems, int envItemsLength, float delta, int width, int height) { static Vector2 bbox = { 0.2f, 0.2f }; diff --git a/examples/core/core_basic_window_web.c b/examples/core/core_basic_window_web.c index 1ecb22f35..8ce1922ab 100644 --- a/examples/core/core_basic_window_web.c +++ b/examples/core/core_basic_window_web.c @@ -46,7 +46,7 @@ int main() #else SetTargetFPS(60); // Set our game to run at 60 frames-per-second //-------------------------------------------------------------------------------------- - + // Main game loop while (!WindowShouldClose()) // Detect window close button or ESC key { diff --git a/examples/core/core_quat_conversion.c b/examples/core/core_quat_conversion.c index a7ea8247d..cca6f01ef 100644 --- a/examples/core/core_quat_conversion.c +++ b/examples/core/core_quat_conversion.c @@ -26,7 +26,7 @@ int main(void) const int screenHeight = 450; InitWindow(screenWidth, screenHeight, "raylib [core] example - quat conversions"); - + Camera3D camera = { 0 }; camera.position = (Vector3){ 0.0f, 10.0f, 10.0f }; // Camera position camera.target = (Vector3){ 0.0f, 0.0f, 0.0f }; // Camera looking at point @@ -34,9 +34,9 @@ int main(void) camera.fovy = 45.0f; // Camera field-of-view Y camera.projection = CAMERA_PERSPECTIVE; // Camera mode type - Mesh mesh = GenMeshCylinder(0.2f, 1.0f, 32); + Mesh mesh = GenMeshCylinder(0.2f, 1.0f, 32); Model model = LoadModelFromMesh(mesh); - + // Some required variables Quaternion q1 = { 0 }; Matrix m1 = { 0 }, m2 = { 0 }, m3 = { 0 }, m4 = { 0 }; @@ -44,7 +44,7 @@ int main(void) SetTargetFPS(60); // Set our game to run at 60 frames-per-second //-------------------------------------------------------------------------------------- - + // Main game loop while (!WindowShouldClose()) // Detect window close button or ESC key { @@ -60,28 +60,28 @@ int main(void) if (v1.x > PI*2) v1.x -= PI*2; if (v1.y > PI*2) v1.y -= PI*2; if (v1.z > PI*2) v1.z -= PI*2; - + q1 = QuaternionFromEuler(v1.x, v1.y, v1.z); m1 = MatrixRotateZYX(v1); m2 = QuaternionToMatrix(q1); q1 = QuaternionFromMatrix(m1); m3 = QuaternionToMatrix(q1); - - v2 = QuaternionToEuler(q1); - v2.x *= DEG2RAD; - v2.y *= DEG2RAD; - v2.z *= DEG2RAD; - + + v2 = QuaternionToEuler(q1); + v2.x *= DEG2RAD; + v2.y *= DEG2RAD; + v2.z *= DEG2RAD; + m4 = MatrixRotateZYX(v2); //-------------------------------------------------------------------------------------- - + // Draw //---------------------------------------------------------------------------------- BeginDrawing(); ClearBackground(RAYWHITE); - + BeginMode3D(camera); model.transform = m1; @@ -94,19 +94,19 @@ int main(void) DrawModel(model, (Vector3){ 0, 0, -1 }, 1.0f, RED); DrawGrid(10, 1.0f); - + EndMode3D(); - + if (v2.x < 0) v2.x += PI*2; if (v2.y < 0) v2.y += PI*2; if (v2.z < 0) v2.z += PI*2; - + Color cx,cy,cz; cx = cy = cz = BLACK; if (v1.x == v2.x) cx = GREEN; if (v1.y == v2.y) cy = GREEN; if (v1.z == v2.z) cz = GREEN; - + DrawText(TextFormat("%2.3f", v1.x), 20, 20, 20, cx); DrawText(TextFormat("%2.3f", v1.y), 20, 40, 20, cy); DrawText(TextFormat("%2.3f", v1.z), 20, 60, 20, cz); @@ -122,7 +122,7 @@ int main(void) // De-Initialization //-------------------------------------------------------------------------------------- UnloadModel(model); // Unload model data (mesh and materials) - + CloseWindow(); // Close window and OpenGL context //-------------------------------------------------------------------------------------- diff --git a/examples/core/core_vr_simulator.c b/examples/core/core_vr_simulator.c index b57e1f7fd..bba90b823 100644 --- a/examples/core/core_vr_simulator.c +++ b/examples/core/core_vr_simulator.c @@ -38,9 +38,9 @@ int main(void) .eyeToScreenDistance = 0.041f, // Distance between eye and display in meters .lensSeparationDistance = 0.07f, // Lens separation distance in meters .interpupillaryDistance = 0.07f, // IPD (distance between pupils) in meters - + // NOTE: CV1 uses fresnel-hybrid-asymmetric lenses with specific compute shaders - // Following parameters are just an approximation to CV1 distortion stereo rendering + // Following parameters are just an approximation to CV1 distortion stereo rendering .lensDistortionValues[0] = 1.0f, // Lens distortion constant parameter 0 .lensDistortionValues[1] = 0.22f, // Lens distortion constant parameter 1 .lensDistortionValues[2] = 0.24f, // Lens distortion constant parameter 2 @@ -50,32 +50,32 @@ int main(void) .chromaAbCorrection[2] = 1.014f, // Chromatic aberration correction parameter 2 .chromaAbCorrection[3] = 0.0f, // Chromatic aberration correction parameter 3 }; - + // Load VR stereo config for VR device parameteres (Oculus Rift CV1 parameters) VrStereoConfig config = LoadVrStereoConfig(device); // Distortion shader (uses device lens distortion and chroma) Shader distortion = LoadShader(0, TextFormat("resources/distortion%i.fs", GLSL_VERSION)); - + // Update distortion shader with lens and distortion-scale parameters - SetShaderValue(distortion, GetShaderLocation(distortion, "leftLensCenter"), + SetShaderValue(distortion, GetShaderLocation(distortion, "leftLensCenter"), config.leftLensCenter, SHADER_UNIFORM_VEC2); - SetShaderValue(distortion, GetShaderLocation(distortion, "rightLensCenter"), + SetShaderValue(distortion, GetShaderLocation(distortion, "rightLensCenter"), config.rightLensCenter, SHADER_UNIFORM_VEC2); - SetShaderValue(distortion, GetShaderLocation(distortion, "leftScreenCenter"), + SetShaderValue(distortion, GetShaderLocation(distortion, "leftScreenCenter"), config.leftScreenCenter, SHADER_UNIFORM_VEC2); - SetShaderValue(distortion, GetShaderLocation(distortion, "rightScreenCenter"), + SetShaderValue(distortion, GetShaderLocation(distortion, "rightScreenCenter"), config.rightScreenCenter, SHADER_UNIFORM_VEC2); - SetShaderValue(distortion, GetShaderLocation(distortion, "scale"), + SetShaderValue(distortion, GetShaderLocation(distortion, "scale"), config.scale, SHADER_UNIFORM_VEC2); - SetShaderValue(distortion, GetShaderLocation(distortion, "scaleIn"), + SetShaderValue(distortion, GetShaderLocation(distortion, "scaleIn"), config.scaleIn, SHADER_UNIFORM_VEC2); - SetShaderValue(distortion, GetShaderLocation(distortion, "deviceWarpParam"), + SetShaderValue(distortion, GetShaderLocation(distortion, "deviceWarpParam"), device.lensDistortionValues, SHADER_UNIFORM_VEC4); SetShaderValue(distortion, GetShaderLocation(distortion, "chromaAbParam"), device.chromaAbCorrection, SHADER_UNIFORM_VEC4); - + // Initialize framebuffer for stereo rendering // NOTE: Screen size should match HMD aspect ratio RenderTexture2D target = LoadRenderTexture(GetScreenWidth(), GetScreenHeight()); @@ -121,9 +121,9 @@ int main(void) EndMode3D(); EndVrStereoMode(); EndTextureMode(); - + BeginShaderMode(distortion); - DrawTextureRec(target.texture, (Rectangle){ 0, 0, (float)target.texture.width, + DrawTextureRec(target.texture, (Rectangle){ 0, 0, (float)target.texture.width, (float)-target.texture.height }, (Vector2){ 0.0f, 0.0f }, WHITE); EndShaderMode(); @@ -136,7 +136,7 @@ int main(void) // De-Initialization //-------------------------------------------------------------------------------------- UnloadVrStereoConfig(config); // Unload stereo config - + UnloadRenderTexture(target); // Unload stereo render fbo UnloadShader(distortion); // Unload distortion shader diff --git a/examples/core/core_window_letterbox.c b/examples/core/core_window_letterbox.c index c37e75609..dca70d9ac 100644 --- a/examples/core/core_window_letterbox.c +++ b/examples/core/core_window_letterbox.c @@ -64,13 +64,13 @@ int main(void) // Recalculate random colors for the bars for (int i = 0; i < 10; i++) colors[i] = (Color){ GetRandomValue(100, 250), GetRandomValue(50, 150), GetRandomValue(10, 100), 255 }; } - + // Update virtual mouse (clamped mouse value behind game screen) Vector2 mouse = GetMousePosition(); Vector2 virtualMouse = { 0 }; virtualMouse.x = (mouse.x - (GetScreenWidth() - (gameScreenWidth*scale))*0.5f)/scale; virtualMouse.y = (mouse.y - (GetScreenHeight() - (gameScreenHeight*scale))*0.5f)/scale; - virtualMouse = ClampValue(virtualMouse, (Vector2){ 0, 0 }, (Vector2){ gameScreenWidth, gameScreenHeight }); + virtualMouse = ClampValue(virtualMouse, (Vector2){ 0, 0 }, (Vector2){ gameScreenWidth, gameScreenHeight }); // Apply the same transformation as the virtual mouse to the real mouse (i.e. to work with raygui) //SetMouseOffset(-(GetScreenWidth() - (gameScreenWidth*scale))*0.5f, -(GetScreenHeight() - (gameScreenHeight*scale))*0.5f); @@ -90,7 +90,7 @@ int main(void) for (int i = 0; i < 10; i++) DrawRectangle(0, (gameScreenHeight/10)*i, gameScreenWidth, gameScreenHeight/10, colors[i]); DrawText("If executed inside a window,\nyou can resize the window,\nand see the screen scaling!", 10, 25, 20, WHITE); - + DrawText(TextFormat("Default Mouse: [%i , %i]", (int)mouse.x, (int)mouse.y), 350, 25, 20, GREEN); DrawText(TextFormat("Virtual Mouse: [%i , %i]", (int)virtualMouse.x, (int)virtualMouse.y), 350, 55, 20, YELLOW); diff --git a/examples/examples_template.c b/examples/examples_template.c index 49cd5e7b1..296a2a228 100644 --- a/examples/examples_template.c +++ b/examples/examples_template.c @@ -1,6 +1,6 @@ /* WELCOME raylib EXAMPLES CONTRIBUTOR! - + This is a bsasic template to anyone ready to contribute with some code example for the library, here there are some guidelines on how to create an example to be included in raylib @@ -8,32 +8,32 @@ no more than 3-4 words in total to describe the example. referes to the primary raylib module the example is more related with (code, shapes, textures, models, shaders, raudio). i.e: core_input_multitouch, shapes_lines_bezier, shaders_palette_switch - + 2. Follow below template structure, example info should list the module, the short description and the author of the example, twitter or github info could be also provided for the author. Short description should also be used on the title of the window. - + 3. Code should be organized by sections:[Initialization]- [Update] - [Draw] - [De-Initialization] Place your code between the dotted lines for every section, please don't mix update logic with drawing and remember to unload all loaded resources. - + 4. Code should follow raylib conventions: https://github.com/raysan5/raylib/wiki/raylib-coding-conventions Try to be very organized, using line-breaks appropiately. - + 5. Add comments to the specific parts of code the example is focus on. Don't abuse with comments, try to be clear and impersonal on the comments. - + 6. Try to keep the example simple, under 300 code lines if possible. Try to avoid external dependencies. Try to avoid defining functions outside the main(). Example should be as self-contained as possible. - + 7. About external resources, they should be placed in a [resources] folder and those resources should be open and free for use and distribution. Avoid propietary content. - + 8. Try to keep the example simple but with a creative touch. Simple but beautiful examples are more appealing to users! - + 9. In case of additional information is required, just come to raylib Discord channel: example-contributions - + 10. Have fun! */ @@ -58,9 +58,9 @@ int main() const int screenHeight = 450; InitWindow(screenWidth, screenHeight, "raylib [core] example - basic window"); - - // TODO: Load resources / Initialize variables at this point - + + // TODO: Load resources / Initialize variables at this point + SetTargetFPS(60); //-------------------------------------------------------------------------------------- @@ -79,7 +79,7 @@ int main() ClearBackground(RAYWHITE); // TODO: Draw everything that requires to be drawn at this point: - + DrawText("Congrats! You created your first window!", 190, 200, 20, LIGHTGRAY); // Example EndDrawing(); @@ -88,9 +88,9 @@ int main() // De-Initialization //-------------------------------------------------------------------------------------- - + // TODO: Unload all loaded resources at this point - + CloseWindow(); // Close window and OpenGL context //-------------------------------------------------------------------------------------- diff --git a/examples/models/models_animation.c b/examples/models/models_animation.c index 778e347e6..2c3348c0f 100644 --- a/examples/models/models_animation.c +++ b/examples/models/models_animation.c @@ -11,7 +11,7 @@ * ******************************************************************************************** * -* To export a model from blender, make sure it is not posed, the vertices need to be in the +* To export a model from blender, make sure it is not posed, the vertices need to be in the * same position as they would be in edit mode. * and that the scale of your models is set to 0. Scaling can be done from the export menu. * @@ -100,7 +100,7 @@ int main(void) // De-Initialization //-------------------------------------------------------------------------------------- UnloadTexture(texture); // Unload texture - + // Unload model animations data for (int i = 0; i < animsCount; i++) UnloadModelAnimation(anims[i]); RL_FREE(anims); diff --git a/examples/models/models_gltf_animation.c b/examples/models/models_gltf_animation.c index 8bd812d61..69df2982b 100644 --- a/examples/models/models_gltf_animation.c +++ b/examples/models/models_gltf_animation.c @@ -11,7 +11,7 @@ * ******************************************************************************************** * -* To export a model from blender, make sure it is not posed, the vertices need to be in the +* To export a model from blender, make sure it is not posed, the vertices need to be in the * same position as they would be in edit mode. * and that the scale of your models is set to 0. Scaling can be done from the export menu. * @@ -68,13 +68,13 @@ int main(void) if (IsKeyDown(KEY_SPACE)) { animFrameCounter += animationDirection; - + if (animFrameCounter >= anims[0].frameCount || animFrameCounter <= 0) { animationDirection *= -1; animFrameCounter += animationDirection; } - + UpdateModelAnimation(model, anims[0], animFrameCounter); } //---------------------------------------------------------------------------------- @@ -108,7 +108,7 @@ int main(void) // De-Initialization //-------------------------------------------------------------------------------------- // UnloadTexture(texture); // Unload texture - + // Unload model animations data for (int i = 0; i < animsCount; i++) UnloadModelAnimation(anims[i]); RL_FREE(anims); diff --git a/examples/models/models_gltf_model.c b/examples/models/models_gltf_model.c index 24996e5c7..d5bd1687e 100644 --- a/examples/models/models_gltf_model.c +++ b/examples/models/models_gltf_model.c @@ -11,7 +11,7 @@ * ******************************************************************************************** * -* To export a model from blender, make sure it is not posed, the vertices need to be in the +* To export a model from blender, make sure it is not posed, the vertices need to be in the * same position as they would be in edit mode. * and that the scale of your models is set to 0. Scaling can be done from the export menu. * @@ -41,14 +41,14 @@ int main(void) camera.projection = CAMERA_PERSPECTIVE; // Camera mode type Model model[MAX_MODELS] = { 0 }; - + model[0] = LoadModel("resources/gltf/raylib_32x32.glb"); model[1] = LoadModel("resources/gltf/rigged_figure.glb"); model[2] = LoadModel("resources/gltf/GearboxAssy.glb"); model[3] = LoadModel("resources/gltf/BoxAnimated.glb"); model[4] = LoadModel("resources/gltf/AnimatedTriangle.gltf"); model[5] = LoadModel("resources/gltf/AnimatedMorphCube.glb"); - + int currentModel = 0; Vector3 position = { 0.0f, 0.0f, 0.0f }; // Set model position @@ -64,13 +64,13 @@ int main(void) // Update //---------------------------------------------------------------------------------- UpdateCamera(&camera); - + if (IsKeyReleased(KEY_RIGHT)) { currentModel++; if (currentModel == MAX_MODELS) currentModel = 0; } - + if (IsKeyReleased(KEY_LEFT)) { currentModel--; diff --git a/examples/models/models_loading.c b/examples/models/models_loading.c index 2af80c976..f6cd0589f 100644 --- a/examples/models/models_loading.c +++ b/examples/models/models_loading.c @@ -9,7 +9,7 @@ * - GLTF > Modern text/binary file format, includes lot of information and it could * also reference external files, raylib will try loading mesh and materials data * - IQM > Binary file format including mesh vertex data but also animation data, -* raylib can load .iqm animations. +* raylib can load .iqm animations. * * This example has been created using raylib 2.6 (www.raylib.com) * raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details) @@ -42,7 +42,7 @@ int main(void) model.materials[0].maps[MATERIAL_MAP_DIFFUSE].texture = texture; // Set map diffuse texture Vector3 position = { 0.0f, 0.0f, 0.0f }; // Set model position - + BoundingBox bounds = MeshBoundingBox(model.meshes[0]); // Set model bounds // NOTE: bounds are calculated from the original size of the model, @@ -61,7 +61,7 @@ int main(void) // Update //---------------------------------------------------------------------------------- UpdateCamera(&camera); - + // Load new models/textures on drag&drop if (IsFileDropped()) { @@ -79,7 +79,7 @@ int main(void) model.materials[0].maps[MATERIAL_MAP_DIFFUSE].texture = texture; // Set current map diffuse texture bounds = MeshBoundingBox(model.meshes[0]); - + // TODO: Move camera position from target enough distance to visualize model properly } else if (IsFileExtension(droppedFiles[0], ".png")) // Texture file formats supported @@ -118,7 +118,7 @@ int main(void) if (selected) DrawBoundingBox(bounds, GREEN); // Draw selection box EndMode3D(); - + DrawText("Drag & drop model to load mesh/texture.", 10, GetScreenHeight() - 20, 10, DARKGRAY); if (selected) DrawText("MODEL SELECTED", GetScreenWidth() - 110, 10, 10, GREEN); diff --git a/examples/models/models_material_pbr.c b/examples/models/models_material_pbr.c index eac9d9c06..f89a2758d 100644 --- a/examples/models/models_material_pbr.c +++ b/examples/models/models_material_pbr.c @@ -133,7 +133,7 @@ static Material LoadMaterialPBR(Color albedo, float metalness, float roughness) Material mat = LoadMaterialDefault(); // Initialize material to default // Load PBR shader (requires several maps) - mat.shader = LoadShader(TextFormat("resources/shaders/glsl%i/pbr.vs", GLSL_VERSION), + mat.shader = LoadShader(TextFormat("resources/shaders/glsl%i/pbr.vs", GLSL_VERSION), TextFormat("resources/shaders/glsl%i/pbr.fs", GLSL_VERSION)); // Get required locations points for PBR material @@ -160,14 +160,14 @@ static Material LoadMaterialPBR(Color albedo, float metalness, float roughness) mat.maps[MATERIAL_MAP_METALNESS].texture = LoadTexture("resources/pbr/trooper_metalness.png"); mat.maps[MATERIAL_MAP_ROUGHNESS].texture = LoadTexture("resources/pbr/trooper_roughness.png"); mat.maps[MATERIAL_MAP_OCCLUSION].texture = LoadTexture("resources/pbr/trooper_ao.png"); - + // Set textures filtering for better quality SetTextureFilter(mat.maps[MATERIAL_MAP_ALBEDO].texture, FILTER_BILINEAR); SetTextureFilter(mat.maps[MATERIAL_MAP_NORMAL].texture, FILTER_BILINEAR); SetTextureFilter(mat.maps[MATERIAL_MAP_METALNESS].texture, FILTER_BILINEAR); SetTextureFilter(mat.maps[MATERIAL_MAP_ROUGHNESS].texture, FILTER_BILINEAR); SetTextureFilter(mat.maps[MATERIAL_MAP_OCCLUSION].texture, FILTER_BILINEAR); - + // Enable sample usage in shader for assigned textures SetShaderValue(mat.shader, GetShaderLocation(mat.shader, "albedo.useSampler"), (int[1]){ 1 }, SHADER_UNIFORM_INT); SetShaderValue(mat.shader, GetShaderLocation(mat.shader, "normals.useSampler"), (int[1]){ 1 }, SHADER_UNIFORM_INT); @@ -186,13 +186,13 @@ static Material LoadMaterialPBR(Color albedo, float metalness, float roughness) mat.maps[MATERIAL_MAP_OCCLUSION].value = 1.0f; mat.maps[MATERIAL_MAP_EMISSION].value = 0.5f; mat.maps[MATERIAL_MAP_HEIGHT].value = 0.5f; - + // Generate cubemap from panorama texture //-------------------------------------------------------------------------------------------------------- Texture2D panorama = LoadTexture("resources/dresden_square_2k.hdr"); - + // Load equirectangular to cubemap shader - Shader shdrCubemap = LoadShader(TextFormat("resources/shaders/glsl%i/pbr.vs", GLSL_VERSION), + Shader shdrCubemap = LoadShader(TextFormat("resources/shaders/glsl%i/pbr.vs", GLSL_VERSION), TextFormat("resources/shaders/glsl%i/pbr.fs", GLSL_VERSION)); SetShaderValue(shdrCubemap, GetShaderLocation(shdrCubemap, "equirectangularMap"), (int[1]){ 0 }, SHADER_UNIFORM_INT); @@ -200,33 +200,33 @@ static Material LoadMaterialPBR(Color albedo, float metalness, float roughness) UnloadTexture(panorama); UnloadShader(shdrCubemap); //-------------------------------------------------------------------------------------------------------- - + // Generate irradiance map from cubemap texture //-------------------------------------------------------------------------------------------------------- // Load irradiance (GI) calculation shader - Shader shdrIrradiance = LoadShader(TextFormat("resources/shaders/glsl%i/skybox.vs", GLSL_VERSION), + Shader shdrIrradiance = LoadShader(TextFormat("resources/shaders/glsl%i/skybox.vs", GLSL_VERSION), TextFormat("resources/shaders/glsl%i/irradiance.fs", GLSL_VERSION)); SetShaderValue(shdrIrradiance, GetShaderLocation(shdrIrradiance, "environmentMap"), (int[1]){ 0 }, SHADER_UNIFORM_INT); mat.maps[MATERIAL_MAP_IRRADIANCE].texture = GenTextureIrradiance(shdrIrradiance, cubemap, IRRADIANCE_SIZE); UnloadShader(shdrIrradiance); //-------------------------------------------------------------------------------------------------------- - + // Generate prefilter map from cubemap texture //-------------------------------------------------------------------------------------------------------- // Load reflection prefilter calculation shader - Shader shdrPrefilter = LoadShader(TextFormat("resources/shaders/glsl%i/skybox.vs", GLSL_VERSION), + Shader shdrPrefilter = LoadShader(TextFormat("resources/shaders/glsl%i/skybox.vs", GLSL_VERSION), TextFormat("resources/shaders/glsl%i/prefilter.fs", GLSL_VERSION)); - + SetShaderValue(shdrPrefilter, GetShaderLocation(shdrPrefilter, "environmentMap"), (int[1]){ 0 }, SHADER_UNIFORM_INT); mat.maps[MATERIAL_MAP_PREFILTER].texture = GenTexturePrefilter(shdrPrefilter, cubemap, PREFILTERED_SIZE); UnloadTexture(cubemap); UnloadShader(shdrPrefilter); //-------------------------------------------------------------------------------------------------------- - + // Generate BRDF (bidirectional reflectance distribution function) texture (using shader) //-------------------------------------------------------------------------------------------------------- - Shader shdrBRDF = LoadShader(TextFormat("resources/shaders/glsl%i/brdf.vs", GLSL_VERSION), + Shader shdrBRDF = LoadShader(TextFormat("resources/shaders/glsl%i/brdf.vs", GLSL_VERSION), TextFormat("resources/shaders/glsl%i/brdf.fs", GLSL_VERSION)); mat.maps[MATERIAL_MAP_BRDG].texture = GenTextureBRDF(shdrBRDF, BRDF_SIZE); @@ -453,7 +453,7 @@ static TextureCubemap GenTexturePrefilter(Shader shader, TextureCubemap cubemap, { rlSetUniformMatrix(shader.locs[SHADER_LOC_MATRIX_VIEW], fboViews[i]); rlFramebufferAttach(fbo, prefilter.id, RL_ATTACHMENT_COLOR_CHANNEL0, RL_ATTACHMENT_CUBEMAP_POSITIVE_X + i, mip); - + rlClearScreenBuffers(); rlLoadDrawCube(); } diff --git a/examples/models/models_rlgl_solar_system.c b/examples/models/models_rlgl_solar_system.c index 7eda6c76d..97d692453 100644 --- a/examples/models/models_rlgl_solar_system.c +++ b/examples/models/models_rlgl_solar_system.c @@ -135,7 +135,7 @@ void DrawSphereBasic(Color color) { int rings = 16; int slices = 16; - + // Make sure there is enough space in the internal render batch // buffer to store all required vertex, batch is reseted if required rlCheckRenderBatchLimit((rings + 2)*slices*6); diff --git a/examples/models/models_skybox.c b/examples/models/models_skybox.c index 2060688e1..bd57a34d3 100644 --- a/examples/models/models_skybox.c +++ b/examples/models/models_skybox.c @@ -36,12 +36,12 @@ int main(void) // Load skybox model Mesh cube = GenMeshCube(1.0f, 1.0f, 1.0f); Model skybox = LoadModelFromMesh(cube); - + bool useHDR = false; // Load skybox shader and set required locations // NOTE: Some locations are automatically set at shader loading - skybox.materials[0].shader = LoadShader(TextFormat("resources/shaders/glsl%i/skybox.vs", GLSL_VERSION), + skybox.materials[0].shader = LoadShader(TextFormat("resources/shaders/glsl%i/skybox.vs", GLSL_VERSION), TextFormat("resources/shaders/glsl%i/skybox.fs", GLSL_VERSION)); SetShaderValue(skybox.materials[0].shader, GetShaderLocation(skybox.materials[0].shader, "environmentMap"), (int[1]){ MATERIAL_MAP_CUBEMAP }, SHADER_UNIFORM_INT); @@ -49,7 +49,7 @@ int main(void) SetShaderValue(skybox.materials[0].shader, GetShaderLocation(skybox.materials[0].shader, "vflipped"), (int[1]){ useHDR ? 1 : 0 }, SHADER_UNIFORM_INT); // Load cubemap shader and setup required shader locations - Shader shdrCubemap = LoadShader(TextFormat("resources/shaders/glsl%i/cubemap.vs", GLSL_VERSION), + Shader shdrCubemap = LoadShader(TextFormat("resources/shaders/glsl%i/cubemap.vs", GLSL_VERSION), TextFormat("resources/shaders/glsl%i/cubemap.fs", GLSL_VERSION)); SetShaderValue(shdrCubemap, GetShaderLocation(shdrCubemap, "equirectangularMap"), (int[1]){ 0 }, SHADER_UNIFORM_INT); @@ -89,7 +89,7 @@ int main(void) // Update //---------------------------------------------------------------------------------- UpdateCamera(&camera); // Update camera - + // Load new cubemap texture on drag&drop if (IsFileDropped()) { @@ -105,7 +105,7 @@ int main(void) if (useHDR) { Texture2D panorama = LoadTexture(droppedFiles[0]); - + // Generate cubemap from panorama texture skybox.materials[0].maps[MATERIAL_MAP_CUBEMAP].texture = GenTextureCubemap(shdrCubemap, panorama, 1024, PIXELFORMAT_UNCOMPRESSED_R8G8B8A8); UnloadTexture(panorama); @@ -132,16 +132,16 @@ int main(void) ClearBackground(RAYWHITE); BeginMode3D(camera); - + // We are inside the cube, we need to disable backface culling! rlDisableBackfaceCulling(); rlDisableDepthMask(); DrawModel(skybox, (Vector3){0, 0, 0}, 1.0f, WHITE); rlEnableBackfaceCulling(); rlEnableDepthMask(); - + DrawGrid(10, 1.0f); - + EndMode3D(); if (useHDR) @@ -159,7 +159,7 @@ int main(void) //-------------------------------------------------------------------------------------- UnloadShader(skybox.materials[0].shader); UnloadTexture(skybox.materials[0].maps[MATERIAL_MAP_CUBEMAP].texture); - + UnloadModel(skybox); // Unload skybox model CloseWindow(); // Close window and OpenGL context diff --git a/examples/models/models_waving_cubes.c b/examples/models/models_waving_cubes.c index 2a3b142df..13f098b9d 100644 --- a/examples/models/models_waving_cubes.c +++ b/examples/models/models_waving_cubes.c @@ -53,7 +53,7 @@ int main() camera.position.x = (float)cos(cameraTime)*40.0f; camera.position.z = (float)sin(cameraTime)*40.0f; //---------------------------------------------------------------------------------- - + // Draw //---------------------------------------------------------------------------------- BeginDrawing(); @@ -64,11 +64,11 @@ int main() DrawGrid(10, 5.0f); - for (int x = 0; x < numBlocks; x++) + for (int x = 0; x < numBlocks; x++) { - for (int y = 0; y < numBlocks; y++) + for (int y = 0; y < numBlocks; y++) { - for (int z = 0; z < numBlocks; z++) + for (int z = 0; z < numBlocks; z++) { // Scale of the blocks depends on x/y/z positions float blockScale = (x + y + z)/30.0f; @@ -94,9 +94,9 @@ int main() } } } - + EndMode3D(); - + DrawFPS(10, 10); EndDrawing(); diff --git a/examples/models/models_yaw_pitch_roll.c b/examples/models/models_yaw_pitch_roll.c index 77419fbdd..70fe84777 100644 --- a/examples/models/models_yaw_pitch_roll.c +++ b/examples/models/models_yaw_pitch_roll.c @@ -30,7 +30,7 @@ int main(void) camera.up = (Vector3){ 0.0f, 1.0f, 0.0f }; // Camera up vector (rotation towards target) camera.fovy = 30.0f; // Camera field-of-view Y camera.projection = CAMERA_PERSPECTIVE; // Camera type - + // Model loading // NOTE: Diffuse map loaded automatically Model model = LoadModel("resources/plane/plane.gltf"); @@ -77,8 +77,8 @@ int main(void) // Tranformation matrix for rotations model.transform = MatrixRotateXYZ((Vector3){ DEG2RAD*pitch, DEG2RAD*yaw, DEG2RAD*roll }); //---------------------------------------------------------------------------------- - - + + // Draw //---------------------------------------------------------------------------------- BeginDrawing(); @@ -92,7 +92,7 @@ int main(void) DrawGrid(10, 10.0f); EndMode3D(); - + // Draw controls info DrawRectangle(30, 370, 260, 70, Fade(GREEN, 0.5f)); DrawRectangleLines(30, 370, 260, 70, Fade(DARKGREEN, 0.5f)); @@ -107,7 +107,7 @@ int main(void) } // De-Initialization - //-------------------------------------------------------------------------------------- + //-------------------------------------------------------------------------------------- UnloadModel(model); // Unload model data CloseWindow(); // Close window and OpenGL context diff --git a/examples/network/network_ping_pong.c b/examples/network/network_ping_pong.c index 22aaa69e8..ec45f6445 100644 --- a/examples/network/network_ping_pong.c +++ b/examples/network/network_ping_pong.c @@ -40,16 +40,16 @@ static void NetworkConnect(void) { ping = true; connected = true; - } - else + } + else { // If the client is connected, run the server code to check for a connection - if (clientConnected) + if (clientConnected) { int active = CheckSockets(socketSet, 0); if (active != 0) TraceLog(LOG_INFO, "There are currently %d socket(s) with data to be processed.", active); - if (active > 0) + if (active > 0) { if ((connection = SocketAccept(serverResult->socket, &connectionConfig)) != NULL) { @@ -58,7 +58,7 @@ static void NetworkConnect(void) ping = true; } } - } + } else { // Check if we're connected every _delay_ seconds @@ -66,7 +66,7 @@ static void NetworkConnect(void) if (elapsed > delay) { if (IsSocketConnected(clientResult->socket)) clientConnected = true; - + elapsed = 0.0f; } } @@ -88,7 +88,7 @@ static void UpdateNetwork(void) { if (IsSocketReady(clientResult->socket)) bytesRecv = SocketReceive(clientResult->socket, receiveBuffer, msglen); if (IsSocketReady(serverResult->socket)) bytesRecv = SocketReceive(serverResult->socket, receiveBuffer, msglen); - } + } else if (IsSocketReady(connection)) bytesRecv = SocketReceive(connection, receiveBuffer, msglen); // If we received data, was that data a "Ping!" or a "Pong!" @@ -107,14 +107,14 @@ static void UpdateNetwork(void) ping = false; if (serverConfig.type == SOCKET_UDP && clientConfig.type == SOCKET_UDP) SocketSend(clientResult->socket, pingmsg, msglen); else SocketSend(clientResult->socket, pingmsg, msglen); - } + } else if (pong) { pong = false; if (serverConfig.type == SOCKET_UDP && clientConfig.type == SOCKET_UDP) SocketSend(clientResult->socket, pongmsg, msglen); else SocketSend(clientResult->socket, pongmsg, msglen); } - + elapsed = 0.0f; } } @@ -132,7 +132,7 @@ int main(void) // Create the server: getaddrinfo + socket + setsockopt + bind + listen serverResult = LoadSocketResult(); - if (!SocketCreate(&serverConfig, serverResult)) + if (!SocketCreate(&serverConfig, serverResult)) { TraceLog(LOG_WARNING, "Failed to open server: status %d, errno %d", serverResult->status, serverResult->socket->status); } @@ -141,7 +141,7 @@ int main(void) if (!SocketBind(&serverConfig, serverResult)) { TraceLog(LOG_WARNING, "Failed to bind server: status %d, errno %d", serverResult->status, serverResult->socket->status); - } + } else { if (!(serverConfig.type == SOCKET_UDP)) @@ -156,7 +156,7 @@ int main(void) // Create the client: getaddrinfo + socket + setsockopt + connect (TCP only) clientResult = LoadSocketResult(); - if (!SocketCreate(&clientConfig, clientResult)) + if (!SocketCreate(&clientConfig, clientResult)) { TraceLog(LOG_WARNING, "Failed to open client: status %d, errno %d", clientResult->status, clientResult->socket->status); } @@ -194,7 +194,7 @@ int main(void) BeginDrawing(); ClearBackground(RAYWHITE); - + // TODO: Draw relevant connection info EndDrawing(); @@ -204,7 +204,7 @@ int main(void) // De-Initialization //-------------------------------------------------------------------------------------- CloseNetworkDevice(); // Close network communication - + CloseWindow(); // Close window and OpenGL context //-------------------------------------------------------------------------------------- diff --git a/examples/network/network_resolve_host.c b/examples/network/network_resolve_host.c index e2e3f7218..a6e9ecdf4 100644 --- a/examples/network/network_resolve_host.c +++ b/examples/network/network_resolve_host.c @@ -22,17 +22,17 @@ int main(void) const int screenHeight = 450; InitWindow(screenWidth, screenHeight, "raylib [network] example - resolve host"); - + InitNetworkDevice(); // Init network communications - + char buffer[ADDRESS_IPV6_ADDRSTRLEN]; unsigned short port = 0; AddressInformation *address = LoadAddressList(1); - + // Address info flags // ADDRESS_INFO_NUMERICHOST // or try them in conjunction to - // ADDRESS_INFO_NUMERICSERV // specify custom behaviour from + // ADDRESS_INFO_NUMERICSERV // specify custom behaviour from // ADDRESS_INFO_DNS_ONLY // the function getaddrinfo() // ADDRESS_INFO_ALL // // ADDRESS_INFO_FQDN // e.g. ADDRESS_INFO_CANONNAME | ADDRESS_INFO_NUMERICSERV @@ -70,7 +70,7 @@ int main(void) // De-Initialization //-------------------------------------------------------------------------------------- CloseNetworkDevice(); // Close network communication - + CloseWindow(); // Close window and OpenGL context //-------------------------------------------------------------------------------------- diff --git a/examples/network/network_tcp_client.c b/examples/network/network_tcp_client.c index b2daab48f..1779a3a4a 100644 --- a/examples/network/network_tcp_client.c +++ b/examples/network/network_tcp_client.c @@ -24,10 +24,10 @@ int main(void) InitWindow(screenWidth, screenHeight, "raylib [network] example - tcp client"); InitNetworkDevice(); // Init network communications - + const char *pingmsg = "Ping!"; const char *pongmsg = "Pong!"; - + bool ping = false; bool pong = false; float elapsed = 0.0f; @@ -35,12 +35,12 @@ int main(void) bool connected = false; SocketConfig clientConfig = { - .host = "127.0.0.1", - .port = "4950", - .type = SOCKET_TCP, + .host = "127.0.0.1", + .port = "4950", + .type = SOCKET_TCP, .nonblocking = true }; - + SocketSet *socketSet = NULL; SocketResult *clientResult = NULL; char receiveBuffer[512] = { 0 }; @@ -48,9 +48,9 @@ int main(void) // Create the client: getaddrinfo + socket + setsockopt + connect (TCP only) clientResult = LoadSocketResult(); if (!SocketCreate(&clientConfig, clientResult)) TraceLog(LOG_WARNING, "Failed to open client: status %d, errno %d", clientResult->status, clientResult->socket->status); - else + else { - if (!(clientConfig.type == SOCKET_UDP)) + if (!(clientConfig.type == SOCKET_UDP)) { if (!SocketConnect(&clientConfig, clientResult)) TraceLog(LOG_WARNING, "Failed to connect to server: status %d, errno %d", clientResult->status, clientResult->socket->status); } @@ -83,7 +83,7 @@ int main(void) if (IsSocketReady(clientResult->socket)) bytesRecv = SocketReceive(clientResult->socket, receiveBuffer, (int)strlen(pingmsg) + 1); // If we received data, was that data a "Ping!" or a "Pong!" - if (bytesRecv > 0) + if (bytesRecv > 0) { if (strcmp(receiveBuffer, pingmsg) == 0) { pong = true; } if (strcmp(receiveBuffer, pongmsg) == 0) { ping = true; } @@ -91,19 +91,19 @@ int main(void) // After each delay has expired, send a response "Ping!" for a "Pong!" and vice versa elapsed += GetFrameTime(); - if (elapsed > delay) + if (elapsed > delay) { - if (ping) + if (ping) { ping = false; SocketSend(clientResult->socket, pingmsg, (int)strlen(pingmsg) + 1); } - else if (pong) + else if (pong) { pong = false; SocketSend(clientResult->socket, pongmsg, (int)strlen(pingmsg) + 1); } - + elapsed = 0.0f; } } @@ -124,7 +124,7 @@ int main(void) BeginDrawing(); ClearBackground(RAYWHITE); - + // TODO: Draw relevant connection info EndDrawing(); @@ -134,7 +134,7 @@ int main(void) // De-Initialization //-------------------------------------------------------------------------------------- CloseNetworkDevice(); // Close network communication - + CloseWindow(); // Close window and OpenGL context //-------------------------------------------------------------------------------------- diff --git a/examples/network/network_tcp_server.c b/examples/network/network_tcp_server.c index 3e1942c57..5cbbe54bd 100644 --- a/examples/network/network_tcp_server.c +++ b/examples/network/network_tcp_server.c @@ -24,10 +24,10 @@ int main(void) InitWindow(screenWidth, screenHeight, "raylib [network] example - tcp server"); InitNetworkDevice(); // Init network communications - + const char *pingmsg = "Ping!"; const char *pongmsg = "Pong!"; - + bool ping = false; bool pong = false; float elapsed = 0.0f; @@ -35,32 +35,32 @@ int main(void) bool connected = false; SocketConfig serverConfig = { - .host = "127.0.0.1", - .port = "4950", + .host = "127.0.0.1", + .port = "4950", .type = SOCKET_TCP, .server = true, .nonblocking = true }; - + SocketConfig connectionConfig = { .nonblocking = true }; - + Socket *connection = NULL; SocketSet *socketSet = NULL; SocketResult *serverResult = NULL; char receiveBuffer[512] = { 0 }; - + // Create the server: getaddrinfo + socket + setsockopt + bind + listen serverResult = LoadSocketResult(); - if (!SocketCreate(&serverConfig, serverResult)) + if (!SocketCreate(&serverConfig, serverResult)) { TraceLog(LOG_WARNING, "Failed to open server: status %d, errno %d", serverResult->status, serverResult->socket->status); - } + } else { if (!SocketBind(&serverConfig, serverResult)) { TraceLog(LOG_WARNING, "Failed to bind server: status %d, errno %d", serverResult->status, serverResult->socket->status); - } + } else { if (!(serverConfig.type == SOCKET_UDP)) @@ -107,17 +107,17 @@ int main(void) elapsed += GetFrameTime(); if (elapsed > delay) { - if (ping) + if (ping) { ping = false; SocketSend(connection, pingmsg, (int)strlen(pingmsg) + 1); - } + } else if (pong) { pong = false; SocketSend(connection, pongmsg, (int)strlen(pingmsg) + 1); } - + elapsed = 0.0f; } } @@ -127,9 +127,9 @@ int main(void) int active = CheckSockets(socketSet, 0); if (active != 0) TraceLog(LOG_DEBUG, "There are currently %d socket(s) with data to be processed.", active); - if (active > 0) + if (active > 0) { - if ((connection = SocketAccept(serverResult->socket, &connectionConfig)) != NULL) + if ((connection = SocketAccept(serverResult->socket, &connectionConfig)) != NULL) { AddSocket(socketSet, connection); connected = true; @@ -144,7 +144,7 @@ int main(void) BeginDrawing(); ClearBackground(RAYWHITE); - + // TODO: Draw relevant connection info EndDrawing(); @@ -154,7 +154,7 @@ int main(void) // De-Initialization //-------------------------------------------------------------------------------------- CloseNetworkDevice(); // Close network communication - + CloseWindow(); // Close window and OpenGL context //-------------------------------------------------------------------------------------- diff --git a/examples/network/network_test.c b/examples/network/network_test.c index b756c2cdf..957ed8ba0 100644 --- a/examples/network/network_test.c +++ b/examples/network/network_test.c @@ -85,7 +85,7 @@ void test_resolve_host() const char *address = "localhost"; const char *port = "80"; AddressInformation *addr = LoadAddressList(3); - int count = ResolveHost(address, port, ADDRESS_TYPE_ANY, 0, addr); + int count = ResolveHost(address, port, ADDRESS_TYPE_ANY, 0, addr); assert(GetAddressFamily(addr[0]) == ADDRESS_TYPE_IPV6); assert(GetAddressFamily(addr[1]) == ADDRESS_TYPE_IPV4); @@ -122,9 +122,9 @@ int main(void) const int screenHeight = 450; InitWindow(screenWidth, screenHeight, "raylib [network] example - network test"); - + InitNetworkDevice(); // Init network communications - + // Run some tests test_resolve_host(); //test_socket_create(); @@ -146,7 +146,7 @@ int main(void) BeginDrawing(); ClearBackground(RAYWHITE); - + // TODO: Draw relevant connection info EndDrawing(); @@ -156,7 +156,7 @@ int main(void) // De-Initialization //-------------------------------------------------------------------------------------- CloseNetworkDevice(); // Close network communication - + CloseWindow(); // Close window and OpenGL context //-------------------------------------------------------------------------------------- diff --git a/examples/network/network_udp_client.c b/examples/network/network_udp_client.c index 680ed00e5..d351372b5 100644 --- a/examples/network/network_udp_client.c +++ b/examples/network/network_udp_client.c @@ -24,22 +24,22 @@ int main(void) InitWindow(screenWidth, screenHeight, "raylib [network] example - udp client"); InitNetworkDevice(); // Init network communications - + const char *pingmsg = "Ping!"; const char *pongmsg = "Pong!"; - + bool ping = true; bool pong = false; float elapsed = 0.0f; float delay = 1.0f; SocketConfig clientConfig = { - .host = "127.0.0.1", - .port = "4950", - .type = SOCKET_UDP, + .host = "127.0.0.1", + .port = "4950", + .type = SOCKET_UDP, .nonblocking = true }; - + SocketResult *clientResult = NULL; SocketSet *socketSet = NULL; char receiveBuffer[512] = { 0 }; @@ -76,7 +76,7 @@ int main(void) if (IsSocketReady(clientResult->socket)) bytesRecv = SocketReceive(clientResult->socket, receiveBuffer, (int)strlen(pingmsg) + 1); // If we received data, was that data a "Ping!" or a "Pong!" - if (bytesRecv > 0) + if (bytesRecv > 0) { if (strcmp(receiveBuffer, pingmsg) == 0) { pong = true; } if (strcmp(receiveBuffer, pongmsg) == 0) { ping = true; } @@ -86,17 +86,17 @@ int main(void) elapsed += GetFrameTime(); if (elapsed > delay) { - if (ping) + if (ping) { ping = false; SocketSend(clientResult->socket, pingmsg, (int)strlen(pingmsg) + 1); - } + } else if (pong) { pong = false; SocketSend(clientResult->socket, pongmsg, (int)strlen(pongmsg) + 1); } - + elapsed = 0.0f; } //---------------------------------------------------------------------------------- @@ -106,7 +106,7 @@ int main(void) BeginDrawing(); ClearBackground(RAYWHITE); - + // TODO: Draw relevant connection info EndDrawing(); @@ -116,7 +116,7 @@ int main(void) // De-Initialization //-------------------------------------------------------------------------------------- CloseNetworkDevice(); // Close network communication - + CloseWindow(); // Close window and OpenGL context //-------------------------------------------------------------------------------------- diff --git a/examples/network/network_udp_server.c b/examples/network/network_udp_server.c index f32189c29..29fffbe7b 100644 --- a/examples/network/network_udp_server.c +++ b/examples/network/network_udp_server.c @@ -24,30 +24,30 @@ int main(void) InitWindow(screenWidth, screenHeight, "raylib [network] example - udp server"); InitNetworkDevice(); // Init network communications - + const char *pingmsg = "Ping!"; const char *pongmsg = "Pong!"; - + bool ping = false; bool pong = false; float elapsed = 0.0f; float delay = 1.0f; SocketConfig serverConfig = { - .host = "127.0.0.1", - .port = "4950", - .server = true, - .type = SOCKET_UDP, + .host = "127.0.0.1", + .port = "4950", + .server = true, + .type = SOCKET_UDP, .nonblocking = true }; - + SocketResult *serverResult = NULL; SocketSet *socketSet = NULL; char receiveBuffer[512] = { 0 }; // Create the server: getaddrinfo + socket + setsockopt + bind + listen serverResult = LoadSocketResult(); - + if (!SocketCreate(&serverConfig, serverResult)) TraceLog(LOG_WARNING, "Failed to open server: status %d, errno %d", serverResult->status, serverResult->socket->status); else if (!SocketBind(&serverConfig, serverResult)) TraceLog(LOG_WARNING, "Failed to bind server: status %d, errno %d", serverResult->status, serverResult->socket->status); @@ -65,7 +65,7 @@ int main(void) //---------------------------------------------------------------------------------- // Once connected to the network, check the sockets for pending information // and when information is ready, send either a Ping or a Pong. - + // CheckSockets, if any of the sockets in the set are pending (received data, or requests) // then mark the socket as being ready. You can check this with IsSocketReady(client_res->socket) int active = CheckSockets(socketSet, 0); @@ -79,7 +79,7 @@ int main(void) int bytesRecv = SocketReceive(serverResult->socket, receiveBuffer, (int)strlen(pingmsg) + 1); // If we received data, is that data a "Ping!" or a "Pong!"? - if (bytesRecv > 0) + if (bytesRecv > 0) { if (strcmp(receiveBuffer, pingmsg) == 0) { pong = true; } if (strcmp(receiveBuffer, pongmsg) == 0) { ping = true; } @@ -87,20 +87,20 @@ int main(void) // After each delay has expired, send a response "Ping!" for a "Pong!" and vice-versa elapsed += GetFrameTime(); - + if (elapsed > delay) { - if (ping) + if (ping) { ping = false; SocketSend(serverResult->socket, pingmsg, (int)strlen(pingmsg) + 1); - } - else if (pong) + } + else if (pong) { pong = false; SocketSend(serverResult->socket, pongmsg, (int)strlen(pongmsg) + 1); } - + elapsed = 0.0f; } //---------------------------------------------------------------------------------- @@ -120,7 +120,7 @@ int main(void) // De-Initialization //-------------------------------------------------------------------------------------- CloseNetworkDevice(); // Close network communication - + CloseWindow(); // Close window and OpenGL context //-------------------------------------------------------------------------------------- diff --git a/examples/others/easings_testbed.c b/examples/others/easings_testbed.c index 9c94cfc3e..19c3b4578 100644 --- a/examples/others/easings_testbed.c +++ b/examples/others/easings_testbed.c @@ -107,7 +107,7 @@ int main(void) InitWindow(screenWidth, screenHeight, "raylib [easings] example - easings testbed"); Vector2 ballPosition = { 100.0f, 200.0f }; - + float t = 0.0f; // Current time (in any unit measure, but same unit as duration) float d = 300.0f; // Total time it should take to complete (duration) bool paused = true; diff --git a/examples/others/embedded_files_loading.c b/examples/others/embedded_files_loading.c index 7064ebc69..60a2a6f0f 100644 --- a/examples/others/embedded_files_loading.c +++ b/examples/others/embedded_files_loading.c @@ -28,7 +28,7 @@ int main(void) InitAudioDevice(); // Initialize audio device // Loaded in CPU memory (RAM) from header file (audio_data.h) - // Same as: Wave wave = LoadWave("sound.wav"); + // Same as: Wave wave = LoadWave("sound.wav"); Wave wave = { .data = AUDIO_DATA, .sampleCount = AUDIO_SAMPLE_COUNT, @@ -39,14 +39,14 @@ int main(void) // Wave converted to Sound to be played Sound sound = LoadSoundFromWave(wave); - + // With a Wave loaded from file, after Sound is loaded, we can unload Wave // but in our case, Wave is embedded in executable, in program .data segment // we can not (and should not) try to free that private memory region //UnloadWave(wave); // Do not unload wave data! // Loaded in CPU memory (RAM) from header file (image_data.h) - // Same as: Image image = LoadImage("raylib_logo.png"); + // Same as: Image image = LoadImage("raylib_logo.png"); Image image = { .data = IMAGE_DATA, .width = IMAGE_WIDTH, @@ -54,15 +54,15 @@ int main(void) .format = IMAGE_FORMAT, .mipmaps = 1 }; - + // Image converted to Texture (VRAM) to be drawn - Texture2D texture = LoadTextureFromImage(image); - + Texture2D texture = LoadTextureFromImage(image); + // With an Image loaded from file, after Texture is loaded, we can unload Image // but in our case, Image is embedded in executable, in program .data segment // we can not (and should not) try to free that private memory region //UnloadImage(image); // Do not unload image data! - + SetTargetFPS(60); // Set our game to run at 60 frames-per-second //-------------------------------------------------------------------------------------- diff --git a/examples/others/opengl_interop.c b/examples/others/opengl_interop.c index 50003de05..5d435f2a8 100644 --- a/examples/others/opengl_interop.c +++ b/examples/others/opengl_interop.c @@ -5,7 +5,7 @@ * This example has been created using raylib 2ad3eb1 (www.raylib.com) * raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details) * -* Example contributed by Stephan Soller (@arkanis - http://arkanis.de/) +* Example contributed by Stephan Soller (@arkanis - http://arkanis.de/) * and reviewed by Ramon Santamaria (@raysan5) * * Copyright (c) 2021 Stephan Soller (@arkanis) and Ramon Santamaria (@raysan5) @@ -14,10 +14,10 @@ * * Mixes raylib and plain OpenGL code to draw a GL_POINTS based particle system. The * primary point is to demonstrate raylib and OpenGL interop. -* +* * rlgl batched draw operations internally so we have to flush the current batch before * doing our own OpenGL work (rlDrawRenderBatchActive()). -* +* * The example also demonstrates how to get the current model view projection matrix of * raylib. That way raylib cameras and so on work as expected. * @@ -39,15 +39,15 @@ int main() //-------------------------------------------------------------------------------------- const int screenWidth = 800; const int screenHeight = 450; - + InitWindow(screenWidth, screenHeight, "raylib - point particles"); - + Shader shader = LoadShader( TextFormat("resources/shaders/glsl%i/point_particle.vs", GLSL_VERSION), TextFormat("resources/shaders/glsl%i/point_particle.fs", GLSL_VERSION)); int currentTimeLoc = GetShaderLocation(shader, "currentTime"); int colorLoc = GetShaderLocation(shader, "color"); - + // Initialize the vertex buffer for the particles and assign each particle random values struct { float x, y, period; } particles[10000]; const size_t particleCount = sizeof(particles) / sizeof(particles[0]); @@ -59,7 +59,7 @@ int main() // every so often and you get a glimps of what is going on. particles[i].period = GetRandomValue(10, 30) / 10.0f; } - + // Create a plain OpenGL vertex buffer with the data and an vertex array object that feeds the data from the buffer // into the vertexPosition shader attribute. GLuint vao = 0, vbo = 0; @@ -73,13 +73,13 @@ int main() glEnableVertexAttribArray(0); glBindBuffer(GL_ARRAY_BUFFER, 0); glBindVertexArray(0); - + // Allows the vertex shader to set the point size of each particle individually glEnable(GL_PROGRAM_POINT_SIZE); - + SetTargetFPS(60); //-------------------------------------------------------------------------------------- - + // Main game loop while (!WindowShouldClose()) // Detect window close button or ESC key { @@ -87,46 +87,46 @@ int main() //---------------------------------------------------------------------------------- BeginDrawing(); ClearBackground(WHITE); - + DrawRectangle(10, 10, 210, 30, MAROON); DrawText(TextFormat("%zu particles in one vertex buffer", particleCount), 20, 20, 10, RAYWHITE); - + // Switch to plain OpenGL //------------------------------------------------------------------------------ // rlglDraw() in raylib 3.5 rlDrawRenderBatchActive(); glUseProgram(shader.id); glUniform1f(currentTimeLoc, GetTime()); - + Vector4 color = ColorNormalize((Color){ 255, 0, 0, 128 }); glUniform4fv(colorLoc, 1, (float*)&color); - + // The the current model view projection matrix so the particle system is displayed and transformed // (e.g. by cameras) just like everything else. // GetMatrixModelview() and GetMatrixProjection() in raylib 3.5 Matrix modelViewProjection = MatrixMultiply(rlGetMatrixModelview(), rlGetMatrixProjection()); glUniformMatrix4fv(shader.locs[SHADER_LOC_MATRIX_MVP], 1, false, MatrixToFloat(modelViewProjection)); - + glBindVertexArray(vao); glDrawArrays(GL_POINTS, 0, particleCount); glBindVertexArray(0); glUseProgram(0); - + // And back to raylib again //------------------------------------------------------------------------------ DrawFPS(screenWidth - 100, 10); EndDrawing(); //---------------------------------------------------------------------------------- } - + // De-Initialization //-------------------------------------------------------------------------------------- glDeleteBuffers(1, &vbo); glDeleteVertexArrays(1, &vao); - + UnloadShader(shader); CloseWindow(); // Close window and OpenGL context //-------------------------------------------------------------------------------------- - + return 0; } \ No newline at end of file diff --git a/examples/others/raudio_standalone.c b/examples/others/raudio_standalone.c index 42a336ecb..2c2636f6a 100644 --- a/examples/others/raudio_standalone.c +++ b/examples/others/raudio_standalone.c @@ -15,7 +15,7 @@ * * COMPILATION: * gcc -o raudio_standalone.exe raudio_standalone.c ..\..\src\raudio.c / -* -I..\..\src -I..\..\src\external -L. -Wall -std=c99 -DRAUDIO_STANDALONE / +* -I..\..\src -I..\..\src\external -L. -Wall -std=c99 -DRAUDIO_STANDALONE / * -DSUPPORT_FILEFORMAT_WAV -DSUPPORT_FILEFORMAT_OGG -DSUPPORT_FILEFORMAT_MP3 * * LICENSE: zlib/libpng @@ -96,7 +96,7 @@ int main(int argc, char *argv[]) if ((key == 's') || (key == 'S')) PlaySound(fxWav); if ((key == 'd') || (key == 'D')) PlaySound(fxOgg); - + key = 0; UpdateMusicStream(music); diff --git a/examples/others/rlgl_standalone.c b/examples/others/rlgl_standalone.c index 5282aaa8f..f1fce8582 100644 --- a/examples/others/rlgl_standalone.c +++ b/examples/others/rlgl_standalone.c @@ -9,7 +9,7 @@ * rlgl.h - OpenGL 1.1 immediate-mode style coding translation layer * glad.h - OpenGL extensions initialization library (required by rlgl) * raymath.h - 3D math library (required by rlgl) -* glfw3 - Windows and context initialization library +* glfw3 - Windows and context initialization library * * rlgl library is provided as a single-file header-only library, this library * allows coding in a pseudo-OpenGL 1.1 style while translating calls to multiple @@ -95,18 +95,18 @@ int main(void) //-------------------------------------------------------------------------------------- const int screenWidth = 800; const int screenHeight = 450; - + // GLFW3 Initialization + OpenGL 3.3 Context + Extensions //-------------------------------------------------------- glfwSetErrorCallback(ErrorCallback); - + if (!glfwInit()) { printf("GLFW3: Can not initialize GLFW\n"); return 1; } else printf("GLFW3: GLFW initialized successfully\n"); - + glfwWindowHint(GLFW_SAMPLES, 4); glfwWindowHint(GLFW_DEPTH_BITS, 16); glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3); @@ -117,27 +117,27 @@ int main(void) glfwWindowHint( GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE ); #endif - + GLFWwindow *window = glfwCreateWindow(screenWidth, screenHeight, "rlgl standalone", NULL, NULL); - + if (!window) { glfwTerminate(); return 2; } else printf("GLFW3: Window created successfully\n"); - + glfwSetWindowPos(window, 200, 200); - + glfwSetKeyCallback(window, KeyCallback); - + glfwMakeContextCurrent(window); glfwSwapInterval(0); - + // Load OpenGL 3.3 supported extensions rlLoadExtensions(glfwGetProcAddress); //-------------------------------------------------------- - + // Initialize OpenGL context (states and resources) rlglInit(screenWidth, screenHeight); @@ -151,18 +151,18 @@ int main(void) rlClearColor(245, 245, 245, 255); // Define clear color rlEnableDepthTest(); // Enable DEPTH_TEST for 3D - + Camera camera = { 0 }; camera.position = (Vector3){ 5.0f, 5.0f, 5.0f }; // Camera position camera.target = (Vector3){ 0.0f, 0.0f, 0.0f }; // Camera looking at point camera.up = (Vector3){ 0.0f, 1.0f, 0.0f }; // Camera up vector (rotation towards target) camera.fovy = 45.0f; // Camera field-of-view Y - - Vector3 cubePosition = { 0.0f, 0.0f, 0.0f }; // Cube default position (center) - //-------------------------------------------------------------------------------------- - // Main game loop - while (!glfwWindowShouldClose(window)) + Vector3 cubePosition = { 0.0f, 0.0f, 0.0f }; // Cube default position (center) + //-------------------------------------------------------------------------------------- + + // Main game loop + while (!glfwWindowShouldClose(window)) { // Update //---------------------------------------------------------------------------------- @@ -189,14 +189,14 @@ int main(void) // Draw internal render batch buffers (3D data) rlDrawRenderBatchActive(); //----------------------------------------------- - + // Draw '2D' elements in the scene (GUI) //----------------------------------------------- #define RLGL_CREATE_MATRIX_MANUALLY #if defined(RLGL_CREATE_MATRIX_MANUALLY) matProj = MatrixOrtho(0.0, screenWidth, screenHeight, 0.0, 0.0, 1.0); matView = MatrixIdentity(); - + rlSetMatrixModelview(matView); // Set internal modelview matrix (default shader) rlSetMatrixProjection(matProj); // Set internal projection matrix (default shader) @@ -213,7 +213,7 @@ int main(void) // Draw internal render batch buffers (3D data) rlDrawRenderBatchActive(); //----------------------------------------------- - + glfwSwapBuffers(window); glfwPollEvents(); //---------------------------------------------------------------------------------- @@ -222,11 +222,11 @@ int main(void) // De-Initialization //-------------------------------------------------------------------------------------- rlglClose(); // Unload rlgl internal buffers and default shader/texture - + glfwDestroyWindow(window); // Close window glfwTerminate(); // Free GLFW3 resources //-------------------------------------------------------------------------------------- - + return 0; } diff --git a/examples/physics/physics_demo.c b/examples/physics/physics_demo.c index 98a92bccc..1acb0d13e 100644 --- a/examples/physics/physics_demo.c +++ b/examples/physics/physics_demo.c @@ -54,7 +54,7 @@ int main(void) if (IsKeyPressed(KEY_R)) // Reset physics system { ResetPhysics(); - + floor = CreatePhysicsBodyRectangle((Vector2){ screenWidth/2, screenHeight }, 500, 100, 10); floor->enabled = false; diff --git a/examples/physics/physics_restitution.c b/examples/physics/physics_restitution.c index 7fab7cb3f..917ab8d09 100644 --- a/examples/physics/physics_restitution.c +++ b/examples/physics/physics_restitution.c @@ -48,7 +48,7 @@ int main(void) // Restitution demo needs a very tiny physics time step for a proper simulation SetPhysicsTimeStep(1.0/60.0/100*1000); - + SetTargetFPS(60); // Set our game to run at 60 frames-per-second //-------------------------------------------------------------------------------------- @@ -119,7 +119,7 @@ int main(void) DestroyPhysicsBody(circleB); DestroyPhysicsBody(circleC); DestroyPhysicsBody(floor); - + ClosePhysics(); // Unitialize physics CloseWindow(); // Close window and OpenGL context diff --git a/examples/physics/physics_shatter.c b/examples/physics/physics_shatter.c index afabd775d..e996a3721 100644 --- a/examples/physics/physics_shatter.c +++ b/examples/physics/physics_shatter.c @@ -45,7 +45,7 @@ int main(void) { //---------------------------------------------------------------------------------- UpdatePhysics(); // Update physics system - + if (IsKeyPressed(KEY_R)) // Reset physics input { ResetPhysics(); @@ -59,7 +59,7 @@ int main(void) for (int i = count - 1; i >= 0; i--) { PhysicsBody currentBody = GetPhysicsBody(i); - + if (currentBody != NULL) PhysicsShatter(currentBody, GetMousePosition(), 10/currentBody->inverseMass); } } diff --git a/examples/shaders/shaders_basic_lighting.c b/examples/shaders/shaders_basic_lighting.c index 1f7336a9e..c7e43b0c8 100644 --- a/examples/shaders/shaders_basic_lighting.c +++ b/examples/shaders/shaders_basic_lighting.c @@ -69,9 +69,9 @@ int main(void) modelB.materials[0].maps[MATERIAL_MAP_DIFFUSE].texture = texture; modelC.materials[0].maps[MATERIAL_MAP_DIFFUSE].texture = texture; - Shader shader = LoadShader(TextFormat("resources/shaders/glsl%i/base_lighting.vs", GLSL_VERSION), + Shader shader = LoadShader(TextFormat("resources/shaders/glsl%i/base_lighting.vs", GLSL_VERSION), TextFormat("resources/shaders/glsl%i/lighting.fs", GLSL_VERSION)); - + // Get some shader loactions shader.locs[SHADER_LOC_MATRIX_MODEL] = GetShaderLocation(shader, "matModel"); shader.locs[SHADER_LOC_VECTOR_VIEW] = GetShaderLocation(shader, "viewPos"); @@ -79,7 +79,7 @@ int main(void) // ambient light level int ambientLoc = GetShaderLocation(shader, "ambient"); SetShaderValue(shader, ambientLoc, (float[4]){ 0.2f, 0.2f, 0.2f, 1.0f }, SHADER_UNIFORM_VEC4); - + float angle = 6.282f; // All models use the same shader @@ -121,7 +121,7 @@ int main(void) lights[2].position.z = sinf(angle*0.2f)*4.0f; lights[3].position.y = cosf(-angle*0.35f)*4.0f; lights[3].position.z = sinf(-angle*0.35f)*4.0f; - + UpdateLightValues(shader, lights[0]); UpdateLightValues(shader, lights[1]); UpdateLightValues(shader, lights[2]); @@ -160,7 +160,7 @@ int main(void) EndMode3D(); DrawFPS(10, 10); - + DrawText("Use keys RGBW to toggle lights", 10, 30, 20, DARKGRAY); EndDrawing(); @@ -172,7 +172,7 @@ int main(void) UnloadModel(modelA); // Unload the modelA UnloadModel(modelB); // Unload the modelB UnloadModel(modelC); // Unload the modelC - + UnloadTexture(texture); // Unload the texture UnloadShader(shader); // Unload shader diff --git a/examples/shaders/shaders_eratosthenes.c b/examples/shaders/shaders_eratosthenes.c index 3bd83d0fe..f0b828a9c 100644 --- a/examples/shaders/shaders_eratosthenes.c +++ b/examples/shaders/shaders_eratosthenes.c @@ -41,7 +41,7 @@ int main(void) InitWindow(screenWidth, screenHeight, "raylib [shaders] example - Sieve of Eratosthenes"); RenderTexture2D target = LoadRenderTexture(screenWidth, screenHeight); - + // Load Eratosthenes shader // NOTE: Defining 0 (NULL) for vertex shader forces usage of internal default vertex shader Shader shader = LoadShader(0, TextFormat("resources/shaders/glsl%i/eratosthenes.fs", GLSL_VERSION)); diff --git a/examples/shaders/shaders_fog.c b/examples/shaders/shaders_fog.c index 63a2cce0c..0f9d782e4 100644 --- a/examples/shaders/shaders_fog.c +++ b/examples/shaders/shaders_fog.c @@ -49,7 +49,7 @@ int main(void) InitWindow(screenWidth, screenHeight, "raylib [shaders] example - fog"); // Define the camera to look into our 3d world - Camera camera = { + Camera camera = { (Vector3){ 2.0f, 2.0f, 6.0f }, // position (Vector3){ 0.0f, 0.5f, 0.0f }, // target (Vector3){ 0.0f, 1.0f, 0.0f }, // up @@ -67,7 +67,7 @@ int main(void) modelC.materials[0].maps[MATERIAL_MAP_DIFFUSE].texture = texture; // Load shader and set up some uniforms - Shader shader = LoadShader(TextFormat("resources/shaders/glsl%i/base_lighting.vs", GLSL_VERSION), + Shader shader = LoadShader(TextFormat("resources/shaders/glsl%i/base_lighting.vs", GLSL_VERSION), TextFormat("resources/shaders/glsl%i/fog.fs", GLSL_VERSION)); shader.locs[SHADER_LOC_MATRIX_MODEL] = GetShaderLocation(shader, "matModel"); shader.locs[SHADER_LOC_VECTOR_VIEW] = GetShaderLocation(shader, "viewPos"); @@ -75,7 +75,7 @@ int main(void) // Ambient light level int ambientLoc = GetShaderLocation(shader, "ambient"); SetShaderValue(shader, ambientLoc, (float[4]){ 0.2f, 0.2f, 0.2f, 1.0f }, SHADER_UNIFORM_VEC4); - + float fogDensity = 0.15f; int fogDensityLoc = GetShaderLocation(shader, "fogDensity"); SetShaderValue(shader, fogDensityLoc, &fogDensity, SHADER_UNIFORM_FLOAT); @@ -100,18 +100,18 @@ int main(void) //---------------------------------------------------------------------------------- UpdateCamera(&camera); // Update camera - if (IsKeyDown(KEY_UP)) + if (IsKeyDown(KEY_UP)) { fogDensity += 0.001; if (fogDensity > 1.0) fogDensity = 1.0; } - + if (IsKeyDown(KEY_DOWN)) { fogDensity -= 0.001; if (fogDensity < 0.0) fogDensity = 0.0; } - + SetShaderValue(shader, fogDensityLoc, &fogDensity, SHADER_UNIFORM_FLOAT); // Rotate the torus diff --git a/examples/shaders/shaders_hot_reloading.c b/examples/shaders/shaders_hot_reloading.c index 5b4ba0a03..9b46a1574 100644 --- a/examples/shaders/shaders_hot_reloading.c +++ b/examples/shaders/shaders_hot_reloading.c @@ -65,36 +65,36 @@ int main(void) // Set shader required uniform values SetShaderValue(shader, timeLoc, &totalTime, SHADER_UNIFORM_FLOAT); SetShaderValue(shader, mouseLoc, mousePos, SHADER_UNIFORM_VEC2); - + // Hot shader reloading if (shaderAutoReloading || (IsMouseButtonPressed(MOUSE_LEFT_BUTTON))) { long currentFragShaderModTime = GetFileModTime(TextFormat(fragShaderFileName, GLSL_VERSION)); - + // Check if shader file has been modified if (currentFragShaderModTime != fragShaderFileModTime) { // Try reloading updated shader Shader updatedShader = LoadShader(0, TextFormat(fragShaderFileName, GLSL_VERSION)); - + if (updatedShader.id != rlGetShaderDefault().id) // It was correctly loaded { UnloadShader(shader); shader = updatedShader; - + // Get shader locations for required uniforms resolutionLoc = GetShaderLocation(shader, "resolution"); mouseLoc = GetShaderLocation(shader, "mouse"); timeLoc = GetShaderLocation(shader, "time"); - + // Reset required uniforms SetShaderValue(shader, resolutionLoc, resolution, SHADER_UNIFORM_VEC2); } - + fragShaderFileModTime = currentFragShaderModTime; } } - + if (IsKeyPressed(KEY_A)) shaderAutoReloading = !shaderAutoReloading; //---------------------------------------------------------------------------------- @@ -109,10 +109,10 @@ int main(void) DrawRectangle(0, 0, screenWidth, screenHeight, WHITE); EndShaderMode(); - DrawText(TextFormat("PRESS [A] to TOGGLE SHADER AUTOLOADING: %s", + DrawText(TextFormat("PRESS [A] to TOGGLE SHADER AUTOLOADING: %s", shaderAutoReloading? "AUTO" : "MANUAL"), 10, 10, 10, shaderAutoReloading? RED : BLACK); if (!shaderAutoReloading) DrawText("MOUSE CLICK to SHADER RE-LOADING", 10, 30, 10, BLACK); - + DrawText(TextFormat("Shader last modification: %s", asctime(localtime(&fragShaderFileModTime))), 10, 430, 10, BLACK); EndDrawing(); diff --git a/examples/shaders/shaders_julia_set.c b/examples/shaders/shaders_julia_set.c index 754513678..6ca226867 100644 --- a/examples/shaders/shaders_julia_set.c +++ b/examples/shaders/shaders_julia_set.c @@ -48,7 +48,7 @@ int main(void) // Load julia set shader // NOTE: Defining 0 (NULL) for vertex shader forces usage of internal default vertex shader Shader shader = LoadShader(0, TextFormat("resources/shaders/glsl%i/julia_set.fs", GLSL_VERSION)); - + // Create a RenderTexture2D to be used for render to texture RenderTexture2D target = LoadRenderTexture(GetScreenWidth(), GetScreenHeight()); @@ -74,7 +74,7 @@ int main(void) SetShaderValue(shader, cLoc, c, SHADER_UNIFORM_VEC2); SetShaderValue(shader, zoomLoc, &zoom, SHADER_UNIFORM_FLOAT); SetShaderValue(shader, offsetLoc, offset, SHADER_UNIFORM_VEC2); - + int incrementSpeed = 0; // Multiplier of speed to change c value bool showControls = true; // Show controls bool pause = false; // Pause animation diff --git a/examples/shaders/shaders_mesh_instancing.c b/examples/shaders/shaders_mesh_instancing.c index 520a2d65c..290a29484 100644 --- a/examples/shaders/shaders_mesh_instancing.c +++ b/examples/shaders/shaders_mesh_instancing.c @@ -56,7 +56,7 @@ int main(void) camera.fovy = 45.0f; camera.projection = CAMERA_PERSPECTIVE; - const int instances = 10000; // Number of instances to display + const int instances = 10000; // Number of instances to display Mesh cube = GenMeshCube(1.0f, 1.0f, 1.0f); Matrix *rotations = RL_MALLOC(instances*sizeof(Matrix)); // Rotation state of instances @@ -69,7 +69,7 @@ int main(void) x = GetRandomValue(-50, 50); y = GetRandomValue(-50, 50); z = GetRandomValue(-50, 50); - translations[i] = MatrixTranslate(x, y, z); + translations[i] = MatrixTranslate(x, y, z); x = GetRandomValue(0, 360); y = GetRandomValue(0, 360); @@ -83,7 +83,7 @@ int main(void) Matrix *transforms = RL_MALLOC(instances*sizeof(Matrix)); // Pre-multiplied transformations passed to rlgl - Shader shader = LoadShader(TextFormat("resources/shaders/glsl%i/base_lighting_instanced.vs", GLSL_VERSION), + Shader shader = LoadShader(TextFormat("resources/shaders/glsl%i/base_lighting_instanced.vs", GLSL_VERSION), TextFormat("resources/shaders/glsl%i/lighting.fs", GLSL_VERSION)); // Get some shader loactions @@ -102,7 +102,7 @@ int main(void) Material material = LoadMaterialDefault(); material.shader = shader; material.maps[MATERIAL_MAP_DIFFUSE].color = RED; - + SetCameraMode(camera, CAMERA_ORBITAL); // Set an orbital camera mode int textPositionY = 300; @@ -134,10 +134,10 @@ int main(void) if (IsKeyDown(KEY_EIGHT)) groups = 8; if (IsKeyDown(KEY_NINE)) groups = 9; if (IsKeyDown(KEY_W)) { groups = 7; amp = 25; speed = 18; variance = 0.70f; } - + if (IsKeyDown(KEY_EQUAL)) speed = (speed <= (fps*0.25f))? (fps*0.25f) : (speed*0.95f); if (IsKeyDown(KEY_KP_ADD)) speed = (speed <= (fps*0.25f))? (fps*0.25f) : (speed*0.95f); - + if (IsKeyDown(KEY_MINUS)) speed = fmaxf(speed*1.02f, speed + 1); if (IsKeyDown(KEY_KP_SUBTRACT)) speed = fmaxf(speed*1.02f, speed + 1); @@ -150,19 +150,19 @@ int main(void) { rotations[i] = MatrixMultiply(rotations[i], rotationsInc[i]); transforms[i] = MatrixMultiply(rotations[i], translations[i]); - + // Get the animation cycle's framesCounter for this instance loop = (float)((framesCounter + (int)(((float)(i%groups)/groups)*speed))%speed)/speed; - + // Calculate the y according to loop cycle y = (sinf(loop*PI*2))*amp*((1 - variance) + (variance*(float)(i%(groups*10))/(groups*10))); - + // Clamp to floor y = (y < 0)? 0.0f : y; - + transforms[i] = MatrixMultiply(transforms[i], MatrixTranslate(0.0f, y, 0.0f)); } - + UpdateCamera(&camera); //---------------------------------------------------------------------------------- @@ -179,35 +179,35 @@ int main(void) DrawText("A CUBE OF DANCING CUBES!", 490, 10, 20, MAROON); DrawText("PRESS KEYS:", 10, textPositionY, 20, BLACK); - - DrawText("1 - 9", 10, textPositionY += 25, 10, BLACK); + + DrawText("1 - 9", 10, textPositionY += 25, 10, BLACK); DrawText(": Number of groups", 50, textPositionY , 10, BLACK); DrawText(TextFormat(": %d", groups), 160, textPositionY , 10, BLACK); - - DrawText("UP", 10, textPositionY += 15, 10, BLACK); + + DrawText("UP", 10, textPositionY += 15, 10, BLACK); DrawText(": increase amplitude", 50, textPositionY, 10, BLACK); DrawText(TextFormat(": %.2f", amp), 160, textPositionY , 10, BLACK); - - DrawText("DOWN", 10, textPositionY += 15, 10, BLACK); + + DrawText("DOWN", 10, textPositionY += 15, 10, BLACK); DrawText(": decrease amplitude", 50, textPositionY, 10, BLACK); - - DrawText("LEFT", 10, textPositionY += 15, 10, BLACK); + + DrawText("LEFT", 10, textPositionY += 15, 10, BLACK); DrawText(": decrease variance", 50, textPositionY, 10, BLACK); DrawText(TextFormat(": %.2f", variance), 160, textPositionY , 10, BLACK); - - DrawText("RIGHT", 10, textPositionY += 15, 10, BLACK); + + DrawText("RIGHT", 10, textPositionY += 15, 10, BLACK); DrawText(": increase variance", 50, textPositionY, 10, BLACK); - - DrawText("+/=", 10, textPositionY += 15, 10, BLACK); + + DrawText("+/=", 10, textPositionY += 15, 10, BLACK); DrawText(": increase speed", 50, textPositionY, 10, BLACK); DrawText(TextFormat(": %d = %f loops/sec", speed, ((float)fps / speed)), 160, textPositionY , 10, BLACK); - - DrawText("-", 10, textPositionY += 15, 10, BLACK); + + DrawText("-", 10, textPositionY += 15, 10, BLACK); DrawText(": decrease speed", 50, textPositionY, 10, BLACK); - - DrawText("W", 10, textPositionY += 15, 10, BLACK); + + DrawText("W", 10, textPositionY += 15, 10, BLACK); DrawText(": Wild setup!", 50, textPositionY, 10, BLACK); - + DrawFPS(10, 10); EndDrawing(); diff --git a/examples/shaders/shaders_multi_sample2d.c b/examples/shaders/shaders_multi_sample2d.c index 2ff6f2001..fbe75085c 100644 --- a/examples/shaders/shaders_multi_sample2d.c +++ b/examples/shaders/shaders_multi_sample2d.c @@ -42,10 +42,10 @@ int main(void) UnloadImage(imBlue); Shader shader = LoadShader(0, TextFormat("resources/shaders/glsl%i/color_mix.fs", GLSL_VERSION)); - + // Get an additional sampler2D location to be enabled on drawing int texBlueLoc = GetShaderLocation(shader, "texture1"); - + // Get shader uniform for divider int dividerLoc = GetShaderLocation(shader, "divider"); float dividerValue = 0.5f; @@ -60,34 +60,34 @@ int main(void) //---------------------------------------------------------------------------------- if (IsKeyDown(KEY_RIGHT)) dividerValue += 0.01f; else if (IsKeyDown(KEY_LEFT)) dividerValue -= 0.01f; - + if (dividerValue < 0.0f) dividerValue = 0.0f; else if (dividerValue > 1.0f) dividerValue = 1.0f; - + SetShaderValue(shader, dividerLoc, ÷rValue, SHADER_UNIFORM_FLOAT); //---------------------------------------------------------------------------------- - + // Draw //---------------------------------------------------------------------------------- BeginDrawing(); - + ClearBackground(RAYWHITE); BeginShaderMode(shader); - + // WARNING: Additional samplers are enabled for all draw calls in the batch, // EndShaderMode() forces batch drawing and consequently resets active textures // to let other sampler2D to be activated on consequent drawings (if required) SetShaderValueTexture(shader, texBlueLoc, texBlue); - + // We are drawing texRed using default sampler2D texture0 but // an additional texture units is enabled for texBlue (sampler2D texture1) DrawTexture(texRed, 0, 0, WHITE); - + EndShaderMode(); - + DrawText("Use KEY_LEFT/KEY_RIGHT to move texture mixing in shader!", 80, GetScreenHeight() - 40, 20, RAYWHITE); - + EndDrawing(); //---------------------------------------------------------------------------------- } diff --git a/examples/shaders/shaders_raymarching.c b/examples/shaders/shaders_raymarching.c index 0db1cf5a6..5ffe134b0 100644 --- a/examples/shaders/shaders_raymarching.c +++ b/examples/shaders/shaders_raymarching.c @@ -73,7 +73,7 @@ int main(void) SetShaderValue(shader, viewEyeLoc, cameraPos, SHADER_UNIFORM_VEC3); SetShaderValue(shader, viewCenterLoc, cameraTarget, SHADER_UNIFORM_VEC3); SetShaderValue(shader, runTimeLoc, &runTime, SHADER_UNIFORM_FLOAT); - + // Check if screen is resized if (IsWindowResized()) { diff --git a/examples/shaders/shaders_simple_mask.c b/examples/shaders/shaders_simple_mask.c index b46b65c74..981e64863 100644 --- a/examples/shaders/shaders_simple_mask.c +++ b/examples/shaders/shaders_simple_mask.c @@ -57,7 +57,7 @@ int main(void) // Load the shader Shader shader = LoadShader(0, TextFormat("resources/shaders/glsl%i/mask.fs", GLSL_VERSION)); - + // Load and apply the diffuse texture (colour map) Texture texDiffuse = LoadTexture("resources/plasma.png"); model1.materials[0].maps[MATERIAL_MAP_DIFFUSE].texture = texDiffuse; @@ -131,10 +131,10 @@ int main(void) UnloadModel(model1); UnloadModel(model2); UnloadModel(model3); - + UnloadTexture(texDiffuse); // Unload default diffuse texture UnloadTexture(texMask); // Unload texture mask - + UnloadShader(shader); // Unload shader CloseWindow(); // Close window and OpenGL context diff --git a/examples/shaders/shaders_spotlight.c b/examples/shaders/shaders_spotlight.c index f924bac79..40fd23172 100644 --- a/examples/shaders/shaders_spotlight.c +++ b/examples/shaders/shaders_spotlight.c @@ -5,7 +5,7 @@ * This example has been created using raylib 2.5 (www.raylib.com) * raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details) * -* Example contributed by Chris Camacho (@chriscamacho - http://bedroomcoders.co.uk/) +* Example contributed by Chris Camacho (@chriscamacho - http://bedroomcoders.co.uk/) * and reviewed by Ramon Santamaria (@raysan5) * * Copyright (c) 2019 Chris Camacho (@chriscamacho) and Ramon Santamaria (@raysan5) @@ -14,13 +14,13 @@ * * The shader makes alpha holes in the forground to give the apearance of a top * down look at a spotlight casting a pool of light... -* +* * The right hand side of the screen there is just enough light to see whats * going on without the spot light, great for a stealth type game where you * have to avoid the spotlights. -* +* * The left hand side of the screen is in pitch dark except for where the spotlights are. -* +* * Although this example doesn't scale like the letterbox example, you could integrate * the two techniques, but by scaling the actual colour of the render texture rather * than using alpha as a mask. @@ -43,12 +43,12 @@ #define MAX_STARS 400 // Spot data -typedef struct { +typedef struct { Vector2 pos; Vector2 vel; float inner; float radius; - + // Shader locations unsigned int posLoc; unsigned int innerLoc; @@ -75,26 +75,26 @@ int main(void) HideCursor(); Texture texRay = LoadTexture("resources/raysan.png"); - + Star stars[MAX_STARS] = { 0 }; for (int n = 0; n < MAX_STARS; n++) ResetStar(&stars[n]); // Progress all the stars on, so they don't all start in the centre - for (int m = 0; m < screenWidth/2.0; m++) + for (int m = 0; m < screenWidth/2.0; m++) { for (int n = 0; n < MAX_STARS; n++) UpdateStar(&stars[n]); } int frameCounter = 0; - + // Use default vert shader Shader shdrSpot = LoadShader(0, TextFormat("resources/shaders/glsl%i/spotlight.fs", GLSL_VERSION)); - + // Get the locations of spots in the shader Spot spots[MAX_SPOTS]; - for (int i = 0; i < MAX_SPOTS; i++) + for (int i = 0; i < MAX_SPOTS; i++) { char posName[32] = "spots[x].pos\0"; char innerName[32] = "spots[x].inner\0"; @@ -103,13 +103,13 @@ int main(void) posName[6] = '0' + i; innerName[6] = '0' + i; radiusName[6] = '0' + i; - + spots[i].posLoc = GetShaderLocation(shdrSpot, posName); spots[i].innerLoc = GetShaderLocation(shdrSpot, innerName); spots[i].radiusLoc = GetShaderLocation(shdrSpot, radiusName); - + } - + // Tell the shader how wide the screen is so we can have // a pitch black half and a dimly lit half. unsigned int wLoc = GetShaderLocation(shdrSpot, "screenWidth"); @@ -123,16 +123,16 @@ int main(void) spots[i].pos.x = GetRandomValue(64, screenWidth - 64); spots[i].pos.y = GetRandomValue(64, screenHeight - 64); spots[i].vel = (Vector2){ 0, 0 }; - + while ((fabs(spots[i].vel.x) + fabs(spots[i].vel.y)) < 2) { spots[i].vel.x = GetRandomValue(-40, 40)/10.0; spots[i].vel.y = GetRandomValue(-40, 40)/10.0; } - + spots[i].inner = 28 * (i + 1); spots[i].radius = 48 * (i + 1); - + SetShaderValue(shdrSpot, spots[i].posLoc, &spots[i].pos.x, SHADER_UNIFORM_VEC2); SetShaderValue(shdrSpot, spots[i].innerLoc, &spots[i].inner, SHADER_UNIFORM_FLOAT); SetShaderValue(shdrSpot, spots[i].radiusLoc, &spots[i].radius, SHADER_UNIFORM_FLOAT); @@ -140,7 +140,7 @@ int main(void) SetTargetFPS(60); // Set to run at 60 frames-per-second //-------------------------------------------------------------------------------------- - + // Main game loop while (!WindowShouldClose()) // Detect window close button or ESC key { @@ -157,23 +157,23 @@ int main(void) if (i == 0) { Vector2 mp = GetMousePosition(); - spots[i].pos.x = mp.x; + spots[i].pos.x = mp.x; spots[i].pos.y = screenHeight - mp.y; } else { - spots[i].pos.x += spots[i].vel.x; + spots[i].pos.x += spots[i].vel.x; spots[i].pos.y += spots[i].vel.y; - - if (spots[i].pos.x < 64) spots[i].vel.x = -spots[i].vel.x; - if (spots[i].pos.x > (screenWidth - 64)) spots[i].vel.x = -spots[i].vel.x; - if (spots[i].pos.y < 64) spots[i].vel.y = -spots[i].vel.y; + + if (spots[i].pos.x < 64) spots[i].vel.x = -spots[i].vel.x; + if (spots[i].pos.x > (screenWidth - 64)) spots[i].vel.x = -spots[i].vel.x; + if (spots[i].pos.y < 64) spots[i].vel.y = -spots[i].vel.y; if (spots[i].pos.y > (screenHeight - 64)) spots[i].vel.y = -spots[i].vel.y; } - - SetShaderValue(shdrSpot, spots[i].posLoc, &spots[i].pos.x, SHADER_UNIFORM_VEC2); + + SetShaderValue(shdrSpot, spots[i].posLoc, &spots[i].pos.x, SHADER_UNIFORM_VEC2); } - + // Draw //---------------------------------------------------------------------------------- BeginDrawing(); @@ -204,11 +204,11 @@ int main(void) EndShaderMode(); DrawFPS(10, 10); - + DrawText("Move the mouse!", 10, 30, 20, GREEN); DrawText("Pitch Black", screenWidth*0.2f, screenHeight/2, 20, GREEN); DrawText("Dark", screenWidth*.66f, screenHeight/2, 20, GREEN); - + EndDrawing(); //---------------------------------------------------------------------------------- @@ -229,21 +229,21 @@ int main(void) void ResetStar(Star *s) { s->pos = (Vector2){ GetScreenWidth()/2.0f, GetScreenHeight()/2.0f }; - + do { s->vel.x = (float)GetRandomValue(-1000, 1000)/100.0f; s->vel.y = (float)GetRandomValue(-1000, 1000)/100.0f; - + } while (!(fabs(s->vel.x) + (fabs(s->vel.y) > 1))); - + s->pos = Vector2Add(s->pos, Vector2Multiply(s->vel, (Vector2){ 8.0f, 8.0f })); } void UpdateStar(Star *s) { s->pos = Vector2Add(s->pos, s->vel); - + if ((s->pos.x < 0) || (s->pos.x > GetScreenWidth()) || (s->pos.y < 0) || (s->pos.y > GetScreenHeight())) { diff --git a/examples/shaders/shaders_texture_waves.c b/examples/shaders/shaders_texture_waves.c index 23c502813..7d396fd12 100644 --- a/examples/shaders/shaders_texture_waves.c +++ b/examples/shaders/shaders_texture_waves.c @@ -34,10 +34,10 @@ int main(void) const int screenHeight = 450; InitWindow(screenWidth, screenHeight, "raylib [shaders] example - texture waves"); - + // Load texture texture to apply shaders Texture2D texture = LoadTexture("resources/space.png"); - + // Load shader and setup location points and values Shader shader = LoadShader(0, TextFormat("resources/shaders/glsl%i/wave.fs", GLSL_VERSION)); @@ -77,7 +77,7 @@ int main(void) // Update //---------------------------------------------------------------------------------- seconds += GetFrameTime(); - + SetShaderValue(shader, secondsLoc, &seconds, SHADER_UNIFORM_FLOAT); //---------------------------------------------------------------------------------- @@ -88,10 +88,10 @@ int main(void) ClearBackground(RAYWHITE); BeginShaderMode(shader); - + DrawTexture(texture, 0, 0, WHITE); DrawTexture(texture, texture.width, 0, WHITE); - + EndShaderMode(); EndDrawing(); @@ -102,7 +102,7 @@ int main(void) //-------------------------------------------------------------------------------------- UnloadShader(shader); // Unload shader UnloadTexture(texture); // Unload texture - + CloseWindow(); // Close window and OpenGL context //-------------------------------------------------------------------------------------- diff --git a/examples/shapes/shapes_draw_circle_sector.c b/examples/shapes/shapes_draw_circle_sector.c index 7a6c3aa2a..009288df6 100644 --- a/examples/shapes/shapes_draw_circle_sector.c +++ b/examples/shapes/shapes_draw_circle_sector.c @@ -43,39 +43,39 @@ int main(void) //---------------------------------------------------------------------------------- // NOTE: All variables update happens inside GUI control functions //---------------------------------------------------------------------------------- - + // Draw //---------------------------------------------------------------------------------- BeginDrawing(); - + ClearBackground(RAYWHITE); - + DrawLine(500, 0, 500, GetScreenHeight(), Fade(LIGHTGRAY, 0.6f)); DrawRectangle(500, 0, GetScreenWidth() - 500, GetScreenHeight(), Fade(LIGHTGRAY, 0.3f)); DrawCircleSector(center, outerRadius, startAngle, endAngle, segments, Fade(MAROON, 0.3)); DrawCircleSectorLines(center, outerRadius, startAngle, endAngle, segments, Fade(MAROON, 0.6)); - + // Draw GUI controls //------------------------------------------------------------------------------ startAngle = GuiSliderBar((Rectangle){ 600, 40, 120, 20}, "StartAngle", NULL, startAngle, 0, 720); endAngle = GuiSliderBar((Rectangle){ 600, 70, 120, 20}, "EndAngle", NULL, endAngle, 0, 720); - + outerRadius = GuiSliderBar((Rectangle){ 600, 140, 120, 20}, "Radius", NULL, outerRadius, 0, 200); segments = GuiSliderBar((Rectangle){ 600, 170, 120, 20}, "Segments", NULL, segments, 0, 100); //------------------------------------------------------------------------------ - + minSegments = (int)ceilf((endAngle - startAngle) / 90); DrawText(TextFormat("MODE: %s", (segments >= minSegments)? "MANUAL" : "AUTO"), 600, 200, 10, (segments >= minSegments)? MAROON : DARKGRAY); - + DrawFPS(10, 10); - + EndDrawing(); //---------------------------------------------------------------------------------- } // De-Initialization - //-------------------------------------------------------------------------------------- + //-------------------------------------------------------------------------------------- CloseWindow(); // Close window and OpenGL context //-------------------------------------------------------------------------------------- diff --git a/examples/text/text_draw_3d.c b/examples/text/text_draw_3d.c index bbc20c432..4a385f7a6 100644 --- a/examples/text/text_draw_3d.c +++ b/examples/text/text_draw_3d.c @@ -3,17 +3,17 @@ * raylib [text] example - Draw 2D text in 3D * * Draw a 2D text in 3D space, each letter is drawn in a quad (or 2 quads if backface is set) -* where the texture coodinates of each quad map to the texture coordinates of the glyphs -* inside the font texture. -* A more efficient approach, i believe, would be to render the text in a render texture and -* map that texture to a plane and render that, or maybe a shader but my method allows more -* flexibility...for example to change position of each letter individually to make somethink +* where the texture coodinates of each quad map to the texture coordinates of the glyphs +* inside the font texture. +* A more efficient approach, i believe, would be to render the text in a render texture and +* map that texture to a plane and render that, or maybe a shader but my method allows more +* flexibility...for example to change position of each letter individually to make somethink * like a wavy text effect. * -* Special thanks to: +* Special thanks to: * @Nighten for the DrawTextStyle() code https://github.com/NightenDushi/Raylib_DrawTextStyle * Chris Camacho (codifies - http://bedroomcoders.co.uk/) for the alpha discard shader -* +* * This example has been created using raylib 3.5 (www.raylib.com) * raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details) * @@ -26,7 +26,7 @@ #include "raylib.h" #include "rlgl.h" -#include // Required for: NULL +#include // Required for: NULL #include // Required for: sinf() // To make it work with the older RLGL module just comment the line below @@ -80,13 +80,13 @@ int main(void) //-------------------------------------------------------------------------------------- const int screenWidth = 800; const int screenHeight = 450; - + SetConfigFlags(FLAG_MSAA_4X_HINT|FLAG_VSYNC_HINT); InitWindow(screenWidth, screenHeight, "raylib [text] example - draw 2D text in 3D"); bool spin = true; // Spin the camera? bool multicolor = false; // Multicolor mode - + // Define the camera to look into our 3d world Camera3D camera = { 0 }; camera.position = (Vector3){ -10.0f, 15.0f, -10.0f }; // Camera position @@ -94,41 +94,41 @@ int main(void) camera.up = (Vector3){ 0.0f, 1.0f, 0.0f }; // Camera up vector (rotation towards target) camera.fovy = 45.0f; // Camera field-of-view Y camera.projection = CAMERA_PERSPECTIVE; // Camera mode type - + SetCameraMode(camera, CAMERA_ORBITAL); Vector3 cubePosition = { 0.0f, 1.0f, 0.0f }; Vector3 cubeSize = { 2.0f, 2.0f, 2.0f }; - + SetTargetFPS(60); // Set our game to run at 60 frames-per-second - + // Use the default font Font font = GetFontDefault(); float fontSize = 8.0f; float fontSpacing = 0.5f; float lineSpacing = -1.0f; - + // Set the text (using markdown!) char text[64] = "Hello ~~World~~ in 3D!"; Vector3 tbox = {0}; int layers = 1; int quads = 0; float layerDistance = 0.01f; - + WaveTextConfig wcfg; wcfg.waveSpeed.x = wcfg.waveSpeed.y = 3.0f; wcfg.waveSpeed.z = 0.5f; wcfg.waveOffset.x = wcfg.waveOffset.y = wcfg.waveOffset.z = 0.35f; wcfg.waveRange.x = wcfg.waveRange.y = wcfg.waveRange.z = 0.45f; - + float time = 0.0f; - + // Setup a light and dark color Color light = MAROON; Color dark = RED; - + // Load the alpha discard shader Shader alphaDiscard = LoadShader(NULL, "resources/shaders/glsl330/alpha_discard.fs"); - + // Array filled with multiple random colors (when multicolor mode is set) Color multi[TEXT_MAX_LAYERS] = {0}; //-------------------------------------------------------------------------------------- @@ -150,7 +150,7 @@ int main(void) UnloadFont(font); font = LoadFontEx(droppedFiles[0], fontSize, 0, 0); } - else if (IsFileExtension(droppedFiles[0], ".fnt")) + else if (IsFileExtension(droppedFiles[0], ".fnt")) { UnloadFont(font); font = LoadFont(droppedFiles[0]); @@ -158,33 +158,33 @@ int main(void) } ClearDroppedFiles(); } - + // Handle Events if (IsKeyPressed(KEY_F1)) SHOW_LETTER_BOUNDRY = !SHOW_LETTER_BOUNDRY; if (IsKeyPressed(KEY_F2)) SHOW_TEXT_BOUNDRY = !SHOW_TEXT_BOUNDRY; - if (IsKeyPressed(KEY_F3)) - { + if (IsKeyPressed(KEY_F3)) + { // Handle camera change - spin = !spin; + spin = !spin; // we need to reset the camera when changing modes camera = (Camera3D){ 0 }; camera.target = (Vector3){ 0.0f, 0.0f, 0.0f }; // Camera looking at point camera.up = (Vector3){ 0.0f, 1.0f, 0.0f }; // Camera up vector (rotation towards target) camera.fovy = 45.0f; // Camera field-of-view Y camera.projection = CAMERA_PERSPECTIVE; // Camera mode type - - if (spin) + + if (spin) { camera.position = (Vector3){ -10.0f, 15.0f, -10.0f }; // Camera position SetCameraMode(camera, CAMERA_ORBITAL); } - else - { + else + { camera.position = (Vector3){ 10.0f, 10.0f, -10.0f }; // Camera position SetCameraMode(camera, CAMERA_FREE); } } - + // Handle clicking the cube if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON)) { @@ -194,18 +194,18 @@ int main(void) bool collision = CheckCollisionRayBox(ray, (BoundingBox){(Vector3){ cubePosition.x - cubeSize.x/2, cubePosition.y - cubeSize.y/2, cubePosition.z - cubeSize.z/2 }, (Vector3){ cubePosition.x + cubeSize.x/2, cubePosition.y + cubeSize.y/2, cubePosition.z + cubeSize.z/2 }}); - if (collision) + if (collision) { // Generate new random colors light = GenerateRandomColor(0.5f, 0.78f); dark = GenerateRandomColor(0.4f, 0.58f); } } - + // Handle text layers changes if (IsKeyPressed(KEY_HOME)) { if (layers > 1) --layers; } else if (IsKeyPressed(KEY_END)) { if (layers < TEXT_MAX_LAYERS) ++layers; } - + // Handle text changes if (IsKeyPressed(KEY_LEFT)) fontSize -= 0.5f; else if (IsKeyPressed(KEY_RIGHT)) fontSize += 0.5f; @@ -215,53 +215,53 @@ int main(void) else if (IsKeyPressed(KEY_PAGE_DOWN)) lineSpacing += 0.1f; else if (IsKeyDown(KEY_INSERT)) layerDistance -= 0.001f; else if (IsKeyDown(KEY_DELETE)) layerDistance += 0.001f; - else if (IsKeyPressed(KEY_TAB)) + else if (IsKeyPressed(KEY_TAB)) { multicolor = !multicolor; // Enable /disable multicolor mode - - if (multicolor) + + if (multicolor) { // Fill color array with random colors - for (int i = 0; i < TEXT_MAX_LAYERS; ++i) + for (int i = 0; i < TEXT_MAX_LAYERS; ++i) { multi[i] = GenerateRandomColor(0.5f, 0.8f); multi[i].a = GetRandomValue(0, 255); } } } - + // Handle text input int ch = GetCharPressed(); - if (IsKeyPressed(KEY_BACKSPACE)) + if (IsKeyPressed(KEY_BACKSPACE)) { // Remove last char int len = TextLength(text); if (len > 0) text[len - 1] = '\0'; - } - else if (IsKeyPressed(KEY_ENTER)) + } + else if (IsKeyPressed(KEY_ENTER)) { // handle newline int len = TextLength(text); if (len < sizeof(text) - 1) { - text[len] = '\n'; + text[len] = '\n'; text[len+1] ='\0'; } - } + } else { // append only printable chars int len = TextLength(text); if (len < sizeof(text) - 1) { - text[len] = ch; + text[len] = ch; text[len+1] ='\0'; } } - + // Measure 3D text so we can center it tbox = MeasureTextWave3D(font, text, fontSize, fontSpacing, lineSpacing); - + UpdateCamera(&camera); // Update camera quads = 0; // Reset quad counter time += GetFrameTime(); // Update timer needed by `DrawTextWave3D()` @@ -272,37 +272,37 @@ int main(void) BeginDrawing(); ClearBackground(RAYWHITE); - + BeginMode3D(camera); DrawCubeV(cubePosition, cubeSize, dark); DrawCubeWires(cubePosition, 2.1f, 2.1f, 2.1f, light); - + DrawGrid(10, 2.0f); - + // Use a shader to handle the depth buffer issue with transparent textures // NOTE: more info at https://bedroomcoders.co.uk/raylib-billboards-advanced-use/ BeginShaderMode(alphaDiscard); - + // Draw the 3D text above the red cube rlPushMatrix(); rlRotatef(90.0f, 1.0f, 0.0f, 0.0f); rlRotatef(90.0f, 0.0f, 0.0f, -1.0f); - - for (int i = 0; i < layers; ++i) + + for (int i = 0; i < layers; ++i) { Color clr = light; if(multicolor) clr = multi[i]; DrawTextWave3D(font, text, (Vector3){ -tbox.x/2.0f, layerDistance*i, -4.5f }, fontSize, fontSpacing, lineSpacing, true, &wcfg, time, clr); } - + // Draw the text boundry if set if (SHOW_TEXT_BOUNDRY) DrawCubeWiresV((Vector3){ 0.0f, 0.0f, -4.5f + tbox.z/2 }, tbox, dark); rlPopMatrix(); - + // Don't draw the letter boundries for the 3D text below bool slb = SHOW_LETTER_BOUNDRY; SHOW_LETTER_BOUNDRY = false; - + // Draw 3D options (use default font) //------------------------------------------------------------------------- rlPushMatrix(); @@ -313,35 +313,35 @@ int main(void) Vector3 pos = { -m.x/2.0f, 0.01f, 2.0f}; DrawText3D(GetFontDefault(), opt, pos, 8.0f, 1.0f, 0.0f, false, BLUE); pos.z += 0.5f + m.z; - + opt = (char *)TextFormat("< SPACING: %2.1f >", fontSpacing); quads += TextLength(opt); m = MeasureText3D(GetFontDefault(), opt, 8.0f, 1.0f, 0.0f); pos.x = -m.x/2.0f; DrawText3D(GetFontDefault(), opt, pos, 8.0f, 1.0f, 0.0f, false, BLUE); pos.z += 0.5f + m.z; - + opt = (char *)TextFormat("< LINE: %2.1f >", lineSpacing); quads += TextLength(opt); m = MeasureText3D(GetFontDefault(), opt, 8.0f, 1.0f, 0.0f); pos.x = -m.x/2.0f; DrawText3D(GetFontDefault(), opt, pos, 8.0f, 1.0f, 0.0f, false, BLUE); pos.z += 1.0f + m.z; - + opt = (char *)TextFormat("< LBOX: %3s >", slb? "ON" : "OFF"); quads += TextLength(opt); m = MeasureText3D(GetFontDefault(), opt, 8.0f, 1.0f, 0.0f); pos.x = -m.x/2.0f; DrawText3D(GetFontDefault(), opt, pos, 8.0f, 1.0f, 0.0f, false, RED); pos.z += 0.5f + m.z; - + opt = (char *)TextFormat("< TBOX: %3s >", SHOW_TEXT_BOUNDRY? "ON" : "OFF"); quads += TextLength(opt); m = MeasureText3D(GetFontDefault(), opt, 8.0f, 1.0f, 0.0f); pos.x = -m.x/2.0f; DrawText3D(GetFontDefault(), opt, pos, 8.0f, 1.0f, 0.0f, false, RED); pos.z += 0.5f + m.z; - + opt = (char *)TextFormat("< LAYER DISTANCE: %.3f >", layerDistance); quads += TextLength(opt); m = MeasureText3D(GetFontDefault(), opt, 8.0f, 1.0f, 0.0f); @@ -349,7 +349,7 @@ int main(void) DrawText3D(GetFontDefault(), opt, pos, 8.0f, 1.0f, 0.0f, false, DARKPURPLE); rlPopMatrix(); //------------------------------------------------------------------------- - + // Draw 3D info text (use default font) //------------------------------------------------------------------------- opt = "All the text displayed here is in 3D"; @@ -358,74 +358,74 @@ int main(void) pos = (Vector3){-m.x/2.0f, 0.01f, 2.0f}; DrawText3D(GetFontDefault(), opt, pos, 10.0f, 0.5f, 0.0f, false, DARKBLUE); pos.z += 1.5f + m.z; - + opt = "press [Left]/[Right] to change the font size"; quads += 44; m = MeasureText3D(GetFontDefault(), opt, 6.0f, 0.5f, 0.0f); pos.x = -m.x/2.0f; DrawText3D(GetFontDefault(), opt, pos, 6.0f, 0.5f, 0.0f, false, DARKBLUE); pos.z += 0.5f + m.z; - + opt = "press [Up]/[Down] to change the font spacing"; quads += 44; m = MeasureText3D(GetFontDefault(), opt, 6.0f, 0.5f, 0.0f); pos.x = -m.x/2.0f; DrawText3D(GetFontDefault(), opt, pos, 6.0f, 0.5f, 0.0f, false, DARKBLUE); pos.z += 0.5f + m.z; - + opt = "press [PgUp]/[PgDown] to change the line spacing"; quads += 48; m = MeasureText3D(GetFontDefault(), opt, 6.0f, 0.5f, 0.0f); pos.x = -m.x/2.0f; DrawText3D(GetFontDefault(), opt, pos, 6.0f, 0.5f, 0.0f, false, DARKBLUE); pos.z += 0.5f + m.z; - + opt = "press [F1] to toggle the letter boundry"; quads += 39; m = MeasureText3D(GetFontDefault(), opt, 6.0f, 0.5f, 0.0f); pos.x = -m.x/2.0f; DrawText3D(GetFontDefault(), opt, pos, 6.0f, 0.5f, 0.0f, false, DARKBLUE); pos.z += 0.5f + m.z; - + opt = "press [F2] to toggle the text boundry"; quads += 37; m = MeasureText3D(GetFontDefault(), opt, 6.0f, 0.5f, 0.0f); pos.x = -m.x/2.0f; DrawText3D(GetFontDefault(), opt, pos, 6.0f, 0.5f, 0.0f, false, DARKBLUE); //------------------------------------------------------------------------- - + SHOW_LETTER_BOUNDRY = slb; EndShaderMode(); - + EndMode3D(); - + // Draw 2D info text & stats //------------------------------------------------------------------------- DrawText("Drag & drop a font file to change the font!\nType something, see what happens!\n\n" "Press [F3] to toggle the camera", 10, 35, 10, BLACK); - + quads += TextLength(text)*2*layers; char *tmp = (char *)TextFormat("%2i layer(s) | %s camera | %4i quads (%4i verts)", layers, spin? "ORBITAL" : "FREE", quads, quads*4); int width = MeasureText(tmp, 10); DrawText(tmp, screenWidth - 20 - width, 10, 10, DARKGREEN); - + tmp = "[Home]/[End] to add/remove 3D text layers"; width = MeasureText(tmp, 10); DrawText(tmp, screenWidth - 20 - width, 25, 10, DARKGRAY); - + tmp = "[Insert]/[Delete] to increase/decrease distance between layers"; width = MeasureText(tmp, 10); DrawText(tmp, screenWidth - 20 - width, 40, 10, DARKGRAY); - + tmp = "click the [CUBE] for a random color"; width = MeasureText(tmp, 10); DrawText(tmp, screenWidth - 20 - width, 55, 10, DARKGRAY); - + tmp = "[Tab] to toggle multicolor mode"; width = MeasureText(tmp, 10); DrawText(tmp, screenWidth - 20 - width, 70, 10, DARKGRAY); //------------------------------------------------------------------------- - + DrawFPS(10, 10); EndDrawing(); @@ -461,22 +461,22 @@ void DrawTextCodepoint3D(Font font, int codepoint, Vector3 position, float fontS // NOTE: We consider chars padding when drawing, it could be required for outline/glow shader effects Rectangle srcRec = { font.recs[index].x - (float)font.charsPadding, font.recs[index].y - (float)font.charsPadding, font.recs[index].width + 2.0f*font.charsPadding, font.recs[index].height + 2.0f*font.charsPadding }; - + float width = (float)(font.recs[index].width + 2.0f*font.charsPadding)/(float)font.baseSize*scale; float height = (float)(font.recs[index].height + 2.0f*font.charsPadding)/(float)font.baseSize*scale; - + if(font.texture.id > 0) { const float x = 0.0f; const float y = 0.0f; const float z = 0.0f; - + // normalized texture coordinates of the glyph inside the font texture (0.0f -> 1.0f) const float tx = srcRec.x/font.texture.width; const float ty = srcRec.y/font.texture.height; const float tw = (srcRec.x+srcRec.width)/font.texture.width; const float th = (srcRec.y+srcRec.height)/font.texture.height; - + if(SHOW_LETTER_BOUNDRY) DrawCubeWiresV((Vector3){ position.x + width/2, position.y, position.z + height/2}, (Vector3){ width, LETTER_BOUNDRY_SIZE, height }, LETTER_BOUNDRY_COLOR); @@ -489,17 +489,17 @@ void DrawTextCodepoint3D(Font font, int codepoint, Vector3 position, float fontS #endif rlPushMatrix(); rlTranslatef(position.x, position.y, position.z); - + rlBegin(RL_QUADS); rlColor4ub(tint.r, tint.g, tint.b, tint.a); - + // Front Face rlNormal3f(0.0f, 1.0f, 0.0f); // Normal Pointing Up rlTexCoord2f(tx, ty); rlVertex3f(x, y, z); // Top Left Of The Texture and Quad rlTexCoord2f(tx, th); rlVertex3f(x, y, z + height); // Bottom Left Of The Texture and Quad rlTexCoord2f(tw, th); rlVertex3f(x + width, y, z + height); // Bottom Right Of The Texture and Quad rlTexCoord2f(tw, ty); rlVertex3f(x + width, y, z); // Top Right Of The Texture and Quad - + if (backface) { // Back Face @@ -526,9 +526,9 @@ void DrawText3D(Font font, const char *text, Vector3 position, float fontSize, f float textOffsetY = 0.0f; // Offset between lines (on line break '\n') float textOffsetX = 0.0f; // Offset X to next character to draw - + float scale = fontSize/(float)font.baseSize; - + for (int i = 0; i < length;) { // Get next codepoint from byte string and glyph index in font @@ -562,12 +562,12 @@ void DrawText3D(Font font, const char *text, Vector3 position, float fontSize, f } } -Vector3 MeasureText3D(Font font, const char* text, float fontSize, float fontSpacing, float lineSpacing) +Vector3 MeasureText3D(Font font, const char* text, float fontSize, float fontSpacing, float lineSpacing) { int len = TextLength(text); int tempLen = 0; // Used to count longer text line num chars int lenCounter = 0; - + float tempTextWidth = 0.0f; // Used to count longer text line width float scale = fontSize/(float)font.baseSize; @@ -623,9 +623,9 @@ void DrawTextWave3D(Font font, const char *text, Vector3 position, float fontSiz float textOffsetY = 0.0f; // Offset between lines (on line break '\n') float textOffsetX = 0.0f; // Offset X to next character to draw - + float scale = fontSize/(float)font.baseSize; - + bool wave = false; for (int i = 0, k = 0; i < length; ++k) @@ -649,7 +649,7 @@ void DrawTextWave3D(Font font, const char *text, Vector3 position, float fontSiz } else if (codepoint == '~') { - if (GetNextCodepoint(&text[i+1], &codepointByteCount) == '~') + if (GetNextCodepoint(&text[i+1], &codepointByteCount) == '~') { codepointByteCount += 1; wave = !wave; @@ -666,7 +666,7 @@ void DrawTextWave3D(Font font, const char *text, Vector3 position, float fontSiz pos.y += sinf(time*config->waveSpeed.y-k*config->waveOffset.y)*config->waveRange.y; pos.z += sinf(time*config->waveSpeed.z-k*config->waveOffset.z)*config->waveRange.z; } - + DrawTextCodepoint3D(font, codepoint, (Vector3){ pos.x + textOffsetX, pos.y, pos.z + textOffsetY }, fontSize, backface, tint); } @@ -678,12 +678,12 @@ void DrawTextWave3D(Font font, const char *text, Vector3 position, float fontSiz } } -Vector3 MeasureTextWave3D(Font font, const char* text, float fontSize, float fontSpacing, float lineSpacing) +Vector3 MeasureTextWave3D(Font font, const char* text, float fontSize, float fontSpacing, float lineSpacing) { int len = TextLength(text); int tempLen = 0; // Used to count longer text line num chars int lenCounter = 0; - + float tempTextWidth = 0.0f; // Used to count longer text line width float scale = fontSize/(float)font.baseSize; diff --git a/examples/text/text_font_loading.c b/examples/text/text_font_loading.c index e0515167f..2f8225db3 100644 --- a/examples/text/text_font_loading.c +++ b/examples/text/text_font_loading.c @@ -9,7 +9,7 @@ * - BMFonts > Angel code font fileformat, sprite font image must be provided * together with the .fnt file, font generation cna not be configured * - XNA Spritefont > Sprite font image, following XNA Spritefont conventions, -* Characters in image must follow some spacing and order rules +* Characters in image must follow some spacing and order rules * * This example has been created using raylib 2.6 (www.raylib.com) * raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details) diff --git a/examples/text/text_font_sdf.c b/examples/text/text_font_sdf.c index 36c0ae564..f9517bdc3 100644 --- a/examples/text/text_font_sdf.c +++ b/examples/text/text_font_sdf.c @@ -31,7 +31,7 @@ int main(void) // NOTE: Textures/Fonts MUST be loaded after Window initialization (OpenGL context is required) const char msg[50] = "Signed Distance Fields"; - + // Loading file to memory unsigned int fileSize = 0; unsigned char *fileData = LoadFileData("resources/anonymous_pro_bold.ttf", &fileSize); @@ -40,7 +40,7 @@ int main(void) Font fontDefault = { 0 }; fontDefault.baseSize = 16; fontDefault.charsCount = 95; - + // Loading font data from memory data // Parameters > font size: 16, no chars array provided (0), chars count: 95 (autogenerate chars array) fontDefault.chars = LoadFontData(fileData, fileSize, 16, 0, 95, FONT_DEFAULT); @@ -59,7 +59,7 @@ int main(void) atlas = GenImageFontAtlas(fontSDF.chars, &fontSDF.recs, 95, 16, 0, 1); fontSDF.texture = LoadTextureFromImage(atlas); UnloadImage(atlas); - + UnloadFileData(fileData); // Free memory from loaded file // Load SDF required shader (we use default vertex shader) @@ -70,7 +70,7 @@ int main(void) Vector2 textSize = { 0.0f, 0.0f }; float fontSize = 16.0f; int currentFont = 0; // 0 - fontDefault, 1 - fontSDF - + SetTargetFPS(60); // Set our game to run at 60 frames-per-second //-------------------------------------------------------------------------------------- diff --git a/examples/text/text_font_spritefont.c b/examples/text/text_font_spritefont.c index 0f4a08b27..8ff63bb9d 100644 --- a/examples/text/text_font_spritefont.c +++ b/examples/text/text_font_spritefont.c @@ -8,8 +8,8 @@ * - Every character and every line must be separated the same distance * - Rectangles must be defined by a MAGENTA color background * -* If following this constraints, a font can be provided just by an image, -* this is quite handy to avoid additional information files (like BMFonts use). +* If following this constraints, a font can be provided just by an image, +* this is quite handy to avoid additional information files (like BMFonts use). * * This example has been created using raylib 1.0 (www.raylib.com) * raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details) diff --git a/examples/text/text_input_box.c b/examples/text/text_input_box.c index a2e2adfec..408a234ba 100644 --- a/examples/text/text_input_box.c +++ b/examples/text/text_input_box.c @@ -58,7 +58,7 @@ int main(void) name[letterCount] = (char)key; letterCount++; } - + key = GetCharPressed(); // Check next character in the queue } diff --git a/examples/text/text_raylib_fonts.c b/examples/text/text_raylib_fonts.c index f14c86dec..782a5f876 100644 --- a/examples/text/text_raylib_fonts.c +++ b/examples/text/text_raylib_fonts.c @@ -62,7 +62,7 @@ int main(void) positions[7].y -= 8; Color colors[MAX_FONTS] = { MAROON, ORANGE, DARKGREEN, DARKBLUE, DARKPURPLE, LIME, GOLD, RED }; - + SetTargetFPS(60); // Set our game to run at 60 frames-per-second //-------------------------------------------------------------------------------------- diff --git a/examples/text/text_rectangle_bounds.c b/examples/text/text_rectangle_bounds.c index 21dfcd91c..4d3edaccc 100644 --- a/examples/text/text_rectangle_bounds.c +++ b/examples/text/text_rectangle_bounds.c @@ -100,15 +100,15 @@ tempor incididunt ut labore et dolore magna aliqua. Nec ullamcorper sit amet ris // Draw bottom info DrawRectangle(0, screenHeight - 54, screenWidth, 54, GRAY); DrawRectangleRec((Rectangle){ 382, screenHeight - 34, 12, 12 }, MAROON); - + DrawText("Word Wrap: ", 313, screenHeight-115, 20, BLACK); if (wordWrap) DrawText("ON", 447, screenHeight - 115, 20, RED); else DrawText("OFF", 447, screenHeight - 115, 20, BLACK); - + DrawText("Press [SPACE] to toggle word wrap", 218, screenHeight - 86, 20, GRAY); DrawText("Click hold & drag the to resize the container", 155, screenHeight - 38, 20, RAYWHITE); - + EndDrawing(); //---------------------------------------------------------------------------------- } diff --git a/examples/textures/textures_blend_modes.c b/examples/textures/textures_blend_modes.c index 2d9b0af9d..646bceaa4 100644 --- a/examples/textures/textures_blend_modes.c +++ b/examples/textures/textures_blend_modes.c @@ -32,12 +32,12 @@ int main(void) Texture2D fgTexture = LoadTextureFromImage(fgImage); // Image converted to texture, GPU memory (VRAM) // Once image has been converted to texture and uploaded to VRAM, it can be unloaded from RAM - UnloadImage(bgImage); + UnloadImage(bgImage); UnloadImage(fgImage); const int blendCountMax = 4; BlendMode blendMode = 0; - + // Main game loop while (!WindowShouldClose()) // Detect window close button or ESC key { @@ -49,7 +49,7 @@ int main(void) else blendMode++; } //---------------------------------------------------------------------------------- - + // Draw //---------------------------------------------------------------------------------- BeginDrawing(); @@ -65,7 +65,7 @@ int main(void) // Draw the texts DrawText("Press SPACE to change blend modes.", 310, 350, 10, GRAY); - + switch (blendMode) { case BLEND_ALPHA: DrawText("Current: BLEND_ALPHA", (screenWidth / 2) - 60, 370, 10, GRAY); break; @@ -74,7 +74,7 @@ int main(void) case BLEND_ADD_COLORS: DrawText("Current: BLEND_ADD_COLORS", (screenWidth / 2) - 60, 370, 10, GRAY); break; default: break; } - + DrawText("(c) Cyberpunk Street Environment by Luis Zuno (@ansimuz)", screenWidth - 330, screenHeight - 20, 10, GRAY); EndDrawing(); @@ -88,6 +88,6 @@ int main(void) CloseWindow(); // Close window and OpenGL context //-------------------------------------------------------------------------------------- - + return 0; } diff --git a/examples/textures/textures_draw_tiled.c b/examples/textures/textures_draw_tiled.c index 97bffc80f..842be11ec 100644 --- a/examples/textures/textures_draw_tiled.c +++ b/examples/textures/textures_draw_tiled.c @@ -21,24 +21,24 @@ int main(int argc, char **argv) //-------------------------------------------------------------------------------------- int screenWidth = 800; int screenHeight = 450; - + SetConfigFlags(FLAG_WINDOW_RESIZABLE); // Make the window resizable InitWindow(screenWidth, screenHeight, "raylib [textures] example - Draw part of a texture tiled"); // NOTE: Textures MUST be loaded after Window initialization (OpenGL context is required) Texture texPattern = LoadTexture("resources/patterns.png"); SetTextureFilter(texPattern, TEXTURE_FILTER_TRILINEAR); // Makes the texture smoother when upscaled - + // Coordinates for all patterns inside the texture - const Rectangle recPattern[] = { - (Rectangle){ 3, 3, 66, 66 }, - (Rectangle){ 75, 3, 100, 100 }, + const Rectangle recPattern[] = { + (Rectangle){ 3, 3, 66, 66 }, + (Rectangle){ 75, 3, 100, 100 }, (Rectangle){ 3, 75, 66, 66 }, (Rectangle){ 7, 156, 50, 50 }, (Rectangle){ 85, 106, 90, 45 }, (Rectangle){ 75, 154, 100, 60} }; - + // Setup colors const Color colors[] = { BLACK, MAROON, ORANGE, BLUE, PURPLE, BEIGE, LIME, RED, DARKGRAY, SKYBLUE }; enum { MAX_COLORS = SIZEOF(colors) }; @@ -51,21 +51,21 @@ int main(int argc, char **argv) colorRec[i].y = 22.0f + 256.0f + MARGIN_SIZE + y; colorRec[i].width = COLOR_SIZE*2.0f; colorRec[i].height = (float)COLOR_SIZE; - + if (i == (MAX_COLORS/2 - 1)) { - x = 0; + x = 0; y += COLOR_SIZE + MARGIN_SIZE; - } + } else x += (COLOR_SIZE*2 + MARGIN_SIZE); } int activePattern = 0, activeCol = 0; float scale = 1.0f, rotation = 0.0f; - + SetTargetFPS(60); //--------------------------------------------------------------------------------------- - + // Main game loop while (!WindowShouldClose()) // Detect window close button or ESC key { @@ -73,22 +73,22 @@ int main(int argc, char **argv) //---------------------------------------------------------------------------------- screenWidth = GetScreenWidth(); screenHeight = GetScreenHeight(); - + // Handle mouse if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON)) { const Vector2 mouse = GetMousePosition(); - + // Check which pattern was clicked and set it as the active pattern for (int i = 0; i < SIZEOF(recPattern); i++) { if (CheckCollisionPointRec(mouse, (Rectangle){ 2 + MARGIN_SIZE + recPattern[i].x, 40 + MARGIN_SIZE + recPattern[i].y, recPattern[i].width, recPattern[i].height })) - { - activePattern = i; - break; + { + activePattern = i; + break; } } - + // Check to see which color was clicked and set it as the active color for (int i = 0; i < MAX_COLORS; ++i) { @@ -99,67 +99,67 @@ int main(int argc, char **argv) } } } - + // Handle keys - + // Change scale if (IsKeyPressed(KEY_UP)) scale += 0.25f; if (IsKeyPressed(KEY_DOWN)) scale -= 0.25f; if (scale > 10.0f) scale = 10.0f; else if ( scale <= 0.0f) scale = 0.25f; - + // Change rotation if (IsKeyPressed(KEY_LEFT)) rotation -= 25.0f; if (IsKeyPressed(KEY_RIGHT)) rotation += 25.0f; - + // Reset if (IsKeyPressed(KEY_SPACE)) { rotation = 0.0f; scale = 1.0f; } //---------------------------------------------------------------------------------- - + // Draw //---------------------------------------------------------------------------------- BeginDrawing(); ClearBackground(RAYWHITE); - + // Draw the tiled area DrawTextureTiled(texPattern, recPattern[activePattern], (Rectangle){(float)OPT_WIDTH+MARGIN_SIZE, (float)MARGIN_SIZE, screenWidth - OPT_WIDTH - 2.0f*MARGIN_SIZE, screenHeight - 2.0f*MARGIN_SIZE}, (Vector2){0.0f, 0.0f}, rotation, scale, colors[activeCol]); - + // Draw options DrawRectangle(MARGIN_SIZE, MARGIN_SIZE, OPT_WIDTH - MARGIN_SIZE, screenHeight - 2*MARGIN_SIZE, ColorAlpha(LIGHTGRAY, 0.5f)); - + DrawText("Select Pattern", 2 + MARGIN_SIZE, 30 + MARGIN_SIZE, 10, BLACK); DrawTexture(texPattern, 2 + MARGIN_SIZE, 40 + MARGIN_SIZE, BLACK); DrawRectangle(2 + MARGIN_SIZE + (int)recPattern[activePattern].x, 40 + MARGIN_SIZE + (int)recPattern[activePattern].y, (int)recPattern[activePattern].width, (int)recPattern[activePattern].height, ColorAlpha(DARKBLUE, 0.3f)); - + DrawText("Select Color", 2+MARGIN_SIZE, 10+256+MARGIN_SIZE, 10, BLACK); for (int i = 0; i < MAX_COLORS; i++) { DrawRectangleRec(colorRec[i], colors[i]); if (activeCol == i) DrawRectangleLinesEx(colorRec[i], 3, ColorAlpha(WHITE, 0.5f)); } - + DrawText("Scale (UP/DOWN to change)", 2 + MARGIN_SIZE, 80 + 256 + MARGIN_SIZE, 10, BLACK); DrawText(TextFormat("%.2fx", scale), 2 + MARGIN_SIZE, 92 + 256 + MARGIN_SIZE, 20, BLACK); - + DrawText("Rotation (LEFT/RIGHT to change)", 2 + MARGIN_SIZE, 122 + 256 + MARGIN_SIZE, 10, BLACK); DrawText(TextFormat("%.0f degrees", rotation), 2 + MARGIN_SIZE, 134 + 256 + MARGIN_SIZE, 20, BLACK); - + DrawText("Press [SPACE] to reset", 2 + MARGIN_SIZE, 164 + 256 + MARGIN_SIZE, 10, DARKBLUE); - + // Draw FPS DrawText(TextFormat("%i FPS", GetFPS()), 2 + MARGIN_SIZE, 2 + MARGIN_SIZE, 20, BLACK); EndDrawing(); //---------------------------------------------------------------------------------- } - + // De-Initialization //-------------------------------------------------------------------------------------- UnloadTexture(texPattern); // Unload texture - + CloseWindow(); // Close window and OpenGL context //-------------------------------------------------------------------------------------- - + return 0; } diff --git a/examples/textures/textures_image_processing.c b/examples/textures/textures_image_processing.c index 23951abd1..a18b15724 100644 --- a/examples/textures/textures_image_processing.c +++ b/examples/textures/textures_image_processing.c @@ -53,7 +53,7 @@ int main(void) Image imOrigin = LoadImage("resources/parrots.png"); // Loaded in CPU memory (RAM) ImageFormat(&imOrigin, PIXELFORMAT_UNCOMPRESSED_R8G8B8A8); // Format image to RGBA 32bit (required for texture update) <-- ISSUE Texture2D texture = LoadTextureFromImage(imOrigin); // Image converted to texture, GPU memory (VRAM) - + Image imCopy = ImageCopy(imOrigin); int currentProcess = NONE; @@ -72,7 +72,7 @@ int main(void) { // Update //---------------------------------------------------------------------------------- - + // Mouse toggle group logic for (int i = 0; i < NUM_PROCESSES; i++) { @@ -89,7 +89,7 @@ int main(void) } else mouseHoverRec = -1; } - + // Keyboard toggle group logic if (IsKeyPressed(KEY_DOWN)) { @@ -109,7 +109,7 @@ int main(void) { UnloadImage(imCopy); // Unload image-copy data imCopy = ImageCopy(imOrigin); // Restore image-copy from image-origin - + // NOTE: Image processing is a costly CPU process to be done every frame, // If image processing is required in a frame-basis, it should be done // with a texture and by shaders diff --git a/examples/textures/textures_image_text.c b/examples/textures/textures_image_text.c index aeccba680..cb4f0df37 100644 --- a/examples/textures/textures_image_text.c +++ b/examples/textures/textures_image_text.c @@ -19,7 +19,7 @@ int main(void) const int screenHeight = 450; InitWindow(screenWidth, screenHeight, "raylib [texture] example - image text drawing"); - + Image parrots = LoadImage("resources/parrots.png"); // Load image in CPU memory (RAM) // TTF Font loading with custom generation parameters diff --git a/examples/textures/textures_poly.c b/examples/textures/textures_poly.c index ea413112b..ff7283430 100644 --- a/examples/textures/textures_poly.c +++ b/examples/textures/textures_poly.c @@ -5,7 +5,7 @@ * This example has been created using raylib 3.7 (www.raylib.com) * raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details) * -* Example contributed by Chris Camacho (@codifies - bedroomcoders.co.uk) and +* Example contributed by Chris Camacho (@codifies - bedroomcoders.co.uk) and * reviewed by Ramon Santamaria (@raysan5) * * Copyright (c) 2021 Chris Camacho (@codifies) and Ramon Santamaria (@raysan5) @@ -52,7 +52,7 @@ int main(void) InitWindow(screenWidth, screenHeight, "raylib [textures] example - textured polygon"); Texture texture = LoadTexture("resources/cat.png"); - + float ang = 0; SetTargetFPS(60); // Set our game to run at 60 frames-per-second @@ -64,9 +64,9 @@ int main(void) // Update //---------------------------------------------------------------------------------- ang++; - + Vector2 positions[MAX_POINTS] = { 0 }; - + for (int i = 0; i < MAX_POINTS; i++) positions[i] = Vector2Rotate(points[i], ang); //---------------------------------------------------------------------------------- @@ -77,8 +77,8 @@ int main(void) ClearBackground(RAYWHITE); DrawText("textured polygon", 20, 20, 20, DARKGRAY); - - DrawTexturePoly(texture, (Vector2){ GetScreenWidth()/2, GetScreenHeight()/2 }, + + DrawTexturePoly(texture, (Vector2){ GetScreenWidth()/2, GetScreenHeight()/2 }, positions, texcoords, MAX_POINTS, WHITE); EndDrawing(); @@ -88,7 +88,7 @@ int main(void) // De-Initialization //-------------------------------------------------------------------------------------- UnloadTexture(texture); // Unload texture - + CloseWindow(); // Close window and OpenGL context //-------------------------------------------------------------------------------------- diff --git a/examples/textures/textures_raw_data.c b/examples/textures/textures_raw_data.c index a3490f611..615e57934 100644 --- a/examples/textures/textures_raw_data.c +++ b/examples/textures/textures_raw_data.c @@ -54,8 +54,8 @@ int main(void) .height = height, .format = PIXELFORMAT_UNCOMPRESSED_R8G8B8A8, .mipmaps = 1 - }; - + }; + Texture2D checked = LoadTextureFromImage(checkedIm); UnloadImage(checkedIm); // Unload CPU (RAM) image data (pixels) //--------------------------------------------------------------------------------------- diff --git a/examples/textures/textures_sprite_explosion.c b/examples/textures/textures_sprite_explosion.c index 52ac26060..900ec9664 100644 --- a/examples/textures/textures_sprite_explosion.c +++ b/examples/textures/textures_sprite_explosion.c @@ -30,7 +30,7 @@ int main(void) // Load explosion texture Texture2D explosion = LoadTexture("resources/explosion.png"); - + // Init variables for animation int frameWidth = explosion.width/NUM_FRAMES_PER_LINE; // Sprite one frame rectangle width int frameHeight = explosion.height/NUM_LINES; // Sprite one frame rectangle height diff --git a/examples/textures/textures_srcrec_dstrec.c b/examples/textures/textures_srcrec_dstrec.c index 3fdb689cc..d24ce0cc0 100644 --- a/examples/textures/textures_srcrec_dstrec.c +++ b/examples/textures/textures_srcrec_dstrec.c @@ -21,7 +21,7 @@ int main(void) InitWindow(screenWidth, screenHeight, "raylib [textures] examples - texture source and destination rectangles"); // NOTE: Textures MUST be loaded after Window initialization (OpenGL context is required) - + Texture2D scarfy = LoadTexture("resources/scarfy.png"); // Texture loading int frameWidth = scarfy.width/6; diff --git a/src/raylib.h b/src/raylib.h index ec6c0fbfd..0b2b4f4b6 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -4,7 +4,7 @@ * * FEATURES: * - NO external dependencies, all required libraries included with raylib -* - Multiplatform: Windows, Linux, FreeBSD, OpenBSD, NetBSD, DragonFly, +* - Multiplatform: Windows, Linux, FreeBSD, OpenBSD, NetBSD, DragonFly, * MacOS, Haiku, UWP, Android, Raspberry Pi, HTML5. * - Written in plain C code (C99) in PascalCase/camelCase notation * - Hardware accelerated with OpenGL (1.1, 2.1, 3.3 or ES2 - choose at compile) From 9a0accddb87fa312c11b44479b258ac5b2b4b8a4 Mon Sep 17 00:00:00 2001 From: Ray Date: Thu, 22 Apr 2021 18:56:42 +0200 Subject: [PATCH 064/121] Update HISTORY.md --- HISTORY.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index e659b4857..073d183c6 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -300,10 +300,10 @@ April 2021, it's been about 4 months since last raylib release and here it is al Let's start with some numbers: - **+100** closed issues (for a TOTAL of **+900**!) - - **+350** commits since previous RELEASE + - **+400** commits since previous RELEASE - **+50** functions ADDED (**+30** of them to rlgl API) - **+30** functions REVIEWED/REDESIGNED - - **+30** new contributors (for a TOTAL of **+200**!) + - **+40** new contributors (for a TOTAL of **+210**!) Highlights for `raylib 3.7`: @@ -321,4 +321,4 @@ Highlights for `raylib 3.7`: Beside those key changes, many functions have been reviewed with improvements and bug fixes, many of them contributed by the community! Thanks! And again, this release sets a **new milestone for raylib library**. Make sure to check [CHANGELOG](CHANGELOG) for detailed list of changes! Hope you enjoy this new raylib installment! -Happy gamedev/tools/graphics programming! :) +Happy **gamedev/tools/graphics** programming! :) From 03815ec4fe0676030838bb91907bf211b178e86e Mon Sep 17 00:00:00 2001 From: Ray Date: Thu, 22 Apr 2021 21:01:48 +0200 Subject: [PATCH 065/121] RPI4: Improve DRM card check #1723 --- src/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core.c b/src/core.c index 247a79322..f4bd6acc4 100644 --- a/src/core.c +++ b/src/core.c @@ -3810,7 +3810,7 @@ static bool InitGraphicsDevice(int width, int height) #else TRACELOG(LOG_INFO, "DISPLAY: No graphic card set, trying card1"); CORE.Window.fd = open("/dev/dri/card1", O_RDWR); // VideoCore VI (Raspberry Pi 4) - if (-1 == CORE.Window.fd) + if ((-1 == CORE.Window.fd) || (drmModeGetResources(CORE.Window.fd) == NULL)) { TRACELOG(LOG_INFO, "DISPLAY: Failed to open graphic card1, trying card0"); CORE.Window.fd = open("/dev/dri/card0", O_RDWR); // VideoCore IV (Raspberry Pi 1-3) From 8a55c60e470412580fd6b526cb9ea1b55fdf6cec Mon Sep 17 00:00:00 2001 From: Ray Date: Fri, 23 Apr 2021 09:09:34 +0200 Subject: [PATCH 066/121] Update shaders_mesh_instancing.c --- examples/shaders/shaders_mesh_instancing.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/examples/shaders/shaders_mesh_instancing.c b/examples/shaders/shaders_mesh_instancing.c index 290a29484..11662f738 100644 --- a/examples/shaders/shaders_mesh_instancing.c +++ b/examples/shaders/shaders_mesh_instancing.c @@ -27,6 +27,8 @@ #define GLSL_VERSION 100 #endif +#define MAX_INSTANCES 10000 + //------------------------------------------------------------------------------------ // Program main entry point //------------------------------------------------------------------------------------ @@ -56,15 +58,14 @@ int main(void) camera.fovy = 45.0f; camera.projection = CAMERA_PERSPECTIVE; - const int instances = 10000; // Number of instances to display Mesh cube = GenMeshCube(1.0f, 1.0f, 1.0f); - Matrix *rotations = RL_MALLOC(instances*sizeof(Matrix)); // Rotation state of instances - Matrix *rotationsInc = RL_MALLOC(instances*sizeof(Matrix)); // Per-frame rotation animation of instances - Matrix *translations = RL_MALLOC(instances*sizeof(Matrix)); // Locations of instances + Matrix *rotations = RL_MALLOC(MAX_INSTANCES*sizeof(Matrix)); // Rotation state of instances + Matrix *rotationsInc = RL_MALLOC(MAX_INSTANCES*sizeof(Matrix)); // Per-frame rotation animation of instances + Matrix *translations = RL_MALLOC(MAX_INSTANCES*sizeof(Matrix)); // Locations of instances // Scatter random cubes around - for (int i = 0; i < instances; i++) + for (int i = 0; i < MAX_INSTANCES; i++) { x = GetRandomValue(-50, 50); y = GetRandomValue(-50, 50); @@ -81,7 +82,7 @@ int main(void) rotations[i] = MatrixIdentity(); } - Matrix *transforms = RL_MALLOC(instances*sizeof(Matrix)); // Pre-multiplied transformations passed to rlgl + Matrix *transforms = RL_MALLOC(MAX_INSTANCES*sizeof(Matrix)); // Pre-multiplied transformations passed to rlgl Shader shader = LoadShader(TextFormat("resources/shaders/glsl%i/base_lighting_instanced.vs", GLSL_VERSION), TextFormat("resources/shaders/glsl%i/lighting.fs", GLSL_VERSION)); @@ -146,7 +147,7 @@ int main(void) SetShaderValue(shader, shader.locs[SHADER_LOC_VECTOR_VIEW], cameraPos, SHADER_UNIFORM_VEC3); // Apply per-instance transformations - for (int i = 0; i < instances; i++) + for (int i = 0; i < MAX_INSTANCES; i++) { rotations[i] = MatrixMultiply(rotations[i], rotationsInc[i]); transforms[i] = MatrixMultiply(rotations[i], translations[i]); @@ -174,7 +175,7 @@ int main(void) BeginMode3D(camera); //DrawMesh(cube, material, MatrixIdentity()); - DrawMeshInstanced(cube, material, transforms, instances); + DrawMeshInstanced(cube, material, transforms, MAX_INSTANCES); EndMode3D(); DrawText("A CUBE OF DANCING CUBES!", 490, 10, 20, MAROON); From f4abc05d62c2f3bf79d787cd24cbc8507689185f Mon Sep 17 00:00:00 2001 From: Ray Date: Fri, 23 Apr 2021 13:21:57 +0200 Subject: [PATCH 067/121] Update README.md --- examples/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/README.md b/examples/README.md index fec709ade..6a366972f 100644 --- a/examples/README.md +++ b/examples/README.md @@ -77,8 +77,8 @@ Examples using raylib textures functionality, including image/textures loading/g | 55 | [textures_bunnymark](textures/textures_bunnymark.c) | textures_bunnymark | ray | | | 56 | [textures_mouse_painting](textures/textures_mouse_painting.c) | textures_mouse_painting | [Chris Dill](https://github.com/MysteriousSpace) | | | 57 | [textures_blend_modes](textures/textures_blend_modes.c) | textures_blend_modes | [Karlo Licudine](https://github.com/accidentalrebel) | | -| 58 | [textures/textures_draw_tiled](textures/textures_draw_tiled.c) | textures_draw_tiled | [Vlad Adrian](https://github.com/demizdor) | | -| -- | [textures/textures_poly](textures/textures_poly.c) | textures_poly | [Chris Camacho](https://github.com/codifies) | ⭐️ | +| 58 | [textures_draw_tiled](textures/textures_draw_tiled.c) | textures_draw_tiled | [Vlad Adrian](https://github.com/demizdor) | | +| -- | [textures_poly](textures/textures_poly.c) | textures_poly | [Chris Camacho](https://github.com/codifies) | ⭐️ | ### category: text @@ -96,7 +96,7 @@ Examples using raylib text functionality, including sprite fonts loading/generat | 66 | [text_writing_anim](text/text_writing_anim.c) | text_writing_anim | ray | | | 67 | [text_rectangle_bounds](text/text_rectangle_bounds.c) | text_rectangle_bounds | [Vlad Adrian](https://github.com/demizdor) | | | 68 | [text_unicode](text/text_unicode.c) | text_unicode | [Vlad Adrian](https://github.com/demizdor) | | -| -- | [text/text_draw_3d](text/text_draw_3d.c) | text_draw_3d | [Vlad Adrian](https://github.com/demizdor) | ⭐️ | +| -- | [text_draw_3d](text/text_draw_3d.c) | text_draw_3d | [Vlad Adrian](https://github.com/demizdor) | ⭐️ | ### category: models From 7ad17386f6f052361a2211d52a099c6d2648285c Mon Sep 17 00:00:00 2001 From: Ray Date: Fri, 23 Apr 2021 17:24:25 +0200 Subject: [PATCH 068/121] Update raylib.h --- src/raylib.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/raylib.h b/src/raylib.h index 0b2b4f4b6..4e45c1ff3 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -1288,8 +1288,8 @@ RLAPI Color Fade(Color color, float alpha); // R RLAPI int ColorToInt(Color color); // Returns hexadecimal value for a Color RLAPI Vector4 ColorNormalize(Color color); // Returns Color normalized as float [0..1] RLAPI Color ColorFromNormalized(Vector4 normalized); // Returns Color from normalized values [0..1] -RLAPI Vector3 ColorToHSV(Color color); // Returns HSV values for a Color -RLAPI Color ColorFromHSV(float hue, float saturation, float value); // Returns a Color from HSV values +RLAPI Vector3 ColorToHSV(Color color); // Returns HSV values for a Color, hue [0..360], saturation/value [0..1] +RLAPI Color ColorFromHSV(float hue, float saturation, float value); // Returns a Color from HSV values, hue [0..360], saturation/value [0..1] RLAPI Color ColorAlpha(Color color, float alpha); // Returns color with alpha applied, alpha goes from 0.0f to 1.0f RLAPI Color ColorAlphaBlend(Color dst, Color src, Color tint); // Returns src alpha-blended into dst color with tint RLAPI Color GetColor(int hexValue); // Get Color structure from hexadecimal value From c4041043f51d6e00d2db7d4a3f81ca4e56e87344 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Sat, 24 Apr 2021 19:58:24 +0200 Subject: [PATCH 069/121] Reviewed VS2019 projects --- ...cxproj => shaders_mesh_instancing.vcxproj} | 8 ++++---- projects/VS2019/raylib.sln | 2 +- projects/VS2019/raylib/raylib.rc | Bin 4630 -> 4630 bytes 3 files changed, 5 insertions(+), 5 deletions(-) rename projects/VS2019/examples/{shaders_rlgl_mesh_instanced.vcxproj => shaders_mesh_instancing.vcxproj} (99%) diff --git a/projects/VS2019/examples/shaders_rlgl_mesh_instanced.vcxproj b/projects/VS2019/examples/shaders_mesh_instancing.vcxproj similarity index 99% rename from projects/VS2019/examples/shaders_rlgl_mesh_instanced.vcxproj rename to projects/VS2019/examples/shaders_mesh_instancing.vcxproj index dea7becad..4ea24888d 100644 --- a/projects/VS2019/examples/shaders_rlgl_mesh_instanced.vcxproj +++ b/projects/VS2019/examples/shaders_mesh_instancing.vcxproj @@ -39,7 +39,7 @@ Win32Proj shaders_rlgl_mesh_instanced 10.0 - shaders_rlgl_mesh_instanced + shaders_mesh_instancing @@ -373,14 +373,14 @@ Copy Release DLL to output directory - - - {e89d61ac-55de-4482-afd4-df7242ebc859} + + + diff --git a/projects/VS2019/raylib.sln b/projects/VS2019/raylib.sln index b8a0a4f6d..4e90233d6 100644 --- a/projects/VS2019/raylib.sln +++ b/projects/VS2019/raylib.sln @@ -239,7 +239,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shaders_postprocessing", "e EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shaders_raymarching", "examples\shaders_raymarching.vcxproj", "{D36EC43E-B31F-4CF4-8285-93A7A9D90189}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shaders_rlgl_mesh_instanced", "examples\shaders_rlgl_mesh_instanced.vcxproj", "{274C0319-7E1E-4188-936B-8DF3331230B3}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shaders_mesh_instancing", "examples\shaders_mesh_instancing.vcxproj", "{274C0319-7E1E-4188-936B-8DF3331230B3}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shaders_shapes_textures", "examples\shaders_shapes_textures.vcxproj", "{41BBCC10-CFDE-48A1-B2E0-A0EC6A668629}" EndProject diff --git a/projects/VS2019/raylib/raylib.rc b/projects/VS2019/raylib/raylib.rc index 2e10d96e3cfd8618de2cec63d47026c0142069e1..34b89514f80a62f3ae2d9c320430fe4733988acf 100644 GIT binary patch delta 41 xcmbQHGEHSe9|xoP Date: Sun, 25 Apr 2021 13:32:24 +0200 Subject: [PATCH 070/121] Review OpenGL 1.1 building #1732 It works compiling with MinGW --- src/rlgl.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/rlgl.h b/src/rlgl.h index 6d6218ec2..e67d743df 100644 --- a/src/rlgl.h +++ b/src/rlgl.h @@ -1830,6 +1830,7 @@ void rlLoadExtensions(void *loader) TRACELOG(LOG_INFO, " > Version: %s", glGetString(GL_VERSION)); TRACELOG(LOG_INFO, " > GLSL: %s", glGetString(GL_SHADING_LANGUAGE_VERSION)); +#if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) // NOTE: Anisotropy levels capability is an extension #ifndef GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT #define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF @@ -1882,7 +1883,9 @@ void rlLoadExtensions(void *loader) if (RLGL.ExtSupported.texCompETC2) TRACELOG(LOG_INFO, "GL: ETC2/EAC compressed textures supported"); if (RLGL.ExtSupported.texCompPVRT) TRACELOG(LOG_INFO, "GL: PVRT compressed textures supported"); if (RLGL.ExtSupported.texCompASTC) TRACELOG(LOG_INFO, "GL: ASTC compressed textures supported"); -#endif +#endif // SUPPORT_GL_DETAILS_INFO + +#endif // GRAPHICS_API_OPENGL_33 || GRAPHICS_API_OPENGL_ES2 } // Returns current OpenGL version From 87198586554e218834542098ec40e6611452c3aa Mon Sep 17 00:00:00 2001 From: raysan5 Date: Sun, 25 Apr 2021 13:51:17 +0200 Subject: [PATCH 071/121] Added opengl32.lib to the linker #1732 --- projects/VS2019/examples/core_2d_camera.vcxproj | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/projects/VS2019/examples/core_2d_camera.vcxproj b/projects/VS2019/examples/core_2d_camera.vcxproj index 1dfc42692..f9c470e75 100644 --- a/projects/VS2019/examples/core_2d_camera.vcxproj +++ b/projects/VS2019/examples/core_2d_camera.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ From 6c518008a58853197890b45e941f342e4195de60 Mon Sep 17 00:00:00 2001 From: Jeffery Myers Date: Sun, 25 Apr 2021 09:50:26 -0700 Subject: [PATCH 072/121] Fixes for 64 bit typecast warnings (#1733) --- examples/core/core_window_letterbox.c | 2 +- examples/physics/physics_shatter.c | 4 ++-- examples/shaders/shaders_basic_lighting.c | 4 ++-- examples/shaders/shaders_custom_uniform.c | 2 +- examples/shaders/shaders_eratosthenes.c | 2 +- examples/shaders/shaders_fog.c | 18 +++++++-------- examples/shaders/shaders_julia_set.c | 12 +++++----- examples/shaders/shaders_spotlight.c | 22 +++++++++---------- examples/shapes/shapes_basic_shapes.c | 12 +++++----- examples/shapes/shapes_colors_palette.c | 8 +++---- examples/shapes/shapes_following_eyes.c | 8 +++---- examples/shapes/shapes_lines_bezier.c | 2 +- examples/text/text_font_filters.c | 6 ++--- examples/text/text_font_spritefont.c | 12 +++++----- examples/text/text_raylib_fonts.c | 4 ++-- examples/text/text_rectangle_bounds.c | 8 +++---- examples/textures/textures_mouse_painting.c | 2 +- examples/textures/textures_sprite_explosion.c | 8 +++---- 18 files changed, 68 insertions(+), 68 deletions(-) diff --git a/examples/core/core_window_letterbox.c b/examples/core/core_window_letterbox.c index dca70d9ac..2c3af6df6 100644 --- a/examples/core/core_window_letterbox.c +++ b/examples/core/core_window_letterbox.c @@ -70,7 +70,7 @@ int main(void) Vector2 virtualMouse = { 0 }; virtualMouse.x = (mouse.x - (GetScreenWidth() - (gameScreenWidth*scale))*0.5f)/scale; virtualMouse.y = (mouse.y - (GetScreenHeight() - (gameScreenHeight*scale))*0.5f)/scale; - virtualMouse = ClampValue(virtualMouse, (Vector2){ 0, 0 }, (Vector2){ gameScreenWidth, gameScreenHeight }); + virtualMouse = ClampValue(virtualMouse, (Vector2){ 0, 0 }, (Vector2){ (float)gameScreenWidth, (float)gameScreenHeight }); // Apply the same transformation as the virtual mouse to the real mouse (i.e. to work with raygui) //SetMouseOffset(-(GetScreenWidth() - (gameScreenWidth*scale))*0.5f, -(GetScreenHeight() - (gameScreenHeight*scale))*0.5f); diff --git a/examples/physics/physics_shatter.c b/examples/physics/physics_shatter.c index e996a3721..d14e9ba65 100644 --- a/examples/physics/physics_shatter.c +++ b/examples/physics/physics_shatter.c @@ -35,7 +35,7 @@ int main(void) SetPhysicsGravity(0, 0); // Create random polygon physics body to shatter - CreatePhysicsBodyPolygon((Vector2){ screenWidth/2, screenHeight/2 }, GetRandomValue(80, 200), GetRandomValue(3, 8), 10); + CreatePhysicsBodyPolygon((Vector2){ screenWidth/2.0f, screenHeight/2.0f }, GetRandomValue(80, 200), GetRandomValue(3, 8), 10); SetTargetFPS(60); // Set our game to run at 60 frames-per-second //-------------------------------------------------------------------------------------- @@ -50,7 +50,7 @@ int main(void) { ResetPhysics(); - CreatePhysicsBodyPolygon((Vector2){ screenWidth/2, screenHeight/2 }, GetRandomValue(80, 200), GetRandomValue(3, 8), 10); + CreatePhysicsBodyPolygon((Vector2){ screenWidth/2.0f, screenHeight/2.0f }, GetRandomValue(80, 200), GetRandomValue(3, 8), 10); } if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON)) // Physics shatter input diff --git a/examples/shaders/shaders_basic_lighting.c b/examples/shaders/shaders_basic_lighting.c index c7e43b0c8..6ef09e4aa 100644 --- a/examples/shaders/shaders_basic_lighting.c +++ b/examples/shaders/shaders_basic_lighting.c @@ -146,8 +146,8 @@ int main(void) // Draw the three models DrawModel(modelA, Vector3Zero(), 1.0f, WHITE); - DrawModel(modelB, (Vector3){-1.6,0,0}, 1.0f, WHITE); - DrawModel(modelC, (Vector3){ 1.6,0,0}, 1.0f, WHITE); + DrawModel(modelB, (Vector3){-1.6f,0.0f,0.0f}, 1.0f, WHITE); + DrawModel(modelC, (Vector3){ 1.6f,0.0f,0.0f}, 1.0f, WHITE); // Draw markers to show where the lights are if (lights[0].enabled) { DrawSphereEx(lights[0].position, 0.2f, 8, 8, WHITE); } diff --git a/examples/shaders/shaders_custom_uniform.c b/examples/shaders/shaders_custom_uniform.c index ecc314e4a..6efda727b 100644 --- a/examples/shaders/shaders_custom_uniform.c +++ b/examples/shaders/shaders_custom_uniform.c @@ -109,7 +109,7 @@ int main(void) BeginShaderMode(shader); // NOTE: Render texture must be y-flipped due to default OpenGL coordinates (left-bottom) - DrawTextureRec(target.texture, (Rectangle){ 0, 0, target.texture.width, -target.texture.height }, (Vector2){ 0, 0 }, WHITE); + DrawTextureRec(target.texture, (Rectangle){ 0, 0, (float)target.texture.width, (float)-target.texture.height }, (Vector2){ 0, 0 }, WHITE); EndShaderMode(); diff --git a/examples/shaders/shaders_eratosthenes.c b/examples/shaders/shaders_eratosthenes.c index f0b828a9c..d5163a7f6 100644 --- a/examples/shaders/shaders_eratosthenes.c +++ b/examples/shaders/shaders_eratosthenes.c @@ -75,7 +75,7 @@ int main(void) BeginShaderMode(shader); // NOTE: Render texture must be y-flipped due to default OpenGL coordinates (left-bottom) - DrawTextureRec(target.texture, (Rectangle){ 0, 0, target.texture.width, -target.texture.height }, (Vector2){ 0.0f, 0.0f }, WHITE); + DrawTextureRec(target.texture, (Rectangle){ 0, 0, (float)target.texture.width, (float)-target.texture.height }, (Vector2){ 0.0f, 0.0f }, WHITE); EndShaderMode(); EndDrawing(); diff --git a/examples/shaders/shaders_fog.c b/examples/shaders/shaders_fog.c index 0f9d782e4..fef311c41 100644 --- a/examples/shaders/shaders_fog.c +++ b/examples/shaders/shaders_fog.c @@ -102,21 +102,21 @@ int main(void) if (IsKeyDown(KEY_UP)) { - fogDensity += 0.001; - if (fogDensity > 1.0) fogDensity = 1.0; + fogDensity += 0.001f; + if (fogDensity > 1.0f) fogDensity = 1.0f; } if (IsKeyDown(KEY_DOWN)) { - fogDensity -= 0.001; - if (fogDensity < 0.0) fogDensity = 0.0; + fogDensity -= 0.001f; + if (fogDensity < 0.0f) fogDensity = 0.0f; } SetShaderValue(shader, fogDensityLoc, &fogDensity, SHADER_UNIFORM_FLOAT); // Rotate the torus - modelA.transform = MatrixMultiply(modelA.transform, MatrixRotateX(-0.025)); - modelA.transform = MatrixMultiply(modelA.transform, MatrixRotateZ(0.012)); + modelA.transform = MatrixMultiply(modelA.transform, MatrixRotateX(-0.025f)); + modelA.transform = MatrixMultiply(modelA.transform, MatrixRotateZ(0.012f)); // Update the light shader with the camera view position SetShaderValue(shader, shader.locs[SHADER_LOC_VECTOR_VIEW], &camera.position.x, SHADER_UNIFORM_VEC3); @@ -132,10 +132,10 @@ int main(void) // Draw the three models DrawModel(modelA, Vector3Zero(), 1.0f, WHITE); - DrawModel(modelB, (Vector3){ -2.6, 0, 0 }, 1.0f, WHITE); - DrawModel(modelC, (Vector3){ 2.6, 0, 0 }, 1.0f, WHITE); + DrawModel(modelB, (Vector3){ -2.6f, 0, 0 }, 1.0f, WHITE); + DrawModel(modelC, (Vector3){ 2.6f, 0, 0 }, 1.0f, WHITE); - for (int i = -20; i < 20; i += 2) DrawModel(modelA,(Vector3){ i, 0, 2 }, 1.0f, WHITE); + for (int i = -20; i < 20; i += 2) DrawModel(modelA,(Vector3){ (float)i, 0, 2 }, 1.0f, WHITE); EndMode3D(); diff --git a/examples/shaders/shaders_julia_set.c b/examples/shaders/shaders_julia_set.c index 6ca226867..b6138b7be 100644 --- a/examples/shaders/shaders_julia_set.c +++ b/examples/shaders/shaders_julia_set.c @@ -27,12 +27,12 @@ // A few good julia sets const float pointsOfInterest[6][2] = { - { -0.348827, 0.607167 }, - { -0.786268, 0.169728 }, - { -0.8, 0.156 }, - { 0.285, 0.0 }, - { -0.835, -0.2321 }, - { -0.70176, -0.3842 }, + { -0.348827f, 0.607167f }, + { -0.786268f, 0.169728f }, + { -0.8f, 0.156f }, + { 0.285f, 0.0f }, + { -0.835f, -0.2321f }, + { -0.70176f, -0.3842f }, }; int main(void) diff --git a/examples/shaders/shaders_spotlight.c b/examples/shaders/shaders_spotlight.c index 40fd23172..892093d75 100644 --- a/examples/shaders/shaders_spotlight.c +++ b/examples/shaders/shaders_spotlight.c @@ -116,22 +116,22 @@ int main(void) float sw = (float)GetScreenWidth(); SetShaderValue(shdrSpot, wLoc, &sw, SHADER_UNIFORM_FLOAT); - // Randomise the locations and velocities of the spotlights - // and initialise the shader locations + // Randomize the locations and velocities of the spotlights + // and initialize the shader locations for (int i = 0; i < MAX_SPOTS; i++) { - spots[i].pos.x = GetRandomValue(64, screenWidth - 64); - spots[i].pos.y = GetRandomValue(64, screenHeight - 64); + spots[i].pos.x = GetRandomValue(64.0f, screenWidth - 64.0f); + spots[i].pos.y = GetRandomValue(64.0f, screenHeight - 64.0f); spots[i].vel = (Vector2){ 0, 0 }; while ((fabs(spots[i].vel.x) + fabs(spots[i].vel.y)) < 2) { - spots[i].vel.x = GetRandomValue(-40, 40)/10.0; - spots[i].vel.y = GetRandomValue(-40, 40)/10.0; + spots[i].vel.x = GetRandomValue(-400.f, 40.0f) / 10.0f; + spots[i].vel.y = GetRandomValue(-400.f, 40.0f) / 10.0f; } - spots[i].inner = 28 * (i + 1); - spots[i].radius = 48 * (i + 1); + spots[i].inner = 28.0f * (i + 1); + spots[i].radius = 48.0f * (i + 1); SetShaderValue(shdrSpot, spots[i].posLoc, &spots[i].pos.x, SHADER_UNIFORM_VEC2); SetShaderValue(shdrSpot, spots[i].innerLoc, &spots[i].inner, SHADER_UNIFORM_FLOAT); @@ -184,14 +184,14 @@ int main(void) for (int n = 0; n < MAX_STARS; n++) { // Single pixel is just too small these days! - DrawRectangle(stars[n].pos.x, stars[n].pos.y, 2, 2, WHITE); + DrawRectangle((int)stars[n].pos.x, (int)stars[n].pos.y, 2, 2, WHITE); } for (int i = 0; i < 16; i++) { DrawTexture(texRay, - (screenWidth/2.0) + cos((frameCounter + i*8)/51.45f)*(screenWidth/2.2) - 32, - (screenHeight/2.0) + sin((frameCounter + i*8)/17.87f)*(screenHeight/4.2), WHITE); + (screenWidth/2.0f) + cos((frameCounter + i*8)/51.45f)*(screenWidth/2.2f) - 32, + (screenHeight/2.0f) + sin((frameCounter + i*8)/17.87f)*(screenHeight/4.2f), WHITE); } // Draw spot lights diff --git a/examples/shapes/shapes_basic_shapes.c b/examples/shapes/shapes_basic_shapes.c index f7a8d02fd..cd165d2e6 100644 --- a/examples/shapes/shapes_basic_shapes.c +++ b/examples/shapes/shapes_basic_shapes.c @@ -45,9 +45,9 @@ int main(void) DrawRectangleLines(screenWidth/4*2 - 40, 320, 80, 60, ORANGE); // NOTE: Uses QUADS internally, not lines DrawRectangleGradientH(screenWidth/4*2 - 90, 170, 180, 130, MAROON, GOLD); - DrawTriangle((Vector2){screenWidth/4*3, 80}, - (Vector2){screenWidth/4*3 - 60, 150}, - (Vector2){screenWidth/4*3 + 60, 150}, VIOLET); + DrawTriangle((Vector2){screenWidth/4.0f *3.0f, 80.0f}, + (Vector2){screenWidth/4.0f *3.0f - 60.0f, 150.0f}, + (Vector2){screenWidth/4.0f *3.0f + 60.0f, 150.0f}, VIOLET); DrawPoly((Vector2){screenWidth/4*3, 320}, 6, 80, 0, BROWN); @@ -57,9 +57,9 @@ int main(void) // this way, all LINES are rendered in a single draw pass DrawLine(18, 42, screenWidth - 18, 42, BLACK); DrawCircleLines(screenWidth/4, 340, 80, DARKBLUE); - DrawTriangleLines((Vector2){screenWidth/4*3, 160}, - (Vector2){screenWidth/4*3 - 20, 230}, - (Vector2){screenWidth/4*3 + 20, 230}, DARKBLUE); + DrawTriangleLines((Vector2){screenWidth/4.0f*3.0f, 160.0f}, + (Vector2){screenWidth/4.0f*3.0f - 20.0f, 230.0f}, + (Vector2){screenWidth/4.0f*3.0f + 20.0f, 230.0f}, DARKBLUE); EndDrawing(); //---------------------------------------------------------------------------------- } diff --git a/examples/shapes/shapes_colors_palette.c b/examples/shapes/shapes_colors_palette.c index a0bba002a..0865d5814 100644 --- a/examples/shapes/shapes_colors_palette.c +++ b/examples/shapes/shapes_colors_palette.c @@ -37,10 +37,10 @@ int main(void) // Fills colorsRecs data (for every rectangle) for (int i = 0; i < MAX_COLORS_COUNT; i++) { - colorsRecs[i].x = 20 + 100*(i%7) + 10*(i%7); - colorsRecs[i].y = 80 + 100*(i/7) + 10*(i/7); - colorsRecs[i].width = 100; - colorsRecs[i].height = 100; + colorsRecs[i].x = 20.0f + 100.0f *(i%7) + 10.0f *(i%7); + colorsRecs[i].y = 80.0f + 100.0f *(i/7) + 10.0f *(i/7); + colorsRecs[i].width = 100.0f; + colorsRecs[i].height = 100.0f; } int colorState[MAX_COLORS_COUNT] = { 0 }; // Color state: 0-DEFAULT, 1-MOUSE_HOVER diff --git a/examples/shapes/shapes_following_eyes.c b/examples/shapes/shapes_following_eyes.c index a36a8d67b..9ded4feb5 100644 --- a/examples/shapes/shapes_following_eyes.c +++ b/examples/shapes/shapes_following_eyes.c @@ -22,12 +22,12 @@ int main(void) InitWindow(screenWidth, screenHeight, "raylib [shapes] example - following eyes"); - Vector2 scleraLeftPosition = { GetScreenWidth()/2 - 100, GetScreenHeight()/2 }; - Vector2 scleraRightPosition = { GetScreenWidth()/2 + 100, GetScreenHeight()/2 }; + Vector2 scleraLeftPosition = { GetScreenWidth()/2.0f - 100.0f, GetScreenHeight()/2.0f }; + Vector2 scleraRightPosition = { GetScreenWidth()/2.0f + 100.0f, GetScreenHeight()/2.0f }; float scleraRadius = 80; - Vector2 irisLeftPosition = { GetScreenWidth()/2 - 100, GetScreenHeight()/2 }; - Vector2 irisRightPosition = { GetScreenWidth()/2 + 100, GetScreenHeight()/2}; + Vector2 irisLeftPosition = { GetScreenWidth()/2.0f - 100.0f, GetScreenHeight()/2.0f }; + Vector2 irisRightPosition = { GetScreenWidth()/2.0f + 100.0f, GetScreenHeight()/2.0f }; float irisRadius = 24; float angle = 0.0f; diff --git a/examples/shapes/shapes_lines_bezier.c b/examples/shapes/shapes_lines_bezier.c index 3d4edcded..00b68c9f1 100644 --- a/examples/shapes/shapes_lines_bezier.c +++ b/examples/shapes/shapes_lines_bezier.c @@ -22,7 +22,7 @@ int main(void) InitWindow(screenWidth, screenHeight, "raylib [shapes] example - cubic-bezier lines"); Vector2 start = { 0, 0 }; - Vector2 end = { screenWidth, screenHeight }; + Vector2 end = { (float)screenWidth, (float)screenHeight }; SetTargetFPS(60); // Set our game to run at 60 frames-per-second //-------------------------------------------------------------------------------------- diff --git a/examples/text/text_font_filters.c b/examples/text/text_font_filters.c index 9ad5cff4e..71213ced9 100644 --- a/examples/text/text_font_filters.c +++ b/examples/text/text_font_filters.c @@ -35,8 +35,8 @@ int main(void) // NOTE: On 2D drawing it won't be noticeable, it looks like FILTER_BILINEAR GenTextureMipmaps(&font.texture); - float fontSize = font.baseSize; - Vector2 fontPosition = { 40, screenHeight/2 - 80 }; + float fontSize = (float)font.baseSize; + Vector2 fontPosition = { 40.0f, screenHeight/2.0f - 80.0f }; Vector2 textSize = { 0.0f, 0.0f }; // Setup texture scaling filter @@ -86,7 +86,7 @@ int main(void) if (IsFileExtension(droppedFiles[0], ".ttf")) { UnloadFont(font); - font = LoadFontEx(droppedFiles[0], fontSize, 0, 0); + font = LoadFontEx(droppedFiles[0], (int)fontSize, 0, 0); ClearDroppedFiles(); } } diff --git a/examples/text/text_font_spritefont.c b/examples/text/text_font_spritefont.c index 8ff63bb9d..424e2719e 100644 --- a/examples/text/text_font_spritefont.c +++ b/examples/text/text_font_spritefont.c @@ -38,14 +38,14 @@ int main(void) Font font2 = LoadFont("resources/custom_alagard.png"); // Font loading Font font3 = LoadFont("resources/custom_jupiter_crash.png"); // Font loading - Vector2 fontPosition1 = { screenWidth/2 - MeasureTextEx(font1, msg1, (float)font1.baseSize, -3).x/2, - screenHeight/2 - font1.baseSize/2 - 80 }; + Vector2 fontPosition1 = { screenWidth/2.0f - MeasureTextEx(font1, msg1, (float)font1.baseSize, -3).x/2, + screenHeight/2.0f - font1.baseSize/2.0f - 80.0f }; - Vector2 fontPosition2 = { screenWidth/2 - MeasureTextEx(font2, msg2, (float)font2.baseSize, -2).x/2, - screenHeight/2 - font2.baseSize/2 - 10 }; + Vector2 fontPosition2 = { screenWidth/2.0f - MeasureTextEx(font2, msg2, (float)font2.baseSize, -2.0f).x/2.0f, + screenHeight/2.0f - font2.baseSize/2.0f - 10.0f }; - Vector2 fontPosition3 = { screenWidth/2.0f - MeasureTextEx(font3, msg3, (float)font3.baseSize, 2).x/2, - screenHeight/2.0f - font3.baseSize/2 + 50 }; + Vector2 fontPosition3 = { screenWidth/2.0f - MeasureTextEx(font3, msg3, (float)font3.baseSize, 2.0f).x/2.0f, + screenHeight/2.0f - font3.baseSize/2.0f + 50.0f }; SetTargetFPS(60); // Set our game to run at 60 frames-per-second //-------------------------------------------------------------------------------------- diff --git a/examples/text/text_raylib_fonts.c b/examples/text/text_raylib_fonts.c index 782a5f876..7bcfb7f69 100644 --- a/examples/text/text_raylib_fonts.c +++ b/examples/text/text_raylib_fonts.c @@ -52,8 +52,8 @@ int main(void) for (int i = 0; i < MAX_FONTS; i++) { - positions[i].x = screenWidth/2.0f - MeasureTextEx(fonts[i], messages[i], fonts[i].baseSize*2.0f, spacings[i]).x/2.0f; - positions[i].y = 60 + fonts[i].baseSize + 45*i; + positions[i].x = screenWidth/2.0f - MeasureTextEx(fonts[i], messages[i], fonts[i].baseSize*2.0f, (float)spacings[i]).x/2.0f; + positions[i].y = 60.0f + fonts[i].baseSize + 45.0f*i; } // Small Y position corrections diff --git a/examples/text/text_rectangle_bounds.c b/examples/text/text_rectangle_bounds.c index 4d3edaccc..cb2469554 100644 --- a/examples/text/text_rectangle_bounds.c +++ b/examples/text/text_rectangle_bounds.c @@ -29,14 +29,14 @@ tempor incididunt ut labore et dolore magna aliqua. Nec ullamcorper sit amet ris bool resizing = false; bool wordWrap = true; - Rectangle container = { 25, 25, screenWidth - 50, screenHeight - 250}; + Rectangle container = { 25.0f, 25.0f, screenWidth - 50.0f, screenHeight - 250.0f }; Rectangle resizer = { container.x + container.width - 17, container.y + container.height - 17, 14, 14 }; // Minimum width and heigh for the container rectangle const float minWidth = 60; const float minHeight = 60; - const float maxWidth = screenWidth - 50; - const float maxHeight = screenHeight - 160; + const float maxWidth = screenWidth - 50.0f; + const float maxHeight = screenHeight - 160.0f; Vector2 lastMouse = { 0.0f, 0.0f }; // Stores last mouse coordinates Color borderColor = MAROON; // Container border color @@ -99,7 +99,7 @@ tempor incididunt ut labore et dolore magna aliqua. Nec ullamcorper sit amet ris // Draw bottom info DrawRectangle(0, screenHeight - 54, screenWidth, 54, GRAY); - DrawRectangleRec((Rectangle){ 382, screenHeight - 34, 12, 12 }, MAROON); + DrawRectangleRec((Rectangle){ 382.0f, screenHeight - 34.0f, 12.0f, 12.0f }, MAROON); DrawText("Word Wrap: ", 313, screenHeight-115, 20, BLACK); if (wordWrap) DrawText("ON", 447, screenHeight - 115, 20, RED); diff --git a/examples/textures/textures_mouse_painting.c b/examples/textures/textures_mouse_painting.c index 30fd390f0..5cfbe6e06 100644 --- a/examples/textures/textures_mouse_painting.c +++ b/examples/textures/textures_mouse_painting.c @@ -177,7 +177,7 @@ int main(void) // Draw drawing circle for reference if (mousePos.y > 50) { - if (IsMouseButtonDown(MOUSE_RIGHT_BUTTON)) DrawCircleLines(mousePos.x, mousePos.y, brushSize, GRAY); + if (IsMouseButtonDown(MOUSE_RIGHT_BUTTON)) DrawCircleLines((int)mousePos.x, (int)mousePos.y, brushSize, GRAY); else DrawCircle(GetMouseX(), GetMouseY(), brushSize, colors[colorSelected]); } diff --git a/examples/textures/textures_sprite_explosion.c b/examples/textures/textures_sprite_explosion.c index 900ec9664..2394f6a88 100644 --- a/examples/textures/textures_sprite_explosion.c +++ b/examples/textures/textures_sprite_explosion.c @@ -32,8 +32,8 @@ int main(void) Texture2D explosion = LoadTexture("resources/explosion.png"); // Init variables for animation - int frameWidth = explosion.width/NUM_FRAMES_PER_LINE; // Sprite one frame rectangle width - int frameHeight = explosion.height/NUM_LINES; // Sprite one frame rectangle height + float frameWidth = explosion.width/NUM_FRAMES_PER_LINE; // Sprite one frame rectangle width + float frameHeight = explosion.height/NUM_LINES; // Sprite one frame rectangle height int currentFrame = 0; int currentLine = 0; @@ -89,8 +89,8 @@ int main(void) } } - frameRec.x = (float)frameWidth*currentFrame; - frameRec.y = (float)frameHeight*currentLine; + frameRec.x = frameWidth*currentFrame; + frameRec.y = frameHeight*currentLine; //---------------------------------------------------------------------------------- // Draw From 30db611e924ad2ad61137a944a0da4257045cd5f Mon Sep 17 00:00:00 2001 From: Jeffery Myers Date: Sun, 25 Apr 2021 14:56:32 -0700 Subject: [PATCH 073/121] Disable projects that won't build by default from 2019 solution build configuration. (#1734) --- projects/VS2019/raylib.sln | 4 ---- 1 file changed, 4 deletions(-) diff --git a/projects/VS2019/raylib.sln b/projects/VS2019/raylib.sln index 4e90233d6..27ef792ba 100644 --- a/projects/VS2019/raylib.sln +++ b/projects/VS2019/raylib.sln @@ -654,7 +654,6 @@ Global {A643BB06-735D-47F3-BFE7-B6D3C36F7097}.Release|x86.ActiveCfg = Release|Win32 {A643BB06-735D-47F3-BFE7-B6D3C36F7097}.Release|x86.Build.0 = Release|Win32 {F026020F-7B00-40C8-91C3-5DE85EC45A95}.Debug.DLL|x64.ActiveCfg = Debug.DLL|x64 - {F026020F-7B00-40C8-91C3-5DE85EC45A95}.Debug.DLL|x64.Build.0 = Debug.DLL|x64 {F026020F-7B00-40C8-91C3-5DE85EC45A95}.Debug.DLL|x86.ActiveCfg = Debug.DLL|Win32 {F026020F-7B00-40C8-91C3-5DE85EC45A95}.Debug.DLL|x86.Build.0 = Debug.DLL|Win32 {F026020F-7B00-40C8-91C3-5DE85EC45A95}.Debug|x64.ActiveCfg = Debug|x64 @@ -662,7 +661,6 @@ Global {F026020F-7B00-40C8-91C3-5DE85EC45A95}.Debug|x86.ActiveCfg = Debug|Win32 {F026020F-7B00-40C8-91C3-5DE85EC45A95}.Debug|x86.Build.0 = Debug|Win32 {F026020F-7B00-40C8-91C3-5DE85EC45A95}.Release.DLL|x64.ActiveCfg = Release.DLL|x64 - {F026020F-7B00-40C8-91C3-5DE85EC45A95}.Release.DLL|x64.Build.0 = Release.DLL|x64 {F026020F-7B00-40C8-91C3-5DE85EC45A95}.Release.DLL|x86.ActiveCfg = Release.DLL|Win32 {F026020F-7B00-40C8-91C3-5DE85EC45A95}.Release.DLL|x86.Build.0 = Release.DLL|Win32 {F026020F-7B00-40C8-91C3-5DE85EC45A95}.Release|x64.ActiveCfg = Release|x64 @@ -2254,7 +2252,6 @@ Global {6237BEDE-BAAA-4A06-9C5E-8089BAA14C8B}.Release|x86.ActiveCfg = Release|Win32 {6237BEDE-BAAA-4A06-9C5E-8089BAA14C8B}.Release|x86.Build.0 = Release|Win32 {C8765523-58F8-4C8E-9914-693396F6F0FF}.Debug.DLL|x64.ActiveCfg = Debug.DLL|x64 - {C8765523-58F8-4C8E-9914-693396F6F0FF}.Debug.DLL|x64.Build.0 = Debug.DLL|x64 {C8765523-58F8-4C8E-9914-693396F6F0FF}.Debug.DLL|x86.ActiveCfg = Debug.DLL|Win32 {C8765523-58F8-4C8E-9914-693396F6F0FF}.Debug.DLL|x86.Build.0 = Debug.DLL|Win32 {C8765523-58F8-4C8E-9914-693396F6F0FF}.Debug|x64.ActiveCfg = Debug|x64 @@ -2262,7 +2259,6 @@ Global {C8765523-58F8-4C8E-9914-693396F6F0FF}.Debug|x86.ActiveCfg = Debug|Win32 {C8765523-58F8-4C8E-9914-693396F6F0FF}.Debug|x86.Build.0 = Debug|Win32 {C8765523-58F8-4C8E-9914-693396F6F0FF}.Release.DLL|x64.ActiveCfg = Release.DLL|x64 - {C8765523-58F8-4C8E-9914-693396F6F0FF}.Release.DLL|x64.Build.0 = Release.DLL|x64 {C8765523-58F8-4C8E-9914-693396F6F0FF}.Release.DLL|x86.ActiveCfg = Release.DLL|Win32 {C8765523-58F8-4C8E-9914-693396F6F0FF}.Release.DLL|x86.Build.0 = Release.DLL|Win32 {C8765523-58F8-4C8E-9914-693396F6F0FF}.Release|x64.ActiveCfg = Release|x64 From a44815e9395e63644e4adeac928155f1e465aed7 Mon Sep 17 00:00:00 2001 From: Ray Date: Mon, 26 Apr 2021 00:36:13 +0200 Subject: [PATCH 074/121] REMOVED: GenMeshDefault() --- src/models.c | 19 ------------------- src/raylib.h | 1 - 2 files changed, 20 deletions(-) diff --git a/src/models.c b/src/models.c index b970a4838..feaadf838 100644 --- a/src/models.c +++ b/src/models.c @@ -1522,25 +1522,6 @@ bool IsModelAnimationValid(Model model, ModelAnimation anim) } #if defined(SUPPORT_MESH_GENERATION) -Mesh GenMeshDefault(int vertexCount) -{ - Mesh mesh = { 0 }; - - mesh.vertexCount = vertexCount; - mesh.triangleCount = vertexCount/3; - - mesh.vertices = (float *)RL_CALLOC(mesh.vertexCount*3, sizeof(float)); - mesh.texcoords = (float *)RL_CALLOC(mesh.vertexCount*2, sizeof(float)); - mesh.normals = (float *)RL_CALLOC(mesh.vertexCount*3, sizeof(float)); - mesh.colors = (unsigned char *)RL_CALLOC(mesh.vertexCount*4, sizeof(unsigned char)); - - // Upload vertex data to GPU (dynamic mesh) - // NOTE: mesh.vboId array is allocated inside UploadMesh() - UploadMesh(&mesh, true); - - return mesh; -} - // Generate polygonal mesh Mesh GenMeshPoly(int sides, float radius) { diff --git a/src/raylib.h b/src/raylib.h index 4e45c1ff3..a9fbe6b45 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -1408,7 +1408,6 @@ RLAPI void UnloadModelAnimations(ModelAnimation* animations, unsigned int count) RLAPI bool IsModelAnimationValid(Model model, ModelAnimation anim); // Check model animation skeleton match // Mesh generation functions -RLAPI Mesh GenMeshDefault(int vertexCount); // Generate an empty mesh with vertex: position, texcoords, normals, colors RLAPI Mesh GenMeshPoly(int sides, float radius); // Generate polygonal mesh RLAPI Mesh GenMeshPlane(float width, float length, int resX, int resZ); // Generate plane mesh (with subdivisions) RLAPI Mesh GenMeshCube(float width, float height, float length); // Generate cuboid mesh From b663724293778260a74ec56f2d6f3c4f176627a5 Mon Sep 17 00:00:00 2001 From: Jeffery Myers Date: Mon, 26 Apr 2021 08:30:07 -0700 Subject: [PATCH 075/121] Generate a mesh in client code. (#1735) --- examples/models/models_mesh_generation.c | 60 ++++++++++++++++++++++-- 1 file changed, 56 insertions(+), 4 deletions(-) diff --git a/examples/models/models_mesh_generation.c b/examples/models/models_mesh_generation.c index f27575ac3..ab11b84bc 100644 --- a/examples/models/models_mesh_generation.c +++ b/examples/models/models_mesh_generation.c @@ -11,7 +11,58 @@ #include "raylib.h" -#define NUM_MODELS 8 // Parametric 3d shapes to generate +#define NUM_MODELS 9 // Parametric 3d shapes to generate + +void AllocateMeshData(Mesh* mesh, int triangleCount) +{ + mesh->vertexCount = triangleCount * 3; + mesh->triangleCount = triangleCount; + + mesh->vertices = (float*)MemAlloc(mesh->vertexCount * 3 * sizeof(float)); + mesh->texcoords = (float*)MemAlloc(mesh->vertexCount * 2 * sizeof(float)); + mesh->normals = (float*)MemAlloc(mesh->vertexCount * 3 * sizeof(float)); +} + +// generate a simple triangle mesh from code +Mesh MakeMesh() +{ + Mesh mesh = { 0 }; + AllocateMeshData(&mesh, 1); + + // vertex at the origin + mesh.vertices[0] = 0; + mesh.vertices[1] = 0; + mesh.vertices[2] = 0; + mesh.normals[0] = 0; + mesh.normals[1] = 1; + mesh.normals[2] = 0; + mesh.texcoords[0] = 0; + mesh.texcoords[1] = 0; + + // vertex at 1,0,2 + mesh.vertices[3] = 1; + mesh.vertices[4] = 0; + mesh.vertices[5] = 2; + mesh.normals[3] = 0; + mesh.normals[4] = 1; + mesh.normals[5] = 0; + mesh.texcoords[2] = 0.5f; + mesh.texcoords[3] = 1.0f; + + // vertex at 2,0,0 + mesh.vertices[6] = 2; + mesh.vertices[7] = 0; + mesh.vertices[8] = 0; + mesh.normals[6] = 0; + mesh.normals[7] = 1; + mesh.normals[8] = 0; + mesh.texcoords[4] = 1; + mesh.texcoords[5] =0; + + UploadMesh(&mesh, false); + + return mesh; +} int main(void) { @@ -37,6 +88,7 @@ int main(void) models[5] = LoadModelFromMesh(GenMeshTorus(0.25f, 4.0f, 16, 32)); models[6] = LoadModelFromMesh(GenMeshKnot(1.0f, 2.0f, 16, 128)); models[7] = LoadModelFromMesh(GenMeshPoly(5, 2.0f)); + models[8] = LoadModelFromMesh(MakeMesh()); // Set checked texture as default diffuse component for all models material for (int i = 0; i < NUM_MODELS; i++) models[i].materials[0].maps[MATERIAL_MAP_DIFFUSE].texture = texture; @@ -86,9 +138,8 @@ int main(void) BeginMode3D(camera); - DrawModel(models[currentModel], position, 1.0f, WHITE); - - DrawGrid(10, 1.0); + DrawModel(models[currentModel], position, 1.0f, WHITE); + DrawGrid(10, 1.0); EndMode3D(); @@ -106,6 +157,7 @@ int main(void) case 5: DrawText("TORUS", 680, 10, 20, DARKBLUE); break; case 6: DrawText("KNOT", 680, 10, 20, DARKBLUE); break; case 7: DrawText("POLY", 680, 10, 20, DARKBLUE); break; + case 8: DrawText("Parametric(custom)", 580, 10, 20, DARKBLUE); break; default: break; } From b6c8d343dca2ef19c23c50975328a028124cf3cb Mon Sep 17 00:00:00 2001 From: Ray Date: Mon, 26 Apr 2021 18:00:33 +0200 Subject: [PATCH 076/121] Update CHANGELOG --- CHANGELOG | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index d80f2dc37..c37aa3162 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,10 +1,10 @@ changelog --------- -Current Release: raylib 3.7.0 (23 April 2021) +Current Release: raylib 3.7.0 (26 April 2021) ------------------------------------------------------------------------- -Release: raylib 3.7 (23 April 2021) +Release: raylib 3.7 (26 April 2021) ------------------------------------------------------------------------- KEY CHANGES: - [rlgl] REDESIGNED: Greater abstraction level, some functionality moved to core module @@ -66,7 +66,6 @@ Detailed changes: [models] ADDED: DrawMesh() [models] ADDED: DrawMeshInstanced() [models] ADDED: UnloadModelAnimations() (#1648) by @object71 -[models] ADDED: GenMeshDefault() (#1556) [models] REMOVED: DrawGizmo() [models] REMOVED: LoadMeshes() [models] REMOVED: MeshNormalsSmooth() From 5751776a731cb9bb5914986e381ba6bbf6f6522a Mon Sep 17 00:00:00 2001 From: Gunko Vadim Date: Tue, 27 Apr 2021 00:59:34 +0500 Subject: [PATCH 077/121] Update BINDINGS.md (#1738) --- BINDINGS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BINDINGS.md b/BINDINGS.md index 7aa6e82a9..b76f11abb 100644 --- a/BINDINGS.md +++ b/BINDINGS.md @@ -40,7 +40,7 @@ Here it is a list with the ones I'm aware of: | raylib.cr | 2.0 | [Crystal](https://crystal-lang.org/) | https://github.com/sam0x17/raylib.cr | | raylib-pascal | 2.0 | [Pascal](https://en.wikipedia.org/wiki/Pascal_(programming_language)) | https://github.com/drezgames/raylib-pascal | | raylib-pas | 3.0 | [Pascal](https://en.wikipedia.org/wiki/Pascal_(programming_language)) | https://github.com/tazdij/raylib-pas | -| Ray4Laz | 3.5 | [Pascal](https://en.wikipedia.org/wiki/Pascal_(programming_language)) | https://github.com/GuvaCode/Ray4Laz | +| Ray4Laz | 3.7 | [Pascal](https://en.wikipedia.org/wiki/Pascal_(programming_language)) | https://github.com/GuvaCode/Ray4Laz | | Graphics-Raylib | 1.4 | [Perl](https://www.perl.org/) | https://github.com/athreef/Graphics-Raylib | | raylib-ruby-ffi | 2.0 | [Ruby](https://www.ruby-lang.org/en/) | https://github.com/D3nX/raylib-ruby-ffi | | raylib-ruby | 2.6 | [Ruby](https://www.ruby-lang.org/en/) | https://github.com/a0/raylib-ruby | From fcf3a048256296587c3184bdd14410f3de8f75d4 Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Tue, 27 Apr 2021 04:31:15 -0400 Subject: [PATCH 078/121] BINDINGS: raylib-cpp targets raylib 3.7.0 (#1739) https://github.com/RobLoach/raylib-cpp/releases/tag/v3.7.0 --- BINDINGS.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BINDINGS.md b/BINDINGS.md index b76f11abb..5c5fb35ca 100644 --- a/BINDINGS.md +++ b/BINDINGS.md @@ -6,8 +6,8 @@ Here it is a list with the ones I'm aware of: | name | raylib version | language | repo | |:------------------:|:-------------: | :--------:|----------------------------------------------------------------------| -| raylib | **3.5** | [C](https://en.wikipedia.org/wiki/C_(programming_language)) | https://github.com/raysan5/raylib | -| raylib-cpp | 3.5 | [C++](https://en.wikipedia.org/wiki/C%2B%2B) | https://github.com/robloach/raylib-cpp | +| raylib | **3.7** | [C](https://en.wikipedia.org/wiki/C_(programming_language)) | https://github.com/raysan5/raylib | +| raylib-cpp | 3.7 | [C++](https://en.wikipedia.org/wiki/C%2B%2B) | https://github.com/robloach/raylib-cpp | | Raylib-cs | 3.5 | [C#](https://en.wikipedia.org/wiki/C_Sharp_(programming_language)) | https://github.com/ChrisDill/Raylib-cs | | raylib-cppsharp | 2.5 | [C#](https://en.wikipedia.org/wiki/C_Sharp_(programming_language)) | https://github.com/phxvyper/raylib-cppsharp | | raylib-boo | 3.5 | [Boo](http://boo-language.github.io/) | https://github.com/Rabios/raylib-boo | From 1aa8a4ff906d4dd181cb4c19fb7a79c8af264a0c Mon Sep 17 00:00:00 2001 From: Ray Date: Tue, 27 Apr 2021 11:04:48 +0200 Subject: [PATCH 079/121] REVIEWED: rlLoadExtensions() On PLATFORM_ANDROID, PLATFORM_RPI, PLATFORM_DRM and PLATFORM_UWP glfwGetProcAddress() is not defines, actually those platforms use egl platform windowing system. --- src/core.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/core.c b/src/core.c index f4bd6acc4..07280cbe6 100644 --- a/src/core.c +++ b/src/core.c @@ -4352,9 +4352,12 @@ static bool InitGraphicsDevice(int width, int height) #endif // PLATFORM_ANDROID || PLATFORM_RPI || PLATFORM_DRM || PLATFORM_UWP // Load OpenGL extensions - // NOTE: GLFW loader function is required by GLAD but only used for OpenGL 2.1 and 3.3, - // OpenGL ES 2.0 extensions (and entry points) are loaded manually using eglGetProcAddress() + // NOTE: GL procedures address loader is required to load extensions +#if defined(PLATFORM_DESKTOP) || defined(PLATFORM_WEB) rlLoadExtensions(glfwGetProcAddress); +#else + rlLoadExtensions(NULL); // Uses eglGetProcAddress() internally +#endif // Initialize OpenGL context (states and resources) // NOTE: CORE.Window.screen.width and CORE.Window.screen.height not used, just stored as globals in rlgl From 6ebe76cba73d270b2cbad5341e2fe7ef16fca40e Mon Sep 17 00:00:00 2001 From: Ray Date: Tue, 27 Apr 2021 11:05:05 +0200 Subject: [PATCH 080/121] Minor tweaks --- src/core.c | 12 ++++++------ src/rlgl.h | 24 ++++++++++++------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/core.c b/src/core.c index 07280cbe6..553662f82 100644 --- a/src/core.c +++ b/src/core.c @@ -225,8 +225,8 @@ #include // Defines AWINDOW_FLAG_FULLSCREEN and others #include // Defines basic app state struct and manages activity - #include // EGL library - Native platform display device control functions - #include // OpenGL ES 2.0 library + #include // Native platform windowing system interface + //#include // OpenGL ES 2.0 library (not required in this module) #endif #if defined(PLATFORM_RPI) || defined(PLATFORM_DRM) @@ -251,14 +251,14 @@ #include // Direct Rendering Manager modesetting interface #endif - #include "EGL/egl.h" // EGL library - Native platform display device control functions - #include "EGL/eglext.h" // EGL library - Extensions + #include "EGL/egl.h" // Native platform windowing system interface + #include "EGL/eglext.h" // EGL extensions #include "GLES2/gl2.h" // OpenGL ES 2.0 library #endif #if defined(PLATFORM_UWP) - #include "EGL/egl.h" // EGL library - Native platform display device control functions - #include "EGL/eglext.h" // EGL library - Extensions + #include "EGL/egl.h" // Native platform windowing system interface + #include "EGL/eglext.h" // EGL extensions #include "GLES2/gl2.h" // OpenGL ES 2.0 library #include "uwp_events.h" // UWP bootstrapping functions #endif diff --git a/src/rlgl.h b/src/rlgl.h index e67d743df..d7775260d 100644 --- a/src/rlgl.h +++ b/src/rlgl.h @@ -182,10 +182,10 @@ #endif // Texture parameters (equivalent to OpenGL defines) -#define RL_TEXTURE_WRAP_S 0x2802 // GL_TEXTURE_WRAP_S -#define RL_TEXTURE_WRAP_T 0x2803 // GL_TEXTURE_WRAP_T -#define RL_TEXTURE_MAG_FILTER 0x2800 // GL_TEXTURE_MAG_FILTER -#define RL_TEXTURE_MIN_FILTER 0x2801 // GL_TEXTURE_MIN_FILTER +#define RL_TEXTURE_WRAP_S 0x2802 // GL_TEXTURE_WRAP_S +#define RL_TEXTURE_WRAP_T 0x2803 // GL_TEXTURE_WRAP_T +#define RL_TEXTURE_MAG_FILTER 0x2800 // GL_TEXTURE_MAG_FILTER +#define RL_TEXTURE_MIN_FILTER 0x2801 // GL_TEXTURE_MIN_FILTER #define RL_TEXTURE_FILTER_NEAREST 0x2600 // GL_NEAREST #define RL_TEXTURE_FILTER_LINEAR 0x2601 // GL_LINEAR @@ -201,18 +201,18 @@ #define RL_TEXTURE_WRAP_MIRROR_CLAMP 0x8742 // GL_MIRROR_CLAMP_EXT // Matrix modes (equivalent to OpenGL) -#define RL_MODELVIEW 0x1700 // GL_MODELVIEW -#define RL_PROJECTION 0x1701 // GL_PROJECTION -#define RL_TEXTURE 0x1702 // GL_TEXTURE +#define RL_MODELVIEW 0x1700 // GL_MODELVIEW +#define RL_PROJECTION 0x1701 // GL_PROJECTION +#define RL_TEXTURE 0x1702 // GL_TEXTURE // Primitive assembly draw modes -#define RL_LINES 0x0001 // GL_LINES -#define RL_TRIANGLES 0x0004 // GL_TRIANGLES -#define RL_QUADS 0x0007 // GL_QUADS +#define RL_LINES 0x0001 // GL_LINES +#define RL_TRIANGLES 0x0004 // GL_TRIANGLES +#define RL_QUADS 0x0007 // GL_QUADS // GL equivalent data types -#define RL_UNSIGNED_BYTE 0x1401 // GL_UNSIGNED_BYTE -#define RL_FLOAT 0x1406 // GL_FLOAT +#define RL_UNSIGNED_BYTE 0x1401 // GL_UNSIGNED_BYTE +#define RL_FLOAT 0x1406 // GL_FLOAT //---------------------------------------------------------------------------------- // Types and Structures Definition From 89d5b3df4410c776e3694a6618e3f7a74bd506a8 Mon Sep 17 00:00:00 2001 From: Ray Date: Tue, 27 Apr 2021 11:27:31 +0200 Subject: [PATCH 081/121] ADDED: raylib-swift binding --- BINDINGS.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/BINDINGS.md b/BINDINGS.md index 5c5fb35ca..55e3d6114 100644 --- a/BINDINGS.md +++ b/BINDINGS.md @@ -89,10 +89,11 @@ Here it is a list with the ones I'm aware of: | raylib-smallBasic | 3.1-dev | [SmallBASIC](https://github.com/smallbasic/SmallBASIC) | https://github.com/smallbasic/smallbasic.plugins/tree/master/raylib | | raylib-ats2 | 3.0 | [ATS2](http://www.ats-lang.org/) | https://github.com/mephistopheles-8/raylib-ats2 | | raylib-beef | 3.0 | [Beef](https://www.beeflang.org/) | https://github.com/M0n7y5/raylib-beef | +| raylib-swift | 3.5 | [Swift](https://swift.org/) | https://github.com/x2/raylib-swift | | raylib-never | 3.0 | [Never](https://github.com/never-lang/never) | https://github.com/never-lang/raylib-never | -| raylib.cbl | 2.0 | [COBOL](https://en.wikipedia.org/wiki/COBOL) | *[code examples](https://github.com/Martinfx/Cobol/tree/master/OpenCobol/Games/raylib)* | +| hb-raylib | 3.5 | [Harbour](https://harbour.github.io) | https://github.com/MarcosLeonardoMendezGerencir/hb-raylib | | Relib | 3.5 | [ReCT](https://github.com/RedCubeDev-ByteSpace/ReCT) | https://github.com/RedCubeDev-ByteSpace/Relib | -| Harbour | 3.5 | [Harbour](https://harbour.github.io) | https://github.com/MarcosLeonardoMendezGerencir/hb-raylib | +| raylib.cbl | 2.0 | [COBOL](https://en.wikipedia.org/wiki/COBOL) | *[code examples](https://github.com/Martinfx/Cobol/tree/master/OpenCobol/Games/raylib)* | Missing some language? Feel free to create a new binding! :) From 399894ac908d789fb82092a84190139d8449b3a9 Mon Sep 17 00:00:00 2001 From: Rabia Alhaffar Date: Tue, 27 Apr 2021 21:17:47 +0300 Subject: [PATCH 082/121] Fixed definition of UNCOMPRESSED_R8G8B8A8 (#1740) --- src/raylib.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/raylib.h b/src/raylib.h index a9fbe6b45..41952018d 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -165,7 +165,7 @@ #define FILTER_POINT TEXTURE_FILTER_POINT #define FILTER_BILINEAR TEXTURE_FILTER_BILINEAR #define MAP_DIFFUSE MATERIAL_MAP_DIFFUSE -#define PIXELFORMAT_UNCOMPRESSED_R8G8B8A8 PIXELFORMAT_PIXELFORMAT_UNCOMPRESSED_R8G8B8A8 +#define UNCOMPRESSED_R8G8B8A8 PIXELFORMAT_UNCOMPRESSED_R8G8B8A8 //---------------------------------------------------------------------------------- // Structures Definition From 9b6a005819c6c62ac5d752aee861a5e37bd9d3fe Mon Sep 17 00:00:00 2001 From: Rabia Alhaffar Date: Tue, 27 Apr 2021 22:08:31 +0300 Subject: [PATCH 083/121] Updated raylua and raylib-boo to raylib 3.7! (#1741) --- BINDINGS.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BINDINGS.md b/BINDINGS.md index 55e3d6114..722997efd 100644 --- a/BINDINGS.md +++ b/BINDINGS.md @@ -10,7 +10,7 @@ Here it is a list with the ones I'm aware of: | raylib-cpp | 3.7 | [C++](https://en.wikipedia.org/wiki/C%2B%2B) | https://github.com/robloach/raylib-cpp | | Raylib-cs | 3.5 | [C#](https://en.wikipedia.org/wiki/C_Sharp_(programming_language)) | https://github.com/ChrisDill/Raylib-cs | | raylib-cppsharp | 2.5 | [C#](https://en.wikipedia.org/wiki/C_Sharp_(programming_language)) | https://github.com/phxvyper/raylib-cppsharp | -| raylib-boo | 3.5 | [Boo](http://boo-language.github.io/) | https://github.com/Rabios/raylib-boo | +| raylib-boo | 3.7 | [Boo](http://boo-language.github.io/) | https://github.com/Rabios/raylib-boo | | RaylibFS | 2.5 | [F#](https://fsharp.org/) | https://github.com/dallinbeutler/RaylibFS | | raylib_d | 2.5 | [D](https://dlang.org/) | https://github.com/Sepheus/raylib_d | | raylib-d | 3.0 | [D](https://dlang.org/) | https://github.com/onroundit/raylib-d | @@ -26,7 +26,7 @@ Here it is a list with the ones I'm aware of: | raylib-lua-sol | 2.5 | [Lua](http://www.lua.org/) | https://github.com/RobLoach/raylib-lua-sol | | raylib-lua | 3.5 | [Lua](http://www.lua.org/) | https://github.com/TSnake41/raylib-lua | | raylib-luamore | 3.0 | [Lua](http://www.lua.org/) | https://github.com/HDPLocust/raylib-luamore | -| raylua | 3.5 | [Lua](http://www.lua.org/) | https://github.com/Rabios/raylua | +| raylua | 3.7 | [Lua](http://www.lua.org/) | https://github.com/Rabios/raylua | | LuaJIT-Raylib | 2.6 | [Lua](http://www.lua.org/) | https://github.com/Bambofy/LuaJIT-Raylib | | raylib-nelua | 3.0 | [Nelua](https://nelua.io/) | https://github.com/Andre-LA/raylib-nelua | | raylib-Nim | 1.7 | [Nim](https://nim-lang.org/) | https://gitlab.com/define-private-public/raylib-Nim | From 131672f1996906ca493b0928272b85d1ae2b96a0 Mon Sep 17 00:00:00 2001 From: Ray Date: Tue, 27 Apr 2021 22:58:49 +0200 Subject: [PATCH 084/121] Updated linkage libraries #1732 --- .../examples/audio_module_playing.vcxproj | 16 ++++++------- .../examples/audio_multichannel_sound.vcxproj | 16 ++++++------- .../examples/audio_music_stream.vcxproj | 16 ++++++------- .../VS2019/examples/audio_raw_stream.vcxproj | 16 ++++++------- .../examples/audio_sound_loading.vcxproj | 16 ++++++------- .../core_2d_camera_platformer.vcxproj | 16 ++++++------- .../core_3d_camera_first_person.vcxproj | 16 ++++++------- .../examples/core_3d_camera_free.vcxproj | 16 ++++++------- .../examples/core_3d_camera_mode.vcxproj | 16 ++++++------- .../VS2019/examples/core_3d_picking.vcxproj | 16 ++++++------- .../VS2019/examples/core_basic_window.vcxproj | 16 ++++++------- .../examples/core_custom_logging.vcxproj | 16 ++++++------- .../VS2019/examples/core_drop_files.vcxproj | 16 ++++++------- .../examples/core_input_gamepad.vcxproj | 16 ++++++------- .../examples/core_input_gestures.vcxproj | 16 ++++++------- .../VS2019/examples/core_input_keys.vcxproj | 16 ++++++------- .../VS2019/examples/core_input_mouse.vcxproj | 16 ++++++------- .../examples/core_input_multitouch.vcxproj | 16 ++++++------- .../examples/core_loading_thread.vcxproj | 16 ++++++------- .../examples/core_quat_conversion.vcxproj | 16 ++++++------- .../examples/core_random_values.vcxproj | 16 ++++++------- .../VS2019/examples/core_scissor_test.vcxproj | 16 ++++++------- .../examples/core_storage_values.vcxproj | 16 ++++++------- .../VS2019/examples/core_vr_simulator.vcxproj | 16 ++++++------- .../VS2019/examples/core_window_flags.vcxproj | 16 ++++++------- .../examples/core_window_letterbox.vcxproj | 16 ++++++------- .../VS2019/examples/core_world_screen.vcxproj | 16 ++++++------- .../VS2019/examples/easings_testbed.vcxproj | 16 ++++++------- .../examples/embedded_files_loading.vcxproj | 16 ++++++------- .../VS2019/examples/models_animation.vcxproj | 16 ++++++------- .../VS2019/examples/models_billboard.vcxproj | 16 ++++++------- .../examples/models_box_collisions.vcxproj | 16 ++++++------- .../VS2019/examples/models_cubicmap.vcxproj | 16 ++++++------- .../examples/models_first_person_maze.vcxproj | 16 ++++++------- .../examples/models_geometric_shapes.vcxproj | 16 ++++++------- .../examples/models_gltf_animation.vcxproj | 16 ++++++------- .../VS2019/examples/models_gltf_model.vcxproj | 16 ++++++------- .../VS2019/examples/models_heightmap.vcxproj | 16 ++++++------- .../VS2019/examples/models_loading.vcxproj | 16 ++++++------- .../examples/models_material_pbr.vcxproj | 16 ++++++------- .../examples/models_mesh_generation.vcxproj | 16 ++++++------- .../examples/models_mesh_picking.vcxproj | 16 ++++++------- .../models_orthographic_projection.vcxproj | 16 ++++++------- .../examples/models_rlgl_solar_system.vcxproj | 16 ++++++------- .../VS2019/examples/models_skybox.vcxproj | 16 ++++++------- .../examples/models_waving_cubes.vcxproj | 16 ++++++------- .../examples/models_yaw_pitch_roll.vcxproj | 16 ++++++------- projects/VS2019/examples/physics_demo.vcxproj | 16 ++++++------- .../VS2019/examples/physics_friction.vcxproj | 16 ++++++------- .../VS2019/examples/physics_movement.vcxproj | 16 ++++++------- .../examples/physics_restitution.vcxproj | 16 ++++++------- .../VS2019/examples/physics_shatter.vcxproj | 16 ++++++------- .../VS2019/examples/raudio_standalone.vcxproj | 16 ++++++------- .../examples/shaders_basic_lighting.vcxproj | 16 ++++++------- .../examples/shaders_custom_uniform.vcxproj | 16 ++++++------- .../examples/shaders_eratosthenes.vcxproj | 16 ++++++------- projects/VS2019/examples/shaders_fog.vcxproj | 16 ++++++------- .../examples/shaders_hot_reloading.vcxproj | 16 ++++++------- .../VS2019/examples/shaders_julia_set.vcxproj | 16 ++++++------- .../examples/shaders_mesh_instancing.vcxproj | 24 +++++++++---------- .../examples/shaders_model_shader.vcxproj | 16 ++++++------- .../examples/shaders_multi_sample2d.vcxproj | 16 ++++++------- .../examples/shaders_palette_switch.vcxproj | 16 ++++++------- .../examples/shaders_postprocessing.vcxproj | 16 ++++++------- .../examples/shaders_raymarching.vcxproj | 16 ++++++------- .../examples/shaders_shapes_textures.vcxproj | 16 ++++++------- .../examples/shaders_simple_mask.vcxproj | 16 ++++++------- .../VS2019/examples/shaders_spotlight.vcxproj | 16 ++++++------- .../examples/shaders_texture_drawing.vcxproj | 16 ++++++------- .../examples/shaders_texture_waves.vcxproj | 16 ++++++------- .../examples/shapes_basic_shapes.vcxproj | 16 ++++++------- .../examples/shapes_bouncing_ball.vcxproj | 16 ++++++------- .../examples/shapes_collision_area.vcxproj | 16 ++++++------- .../examples/shapes_colors_palette.vcxproj | 16 ++++++------- .../shapes_draw_circle_sector.vcxproj | 16 ++++++------- .../shapes_draw_rectangle_rounded.vcxproj | 16 ++++++------- .../VS2019/examples/shapes_draw_ring.vcxproj | 16 ++++++------- .../examples/shapes_easings_ball_anim.vcxproj | 16 ++++++------- .../examples/shapes_easings_box_anim.vcxproj | 16 ++++++------- .../shapes_easings_rectangle_array.vcxproj | 16 ++++++------- .../examples/shapes_following_eyes.vcxproj | 16 ++++++------- .../examples/shapes_lines_bezier.vcxproj | 16 ++++++------- .../examples/shapes_logo_raylib.vcxproj | 16 ++++++------- .../examples/shapes_logo_raylib_anim.vcxproj | 16 ++++++------- .../examples/shapes_rectangle_scaling.vcxproj | 16 ++++++------- .../VS2019/examples/text_font_filters.vcxproj | 16 ++++++------- .../VS2019/examples/text_font_loading.vcxproj | 16 ++++++------- .../VS2019/examples/text_font_sdf.vcxproj | 16 ++++++------- .../examples/text_font_spritefont.vcxproj | 16 ++++++------- .../VS2019/examples/text_format_text.vcxproj | 16 ++++++------- .../VS2019/examples/text_input_box.vcxproj | 16 ++++++------- .../VS2019/examples/text_raylib_fonts.vcxproj | 16 ++++++------- .../examples/text_rectangle_bounds.vcxproj | 16 ++++++------- projects/VS2019/examples/text_unicode.vcxproj | 16 ++++++------- .../VS2019/examples/text_writing_anim.vcxproj | 16 ++++++------- .../textures_background_scrolling.vcxproj | 16 ++++++------- .../examples/textures_blend_modes.vcxproj | 16 ++++++------- .../examples/textures_bunnymark.vcxproj | 16 ++++++------- .../examples/textures_draw_tiled.vcxproj | 16 ++++++------- .../textures_image_generation.vcxproj | 16 ++++++------- .../examples/textures_image_loading.vcxproj | 16 ++++++------- .../textures_image_processing.vcxproj | 16 ++++++------- .../examples/textures_image_text.vcxproj | 16 ++++++------- .../examples/textures_logo_raylib.vcxproj | 16 ++++++------- .../examples/textures_mouse_painting.vcxproj | 16 ++++++------- .../examples/textures_npatch_drawing.vcxproj | 16 ++++++------- .../textures_particles_blending.vcxproj | 16 ++++++------- .../VS2019/examples/textures_raw_data.vcxproj | 16 ++++++------- .../examples/textures_sprite_button.vcxproj | 16 ++++++------- .../textures_sprite_explosion.vcxproj | 16 ++++++------- .../VS2019/examples/textures_to_image.vcxproj | 16 ++++++------- 111 files changed, 892 insertions(+), 892 deletions(-) diff --git a/projects/VS2019/examples/audio_module_playing.vcxproj b/projects/VS2019/examples/audio_module_playing.vcxproj index b3f58fff4..12ad30133 100644 --- a/projects/VS2019/examples/audio_module_playing.vcxproj +++ b/projects/VS2019/examples/audio_module_playing.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/audio_multichannel_sound.vcxproj b/projects/VS2019/examples/audio_multichannel_sound.vcxproj index b00b4468d..cf21b8032 100644 --- a/projects/VS2019/examples/audio_multichannel_sound.vcxproj +++ b/projects/VS2019/examples/audio_multichannel_sound.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/audio_music_stream.vcxproj b/projects/VS2019/examples/audio_music_stream.vcxproj index 3964634c5..8204fafb6 100644 --- a/projects/VS2019/examples/audio_music_stream.vcxproj +++ b/projects/VS2019/examples/audio_music_stream.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/audio_raw_stream.vcxproj b/projects/VS2019/examples/audio_raw_stream.vcxproj index 69be20ca9..83868073b 100644 --- a/projects/VS2019/examples/audio_raw_stream.vcxproj +++ b/projects/VS2019/examples/audio_raw_stream.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/audio_sound_loading.vcxproj b/projects/VS2019/examples/audio_sound_loading.vcxproj index 841e846be..64d59c33c 100644 --- a/projects/VS2019/examples/audio_sound_loading.vcxproj +++ b/projects/VS2019/examples/audio_sound_loading.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/core_2d_camera_platformer.vcxproj b/projects/VS2019/examples/core_2d_camera_platformer.vcxproj index 759b9eaef..17a1c95c7 100644 --- a/projects/VS2019/examples/core_2d_camera_platformer.vcxproj +++ b/projects/VS2019/examples/core_2d_camera_platformer.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/core_3d_camera_first_person.vcxproj b/projects/VS2019/examples/core_3d_camera_first_person.vcxproj index 6a460cd88..bc54434ea 100644 --- a/projects/VS2019/examples/core_3d_camera_first_person.vcxproj +++ b/projects/VS2019/examples/core_3d_camera_first_person.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/core_3d_camera_free.vcxproj b/projects/VS2019/examples/core_3d_camera_free.vcxproj index beade17e4..9412ad8d2 100644 --- a/projects/VS2019/examples/core_3d_camera_free.vcxproj +++ b/projects/VS2019/examples/core_3d_camera_free.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/core_3d_camera_mode.vcxproj b/projects/VS2019/examples/core_3d_camera_mode.vcxproj index 9057eaa43..ec6250d4d 100644 --- a/projects/VS2019/examples/core_3d_camera_mode.vcxproj +++ b/projects/VS2019/examples/core_3d_camera_mode.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/core_3d_picking.vcxproj b/projects/VS2019/examples/core_3d_picking.vcxproj index 729260163..36277fa1e 100644 --- a/projects/VS2019/examples/core_3d_picking.vcxproj +++ b/projects/VS2019/examples/core_3d_picking.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/core_basic_window.vcxproj b/projects/VS2019/examples/core_basic_window.vcxproj index 1d1c4ae73..c280c2d08 100644 --- a/projects/VS2019/examples/core_basic_window.vcxproj +++ b/projects/VS2019/examples/core_basic_window.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/core_custom_logging.vcxproj b/projects/VS2019/examples/core_custom_logging.vcxproj index 89888887e..d631abb6f 100644 --- a/projects/VS2019/examples/core_custom_logging.vcxproj +++ b/projects/VS2019/examples/core_custom_logging.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/core_drop_files.vcxproj b/projects/VS2019/examples/core_drop_files.vcxproj index 39b57a127..b3932d8b0 100644 --- a/projects/VS2019/examples/core_drop_files.vcxproj +++ b/projects/VS2019/examples/core_drop_files.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/core_input_gamepad.vcxproj b/projects/VS2019/examples/core_input_gamepad.vcxproj index 9bc3f62a9..e28033955 100644 --- a/projects/VS2019/examples/core_input_gamepad.vcxproj +++ b/projects/VS2019/examples/core_input_gamepad.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/core_input_gestures.vcxproj b/projects/VS2019/examples/core_input_gestures.vcxproj index 51c980e17..5603c802a 100644 --- a/projects/VS2019/examples/core_input_gestures.vcxproj +++ b/projects/VS2019/examples/core_input_gestures.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/core_input_keys.vcxproj b/projects/VS2019/examples/core_input_keys.vcxproj index 3aad08697..76ceec8ba 100644 --- a/projects/VS2019/examples/core_input_keys.vcxproj +++ b/projects/VS2019/examples/core_input_keys.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/core_input_mouse.vcxproj b/projects/VS2019/examples/core_input_mouse.vcxproj index 62b5b7af8..5d9af4fa4 100644 --- a/projects/VS2019/examples/core_input_mouse.vcxproj +++ b/projects/VS2019/examples/core_input_mouse.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/core_input_multitouch.vcxproj b/projects/VS2019/examples/core_input_multitouch.vcxproj index 5bb705ff9..514ad4a83 100644 --- a/projects/VS2019/examples/core_input_multitouch.vcxproj +++ b/projects/VS2019/examples/core_input_multitouch.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/core_loading_thread.vcxproj b/projects/VS2019/examples/core_loading_thread.vcxproj index 1e42bf573..f738d75ec 100644 --- a/projects/VS2019/examples/core_loading_thread.vcxproj +++ b/projects/VS2019/examples/core_loading_thread.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/core_quat_conversion.vcxproj b/projects/VS2019/examples/core_quat_conversion.vcxproj index 2ddfc55a1..8948a6042 100644 --- a/projects/VS2019/examples/core_quat_conversion.vcxproj +++ b/projects/VS2019/examples/core_quat_conversion.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/core_random_values.vcxproj b/projects/VS2019/examples/core_random_values.vcxproj index ee9226709..bb6a4911c 100644 --- a/projects/VS2019/examples/core_random_values.vcxproj +++ b/projects/VS2019/examples/core_random_values.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/core_scissor_test.vcxproj b/projects/VS2019/examples/core_scissor_test.vcxproj index d7db0be3c..576d6f571 100644 --- a/projects/VS2019/examples/core_scissor_test.vcxproj +++ b/projects/VS2019/examples/core_scissor_test.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/core_storage_values.vcxproj b/projects/VS2019/examples/core_storage_values.vcxproj index 52f5e2c33..735dc2f28 100644 --- a/projects/VS2019/examples/core_storage_values.vcxproj +++ b/projects/VS2019/examples/core_storage_values.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/core_vr_simulator.vcxproj b/projects/VS2019/examples/core_vr_simulator.vcxproj index 62065bbd5..4bf004d01 100644 --- a/projects/VS2019/examples/core_vr_simulator.vcxproj +++ b/projects/VS2019/examples/core_vr_simulator.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/core_window_flags.vcxproj b/projects/VS2019/examples/core_window_flags.vcxproj index 023925968..a4a1f597d 100644 --- a/projects/VS2019/examples/core_window_flags.vcxproj +++ b/projects/VS2019/examples/core_window_flags.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/core_window_letterbox.vcxproj b/projects/VS2019/examples/core_window_letterbox.vcxproj index 201155d96..c46cd6217 100644 --- a/projects/VS2019/examples/core_window_letterbox.vcxproj +++ b/projects/VS2019/examples/core_window_letterbox.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/core_world_screen.vcxproj b/projects/VS2019/examples/core_world_screen.vcxproj index f3c324f31..cadaf5cb8 100644 --- a/projects/VS2019/examples/core_world_screen.vcxproj +++ b/projects/VS2019/examples/core_world_screen.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/easings_testbed.vcxproj b/projects/VS2019/examples/easings_testbed.vcxproj index 7aaacaafe..12b83f60b 100644 --- a/projects/VS2019/examples/easings_testbed.vcxproj +++ b/projects/VS2019/examples/easings_testbed.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/embedded_files_loading.vcxproj b/projects/VS2019/examples/embedded_files_loading.vcxproj index 6498b0dd4..a088c5090 100644 --- a/projects/VS2019/examples/embedded_files_loading.vcxproj +++ b/projects/VS2019/examples/embedded_files_loading.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/models_animation.vcxproj b/projects/VS2019/examples/models_animation.vcxproj index 078788b4d..52b4f18b1 100644 --- a/projects/VS2019/examples/models_animation.vcxproj +++ b/projects/VS2019/examples/models_animation.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/models_billboard.vcxproj b/projects/VS2019/examples/models_billboard.vcxproj index 4ab7c4627..5198f6a97 100644 --- a/projects/VS2019/examples/models_billboard.vcxproj +++ b/projects/VS2019/examples/models_billboard.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/models_box_collisions.vcxproj b/projects/VS2019/examples/models_box_collisions.vcxproj index 21d11cc2f..231648107 100644 --- a/projects/VS2019/examples/models_box_collisions.vcxproj +++ b/projects/VS2019/examples/models_box_collisions.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/models_cubicmap.vcxproj b/projects/VS2019/examples/models_cubicmap.vcxproj index 061420399..bc71d5ff1 100644 --- a/projects/VS2019/examples/models_cubicmap.vcxproj +++ b/projects/VS2019/examples/models_cubicmap.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/models_first_person_maze.vcxproj b/projects/VS2019/examples/models_first_person_maze.vcxproj index 31d51fc49..74e53cfaf 100644 --- a/projects/VS2019/examples/models_first_person_maze.vcxproj +++ b/projects/VS2019/examples/models_first_person_maze.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/models_geometric_shapes.vcxproj b/projects/VS2019/examples/models_geometric_shapes.vcxproj index b00375f50..8b0ba8ff5 100644 --- a/projects/VS2019/examples/models_geometric_shapes.vcxproj +++ b/projects/VS2019/examples/models_geometric_shapes.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/models_gltf_animation.vcxproj b/projects/VS2019/examples/models_gltf_animation.vcxproj index 02aa636f5..96e07de5d 100644 --- a/projects/VS2019/examples/models_gltf_animation.vcxproj +++ b/projects/VS2019/examples/models_gltf_animation.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/models_gltf_model.vcxproj b/projects/VS2019/examples/models_gltf_model.vcxproj index a5e3e7950..92c3ba914 100644 --- a/projects/VS2019/examples/models_gltf_model.vcxproj +++ b/projects/VS2019/examples/models_gltf_model.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/models_heightmap.vcxproj b/projects/VS2019/examples/models_heightmap.vcxproj index 315705d12..e16eff288 100644 --- a/projects/VS2019/examples/models_heightmap.vcxproj +++ b/projects/VS2019/examples/models_heightmap.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/models_loading.vcxproj b/projects/VS2019/examples/models_loading.vcxproj index 62e1ea1ac..4b1be702e 100644 --- a/projects/VS2019/examples/models_loading.vcxproj +++ b/projects/VS2019/examples/models_loading.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/models_material_pbr.vcxproj b/projects/VS2019/examples/models_material_pbr.vcxproj index 6341cf964..56c21de52 100644 --- a/projects/VS2019/examples/models_material_pbr.vcxproj +++ b/projects/VS2019/examples/models_material_pbr.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/models_mesh_generation.vcxproj b/projects/VS2019/examples/models_mesh_generation.vcxproj index 4c5bb5f96..9342c43a1 100644 --- a/projects/VS2019/examples/models_mesh_generation.vcxproj +++ b/projects/VS2019/examples/models_mesh_generation.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/models_mesh_picking.vcxproj b/projects/VS2019/examples/models_mesh_picking.vcxproj index ebbc717ce..e9221146c 100644 --- a/projects/VS2019/examples/models_mesh_picking.vcxproj +++ b/projects/VS2019/examples/models_mesh_picking.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/models_orthographic_projection.vcxproj b/projects/VS2019/examples/models_orthographic_projection.vcxproj index d556d1b7c..1502db9f8 100644 --- a/projects/VS2019/examples/models_orthographic_projection.vcxproj +++ b/projects/VS2019/examples/models_orthographic_projection.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/models_rlgl_solar_system.vcxproj b/projects/VS2019/examples/models_rlgl_solar_system.vcxproj index 16443ea0f..e260b2dbe 100644 --- a/projects/VS2019/examples/models_rlgl_solar_system.vcxproj +++ b/projects/VS2019/examples/models_rlgl_solar_system.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/models_skybox.vcxproj b/projects/VS2019/examples/models_skybox.vcxproj index e271745b6..bcb901485 100644 --- a/projects/VS2019/examples/models_skybox.vcxproj +++ b/projects/VS2019/examples/models_skybox.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/models_waving_cubes.vcxproj b/projects/VS2019/examples/models_waving_cubes.vcxproj index 311202141..9ba062cab 100644 --- a/projects/VS2019/examples/models_waving_cubes.vcxproj +++ b/projects/VS2019/examples/models_waving_cubes.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/models_yaw_pitch_roll.vcxproj b/projects/VS2019/examples/models_yaw_pitch_roll.vcxproj index 02c87e8e4..ff301b3a6 100644 --- a/projects/VS2019/examples/models_yaw_pitch_roll.vcxproj +++ b/projects/VS2019/examples/models_yaw_pitch_roll.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/physics_demo.vcxproj b/projects/VS2019/examples/physics_demo.vcxproj index 51820a35b..e5d1a443b 100644 --- a/projects/VS2019/examples/physics_demo.vcxproj +++ b/projects/VS2019/examples/physics_demo.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/physics_friction.vcxproj b/projects/VS2019/examples/physics_friction.vcxproj index 17aecaff3..f12c3907b 100644 --- a/projects/VS2019/examples/physics_friction.vcxproj +++ b/projects/VS2019/examples/physics_friction.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/physics_movement.vcxproj b/projects/VS2019/examples/physics_movement.vcxproj index e97cf1d9d..4b6ad08a6 100644 --- a/projects/VS2019/examples/physics_movement.vcxproj +++ b/projects/VS2019/examples/physics_movement.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/physics_restitution.vcxproj b/projects/VS2019/examples/physics_restitution.vcxproj index 36d45757a..0561524f3 100644 --- a/projects/VS2019/examples/physics_restitution.vcxproj +++ b/projects/VS2019/examples/physics_restitution.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/physics_shatter.vcxproj b/projects/VS2019/examples/physics_shatter.vcxproj index a7db93888..e4f501f03 100644 --- a/projects/VS2019/examples/physics_shatter.vcxproj +++ b/projects/VS2019/examples/physics_shatter.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/raudio_standalone.vcxproj b/projects/VS2019/examples/raudio_standalone.vcxproj index 371d6cf92..5a415685c 100644 --- a/projects/VS2019/examples/raudio_standalone.vcxproj +++ b/projects/VS2019/examples/raudio_standalone.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/shaders_basic_lighting.vcxproj b/projects/VS2019/examples/shaders_basic_lighting.vcxproj index 67069ac58..7861b0681 100644 --- a/projects/VS2019/examples/shaders_basic_lighting.vcxproj +++ b/projects/VS2019/examples/shaders_basic_lighting.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/shaders_custom_uniform.vcxproj b/projects/VS2019/examples/shaders_custom_uniform.vcxproj index d99ec4475..890aedbd2 100644 --- a/projects/VS2019/examples/shaders_custom_uniform.vcxproj +++ b/projects/VS2019/examples/shaders_custom_uniform.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/shaders_eratosthenes.vcxproj b/projects/VS2019/examples/shaders_eratosthenes.vcxproj index 69af347b1..95725d81a 100644 --- a/projects/VS2019/examples/shaders_eratosthenes.vcxproj +++ b/projects/VS2019/examples/shaders_eratosthenes.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/shaders_fog.vcxproj b/projects/VS2019/examples/shaders_fog.vcxproj index 89efcbe83..cd97064b8 100644 --- a/projects/VS2019/examples/shaders_fog.vcxproj +++ b/projects/VS2019/examples/shaders_fog.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/shaders_hot_reloading.vcxproj b/projects/VS2019/examples/shaders_hot_reloading.vcxproj index 83db3e010..e10ec74e5 100644 --- a/projects/VS2019/examples/shaders_hot_reloading.vcxproj +++ b/projects/VS2019/examples/shaders_hot_reloading.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/shaders_julia_set.vcxproj b/projects/VS2019/examples/shaders_julia_set.vcxproj index fb7d51945..72ee38444 100644 --- a/projects/VS2019/examples/shaders_julia_set.vcxproj +++ b/projects/VS2019/examples/shaders_julia_set.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/shaders_mesh_instancing.vcxproj b/projects/VS2019/examples/shaders_mesh_instancing.vcxproj index 4ea24888d..8a5f1435c 100644 --- a/projects/VS2019/examples/shaders_mesh_instancing.vcxproj +++ b/projects/VS2019/examples/shaders_mesh_instancing.vcxproj @@ -37,7 +37,7 @@ {274C0319-7E1E-4188-936B-8DF3331230B3} Win32Proj - shaders_rlgl_mesh_instanced + shaders_mesh_instancing 10.0 shaders_mesh_instancing @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -373,14 +373,14 @@ Copy Release DLL to output directory + + + {e89d61ac-55de-4482-afd4-df7242ebc859} - - - diff --git a/projects/VS2019/examples/shaders_model_shader.vcxproj b/projects/VS2019/examples/shaders_model_shader.vcxproj index f0d70b788..f7034cf12 100644 --- a/projects/VS2019/examples/shaders_model_shader.vcxproj +++ b/projects/VS2019/examples/shaders_model_shader.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/shaders_multi_sample2d.vcxproj b/projects/VS2019/examples/shaders_multi_sample2d.vcxproj index b62014a7a..d80c2870b 100644 --- a/projects/VS2019/examples/shaders_multi_sample2d.vcxproj +++ b/projects/VS2019/examples/shaders_multi_sample2d.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/shaders_palette_switch.vcxproj b/projects/VS2019/examples/shaders_palette_switch.vcxproj index fb1ead88e..f1f6486dc 100644 --- a/projects/VS2019/examples/shaders_palette_switch.vcxproj +++ b/projects/VS2019/examples/shaders_palette_switch.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/shaders_postprocessing.vcxproj b/projects/VS2019/examples/shaders_postprocessing.vcxproj index cb4732028..31304856a 100644 --- a/projects/VS2019/examples/shaders_postprocessing.vcxproj +++ b/projects/VS2019/examples/shaders_postprocessing.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/shaders_raymarching.vcxproj b/projects/VS2019/examples/shaders_raymarching.vcxproj index 69ee89bfd..46e2efe6d 100644 --- a/projects/VS2019/examples/shaders_raymarching.vcxproj +++ b/projects/VS2019/examples/shaders_raymarching.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/shaders_shapes_textures.vcxproj b/projects/VS2019/examples/shaders_shapes_textures.vcxproj index ac165aa9d..5cbe90435 100644 --- a/projects/VS2019/examples/shaders_shapes_textures.vcxproj +++ b/projects/VS2019/examples/shaders_shapes_textures.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/shaders_simple_mask.vcxproj b/projects/VS2019/examples/shaders_simple_mask.vcxproj index f24574f21..a2cbd012a 100644 --- a/projects/VS2019/examples/shaders_simple_mask.vcxproj +++ b/projects/VS2019/examples/shaders_simple_mask.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/shaders_spotlight.vcxproj b/projects/VS2019/examples/shaders_spotlight.vcxproj index c851894a3..8351362d7 100644 --- a/projects/VS2019/examples/shaders_spotlight.vcxproj +++ b/projects/VS2019/examples/shaders_spotlight.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/shaders_texture_drawing.vcxproj b/projects/VS2019/examples/shaders_texture_drawing.vcxproj index bf36ee8f9..621d9d6f9 100644 --- a/projects/VS2019/examples/shaders_texture_drawing.vcxproj +++ b/projects/VS2019/examples/shaders_texture_drawing.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/shaders_texture_waves.vcxproj b/projects/VS2019/examples/shaders_texture_waves.vcxproj index f2370ad36..7a1ffa30b 100644 --- a/projects/VS2019/examples/shaders_texture_waves.vcxproj +++ b/projects/VS2019/examples/shaders_texture_waves.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/shapes_basic_shapes.vcxproj b/projects/VS2019/examples/shapes_basic_shapes.vcxproj index 76f8e91eb..198fbdae8 100644 --- a/projects/VS2019/examples/shapes_basic_shapes.vcxproj +++ b/projects/VS2019/examples/shapes_basic_shapes.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/shapes_bouncing_ball.vcxproj b/projects/VS2019/examples/shapes_bouncing_ball.vcxproj index dcbb262fc..bc2196922 100644 --- a/projects/VS2019/examples/shapes_bouncing_ball.vcxproj +++ b/projects/VS2019/examples/shapes_bouncing_ball.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/shapes_collision_area.vcxproj b/projects/VS2019/examples/shapes_collision_area.vcxproj index 28a0c2af9..11df1e0a4 100644 --- a/projects/VS2019/examples/shapes_collision_area.vcxproj +++ b/projects/VS2019/examples/shapes_collision_area.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/shapes_colors_palette.vcxproj b/projects/VS2019/examples/shapes_colors_palette.vcxproj index 1714e3cbe..6e798c52b 100644 --- a/projects/VS2019/examples/shapes_colors_palette.vcxproj +++ b/projects/VS2019/examples/shapes_colors_palette.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/shapes_draw_circle_sector.vcxproj b/projects/VS2019/examples/shapes_draw_circle_sector.vcxproj index cb67ceb39..be37881fc 100644 --- a/projects/VS2019/examples/shapes_draw_circle_sector.vcxproj +++ b/projects/VS2019/examples/shapes_draw_circle_sector.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/shapes_draw_rectangle_rounded.vcxproj b/projects/VS2019/examples/shapes_draw_rectangle_rounded.vcxproj index 9df31f1e9..af8ce6fd5 100644 --- a/projects/VS2019/examples/shapes_draw_rectangle_rounded.vcxproj +++ b/projects/VS2019/examples/shapes_draw_rectangle_rounded.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/shapes_draw_ring.vcxproj b/projects/VS2019/examples/shapes_draw_ring.vcxproj index 2ce6172ac..1488c9522 100644 --- a/projects/VS2019/examples/shapes_draw_ring.vcxproj +++ b/projects/VS2019/examples/shapes_draw_ring.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/shapes_easings_ball_anim.vcxproj b/projects/VS2019/examples/shapes_easings_ball_anim.vcxproj index 6c7647689..74f55c6b8 100644 --- a/projects/VS2019/examples/shapes_easings_ball_anim.vcxproj +++ b/projects/VS2019/examples/shapes_easings_ball_anim.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/shapes_easings_box_anim.vcxproj b/projects/VS2019/examples/shapes_easings_box_anim.vcxproj index abf23d1b6..32c02e1c1 100644 --- a/projects/VS2019/examples/shapes_easings_box_anim.vcxproj +++ b/projects/VS2019/examples/shapes_easings_box_anim.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/shapes_easings_rectangle_array.vcxproj b/projects/VS2019/examples/shapes_easings_rectangle_array.vcxproj index d59c5621e..0361bbf0a 100644 --- a/projects/VS2019/examples/shapes_easings_rectangle_array.vcxproj +++ b/projects/VS2019/examples/shapes_easings_rectangle_array.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/shapes_following_eyes.vcxproj b/projects/VS2019/examples/shapes_following_eyes.vcxproj index 55bb7234c..083ef6204 100644 --- a/projects/VS2019/examples/shapes_following_eyes.vcxproj +++ b/projects/VS2019/examples/shapes_following_eyes.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/shapes_lines_bezier.vcxproj b/projects/VS2019/examples/shapes_lines_bezier.vcxproj index 788dc5df2..142feb924 100644 --- a/projects/VS2019/examples/shapes_lines_bezier.vcxproj +++ b/projects/VS2019/examples/shapes_lines_bezier.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/shapes_logo_raylib.vcxproj b/projects/VS2019/examples/shapes_logo_raylib.vcxproj index 084aceb05..7a796e9dc 100644 --- a/projects/VS2019/examples/shapes_logo_raylib.vcxproj +++ b/projects/VS2019/examples/shapes_logo_raylib.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/shapes_logo_raylib_anim.vcxproj b/projects/VS2019/examples/shapes_logo_raylib_anim.vcxproj index b8ebfbab3..954bf8a0d 100644 --- a/projects/VS2019/examples/shapes_logo_raylib_anim.vcxproj +++ b/projects/VS2019/examples/shapes_logo_raylib_anim.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/shapes_rectangle_scaling.vcxproj b/projects/VS2019/examples/shapes_rectangle_scaling.vcxproj index d995f7155..46df80553 100644 --- a/projects/VS2019/examples/shapes_rectangle_scaling.vcxproj +++ b/projects/VS2019/examples/shapes_rectangle_scaling.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/text_font_filters.vcxproj b/projects/VS2019/examples/text_font_filters.vcxproj index 173200c06..28a60766e 100644 --- a/projects/VS2019/examples/text_font_filters.vcxproj +++ b/projects/VS2019/examples/text_font_filters.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/text_font_loading.vcxproj b/projects/VS2019/examples/text_font_loading.vcxproj index 386080b20..9a5b1f491 100644 --- a/projects/VS2019/examples/text_font_loading.vcxproj +++ b/projects/VS2019/examples/text_font_loading.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/text_font_sdf.vcxproj b/projects/VS2019/examples/text_font_sdf.vcxproj index 073144b82..94e6f91ca 100644 --- a/projects/VS2019/examples/text_font_sdf.vcxproj +++ b/projects/VS2019/examples/text_font_sdf.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/text_font_spritefont.vcxproj b/projects/VS2019/examples/text_font_spritefont.vcxproj index e24621898..2cca27710 100644 --- a/projects/VS2019/examples/text_font_spritefont.vcxproj +++ b/projects/VS2019/examples/text_font_spritefont.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/text_format_text.vcxproj b/projects/VS2019/examples/text_format_text.vcxproj index f5bd4d6e0..11f64c3ef 100644 --- a/projects/VS2019/examples/text_format_text.vcxproj +++ b/projects/VS2019/examples/text_format_text.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/text_input_box.vcxproj b/projects/VS2019/examples/text_input_box.vcxproj index 595a3c42d..b676c68ee 100644 --- a/projects/VS2019/examples/text_input_box.vcxproj +++ b/projects/VS2019/examples/text_input_box.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/text_raylib_fonts.vcxproj b/projects/VS2019/examples/text_raylib_fonts.vcxproj index d9e5ca5fd..d6eba6b18 100644 --- a/projects/VS2019/examples/text_raylib_fonts.vcxproj +++ b/projects/VS2019/examples/text_raylib_fonts.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/text_rectangle_bounds.vcxproj b/projects/VS2019/examples/text_rectangle_bounds.vcxproj index 43c273cd5..84fd35b97 100644 --- a/projects/VS2019/examples/text_rectangle_bounds.vcxproj +++ b/projects/VS2019/examples/text_rectangle_bounds.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/text_unicode.vcxproj b/projects/VS2019/examples/text_unicode.vcxproj index dda7065eb..c9b03bf58 100644 --- a/projects/VS2019/examples/text_unicode.vcxproj +++ b/projects/VS2019/examples/text_unicode.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/text_writing_anim.vcxproj b/projects/VS2019/examples/text_writing_anim.vcxproj index 55f8c7c6e..4ab989069 100644 --- a/projects/VS2019/examples/text_writing_anim.vcxproj +++ b/projects/VS2019/examples/text_writing_anim.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/textures_background_scrolling.vcxproj b/projects/VS2019/examples/textures_background_scrolling.vcxproj index 51a30146b..7ca736092 100644 --- a/projects/VS2019/examples/textures_background_scrolling.vcxproj +++ b/projects/VS2019/examples/textures_background_scrolling.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/textures_blend_modes.vcxproj b/projects/VS2019/examples/textures_blend_modes.vcxproj index 98f358cc9..783e82580 100644 --- a/projects/VS2019/examples/textures_blend_modes.vcxproj +++ b/projects/VS2019/examples/textures_blend_modes.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/textures_bunnymark.vcxproj b/projects/VS2019/examples/textures_bunnymark.vcxproj index 168fce95d..c5640c67b 100644 --- a/projects/VS2019/examples/textures_bunnymark.vcxproj +++ b/projects/VS2019/examples/textures_bunnymark.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/textures_draw_tiled.vcxproj b/projects/VS2019/examples/textures_draw_tiled.vcxproj index 996709d59..85a361cc8 100644 --- a/projects/VS2019/examples/textures_draw_tiled.vcxproj +++ b/projects/VS2019/examples/textures_draw_tiled.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/textures_image_generation.vcxproj b/projects/VS2019/examples/textures_image_generation.vcxproj index 0d36423c0..754bb6e32 100644 --- a/projects/VS2019/examples/textures_image_generation.vcxproj +++ b/projects/VS2019/examples/textures_image_generation.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/textures_image_loading.vcxproj b/projects/VS2019/examples/textures_image_loading.vcxproj index dba9a896b..95f8fa93f 100644 --- a/projects/VS2019/examples/textures_image_loading.vcxproj +++ b/projects/VS2019/examples/textures_image_loading.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/textures_image_processing.vcxproj b/projects/VS2019/examples/textures_image_processing.vcxproj index f873f2957..0085aa74e 100644 --- a/projects/VS2019/examples/textures_image_processing.vcxproj +++ b/projects/VS2019/examples/textures_image_processing.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/textures_image_text.vcxproj b/projects/VS2019/examples/textures_image_text.vcxproj index 33e648aa7..cf658b71e 100644 --- a/projects/VS2019/examples/textures_image_text.vcxproj +++ b/projects/VS2019/examples/textures_image_text.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/textures_logo_raylib.vcxproj b/projects/VS2019/examples/textures_logo_raylib.vcxproj index 8e46261e7..309969e8e 100644 --- a/projects/VS2019/examples/textures_logo_raylib.vcxproj +++ b/projects/VS2019/examples/textures_logo_raylib.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/textures_mouse_painting.vcxproj b/projects/VS2019/examples/textures_mouse_painting.vcxproj index 631494c99..f2db6b510 100644 --- a/projects/VS2019/examples/textures_mouse_painting.vcxproj +++ b/projects/VS2019/examples/textures_mouse_painting.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/textures_npatch_drawing.vcxproj b/projects/VS2019/examples/textures_npatch_drawing.vcxproj index 26e640d40..f26b4d43e 100644 --- a/projects/VS2019/examples/textures_npatch_drawing.vcxproj +++ b/projects/VS2019/examples/textures_npatch_drawing.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/textures_particles_blending.vcxproj b/projects/VS2019/examples/textures_particles_blending.vcxproj index fb21be73c..81ce6e234 100644 --- a/projects/VS2019/examples/textures_particles_blending.vcxproj +++ b/projects/VS2019/examples/textures_particles_blending.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/textures_raw_data.vcxproj b/projects/VS2019/examples/textures_raw_data.vcxproj index ffdd37091..ef1501067 100644 --- a/projects/VS2019/examples/textures_raw_data.vcxproj +++ b/projects/VS2019/examples/textures_raw_data.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/textures_sprite_button.vcxproj b/projects/VS2019/examples/textures_sprite_button.vcxproj index 4918f942c..5a76481f4 100644 --- a/projects/VS2019/examples/textures_sprite_button.vcxproj +++ b/projects/VS2019/examples/textures_sprite_button.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/textures_sprite_explosion.vcxproj b/projects/VS2019/examples/textures_sprite_explosion.vcxproj index 30fd88be9..fd3d47717 100644 --- a/projects/VS2019/examples/textures_sprite_explosion.vcxproj +++ b/projects/VS2019/examples/textures_sprite_explosion.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/textures_to_image.vcxproj b/projects/VS2019/examples/textures_to_image.vcxproj index d30f9656f..478c33058 100644 --- a/projects/VS2019/examples/textures_to_image.vcxproj +++ b/projects/VS2019/examples/textures_to_image.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ From fe607323aadef76fa3752fbf2a7ca253ac223bf6 Mon Sep 17 00:00:00 2001 From: Ray Date: Tue, 27 Apr 2021 23:00:49 +0200 Subject: [PATCH 085/121] Updated projects --- .../examples/textures_image_drawing.vcxproj | 16 ++++++++-------- .../VS2019/examples/textures_rectangle.vcxproj | 16 ++++++++-------- .../examples/textures_srcrec_dstrec.vcxproj | 16 ++++++++-------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/projects/VS2019/examples/textures_image_drawing.vcxproj b/projects/VS2019/examples/textures_image_drawing.vcxproj index 038d61622..42737073d 100644 --- a/projects/VS2019/examples/textures_image_drawing.vcxproj +++ b/projects/VS2019/examples/textures_image_drawing.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/textures_rectangle.vcxproj b/projects/VS2019/examples/textures_rectangle.vcxproj index bbc90bd2a..a4736962d 100644 --- a/projects/VS2019/examples/textures_rectangle.vcxproj +++ b/projects/VS2019/examples/textures_rectangle.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ diff --git a/projects/VS2019/examples/textures_srcrec_dstrec.vcxproj b/projects/VS2019/examples/textures_srcrec_dstrec.vcxproj index 351d6fb36..102adf4cc 100644 --- a/projects/VS2019/examples/textures_srcrec_dstrec.vcxproj +++ b/projects/VS2019/examples/textures_srcrec_dstrec.vcxproj @@ -210,7 +210,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -228,7 +228,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -245,7 +245,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -266,7 +266,7 @@ Console true $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,7 +291,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -313,7 +313,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -335,7 +335,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ @@ -363,7 +363,7 @@ true true true - raylib.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ From a113d3326b47414b122b7b538b733e12cf2f213e Mon Sep 17 00:00:00 2001 From: Ray Date: Tue, 27 Apr 2021 23:12:04 +0200 Subject: [PATCH 086/121] Disable raylib code --- src/external/jar_xm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/external/jar_xm.h b/src/external/jar_xm.h index 36d6fb3fc..ea7a32831 100644 --- a/src/external/jar_xm.h +++ b/src/external/jar_xm.h @@ -60,7 +60,7 @@ #define JAR_XM_DEBUG 0 #define JAR_XM_DEFENSIVE 1 -#define JAR_XM_RAYLIB 1 // set to 0 to disable the RayLib visualizer extension +//#define JAR_XM_RAYLIB 0 // set to 0 to disable the RayLib visualizer extension // Allow custom memory allocators #ifndef JARXM_MALLOC From d6708de7b0c640b3ca2e667ba8aaec1d70f14845 Mon Sep 17 00:00:00 2001 From: Ray Date: Tue, 27 Apr 2021 23:55:05 +0200 Subject: [PATCH 087/121] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ddfce61a6..e07b2b16c 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Ready to learn? Jump to [code examples!](http://www.raylib.com/examples.html) [![GitHub contributors](https://img.shields.io/github/contributors/raysan5/raylib)](https://github.com/raysan5/raylib/graphs/contributors) [![GitHub All Releases](https://img.shields.io/github/downloads/raysan5/raylib/total)](https://github.com/raysan5/raylib/releases) -[![GitHub commits since tagged version](https://img.shields.io/github/commits-since/raysan5/raylib/3.5.0)](https://github.com/raysan5/raylib/commits/master) +[![GitHub commits since tagged version](https://img.shields.io/github/commits-since/raysan5/raylib/3.7.0)](https://github.com/raysan5/raylib/commits/master) [![License](https://img.shields.io/badge/license-zlib%2Flibpng-blue.svg)](LICENSE) [![Chat on Discord](https://img.shields.io/discord/426912293134270465.svg?logo=discord)](https://discord.gg/raylib) From f516f4099b6d23c41a8e3aed1a9ee699740eef4e Mon Sep 17 00:00:00 2001 From: Ray Date: Wed, 28 Apr 2021 19:27:50 +0200 Subject: [PATCH 088/121] Corrected issue #1742 --- src/physac.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/physac.h b/src/physac.h index 4b419bbaf..676a96953 100644 --- a/src/physac.h +++ b/src/physac.h @@ -849,7 +849,7 @@ PHYSACDEF void ResetPhysics(void) if (physicsBodiesCount > 0) { // Unitialize physics bodies dynamic memory allocations - for (unsigned int i = physicsBodiesCount - 1; i >= 0; i--) + for (int i = physicsBodiesCount - 1; i >= 0; i--) { PhysicsBody body = bodies[i]; @@ -867,7 +867,7 @@ PHYSACDEF void ResetPhysics(void) if (physicsManifoldsCount > 0) { // Unitialize physics manifolds dynamic memory allocations - for (unsigned int i = physicsManifoldsCount - 1; i >= 0; i--) + for (int i = physicsManifoldsCount - 1; i >= 0; i--) { PhysicsManifold manifold = contacts[i]; From ffadeeeb8467d7df2ad35ccc5504268f0abffb3d Mon Sep 17 00:00:00 2001 From: Ray Date: Wed, 28 Apr 2021 23:57:46 +0200 Subject: [PATCH 089/121] Decoupling rlgl from platform layer Now rlgl only depends on OpenGL and it's completely decoupled from platform layer libraries (EGL) --- src/core.c | 8 ++++---- src/rlgl.h | 31 +++++++++++++++++-------------- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/core.c b/src/core.c index 553662f82..8729ad070 100644 --- a/src/core.c +++ b/src/core.c @@ -226,7 +226,7 @@ #include // Defines basic app state struct and manages activity #include // Native platform windowing system interface - //#include // OpenGL ES 2.0 library (not required in this module) + //#include // OpenGL ES 2.0 library (not required in this module) #endif #if defined(PLATFORM_RPI) || defined(PLATFORM_DRM) @@ -253,13 +253,13 @@ #include "EGL/egl.h" // Native platform windowing system interface #include "EGL/eglext.h" // EGL extensions - #include "GLES2/gl2.h" // OpenGL ES 2.0 library + //#include "GLES2/gl2.h" // OpenGL ES 2.0 library (not required in this module) #endif #if defined(PLATFORM_UWP) #include "EGL/egl.h" // Native platform windowing system interface #include "EGL/eglext.h" // EGL extensions - #include "GLES2/gl2.h" // OpenGL ES 2.0 library + //#include "GLES2/gl2.h" // OpenGL ES 2.0 library (not required in this module) #include "uwp_events.h" // UWP bootstrapping functions #endif @@ -4356,7 +4356,7 @@ static bool InitGraphicsDevice(int width, int height) #if defined(PLATFORM_DESKTOP) || defined(PLATFORM_WEB) rlLoadExtensions(glfwGetProcAddress); #else - rlLoadExtensions(NULL); // Uses eglGetProcAddress() internally + rlLoadExtensions(eglGetProcAddress); #endif // Initialize OpenGL context (states and resources) diff --git a/src/rlgl.h b/src/rlgl.h index d7775260d..b3eddf0c5 100644 --- a/src/rlgl.h +++ b/src/rlgl.h @@ -544,7 +544,7 @@ RLAPI void rlSetBlendFactors(int glSrcFactor, int glDstFactor, int glEquation); // rlgl initialization functions RLAPI void rlglInit(int width, int height); // Initialize rlgl (buffers, shaders, textures, states) RLAPI void rlglClose(void); // De-inititialize rlgl (buffers, shaders, textures) -RLAPI void rlLoadExtensions(void* loader); // Load OpenGL extensions (loader function pointer required) +RLAPI void rlLoadExtensions(void *loader); // Load OpenGL extensions (loader function required) RLAPI int rlGetVersion(void); // Returns current OpenGL version RLAPI int rlGetFramebufferWidth(void); // Get default framebuffer width RLAPI int rlGetFramebufferHeight(void); // Get default framebuffer height @@ -689,7 +689,7 @@ RLAPI void rlLoadDrawQuad(void); // Load and draw a quad #if defined(GRAPHICS_API_OPENGL_ES2) #define GL_GLEXT_PROTOTYPES - #include // EGL library + //#include // EGL library -> not required, platform layer #include // OpenGL ES 2.0 library #include // OpenGL ES 2.0 extensions library @@ -839,11 +839,14 @@ typedef struct rlglData { bool texMirrorClamp; // Clamp mirror wrap mode supported (GL_EXT_texture_mirror_clamp) bool texAnisoFilter; // Anisotropic texture filtering support (GL_EXT_texture_filter_anisotropic) - float maxAnisotropyLevel; // Maximum anisotropy level supported (minimum is 2.0f) + float maxAnisotropyLevel; // Maximum anisotropy level supported (minimum is 2.0f) int maxDepthBits; // Maximum bits for depth component } ExtSupported; // Extensions supported flags } rlglData; + +typedef void *(*rlglLoadProc)(const char *name); // OpenGL extension functions loader signature (same as GLADloadproc) + #endif // GRAPHICS_API_OPENGL_33 || GRAPHICS_API_OPENGL_ES2 //---------------------------------------------------------------------------------- @@ -1664,7 +1667,7 @@ void rlglClose(void) } // Load OpenGL extensions -// NOTE: External loader function could be passed as a pointer +// NOTE: External loader function must be provided void rlLoadExtensions(void *loader) { #if defined(GRAPHICS_API_OPENGL_33) // Also defined for GRAPHICS_API_OPENGL_21 @@ -1747,10 +1750,10 @@ void rlLoadExtensions(void *loader) { // The extension is supported by our hardware and driver, try to get related functions pointers // NOTE: emscripten does not support VAOs natively, it uses emulation and it reduces overall performance... - glGenVertexArrays = (PFNGLGENVERTEXARRAYSOESPROC)eglGetProcAddress("glGenVertexArraysOES"); - glBindVertexArray = (PFNGLBINDVERTEXARRAYOESPROC)eglGetProcAddress("glBindVertexArrayOES"); - glDeleteVertexArrays = (PFNGLDELETEVERTEXARRAYSOESPROC)eglGetProcAddress("glDeleteVertexArraysOES"); - //glIsVertexArray = (PFNGLISVERTEXARRAYOESPROC)eglGetProcAddress("glIsVertexArrayOES"); // NOTE: Fails in WebGL, omitted + glGenVertexArrays = (PFNGLGENVERTEXARRAYSOESPROC)((rlglLoadProc)loader)("glGenVertexArraysOES"); + glBindVertexArray = (PFNGLBINDVERTEXARRAYOESPROC)((rlglLoadProc)loader)("glBindVertexArrayOES"); + glDeleteVertexArrays = (PFNGLDELETEVERTEXARRAYSOESPROC)((rlglLoadProc)loader)("glDeleteVertexArraysOES"); + //glIsVertexArray = (PFNGLISVERTEXARRAYOESPROC)loader("glIsVertexArrayOES"); // NOTE: Fails in WebGL, omitted if ((glGenVertexArrays != NULL) && (glBindVertexArray != NULL) && (glDeleteVertexArrays != NULL)) RLGL.ExtSupported.vao = true; } @@ -1758,9 +1761,9 @@ void rlLoadExtensions(void *loader) // Check instanced rendering support if (strcmp(extList[i], (const char *)"GL_ANGLE_instanced_arrays") == 0) // Web ANGLE { - glDrawArraysInstanced = (PFNGLDRAWARRAYSINSTANCEDEXTPROC)eglGetProcAddress("glDrawArraysInstancedANGLE"); - glDrawElementsInstanced = (PFNGLDRAWELEMENTSINSTANCEDEXTPROC)eglGetProcAddress("glDrawElementsInstancedANGLE"); - glVertexAttribDivisor = (PFNGLVERTEXATTRIBDIVISOREXTPROC)eglGetProcAddress("glVertexAttribDivisorANGLE"); + glDrawArraysInstanced = (PFNGLDRAWARRAYSINSTANCEDEXTPROC)((rlglLoadProc)loader)("glDrawArraysInstancedANGLE"); + glDrawElementsInstanced = (PFNGLDRAWELEMENTSINSTANCEDEXTPROC)((rlglLoadProc)loader)("glDrawElementsInstancedANGLE"); + glVertexAttribDivisor = (PFNGLVERTEXATTRIBDIVISOREXTPROC)((rlglLoadProc)loader)("glVertexAttribDivisorANGLE"); if ((glDrawArraysInstanced != NULL) && (glDrawElementsInstanced != NULL) && (glVertexAttribDivisor != NULL)) RLGL.ExtSupported.instancing = true; } @@ -1769,9 +1772,9 @@ void rlLoadExtensions(void *loader) if ((strcmp(extList[i], (const char *)"GL_EXT_draw_instanced") == 0) && // Standard EXT (strcmp(extList[i], (const char *)"GL_EXT_instanced_arrays") == 0)) { - glDrawArraysInstanced = (PFNGLDRAWARRAYSINSTANCEDEXTPROC)eglGetProcAddress("glDrawArraysInstancedEXT"); - glDrawElementsInstanced = (PFNGLDRAWELEMENTSINSTANCEDEXTPROC)eglGetProcAddress("glDrawElementsInstancedEXT"); - glVertexAttribDivisor = (PFNGLVERTEXATTRIBDIVISOREXTPROC)eglGetProcAddress("glVertexAttribDivisorEXT"); + glDrawArraysInstanced = (PFNGLDRAWARRAYSINSTANCEDEXTPROC)((rlglLoadProc)loader)("glDrawArraysInstancedEXT"); + glDrawElementsInstanced = (PFNGLDRAWELEMENTSINSTANCEDEXTPROC)((rlglLoadProc)loader)("glDrawElementsInstancedEXT"); + glVertexAttribDivisor = (PFNGLVERTEXATTRIBDIVISOREXTPROC)((rlglLoadProc)loader)("glVertexAttribDivisorEXT"); if ((glDrawArraysInstanced != NULL) && (glDrawElementsInstanced != NULL) && (glVertexAttribDivisor != NULL)) RLGL.ExtSupported.instancing = true; } From a3e7664dcf43add951192ba9eb60c6c61e6bec85 Mon Sep 17 00:00:00 2001 From: Ray Date: Thu, 29 Apr 2021 00:07:28 +0200 Subject: [PATCH 090/121] Fixed bug that overrides other flags This issue prevented enabling MSAA on several platforms --- src/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core.c b/src/core.c index 8729ad070..a6a8505c0 100644 --- a/src/core.c +++ b/src/core.c @@ -3782,7 +3782,7 @@ static bool InitGraphicsDevice(int width, int height) #if defined(PLATFORM_ANDROID) || defined(PLATFORM_RPI) || defined(PLATFORM_DRM) || defined(PLATFORM_UWP) CORE.Window.fullscreen = true; - CORE.Window.flags &= FLAG_FULLSCREEN_MODE; + CORE.Window.flags |= FLAG_FULLSCREEN_MODE; #if defined(PLATFORM_RPI) bcm_host_init(); From ecc00357b4d2c7acf6e929402835d4302d1565a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Cavignac?= Date: Thu, 29 Apr 2021 12:13:28 +0200 Subject: [PATCH 091/121] Update BINDINGS.md (#1744) Bump version supported version by raylib-ocaml. --- BINDINGS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BINDINGS.md b/BINDINGS.md index 722997efd..186b75ee4 100644 --- a/BINDINGS.md +++ b/BINDINGS.md @@ -80,7 +80,7 @@ Here it is a list with the ones I'm aware of: | raykit | ? | [Kit](https://www.kitlang.org/) | https://github.com/Gamerfiend/raykit | | vraylib | 3.5 | [V](https://vlang.io/) | https://github.com/waotzi/vraylib | | ray.mod | 3.0 | [BlitzMax](https://blitzmax.org/) | https://github.com/bmx-ng/ray.mod | -| ray-ocaml | 3.0 | [OCaml](https://ocaml.org/) | https://github.com/tjammer/raylib-ocaml | +| ray-ocaml | 3.5 | [OCaml](https://ocaml.org/) | https://github.com/tjammer/raylib-ocaml | | raylib-mosaic | 3.0 | [Mosaic](https://github.com/sal55/langs/tree/master/Mosaic) | https://github.com/pluckyporcupine/raylib-mosaic | | raylib-xdpw | 2.6 | [XD Pascal](https://github.com/vtereshkov/xdpw) | https://github.com/vtereshkov/raylib-xdpw | | raylib-carp | 3.0 | [Carp](https://github.com/carp-lang/Carp) | https://github.com/pluckyporcupine/raylib-carp | From 4c1af4cc90913559e629c85470308b9e1a68f9a3 Mon Sep 17 00:00:00 2001 From: Ray Date: Fri, 30 Apr 2021 13:01:25 +0200 Subject: [PATCH 092/121] Update BINDINGS.md --- BINDINGS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BINDINGS.md b/BINDINGS.md index 186b75ee4..10bf3305e 100644 --- a/BINDINGS.md +++ b/BINDINGS.md @@ -89,7 +89,7 @@ Here it is a list with the ones I'm aware of: | raylib-smallBasic | 3.1-dev | [SmallBASIC](https://github.com/smallbasic/SmallBASIC) | https://github.com/smallbasic/smallbasic.plugins/tree/master/raylib | | raylib-ats2 | 3.0 | [ATS2](http://www.ats-lang.org/) | https://github.com/mephistopheles-8/raylib-ats2 | | raylib-beef | 3.0 | [Beef](https://www.beeflang.org/) | https://github.com/M0n7y5/raylib-beef | -| raylib-swift | 3.5 | [Swift](https://swift.org/) | https://github.com/x2/raylib-swift | +| raylib-swift | 3.5 | [Swift](https://swift.org/) | https://github.com/conifer-dev/raylib-swift | | raylib-never | 3.0 | [Never](https://github.com/never-lang/never) | https://github.com/never-lang/raylib-never | | hb-raylib | 3.5 | [Harbour](https://harbour.github.io) | https://github.com/MarcosLeonardoMendezGerencir/hb-raylib | | Relib | 3.5 | [ReCT](https://github.com/RedCubeDev-ByteSpace/ReCT) | https://github.com/RedCubeDev-ByteSpace/Relib | From 2015828fc68b1af6adf3846580fa912a7726dcf8 Mon Sep 17 00:00:00 2001 From: Ray Date: Mon, 3 May 2021 19:05:43 +0200 Subject: [PATCH 093/121] Security check in case of not valid font --- src/text.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/text.c b/src/text.c index 3a49963a7..3e821fe80 100644 --- a/src/text.c +++ b/src/text.c @@ -848,12 +848,14 @@ void DrawText(const char *text, int posX, int posY, int fontSize, Color color) // NOTE: chars spacing is NOT proportional to fontSize void DrawTextEx(Font font, const char *text, Vector2 position, float fontSize, float spacing, Color tint) { - int length = TextLength(text); // Total length in bytes of the text, scanned by codepoints in loop + if (font.texture.id == 0) font = GetFontDefault(); // Security check in case of not valid font + + int length = TextLength(text); // Total length in bytes of the text, scanned by codepoints in loop int textOffsetY = 0; // Offset between lines (on line break '\n') float textOffsetX = 0.0f; // Offset X to next character to draw - float scaleFactor = fontSize/font.baseSize; // Character quad scaling factor + float scaleFactor = fontSize/font.baseSize; // Character quad scaling factor for (int i = 0; i < length;) { From e5708a8f3656a7c5e387ac6803b04723b3b1add7 Mon Sep 17 00:00:00 2001 From: Ray Date: Mon, 3 May 2021 19:05:53 +0200 Subject: [PATCH 094/121] Comment tweak --- src/raylib.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/raylib.h b/src/raylib.h index 41952018d..1e4ad7d09 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -416,7 +416,7 @@ typedef struct BoundingBox { // Wave type, defines audio wave data typedef struct Wave { - unsigned int sampleCount; // Total number of samples + unsigned int sampleCount; // Total number of samples (considering channels!) unsigned int sampleRate; // Frequency (samples per second) unsigned int sampleSize; // Bit depth (bits per sample): 8, 16, 32 (24 not supported) unsigned int channels; // Number of channels (1-mono, 2-stereo) From c4eaf0076d39517a91da18f44f2be5c87457504d Mon Sep 17 00:00:00 2001 From: Ray Date: Tue, 4 May 2021 11:19:28 +0200 Subject: [PATCH 095/121] Update raylib version --- examples/Makefile | 2 +- projects/4coder/Makefile | 3 +-- projects/VSCode/Makefile | 2 +- templates/advance_game/Makefile | 2 +- templates/simple_game/Makefile | 2 +- templates/standard_game/Makefile | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/examples/Makefile b/examples/Makefile index c7a3ca2ab..475f524d6 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -25,7 +25,7 @@ # Define required raylib variables PROJECT_NAME ?= raylib_examples -RAYLIB_VERSION ?= 3.5.0 +RAYLIB_VERSION ?= 3.7.0 RAYLIB_PATH ?= .. # Define default options diff --git a/projects/4coder/Makefile b/projects/4coder/Makefile index 40a1e230a..7ba7bc3f7 100644 --- a/projects/4coder/Makefile +++ b/projects/4coder/Makefile @@ -25,8 +25,7 @@ # Define required raylib variables PROJECT_NAME ?= game -RAYLIB_VERSION ?= 2.5.0 -RAYLIB_API_VERSION ?= 2 +RAYLIB_VERSION ?= 3.7.0 RAYLIB_PATH ?= ..\.. # Define default options diff --git a/projects/VSCode/Makefile b/projects/VSCode/Makefile index 5e09d668e..dd36164da 100644 --- a/projects/VSCode/Makefile +++ b/projects/VSCode/Makefile @@ -25,7 +25,7 @@ # Define required raylib variables PROJECT_NAME ?= game -RAYLIB_VERSION ?= 3.5.0 +RAYLIB_VERSION ?= 3.7.0 RAYLIB_PATH ?= ..\.. # Define compiler path on Windows diff --git a/templates/advance_game/Makefile b/templates/advance_game/Makefile index 8983ab262..8e3eb3fb9 100644 --- a/templates/advance_game/Makefile +++ b/templates/advance_game/Makefile @@ -25,7 +25,7 @@ # Define required raylib variables PROJECT_NAME ?= advance_game -RAYLIB_VERSION ?= 3.5.0 +RAYLIB_VERSION ?= 3.7.0 RAYLIB_PATH ?= ../.. # Define default options diff --git a/templates/simple_game/Makefile b/templates/simple_game/Makefile index 785565fa8..cf5944aa4 100644 --- a/templates/simple_game/Makefile +++ b/templates/simple_game/Makefile @@ -25,7 +25,7 @@ # Define required raylib variables PROJECT_NAME ?= simple_game -RAYLIB_VERSION ?= 3.5.0 +RAYLIB_VERSION ?= 3.7.0 RAYLIB_PATH ?= ../.. # Define default options diff --git a/templates/standard_game/Makefile b/templates/standard_game/Makefile index e27adb23c..d25c47f13 100644 --- a/templates/standard_game/Makefile +++ b/templates/standard_game/Makefile @@ -25,7 +25,7 @@ # Define required raylib variables PROJECT_NAME ?= standard_game -RAYLIB_VERSION ?= 3.5.0 +RAYLIB_VERSION ?= 3.7.0 RAYLIB_PATH ?= ../.. # Define default options From a41ed986bdd97dfa0d60b361b1eb8de1516519f0 Mon Sep 17 00:00:00 2001 From: Ray Date: Tue, 4 May 2021 11:20:47 +0200 Subject: [PATCH 096/121] Expose RAYLIB_VERSION in raylib.h #1747 --- src/config.h | 2 -- src/core.c | 2 -- src/raylib.h | 2 ++ 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/config.h b/src/config.h index 99cb1d48b..54fadb239 100644 --- a/src/config.h +++ b/src/config.h @@ -25,8 +25,6 @@ * **********************************************************************************************/ -#define RAYLIB_VERSION "3.7" - //------------------------------------------------------------------------------------ // Module: core - Configuration Flags //------------------------------------------------------------------------------------ diff --git a/src/core.c b/src/core.c index a6a8505c0..e0987928c 100644 --- a/src/core.c +++ b/src/core.c @@ -116,8 +116,6 @@ // Check if config flags have been externally provided on compilation line #if !defined(EXTERNAL_CONFIG_FLAGS) #include "config.h" // Defines module configuration flags -#else - #define RAYLIB_VERSION "3.7" #endif #include "utils.h" // Required for: TRACELOG macros diff --git a/src/raylib.h b/src/raylib.h index 1e4ad7d09..bb67c1265 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -81,6 +81,8 @@ #include // Required for: va_list - Only used by TraceLogCallback +#define RAYLIB_VERSION "3.7.0" + #if defined(_WIN32) // Microsoft attibutes to tell compiler that symbols are imported/exported from a .dll #if defined(BUILD_LIBTYPE_SHARED) From 1269ce8a6f42b308102bda451fc96fe3cd8297ce Mon Sep 17 00:00:00 2001 From: Rudolf Kemmler Date: Tue, 4 May 2021 22:53:59 +0200 Subject: [PATCH 097/121] modified Makefile.Android.linux in templates/simple_game (#1748) switched out @echo for @printf to make it actually print newlines instead of literal \n's Co-authored-by: Rudolf Kemmler --- templates/simple_game/Makefile.Android.linux | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/simple_game/Makefile.Android.linux b/templates/simple_game/Makefile.Android.linux index a358b3bbf..ed9117f29 100644 --- a/templates/simple_game/Makefile.Android.linux +++ b/templates/simple_game/Makefile.Android.linux @@ -201,7 +201,7 @@ copy_project_resources: cp $(APP_ICON_LDPI) $(PROJECT_BUILD_PATH)/res/drawable-ldpi/icon.png cp $(APP_ICON_MDPI) $(PROJECT_BUILD_PATH)/res/drawable-mdpi/icon.png cp $(APP_ICON_HDPI) $(PROJECT_BUILD_PATH)/res/drawable-hdpi/icon.png - @echo "\n\ + @printf "\n\ \n\ \n\ $(APP_LABEL_NAME)\n\ @@ -223,7 +223,7 @@ else nativeloader_sharedlib= endif generate_loader_script: - @echo "package com.$(APP_COMPANY_NAME).$(APP_PRODUCT_NAME);\n\n\ + @printf "package com.$(APP_COMPANY_NAME).$(APP_PRODUCT_NAME);\n\n\ public class NativeLoader extends android.app.NativeActivity {\n\ static {\n\ $(nativeloader_sharedlib);\n\ @@ -236,7 +236,7 @@ generate_loader_script: # TODO @jseb: Replace @drawable/icon with @mipmap/icon? # https://stackoverflow.com/questions/23796414/error-no-resource-found-that-matches-the-given-name-at-icon-with-value-dr generate_android_manifest: - @echo "\n\ + @printf "\n\ \n\ From c82d9cb89a4aec4485441887f8b74fff06494be5 Mon Sep 17 00:00:00 2001 From: Astie Teddy Date: Wed, 5 May 2021 19:08:15 +0200 Subject: [PATCH 098/121] Unset CORE.Window.ready on CloseWindow (#1749) Window shouldn't be considered ready when CloseWindow has been called. --- src/core.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/core.c b/src/core.c index e0987928c..d33cc0440 100644 --- a/src/core.c +++ b/src/core.c @@ -919,6 +919,7 @@ void CloseWindow(void) if (CORE.Input.Gamepad.threadId) pthread_join(CORE.Input.Gamepad.threadId, NULL); #endif + CORE.Window.ready = false; TRACELOG(LOG_INFO, "Window closed successfully"); } From b62c86572e58c95e23c19d03e9b0bdacfa214f80 Mon Sep 17 00:00:00 2001 From: Ray Date: Fri, 7 May 2021 15:38:13 +0200 Subject: [PATCH 099/121] REVIEWED: raudio_standalone #1752 --- examples/others/raudio_standalone.c | 2 +- src/raudio.c | 54 ++++++++++++++++++++++++++--- src/raudio.h | 12 ++++--- 3 files changed, 58 insertions(+), 10 deletions(-) diff --git a/examples/others/raudio_standalone.c b/examples/others/raudio_standalone.c index 2c2636f6a..db543aca0 100644 --- a/examples/others/raudio_standalone.c +++ b/examples/others/raudio_standalone.c @@ -61,7 +61,7 @@ //---------------------------------------------------------------------------------- // Module Functions Declaration //---------------------------------------------------------------------------------- -#if !defined(_MSC_VER) +#if !defined(_WIN32) static int kbhit(void); // Check if a key has been pressed static char getch(); // Get pressed character #else diff --git a/src/raudio.c b/src/raudio.c index 2b6b0a19b..5db2407a1 100644 --- a/src/raudio.c +++ b/src/raudio.c @@ -385,6 +385,10 @@ static Wave LoadMP3(const unsigned char *fileData, unsigned int fileSize); // #if defined(RAUDIO_STANDALONE) static bool IsFileExtension(const char *fileName, const char *ext); // Check file extension +static const char *GetFileExtension(const char *fileName); // Get pointer to extension for a filename string (includes the dot: .png) +static bool TextIsEqual(const char *text1, const char *text2); // Check if two text string are equal +static const char *TextToLower(const char *text); // Get lower case version of provided string + static unsigned char *LoadFileData(const char *fileName, unsigned int *bytesRead); // Load file data as byte array (read) static bool SaveFileData(const char *fileName, void *data, unsigned int bytesToWrite); // Save data to file from byte array (write) static bool SaveFileText(const char *fileName, char *text); // Save text data to file (write), string must be '\0' terminated @@ -1587,11 +1591,11 @@ void StopMusicStream(Music music) // Update (re-fill) music buffers if data already processed void UpdateMusicStream(Music music) { - if (music.stream.buffer == NULL) - return; + if (music.stream.buffer == NULL) return; - if (music.ctxType == MUSIC_MODULE_XM) - jar_xm_set_max_loop_count(music.ctxData, music.looping ? 0 : 1); +#if defined(SUPPORT_FILEFORMAT_XM) + if (music.ctxType == MUSIC_MODULE_XM) jar_xm_set_max_loop_count(music.ctxData, music.looping ? 0 : 1); +#endif bool streamEnding = false; @@ -2327,6 +2331,48 @@ static bool IsFileExtension(const char *fileName, const char *ext) return result; } +// Get pointer to extension for a filename string (includes the dot: .png) +static const char *GetFileExtension(const char *fileName) +{ + const char *dot = strrchr(fileName, '.'); + + if (!dot || dot == fileName) return NULL; + + return dot; +} + +// Check if two text string are equal +// REQUIRES: strcmp() +static bool TextIsEqual(const char *text1, const char *text2) +{ + bool result = false; + + if (strcmp(text1, text2) == 0) result = true; + + return result; +} + +// Get lower case version of provided string +// REQUIRES: tolower() +static const char *TextToLower(const char *text) +{ + #define MAX_TEXT_BUFFER_LENGTH 1024 + + static char buffer[MAX_TEXT_BUFFER_LENGTH] = { 0 }; + + for (int i = 0; i < MAX_TEXT_BUFFER_LENGTH; i++) + { + if (text[i] != '\0') + { + buffer[i] = (char)tolower(text[i]); + //if ((text[i] >= 'A') && (text[i] <= 'Z')) buffer[i] = text[i] + 32; + } + else { buffer[i] = '\0'; break; } + } + + return buffer; +} + // Load data from file into a buffer static unsigned char *LoadFileData(const char *fileName, unsigned int *bytesRead) { diff --git a/src/raudio.h b/src/raudio.h index cf8b767a0..e37f4b274 100644 --- a/src/raudio.h +++ b/src/raudio.h @@ -138,13 +138,14 @@ void SetMasterVolume(float volume); // Set master vo // Wave/Sound loading/unloading functions Wave LoadWave(const char *fileName); // Load wave data from file +Wave LoadWaveFromMemory(const char *fileType, const unsigned char *fileData, int dataSize); // Load wave from memory buffer, fileType refers to extension: i.e. ".wav" Sound LoadSound(const char *fileName); // Load sound from file Sound LoadSoundFromWave(Wave wave); // Load sound from wave data void UpdateSound(Sound sound, const void *data, int samplesCount);// Update sound buffer with new data void UnloadWave(Wave wave); // Unload wave data void UnloadSound(Sound sound); // Unload sound -void ExportWave(Wave wave, const char *fileName); // Export wave data to file -void ExportWaveAsCode(Wave wave, const char *fileName); // Export wave sample data to code (.h) +bool ExportWave(Wave wave, const char *fileName); // Export wave data to file, returns true on success +bool ExportWaveAsCode(Wave wave, const char *fileName); // Export wave sample data to code (.h), returns true on success // Wave/Sound management functions void PlaySound(Sound sound); // Play a sound @@ -160,18 +161,19 @@ void SetSoundPitch(Sound sound, float pitch); // Set pitch for void WaveFormat(Wave *wave, int sampleRate, int sampleSize, int channels); // Convert wave data to desired format Wave WaveCopy(Wave wave); // Copy a wave to a new wave void WaveCrop(Wave *wave, int initSample, int finalSample); // Crop a wave to defined samples range -float *GetWaveData(Wave wave); // Get samples data from wave as a floats array +float *LoadWaveSamples(Wave wave); // Load samples data from wave as a floats array +void UnloadWaveSamples(float *samples); // Unload samples data loaded with LoadWaveSamples() // Music management functions Music LoadMusicStream(const char *fileName); // Load music stream from file -Music LoadMusicStreamFromMemory(const char *fileType, unsigned char* data, int dataSize); // Load module music from data +Music LoadMusicStreamFromMemory(const char *fileType, unsigned char* data, int dataSize); // Load music stream from data void UnloadMusicStream(Music music); // Unload music stream void PlayMusicStream(Music music); // Start music playing +bool IsMusicPlaying(Music music); // Check if music is playing void UpdateMusicStream(Music music); // Updates buffers for music streaming void StopMusicStream(Music music); // Stop music playing void PauseMusicStream(Music music); // Pause music playing void ResumeMusicStream(Music music); // Resume playing paused music -bool IsMusicPlaying(Music music); // Check if music is playing void SetMusicVolume(Music music, float volume); // Set volume for music (1.0 is max level) void SetMusicPitch(Music music, float pitch); // Set pitch for a music (1.0 is base level) float GetMusicTimeLength(Music music); // Get music time length (in seconds) From 133e6f097d9c088c36100cc1cd1d0773daf8e19b Mon Sep 17 00:00:00 2001 From: Jeffery Myers Date: Fri, 7 May 2021 10:49:44 -0700 Subject: [PATCH 100/121] Convert the half sleep to a sleep that is a fraction of the target FPS (Default 95%) to reduce CPU use. (#1756) Co-authored-by: Jeffery Myers --- src/config.h | 4 ++-- src/core.c | 17 +++++++++++------ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/config.h b/src/config.h index 54fadb239..6cec3446a 100644 --- a/src/config.h +++ b/src/config.h @@ -43,8 +43,8 @@ #define SUPPORT_WINMM_HIGHRES_TIMER 1 // Use busy wait loop for timing sync, if not defined, a high-resolution timer is setup and used //#define SUPPORT_BUSY_WAIT_LOOP 1 -// Use a half-busy wait loop, in this case frame sleeps for some time and runs a busy-wait-loop at the end -#define SUPPORT_HALFBUSY_WAIT_LOOP +// Use a partial-busy wait loop, in this case frame sleeps for most of the time, but then runs a busy loop at the end for accuracy +#define SUPPORT_PARTIALBUSY_WAIT_LOOP // Wait for events passively (sleeping while no events) instead of polling them actively every frame //#define SUPPORT_EVENTS_WAITING 1 // Allow automatic screen capture of current screen pressing F12, defined in KeyCallback() diff --git a/src/core.c b/src/core.c index d33cc0440..97224ddfc 100644 --- a/src/core.c +++ b/src/core.c @@ -62,8 +62,8 @@ * #define SUPPORT_BUSY_WAIT_LOOP * Use busy wait loop for timing sync, if not defined, a high-resolution timer is setup and used * -* #define SUPPORT_HALFBUSY_WAIT_LOOP -* Use a half-busy wait loop, in this case frame sleeps for some time and runs a busy-wait-loop at the end +* #define SUPPORT_PARTIALBUSY_WAIT_LOOP +* Use a partial-busy wait loop, in this case frame sleeps for most of the time and runs a busy-wait-loop at the end * * #define SUPPORT_EVENTS_WAITING * Wait for events passively (sleeping while no events) instead of polling them actively every frame @@ -4550,10 +4550,15 @@ static void Wait(float ms) // Busy wait loop while ((nextTime - prevTime) < ms/1000.0f) nextTime = GetTime(); #else - #if defined(SUPPORT_HALFBUSY_WAIT_LOOP) - #define MAX_HALFBUSY_WAIT_TIME 4 + #if defined(SUPPORT_PARTIALBUSY_WAIT_LOOP) + #define DEFAULT_PARTIALBUSY_WAIT_TIME 4 + #define PARTIALBUSY_WAIT_FACTOR 0.95f + float halfWait = DEFAULT_PARTIALBUSY_WAIT_TIME; + if (CORE.Time.target > 0) + halfWait = CORE.Time.target * PARTIALBUSY_WAIT_FACTOR; + double destTime = GetTime() + ms/1000; - if (ms > MAX_HALFBUSY_WAIT_TIME) ms -= MAX_HALFBUSY_WAIT_TIME; + if (ms > halfWait) ms -= halfWait; #endif #if defined(_WIN32) @@ -4573,7 +4578,7 @@ static void Wait(float ms) usleep(ms*1000.0f); #endif - #if defined(SUPPORT_HALFBUSY_WAIT_LOOP) + #if defined(SUPPORT_PARTIALBUSY_WAIT_LOOP) while (GetTime() < destTime) { } #endif #endif From 2565c011580fda074e0f3dceacd5e6a1476b3284 Mon Sep 17 00:00:00 2001 From: Antonio Jose Ramos Marquez Date: Sat, 8 May 2021 18:24:14 +0200 Subject: [PATCH 101/121] check for vao extension (#1757) --- src/rlgl.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/rlgl.h b/src/rlgl.h index b3eddf0c5..c60a2a701 100644 --- a/src/rlgl.h +++ b/src/rlgl.h @@ -3141,7 +3141,10 @@ unsigned int rlLoadVertexArray(void) { unsigned int vaoId = 0; #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) - glGenVertexArrays(1, &vaoId); + if (RLGL.ExtSupported.vao) + { + glGenVertexArrays(1, &vaoId); + } #endif return vaoId; } From 2545f62565fd246d1c59bf9a6bcf4942f4ad12ad Mon Sep 17 00:00:00 2001 From: Lambert Wang <77245864+lambert-wang@users.noreply.github.com> Date: Sat, 8 May 2021 09:26:24 -0700 Subject: [PATCH 102/121] Added support for additional mouse buttons (#1753) * Added support for additional mouse buttons * Renamed mouse button enum Co-authored-by: Lambert Wang --- .gitignore | 2 -- examples/audio/audio_raw_stream.c | 2 +- examples/core/core_3d_picking.c | 2 +- examples/core/core_input_mouse.c | 10 ++++--- examples/core/core_input_multitouch.c | 12 ++++----- examples/models/models_loading.c | 2 +- examples/models/models_mesh_generation.c | 2 +- examples/physics/physics_demo.c | 4 +-- examples/physics/physics_shatter.c | 2 +- examples/shaders/shaders_hot_reloading.c | 2 +- examples/shaders/shaders_julia_set.c | 6 ++--- examples/shapes/shapes_lines_bezier.c | 4 +-- examples/shapes/shapes_rectangle_scaling.c | 4 +-- examples/text/text_draw_3d.c | 2 +- examples/text/text_rectangle_bounds.c | 4 +-- examples/text/text_unicode.c | 2 +- examples/textures/textures_bunnymark.c | 2 +- examples/textures/textures_draw_tiled.c | 2 +- examples/textures/textures_image_generation.c | 2 +- examples/textures/textures_image_processing.c | 2 +- examples/textures/textures_mouse_painting.c | 12 ++++----- examples/textures/textures_sprite_button.c | 4 +-- examples/textures/textures_sprite_explosion.c | 2 +- projects/VS2017.UWP/raylib.App.UWP/App.cpp | 14 +++++----- src/camera.h | 2 +- src/core.c | 26 +++++++++++-------- src/raylib.h | 16 +++++++++--- 27 files changed, 81 insertions(+), 65 deletions(-) diff --git a/.gitignore b/.gitignore index d51b5bcd3..49e296e73 100644 --- a/.gitignore +++ b/.gitignore @@ -55,8 +55,6 @@ packages/ # Ignore all examples files examples/* -# Unignore all examples dirs -!examples/*/ # Unignore all examples files with extension !examples/*.c !examples/*.png diff --git a/examples/audio/audio_raw_stream.c b/examples/audio/audio_raw_stream.c index 219739b6a..783c54a77 100644 --- a/examples/audio/audio_raw_stream.c +++ b/examples/audio/audio_raw_stream.c @@ -71,7 +71,7 @@ int main(void) // Sample mouse input. mousePosition = GetMousePosition(); - if (IsMouseButtonDown(MOUSE_LEFT_BUTTON)) + if (IsMouseButtonDown(MOUSE_BUTTON_LEFT)) { float fp = (float)(mousePosition.y); frequency = 40.0f + (float)(fp); diff --git a/examples/core/core_3d_picking.c b/examples/core/core_3d_picking.c index 99b681e33..58d752819 100644 --- a/examples/core/core_3d_picking.c +++ b/examples/core/core_3d_picking.c @@ -47,7 +47,7 @@ int main(void) //---------------------------------------------------------------------------------- UpdateCamera(&camera); // Update camera - if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON)) + if (IsMouseButtonPressed(MOUSE_BUTTON_LEFT)) { if (!collision) { diff --git a/examples/core/core_input_mouse.c b/examples/core/core_input_mouse.c index ad205aed8..c3415e8b7 100644 --- a/examples/core/core_input_mouse.c +++ b/examples/core/core_input_mouse.c @@ -33,9 +33,13 @@ int main(void) //---------------------------------------------------------------------------------- ballPosition = GetMousePosition(); - if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON)) ballColor = MAROON; - else if (IsMouseButtonPressed(MOUSE_MIDDLE_BUTTON)) ballColor = LIME; - else if (IsMouseButtonPressed(MOUSE_RIGHT_BUTTON)) ballColor = DARKBLUE; + if (IsMouseButtonPressed(MOUSE_BUTTON_LEFT)) ballColor = MAROON; + else if (IsMouseButtonPressed(MOUSE_BUTTON_MIDDLE)) ballColor = LIME; + else if (IsMouseButtonPressed(MOUSE_BUTTON_RIGHT)) ballColor = DARKBLUE; + else if (IsMouseButtonPressed(MOUSE_BUTTON_SIDE)) ballColor = PURPLE; + else if (IsMouseButtonPressed(MOUSE_BUTTON_EXTRA)) ballColor = YELLOW; + else if (IsMouseButtonPressed(MOUSE_BUTTON_FORWARD)) ballColor = ORANGE; + else if (IsMouseButtonPressed(MOUSE_BUTTON_BACK)) ballColor = BEIGE; //---------------------------------------------------------------------------------- // Draw diff --git a/examples/core/core_input_multitouch.c b/examples/core/core_input_multitouch.c index cd074c152..32408a3b1 100644 --- a/examples/core/core_input_multitouch.c +++ b/examples/core/core_input_multitouch.c @@ -42,13 +42,13 @@ int main(void) ballColor = BEIGE; - if (IsMouseButtonDown(MOUSE_LEFT_BUTTON)) ballColor = MAROON; - if (IsMouseButtonDown(MOUSE_MIDDLE_BUTTON)) ballColor = LIME; - if (IsMouseButtonDown(MOUSE_RIGHT_BUTTON)) ballColor = DARKBLUE; + if (IsMouseButtonDown(MOUSE_BUTTON_LEFT)) ballColor = MAROON; + if (IsMouseButtonDown(MOUSE_BUTTON_MIDDLE)) ballColor = LIME; + if (IsMouseButtonDown(MOUSE_BUTTON_RIGHT)) ballColor = DARKBLUE; - if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON)) touchCounter = 10; - if (IsMouseButtonPressed(MOUSE_MIDDLE_BUTTON)) touchCounter = 10; - if (IsMouseButtonPressed(MOUSE_RIGHT_BUTTON)) touchCounter = 10; + if (IsMouseButtonPressed(MOUSE_BUTTON_LEFT)) touchCounter = 10; + if (IsMouseButtonPressed(MOUSE_BUTTON_MIDDLE)) touchCounter = 10; + if (IsMouseButtonPressed(MOUSE_BUTTON_RIGHT)) touchCounter = 10; if (touchCounter > 0) touchCounter--; //---------------------------------------------------------------------------------- diff --git a/examples/models/models_loading.c b/examples/models/models_loading.c index f6cd0589f..a7d34bbd7 100644 --- a/examples/models/models_loading.c +++ b/examples/models/models_loading.c @@ -95,7 +95,7 @@ int main(void) } // Select model on mouse click - if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON)) + if (IsMouseButtonPressed(MOUSE_BUTTON_LEFT)) { // Check collision between ray and box if (CheckCollisionRayBox(GetMouseRay(GetMousePosition(), camera), bounds)) selected = !selected; diff --git a/examples/models/models_mesh_generation.c b/examples/models/models_mesh_generation.c index ab11b84bc..095aad827 100644 --- a/examples/models/models_mesh_generation.c +++ b/examples/models/models_mesh_generation.c @@ -113,7 +113,7 @@ int main(void) //---------------------------------------------------------------------------------- UpdateCamera(&camera); // Update internal camera and our camera - if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON)) + if (IsMouseButtonPressed(MOUSE_BUTTON_LEFT)) { currentModel = (currentModel + 1)%NUM_MODELS; // Cycle between the textures } diff --git a/examples/physics/physics_demo.c b/examples/physics/physics_demo.c index 1acb0d13e..fd4c1d25c 100644 --- a/examples/physics/physics_demo.c +++ b/examples/physics/physics_demo.c @@ -63,8 +63,8 @@ int main(void) } // Physics body creation inputs - if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON)) CreatePhysicsBodyPolygon(GetMousePosition(), GetRandomValue(20, 80), GetRandomValue(3, 8), 10); - else if (IsMouseButtonPressed(MOUSE_RIGHT_BUTTON)) CreatePhysicsBodyCircle(GetMousePosition(), GetRandomValue(10, 45), 10); + if (IsMouseButtonPressed(MOUSE_BUTTON_LEFT)) CreatePhysicsBodyPolygon(GetMousePosition(), GetRandomValue(20, 80), GetRandomValue(3, 8), 10); + else if (IsMouseButtonPressed(MOUSE_BUTTON_RIGHT)) CreatePhysicsBodyCircle(GetMousePosition(), GetRandomValue(10, 45), 10); // Destroy falling physics bodies int bodiesCount = GetPhysicsBodiesCount(); diff --git a/examples/physics/physics_shatter.c b/examples/physics/physics_shatter.c index d14e9ba65..6c5bebfda 100644 --- a/examples/physics/physics_shatter.c +++ b/examples/physics/physics_shatter.c @@ -53,7 +53,7 @@ int main(void) CreatePhysicsBodyPolygon((Vector2){ screenWidth/2.0f, screenHeight/2.0f }, GetRandomValue(80, 200), GetRandomValue(3, 8), 10); } - if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON)) // Physics shatter input + if (IsMouseButtonPressed(MOUSE_BUTTON_LEFT)) // Physics shatter input { int count = GetPhysicsBodiesCount(); for (int i = count - 1; i >= 0; i--) diff --git a/examples/shaders/shaders_hot_reloading.c b/examples/shaders/shaders_hot_reloading.c index 9b46a1574..05da7b7ab 100644 --- a/examples/shaders/shaders_hot_reloading.c +++ b/examples/shaders/shaders_hot_reloading.c @@ -67,7 +67,7 @@ int main(void) SetShaderValue(shader, mouseLoc, mousePos, SHADER_UNIFORM_VEC2); // Hot shader reloading - if (shaderAutoReloading || (IsMouseButtonPressed(MOUSE_LEFT_BUTTON))) + if (shaderAutoReloading || (IsMouseButtonPressed(MOUSE_BUTTON_LEFT))) { long currentFragShaderModTime = GetFileModTime(TextFormat(fragShaderFileName, GLSL_VERSION)); diff --git a/examples/shaders/shaders_julia_set.c b/examples/shaders/shaders_julia_set.c index b6138b7be..4a12ba02e 100644 --- a/examples/shaders/shaders_julia_set.c +++ b/examples/shaders/shaders_julia_set.c @@ -115,10 +115,10 @@ int main(void) // TODO: The idea is to zoom and move around with mouse // Probably offset movement should be proportional to zoom level - if (IsMouseButtonDown(MOUSE_LEFT_BUTTON) || IsMouseButtonDown(MOUSE_RIGHT_BUTTON)) + if (IsMouseButtonDown(MOUSE_BUTTON_LEFT) || IsMouseButtonDown(MOUSE_BUTTON_RIGHT)) { - if (IsMouseButtonDown(MOUSE_LEFT_BUTTON)) zoom += zoom*0.003f; - if (IsMouseButtonDown(MOUSE_RIGHT_BUTTON)) zoom -= zoom*0.003f; + if (IsMouseButtonDown(MOUSE_BUTTON_LEFT)) zoom += zoom*0.003f; + if (IsMouseButtonDown(MOUSE_BUTTON_RIGHT)) zoom -= zoom*0.003f; Vector2 mousePos = GetMousePosition(); diff --git a/examples/shapes/shapes_lines_bezier.c b/examples/shapes/shapes_lines_bezier.c index 00b68c9f1..634eb2847 100644 --- a/examples/shapes/shapes_lines_bezier.c +++ b/examples/shapes/shapes_lines_bezier.c @@ -32,8 +32,8 @@ int main(void) { // Update //---------------------------------------------------------------------------------- - if (IsMouseButtonDown(MOUSE_LEFT_BUTTON)) start = GetMousePosition(); - else if (IsMouseButtonDown(MOUSE_RIGHT_BUTTON)) end = GetMousePosition(); + if (IsMouseButtonDown(MOUSE_BUTTON_LEFT)) start = GetMousePosition(); + else if (IsMouseButtonDown(MOUSE_BUTTON_RIGHT)) end = GetMousePosition(); //---------------------------------------------------------------------------------- // Draw diff --git a/examples/shapes/shapes_rectangle_scaling.c b/examples/shapes/shapes_rectangle_scaling.c index 6940cbcd0..bd1f0648a 100644 --- a/examples/shapes/shapes_rectangle_scaling.c +++ b/examples/shapes/shapes_rectangle_scaling.c @@ -45,7 +45,7 @@ int main(void) CheckCollisionPointRec(mousePosition, (Rectangle){ rec.x + rec.width - MOUSE_SCALE_MARK_SIZE, rec.y + rec.height - MOUSE_SCALE_MARK_SIZE, MOUSE_SCALE_MARK_SIZE, MOUSE_SCALE_MARK_SIZE })) { mouseScaleReady = true; - if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON)) mouseScaleMode = true; + if (IsMouseButtonPressed(MOUSE_BUTTON_LEFT)) mouseScaleMode = true; } else mouseScaleReady = false; @@ -59,7 +59,7 @@ int main(void) if (rec.width < MOUSE_SCALE_MARK_SIZE) rec.width = MOUSE_SCALE_MARK_SIZE; if (rec.height < MOUSE_SCALE_MARK_SIZE) rec.height = MOUSE_SCALE_MARK_SIZE; - if (IsMouseButtonReleased(MOUSE_LEFT_BUTTON)) mouseScaleMode = false; + if (IsMouseButtonReleased(MOUSE_BUTTON_LEFT)) mouseScaleMode = false; } //---------------------------------------------------------------------------------- diff --git a/examples/text/text_draw_3d.c b/examples/text/text_draw_3d.c index 4a385f7a6..bc4c55293 100644 --- a/examples/text/text_draw_3d.c +++ b/examples/text/text_draw_3d.c @@ -186,7 +186,7 @@ int main(void) } // Handle clicking the cube - if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON)) + if (IsMouseButtonPressed(MOUSE_BUTTON_LEFT)) { Ray ray = GetMouseRay(GetMousePosition(), camera); diff --git a/examples/text/text_rectangle_bounds.c b/examples/text/text_rectangle_bounds.c index cb2469554..9754cd456 100644 --- a/examples/text/text_rectangle_bounds.c +++ b/examples/text/text_rectangle_bounds.c @@ -61,7 +61,7 @@ tempor incididunt ut labore et dolore magna aliqua. Nec ullamcorper sit amet ris // Container resizing logic if (resizing) { - if (IsMouseButtonReleased(MOUSE_LEFT_BUTTON)) resizing = false; + if (IsMouseButtonReleased(MOUSE_BUTTON_LEFT)) resizing = false; float width = container.width + (mouse.x - lastMouse.x); container.width = (width > minWidth)? ((width < maxWidth)? width : maxWidth) : minWidth; @@ -72,7 +72,7 @@ tempor incididunt ut labore et dolore magna aliqua. Nec ullamcorper sit amet ris else { // Check if we're resizing - if (IsMouseButtonDown(MOUSE_LEFT_BUTTON) && CheckCollisionPointRec(mouse, resizer)) resizing = true; + if (IsMouseButtonDown(MOUSE_BUTTON_LEFT) && CheckCollisionPointRec(mouse, resizer)) resizing = true; } // Move resizer rectangle properly diff --git a/examples/text/text_unicode.c b/examples/text/text_unicode.c index f481cb2da..fa336de7f 100644 --- a/examples/text/text_unicode.c +++ b/examples/text/text_unicode.c @@ -180,7 +180,7 @@ int main(int argc, char **argv) if (IsKeyPressed(KEY_SPACE)) RandomizeEmoji(); // Set the selected emoji and copy its text to clipboard - if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON) && (hovered != -1) && (hovered != selected)) + if (IsMouseButtonPressed(MOUSE_BUTTON_LEFT) && (hovered != -1) && (hovered != selected)) { selected = hovered; selectedPos = hoveredPos; diff --git a/examples/textures/textures_bunnymark.c b/examples/textures/textures_bunnymark.c index b92b3d416..9be7c5964 100644 --- a/examples/textures/textures_bunnymark.c +++ b/examples/textures/textures_bunnymark.c @@ -49,7 +49,7 @@ int main(void) { // Update //---------------------------------------------------------------------------------- - if (IsMouseButtonDown(MOUSE_LEFT_BUTTON)) + if (IsMouseButtonDown(MOUSE_BUTTON_LEFT)) { // Create more bunnies for (int i = 0; i < 100; i++) diff --git a/examples/textures/textures_draw_tiled.c b/examples/textures/textures_draw_tiled.c index 842be11ec..bc2b1724b 100644 --- a/examples/textures/textures_draw_tiled.c +++ b/examples/textures/textures_draw_tiled.c @@ -75,7 +75,7 @@ int main(int argc, char **argv) screenHeight = GetScreenHeight(); // Handle mouse - if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON)) + if (IsMouseButtonPressed(MOUSE_BUTTON_LEFT)) { const Vector2 mouse = GetMousePosition(); diff --git a/examples/textures/textures_image_generation.c b/examples/textures/textures_image_generation.c index 0bb10583c..e2513a876 100644 --- a/examples/textures/textures_image_generation.c +++ b/examples/textures/textures_image_generation.c @@ -59,7 +59,7 @@ int main(void) { // Update //---------------------------------------------------------------------------------- - if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON) || IsKeyPressed(KEY_RIGHT)) + if (IsMouseButtonPressed(MOUSE_BUTTON_LEFT) || IsKeyPressed(KEY_RIGHT)) { currentTexture = (currentTexture + 1)%NUM_TEXTURES; // Cycle between the textures } diff --git a/examples/textures/textures_image_processing.c b/examples/textures/textures_image_processing.c index a18b15724..bb47330b7 100644 --- a/examples/textures/textures_image_processing.c +++ b/examples/textures/textures_image_processing.c @@ -80,7 +80,7 @@ int main(void) { mouseHoverRec = i; - if (IsMouseButtonReleased(MOUSE_LEFT_BUTTON)) + if (IsMouseButtonReleased(MOUSE_BUTTON_LEFT)) { currentProcess = i; textureReload = true; diff --git a/examples/textures/textures_mouse_painting.c b/examples/textures/textures_mouse_painting.c index 5cfbe6e06..3001e8532 100644 --- a/examples/textures/textures_mouse_painting.c +++ b/examples/textures/textures_mouse_painting.c @@ -88,7 +88,7 @@ int main(void) else colorMouseHover = -1; } - if ((colorMouseHover >= 0) && IsMouseButtonPressed(MOUSE_LEFT_BUTTON)) + if ((colorMouseHover >= 0) && IsMouseButtonPressed(MOUSE_BUTTON_LEFT)) { colorSelected = colorMouseHover; colorSelectedPrev = colorSelected; @@ -107,7 +107,7 @@ int main(void) EndTextureMode(); } - if (IsMouseButtonDown(MOUSE_LEFT_BUTTON) || (GetGestureDetected() == GESTURE_DRAG)) + if (IsMouseButtonDown(MOUSE_BUTTON_LEFT) || (GetGestureDetected() == GESTURE_DRAG)) { // Paint circle into render texture // NOTE: To avoid discontinuous circles, we could store @@ -117,7 +117,7 @@ int main(void) EndTextureMode(); } - if (IsMouseButtonDown(MOUSE_RIGHT_BUTTON)) + if (IsMouseButtonDown(MOUSE_BUTTON_RIGHT)) { if (!mouseWasPressed) { @@ -132,7 +132,7 @@ int main(void) if (mousePos.y > 50) DrawCircle((int)mousePos.x, (int)mousePos.y, brushSize, colors[0]); EndTextureMode(); } - else if (IsMouseButtonReleased(MOUSE_RIGHT_BUTTON) && mouseWasPressed) + else if (IsMouseButtonReleased(MOUSE_BUTTON_RIGHT) && mouseWasPressed) { colorSelected = colorSelectedPrev; mouseWasPressed = false; @@ -144,7 +144,7 @@ int main(void) // Image saving logic // NOTE: Saving painted texture to a default named image - if ((btnSaveMouseHover && IsMouseButtonReleased(MOUSE_LEFT_BUTTON)) || IsKeyPressed(KEY_S)) + if ((btnSaveMouseHover && IsMouseButtonReleased(MOUSE_BUTTON_LEFT)) || IsKeyPressed(KEY_S)) { Image image = GetTextureData(target.texture); ImageFlipVertical(&image); @@ -177,7 +177,7 @@ int main(void) // Draw drawing circle for reference if (mousePos.y > 50) { - if (IsMouseButtonDown(MOUSE_RIGHT_BUTTON)) DrawCircleLines((int)mousePos.x, (int)mousePos.y, brushSize, GRAY); + if (IsMouseButtonDown(MOUSE_BUTTON_RIGHT)) DrawCircleLines((int)mousePos.x, (int)mousePos.y, brushSize, GRAY); else DrawCircle(GetMouseX(), GetMouseY(), brushSize, colors[colorSelected]); } diff --git a/examples/textures/textures_sprite_button.c b/examples/textures/textures_sprite_button.c index 6ca4ea906..3d1a18342 100644 --- a/examples/textures/textures_sprite_button.c +++ b/examples/textures/textures_sprite_button.c @@ -53,10 +53,10 @@ int main(void) // Check button state if (CheckCollisionPointRec(mousePoint, btnBounds)) { - if (IsMouseButtonDown(MOUSE_LEFT_BUTTON)) btnState = 2; + if (IsMouseButtonDown(MOUSE_BUTTON_LEFT)) btnState = 2; else btnState = 1; - if (IsMouseButtonReleased(MOUSE_LEFT_BUTTON)) btnAction = true; + if (IsMouseButtonReleased(MOUSE_BUTTON_LEFT)) btnAction = true; } else btnState = 0; diff --git a/examples/textures/textures_sprite_explosion.c b/examples/textures/textures_sprite_explosion.c index 2394f6a88..4cb769060 100644 --- a/examples/textures/textures_sprite_explosion.c +++ b/examples/textures/textures_sprite_explosion.c @@ -53,7 +53,7 @@ int main(void) //---------------------------------------------------------------------------------- // Check for mouse button pressed and activate explosion (if not active) - if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON) && !active) + if (IsMouseButtonPressed(MOUSE_BUTTON_LEFT) && !active) { position = GetMousePosition(); active = true; diff --git a/projects/VS2017.UWP/raylib.App.UWP/App.cpp b/projects/VS2017.UWP/raylib.App.UWP/App.cpp index b7da4b85d..d2a369d66 100644 --- a/projects/VS2017.UWP/raylib.App.UWP/App.cpp +++ b/projects/VS2017.UWP/raylib.App.UWP/App.cpp @@ -231,7 +231,7 @@ void App::GameLoop() if (IsKeyDown(KEY_LEFT_ALT)) DrawRectangle(250, 250, 20, 20, BLACK); if (IsKeyDown(KEY_BACKSPACE)) DrawRectangle(280, 250, 20, 20, BLACK); - if (IsMouseButtonDown(MOUSE_LEFT_BUTTON)) DrawRectangle(280, 250, 20, 20, BLACK); + if (IsMouseButtonDown(MOUSE_BUTTON_LEFT)) DrawRectangle(280, 250, 20, 20, BLACK); DrawRectangle(280, (int)pos + 50, 20, 20, BLACK); DrawRectangle(250, 280 + (gTime++ % 60), 10, 10, PURPLE); @@ -398,9 +398,9 @@ void App::OnPointerPressed(Windows::UI::Core::CoreWindow^ sender, Windows::UI::C if (device->PointerDeviceType == Windows::Devices::Input::PointerDeviceType::Mouse) { - if (props->IsLeftButtonPressed) UWPMouseButtonEvent(MOUSE_LEFT_BUTTON, true); - if (props->IsMiddleButtonPressed) UWPMouseButtonEvent(MOUSE_MIDDLE_BUTTON, true); - if (props->IsRightButtonPressed) UWPMouseButtonEvent(MOUSE_RIGHT_BUTTON, true); + if (props->IsLeftButtonPressed) UWPMouseButtonEvent(MOUSE_BUTTON_LEFT, true); + if (props->IsMiddleButtonPressed) UWPMouseButtonEvent(MOUSE_BUTTON_MIDDLE, true); + if (props->IsRightButtonPressed) UWPMouseButtonEvent(MOUSE_BUTTON_RIGHT, true); } else if (device->PointerDeviceType == PointerDeviceType::Touch) { @@ -418,9 +418,9 @@ void App::OnPointerReleased(Windows::UI::Core::CoreWindow^ sender, Windows::UI:: if (device->PointerDeviceType == PointerDeviceType::Mouse) { - if (!props->IsLeftButtonPressed) UWPMouseButtonEvent(MOUSE_LEFT_BUTTON, false); - if (!props->IsMiddleButtonPressed) UWPMouseButtonEvent(MOUSE_MIDDLE_BUTTON, false); - if (!props->IsRightButtonPressed) UWPMouseButtonEvent(MOUSE_RIGHT_BUTTON, false); + if (!props->IsLeftButtonPressed) UWPMouseButtonEvent(MOUSE_BUTTON_LEFT, false); + if (!props->IsMiddleButtonPressed) UWPMouseButtonEvent(MOUSE_BUTTON_MIDDLE, false); + if (!props->IsRightButtonPressed) UWPMouseButtonEvent(MOUSE_BUTTON_RIGHT, false); } else if (device->PointerDeviceType == PointerDeviceType::Touch) { diff --git a/src/camera.h b/src/camera.h index cd42b54bb..35eda8310 100644 --- a/src/camera.h +++ b/src/camera.h @@ -222,7 +222,7 @@ static CameraData CAMERA = { // Global CAMERA state context .moveControl = { 'W', 'S', 'D', 'A', 'E', 'Q' }, .smoothZoomControl = 341, // raylib: KEY_LEFT_CONTROL .altControl = 342, // raylib: KEY_LEFT_ALT - .panControl = 2 // raylib: MOUSE_MIDDLE_BUTTON + .panControl = 2 // raylib: MOUSE_BUTTON_MIDDLE }; //---------------------------------------------------------------------------------- diff --git a/src/core.c b/src/core.c index 97224ddfc..00cdfffb1 100644 --- a/src/core.c +++ b/src/core.c @@ -438,12 +438,12 @@ typedef struct CoreData { bool cursorHidden; // Track if cursor is hidden bool cursorOnScreen; // Tracks if cursor is inside client area - char currentButtonState[3]; // Registers current mouse button state - char previousButtonState[3]; // Registers previous mouse button state + char currentButtonState[MOUSE_BUTTON_MAX]; // Registers current mouse button state + char previousButtonState[MOUSE_BUTTON_MAX]; // Registers previous mouse button state float currentWheelMove; // Registers current mouse wheel variation float previousWheelMove; // Registers previous mouse wheel variation #if defined(PLATFORM_RPI) || defined(PLATFORM_DRM) - char currentButtonStateEvdev[3]; // Holds the new mouse state for the next polling event to grab (Can't be written directly due to multithreading, app could miss the update) + char currentButtonStateEvdev[MOUSE_BUTTON_MAX]; // Holds the new mouse state for the next polling event to grab (Can't be written directly due to multithreading, app could miss the update) #endif } Mouse; struct { @@ -5351,11 +5351,11 @@ static int32_t AndroidInputCallback(struct android_app *app, AInputEvent *event) if (flags == AMOTION_EVENT_ACTION_DOWN || flags == AMOTION_EVENT_ACTION_MOVE) { - CORE.Input.Touch.currentTouchState[MOUSE_LEFT_BUTTON] = 1; + CORE.Input.Touch.currentTouchState[MOUSE_BUTTON_LEFT] = 1; } else if (flags == AMOTION_EVENT_ACTION_UP) { - CORE.Input.Touch.currentTouchState[MOUSE_LEFT_BUTTON] = 0; + CORE.Input.Touch.currentTouchState[MOUSE_BUTTON_LEFT] = 0; } #if defined(SUPPORT_GESTURES_SYSTEM) @@ -6068,11 +6068,11 @@ static void *EventThread(void *arg) // Touchscreen tap if (event.code == ABS_PRESSURE) { - int previousMouseLeftButtonState = CORE.Input.Mouse.currentButtonStateEvdev[MOUSE_LEFT_BUTTON]; + int previousMouseLeftButtonState = CORE.Input.Mouse.currentButtonStateEvdev[MOUSE_BUTTON_LEFT]; if (!event.value && previousMouseLeftButtonState) { - CORE.Input.Mouse.currentButtonStateEvdev[MOUSE_LEFT_BUTTON] = 0; + CORE.Input.Mouse.currentButtonStateEvdev[MOUSE_BUTTON_LEFT] = 0; #if defined(SUPPORT_GESTURES_SYSTEM) touchAction = TOUCH_UP; @@ -6082,7 +6082,7 @@ static void *EventThread(void *arg) if (event.value && !previousMouseLeftButtonState) { - CORE.Input.Mouse.currentButtonStateEvdev[MOUSE_LEFT_BUTTON] = 1; + CORE.Input.Mouse.currentButtonStateEvdev[MOUSE_BUTTON_LEFT] = 1; #if defined(SUPPORT_GESTURES_SYSTEM) touchAction = TOUCH_DOWN; @@ -6099,7 +6099,7 @@ static void *EventThread(void *arg) // Mouse button parsing if ((event.code == BTN_TOUCH) || (event.code == BTN_LEFT)) { - CORE.Input.Mouse.currentButtonStateEvdev[MOUSE_LEFT_BUTTON] = event.value; + CORE.Input.Mouse.currentButtonStateEvdev[MOUSE_BUTTON_LEFT] = event.value; #if defined(SUPPORT_GESTURES_SYSTEM) if (event.value > 0) touchAction = TOUCH_DOWN; @@ -6108,8 +6108,12 @@ static void *EventThread(void *arg) #endif } - if (event.code == BTN_RIGHT) CORE.Input.Mouse.currentButtonStateEvdev[MOUSE_RIGHT_BUTTON] = event.value; - if (event.code == BTN_MIDDLE) CORE.Input.Mouse.currentButtonStateEvdev[MOUSE_MIDDLE_BUTTON] = event.value; + if (event.code == BTN_RIGHT) CORE.Input.Mouse.currentButtonStateEvdev[MOUSE_BUTTON_RIGHT] = event.value; + if (event.code == BTN_MIDDLE) CORE.Input.Mouse.currentButtonStateEvdev[MOUSE_BUTTON_MIDDLE] = event.value; + if (event.code == BTN_SIDE) CORE.Input.Mouse.currentButtonStateEvdev[MOUSE_BUTTON_SIDE] = event.value; + if (event.code == BTN_EXTRA) CORE.Input.Mouse.currentButtonStateEvdev[MOUSE_BUTTON_EXTRA] = event.value; + if (event.code == BTN_FORWARD) CORE.Input.Mouse.currentButtonStateEvdev[MOUSE_BUTTON_FORWARD] = event.value; + if (event.code == BTN_BACK) CORE.Input.Mouse.currentButtonStateEvdev[MOUSE_BUTTON_BACK] = event.value; } // Screen confinement diff --git a/src/raylib.h b/src/raylib.h index bb67c1265..53c816483 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -637,11 +637,21 @@ typedef enum { KEY_VOLUME_DOWN = 25 } KeyboardKey; +// Add backwards compatibility support for deprecated names +#define MOUSE_LEFT_BUTTON MOUSE_BUTTON_LEFT +#define MOUSE_RIGHT_BUTTON MOUSE_BUTTON_RIGHT +#define MOUSE_MIDDLE_BUTTON MOUSE_BUTTON_MIDDLE + // Mouse buttons typedef enum { - MOUSE_LEFT_BUTTON = 0, - MOUSE_RIGHT_BUTTON = 1, - MOUSE_MIDDLE_BUTTON = 2 + MOUSE_BUTTON_LEFT = 0, + MOUSE_BUTTON_RIGHT = 1, + MOUSE_BUTTON_MIDDLE = 2, + MOUSE_BUTTON_SIDE = 3, + MOUSE_BUTTON_EXTRA = 4, + MOUSE_BUTTON_FORWARD = 5, + MOUSE_BUTTON_BACK = 6, + MOUSE_BUTTON_MAX = 7 } MouseButton; // Mouse cursor From 1d0767022dfa1cb9a7346dcf0285908549614646 Mon Sep 17 00:00:00 2001 From: ProphesorIks <33833914+ProphesorIks@users.noreply.github.com> Date: Mon, 10 May 2021 01:51:37 +0300 Subject: [PATCH 103/121] ~Updated project version (#1761) Updated to fix versioning and linking issues. Old version would cause examples to not be linked on fresh raylib install or linked with an old library version on updated raylib install. --- src/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d1d80652b..38ca3f404 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,7 +1,7 @@ # Setup the project and settings project(raylib C) -set(PROJECT_VERSION 3.5.0) -set(API_VERSION 351) +set(PROJECT_VERSION 3.7.0) +set(API_VERSION 370) include(GNUInstallDirs) include(JoinPaths) From 5d831f3f1853217c27e9c80a12caecf5b8f3133a Mon Sep 17 00:00:00 2001 From: Dmitry Matveyev Date: Mon, 10 May 2021 23:43:17 +0600 Subject: [PATCH 104/121] Update NimraylibNow! - Nim language bindings version to 3.7 (#1764) --- BINDINGS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BINDINGS.md b/BINDINGS.md index 10bf3305e..94fb0c5f4 100644 --- a/BINDINGS.md +++ b/BINDINGS.md @@ -33,7 +33,7 @@ Here it is a list with the ones I'm aware of: | raylib-nim | 2.0 | [Nim](https://nim-lang.org/) | https://github.com/Skrylar/raylib-nim | | raylib-Forever | 3.1-dev | [Nim](https://nim-lang.org/) | https://github.com/Guevara-chan/Raylib-Forever | | nim-raylib | 3.1-dev | [Nim](https://nim-lang.org/) | https://github.com/tomc1998/nim-raylib | -| NimraylibNow! | 3.5-dev | [Nim](https://nim-lang.org/) | https://github.com/greenfork/nimraylib_now | +| NimraylibNow! | 3.7 | [Nim](https://nim-lang.org/) | https://github.com/greenfork/nimraylib_now | | raylib-haskell | 2.0 | [Haskell](https://www.haskell.org/) | https://github.com/DevJac/raylib-haskell | | raylib-cr | 2.5-dev | [Crystal](https://crystal-lang.org/) | https://github.com/AregevDev/raylib-cr | | cray | 1.8 | [Crystal](https://crystal-lang.org/) | https://gitlab.com/Zatherz/cray | From e39e45824db79623fa4c7b55a606ca79fc27659e Mon Sep 17 00:00:00 2001 From: Lambert Wang <77245864+lambert-wang@users.noreply.github.com> Date: Mon, 10 May 2021 11:08:58 -0700 Subject: [PATCH 105/121] Add RenderPolyLinesEx routine (#1758) Co-authored-by: Lambert Wang --- examples/shapes/shapes_basic_shapes.c | 21 ++++--- src/raylib.h | 5 +- src/shapes.c | 86 +++++++++++++++++++++++---- 3 files changed, 92 insertions(+), 20 deletions(-) diff --git a/examples/shapes/shapes_basic_shapes.c b/examples/shapes/shapes_basic_shapes.c index cd165d2e6..086de774a 100644 --- a/examples/shapes/shapes_basic_shapes.c +++ b/examples/shapes/shapes_basic_shapes.c @@ -39,27 +39,32 @@ int main(void) DrawText("some basic shapes available on raylib", 20, 20, 20, DARKGRAY); - DrawCircle(screenWidth/4, 120, 35, DARKBLUE); + // Circle shapes and lines + DrawCircle(screenWidth/5, 120, 35, DARKBLUE); + DrawCircleGradient(screenWidth/5, 220, 60, GREEN, SKYBLUE); + DrawCircleLines(screenWidth/5, 340, 80, DARKBLUE); + // Rectangle shapes and ines DrawRectangle(screenWidth/4*2 - 60, 100, 120, 60, RED); - DrawRectangleLines(screenWidth/4*2 - 40, 320, 80, 60, ORANGE); // NOTE: Uses QUADS internally, not lines DrawRectangleGradientH(screenWidth/4*2 - 90, 170, 180, 130, MAROON, GOLD); + DrawRectangleLines(screenWidth/4*2 - 40, 320, 80, 60, ORANGE); // NOTE: Uses QUADS internally, not lines + // Triangle shapes and lines DrawTriangle((Vector2){screenWidth/4.0f *3.0f, 80.0f}, (Vector2){screenWidth/4.0f *3.0f - 60.0f, 150.0f}, (Vector2){screenWidth/4.0f *3.0f + 60.0f, 150.0f}, VIOLET); - DrawPoly((Vector2){screenWidth/4*3, 320}, 6, 80, 0, BROWN); + DrawTriangleLines((Vector2){screenWidth/4.0f*3.0f, 160.0f}, + (Vector2){screenWidth/4.0f*3.0f - 20.0f, 230.0f}, + (Vector2){screenWidth/4.0f*3.0f + 20.0f, 230.0f}, DARKBLUE); - DrawCircleGradient(screenWidth/4, 220, 60, GREEN, SKYBLUE); + // Polygon shapes and lines + DrawPoly((Vector2){screenWidth/4*3, 320}, 6, 80, 0, BROWN); + DrawPolyLinesEx((Vector2){screenWidth/4*3, 320}, 6, 80, 0, 6, BEIGE); // NOTE: We draw all LINES based shapes together to optimize internal drawing, // this way, all LINES are rendered in a single draw pass DrawLine(18, 42, screenWidth - 18, 42, BLACK); - DrawCircleLines(screenWidth/4, 340, 80, DARKBLUE); - DrawTriangleLines((Vector2){screenWidth/4.0f*3.0f, 160.0f}, - (Vector2){screenWidth/4.0f*3.0f - 20.0f, 230.0f}, - (Vector2){screenWidth/4.0f*3.0f + 20.0f, 230.0f}, DARKBLUE); EndDrawing(); //---------------------------------------------------------------------------------- } diff --git a/src/raylib.h b/src/raylib.h index 53c816483..4caed9134 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -1172,15 +1172,16 @@ RLAPI void DrawRectangleGradientV(int posX, int posY, int width, int height, Col RLAPI void DrawRectangleGradientH(int posX, int posY, int width, int height, Color color1, Color color2);// Draw a horizontal-gradient-filled rectangle RLAPI void DrawRectangleGradientEx(Rectangle rec, Color col1, Color col2, Color col3, Color col4); // Draw a gradient-filled rectangle with custom vertex colors RLAPI void DrawRectangleLines(int posX, int posY, int width, int height, Color color); // Draw rectangle outline -RLAPI void DrawRectangleLinesEx(Rectangle rec, int lineThick, Color color); // Draw rectangle outline with extended parameters +RLAPI void DrawRectangleLinesEx(Rectangle rec, float lineThick, Color color); // Draw rectangle outline with extended parameters RLAPI void DrawRectangleRounded(Rectangle rec, float roundness, int segments, Color color); // Draw rectangle with rounded edges -RLAPI void DrawRectangleRoundedLines(Rectangle rec, float roundness, int segments, int lineThick, Color color); // Draw rectangle with rounded edges outline +RLAPI void DrawRectangleRoundedLines(Rectangle rec, float roundness, int segments, float lineThick, Color color); // Draw rectangle with rounded edges outline RLAPI void DrawTriangle(Vector2 v1, Vector2 v2, Vector2 v3, Color color); // Draw a color-filled triangle (vertex in counter-clockwise order!) RLAPI void DrawTriangleLines(Vector2 v1, Vector2 v2, Vector2 v3, Color color); // Draw triangle outline (vertex in counter-clockwise order!) RLAPI void DrawTriangleFan(Vector2 *points, int pointsCount, Color color); // Draw a triangle fan defined by points (first vertex is the center) RLAPI void DrawTriangleStrip(Vector2 *points, int pointsCount, Color color); // Draw a triangle strip defined by points RLAPI void DrawPoly(Vector2 center, int sides, float radius, float rotation, Color color); // Draw a regular polygon (Vector version) RLAPI void DrawPolyLines(Vector2 center, int sides, float radius, float rotation, Color color); // Draw a polygon outline of n sides +RLAPI void DrawPolyLinesEx(Vector2 center, int sides, float radius, float rotation, float lineThick, Color color); // Draw a polygon outline of n sides with extended parameters // Basic shapes collision detection functions RLAPI bool CheckCollisionRecs(Rectangle rec1, Rectangle rec2); // Check collision between two rectangles diff --git a/src/shapes.c b/src/shapes.c index ae2611182..9f03bfb3e 100644 --- a/src/shapes.c +++ b/src/shapes.c @@ -766,7 +766,7 @@ void DrawRectangleLines(int posX, int posY, int width, int height, Color color) } // Draw rectangle outline with extended parameters -void DrawRectangleLinesEx(Rectangle rec, int lineThick, Color color) +void DrawRectangleLinesEx(Rectangle rec, float lineThick, Color color) { if ((lineThick > rec.width) || (lineThick > rec.height)) { @@ -784,11 +784,11 @@ void DrawRectangleLinesEx(Rectangle rec, int lineThick, Color color) // BBBBBBBB // BBBBBBBB // - float thick = (float)lineThick; - Rectangle top = { rec.x, rec.y, rec.width, thick }; - Rectangle bottom = { rec.x, rec.y - thick + rec.height, rec.width, thick }; - Rectangle left = { rec.x, rec.y + thick, thick, rec.height - thick*2.0f }; - Rectangle right = { rec.x - thick + rec.width, rec.y + thick, thick, rec.height - thick*2.0f }; + + Rectangle top = { rec.x, rec.y, rec.width, lineThick }; + Rectangle bottom = { rec.x, rec.y - lineThick + rec.height, rec.width, lineThick }; + Rectangle left = { rec.x, rec.y + lineThick, lineThick, rec.height - lineThick*2.0f }; + Rectangle right = { rec.x - lineThick + rec.width, rec.y + lineThick, lineThick, rec.height - lineThick*2.0f }; DrawRectangleRec(top, color); DrawRectangleRec(bottom, color); @@ -1019,7 +1019,7 @@ void DrawRectangleRounded(Rectangle rec, float roundness, int segments, Color co } // Draw rectangle with rounded edges outline -void DrawRectangleRoundedLines(Rectangle rec, float roundness, int segments, int lineThick, Color color) +void DrawRectangleRoundedLines(Rectangle rec, float roundness, int segments, float lineThick, Color color) { if (lineThick < 0) lineThick = 0; @@ -1046,7 +1046,7 @@ void DrawRectangleRoundedLines(Rectangle rec, float roundness, int segments, int } float stepLength = 90.0f/(float)segments; - const float outerRadius = radius + (float)lineThick, innerRadius = radius; + const float outerRadius = radius + lineThick, innerRadius = radius; /* Quick sketch to make sense of all of this, @@ -1379,7 +1379,11 @@ void DrawPoly(Vector2 center, int sides, float radius, float rotation, Color col if (sides < 3) sides = 3; float centralAngle = 0.0f; - rlCheckRenderBatchLimit(4*(360/sides)); +#if defined(SUPPORT_QUADS_DRAW_MODE) + rlCheckRenderBatchLimit(4*sides); // Each side is a quad +#else + rlCheckRenderBatchLimit(3*sides); +#endif rlPushMatrix(); rlTranslatef(center.x, center.y, 0.0f); @@ -1431,7 +1435,7 @@ void DrawPolyLines(Vector2 center, int sides, float radius, float rotation, Colo if (sides < 3) sides = 3; float centralAngle = 0.0f; - rlCheckRenderBatchLimit(3*(360/sides)); + rlCheckRenderBatchLimit(2*sides); rlPushMatrix(); rlTranslatef(center.x, center.y, 0.0f); @@ -1450,6 +1454,68 @@ void DrawPolyLines(Vector2 center, int sides, float radius, float rotation, Colo rlPopMatrix(); } +void DrawPolyLinesEx(Vector2 center, int sides, float radius, float rotation, float lineThick, Color color) +{ + if (sides < 3) sides = 3; + float centralAngle = 0.0f; + float exteriorAngle = 360.0f/(float)sides; + float innerRadius = radius - (lineThick*cosf(DEG2RAD*exteriorAngle/2.0f)); + +#if defined(SUPPORT_QUADS_DRAW_MODE) + rlCheckRenderBatchLimit(4*sides); +#else + rlCheckRenderBatchLimit(6*sides); +#endif + + rlPushMatrix(); + rlTranslatef(center.x, center.y, 0.0f); + rlRotatef(rotation, 0.0f, 0.0f, 1.0f); + +#if defined(SUPPORT_QUADS_DRAW_MODE) + rlSetTexture(texShapes.id); + + rlBegin(RL_QUADS); + for (int i = 0; i < sides; i++) + { + rlColor4ub(color.r, color.g, color.b, color.a); + + rlTexCoord2f(texShapesRec.x/texShapes.width, texShapesRec.y/texShapes.height); + rlVertex2f(sinf(DEG2RAD*centralAngle)*innerRadius, cosf(DEG2RAD*centralAngle)*innerRadius); + + rlTexCoord2f(texShapesRec.x/texShapes.width, (texShapesRec.y + texShapesRec.height)/texShapes.height); + rlVertex2f(sinf(DEG2RAD*centralAngle)*radius, cosf(DEG2RAD*centralAngle)*radius); + + centralAngle += exteriorAngle; + rlTexCoord2f((texShapesRec.x + texShapesRec.width)/texShapes.width, texShapesRec.y/texShapes.height); + rlVertex2f(sinf(DEG2RAD*centralAngle)*radius, cosf(DEG2RAD*centralAngle)*radius); + + rlTexCoord2f((texShapesRec.x + texShapesRec.width)/texShapes.width, (texShapesRec.y + texShapesRec.height)/texShapes.height); + rlVertex2f(sinf(DEG2RAD*centralAngle)*innerRadius, cosf(DEG2RAD*centralAngle)*innerRadius); + } + rlEnd(); + rlSetTexture(0); +#else + rlBegin(RL_TRIANGLES); + for (int i = 0; i < sides; i++) + { + rlColor4ub(color.r, color.g, color.b, color.a); + float nextAngle = centralAngle + exteriorAngle; + + rlVertex2f(sinf(DEG2RAD*centralAngle)*radius, cosf(DEG2RAD*centralAngle)*radius); + rlVertex2f(sinf(DEG2RAD*centralAngle)*innerRadius, cosf(DEG2RAD*centralAngle)*innerRadius); + rlVertex2f(sinf(DEG2RAD*nextAngle)*radius, cosf(DEG2RAD*nextAngle)*radius); + + rlVertex2f(sinf(DEG2RAD*centralAngle)*innerRadius, cosf(DEG2RAD*centralAngle)*innerRadius); + rlVertex2f(sinf(DEG2RAD*nextAngle)*radius, cosf(DEG2RAD*nextAngle)*radius); + rlVertex2f(sinf(DEG2RAD*nextAngle)*innerRadius, cosf(DEG2RAD*nextAngle)*innerRadius); + + centralAngle = nextAngle; + } + rlEnd(); +#endif + rlPopMatrix(); +} + //---------------------------------------------------------------------------------- // Module Functions Definition - Collision Detection functions //---------------------------------------------------------------------------------- From 4ab28fffb42bc3104bca48166ea4d7712450852d Mon Sep 17 00:00:00 2001 From: Gianni Alessandroni <45824238+NotManyIdeasDev@users.noreply.github.com> Date: Mon, 10 May 2021 20:16:12 +0200 Subject: [PATCH 106/121] Added smooth pixel-perfect camera example + Small typo fix in examples_template.c (#1760) * Typo fix Changed "bsasic" to "basic" in the comments. * Added pixel-perfect camera example Added pixel-perfect camera example, both the .c file and the cover .png image. The example works with any resolution you want, as long as the ratio stays the same (ex. 16:9, 4:3) ecc. * Fixed Typecasts Fixed compiler errors (implicit conversions) * Precomputed rectangles, time-based movement and whitespace fix Moved the source and destination rectangles for the renderTexture into their own variables, modified the animation to be time-based instead of frame-based, fixed the bug with whitespaces. * Fixed spacing and added more consistency with sinf() and cosf() * Fixed *= operator spacing --- .../core/core_2d_camera_smooth_pixelperfect.c | 136 ++++++++++++++++++ .../core_2d_camera_smooth_pixelperfect.png | Bin 0 -> 6365 bytes examples/examples_template.c | 4 +- 3 files changed, 138 insertions(+), 2 deletions(-) create mode 100644 examples/core/core_2d_camera_smooth_pixelperfect.c create mode 100644 examples/core/core_2d_camera_smooth_pixelperfect.png diff --git a/examples/core/core_2d_camera_smooth_pixelperfect.c b/examples/core/core_2d_camera_smooth_pixelperfect.c new file mode 100644 index 000000000..3594c4abc --- /dev/null +++ b/examples/core/core_2d_camera_smooth_pixelperfect.c @@ -0,0 +1,136 @@ +/******************************************************************************************* +* +* raylib [core] example - smooth pixel-perfect camera +* +* This example has been created using raylib 3.7 (www.raylib.com) +* raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details) +* +* Example contributed by Giancamillo Alessandroni ([discord]NotManyIdeas#9972 - [github]NotManyIdeasDev) and +* reviewed by Ramon Santamaria (@raysan5) +* +* Copyright (c) 2021 Giancamillo Alessandroni (NotManyIdeas#9972) and Ramon Santamaria (@raysan5) +* +********************************************************************************************/ + +#include "raylib.h" +#include + +int main(void) +{ + // Initialization + //-------------------------------------------------------------------------------------- + const int screenWidth = 800; + const int screenHeight = 450; + + const int virualScreenWidth = 160; + const int virtualScreenHeight = 90; + + const float virtualRatio = (float)screenWidth/(float)virualScreenWidth; + + InitWindow(screenWidth, screenHeight, "raylib [core] example - smooth pixel-perfect camera"); + + Camera2D worldSpaceCamera = { 0 }; // Game world camera + worldSpaceCamera.zoom = 1.0f; + + Camera2D screenSpaceCamera = { 0 }; //Smoothing camera + screenSpaceCamera.zoom = 1.0f; + + RenderTexture2D renderTexture = LoadRenderTexture(virualScreenWidth, virtualScreenHeight); //This is where we'll draw all our objects. + + Rectangle firstRectangle = { 70.0f, 35.0f, 20.0f, 20.0f }; + Rectangle secondRectangle = { 90.0f, 55.0f, 30.0f, 10.0f }; + Rectangle thirdRectangle = { 80.0f, 65.0f, 15.0f, 25.0f }; + + //The renderTexture's height is flipped (in the source Rectangle), due to OpenGL reasons. + Rectangle renderTextureSource = { 0.0f, 0.0f, (float)renderTexture.texture.width, (float)-renderTexture.texture.height }; + Rectangle renderTextureDest = { -virtualRatio, -virtualRatio, screenWidth + (virtualRatio*2), screenHeight + (virtualRatio*2) }; + + Vector2 origin = { 0.0f, 0.0f }; + + float rotation = 0.0f; + float degreesPerSecond = 60.0f; + + float cameraX = 0.0f; + float cameraY = 0.0f; + + SetTargetFPS(60); + //-------------------------------------------------------------------------------------- + + // Main game loop + while (!WindowShouldClose()) // Detect window close button or ESC key + { + // Update + //---------------------------------------------------------------------------------- + rotation += degreesPerSecond*GetFrameTime(); // Rotate the rectangles. + + // Make the camera move to demonstrate the effect. + cameraX = (sinf(GetTime())*50.0f) - 10.0f; + cameraY = cosf(GetTime())*30.0f; + + // Set the camera's target to the values computed above. + screenSpaceCamera.target = (Vector2){ cameraX, cameraY }; + + // Round worldCamera's X, keep the decimals on screenSpaceCamera. + if (screenSpaceCamera.target.x >= 1 || screenSpaceCamera.target.x <= -1) + { + worldSpaceCamera.target.x = (int)screenSpaceCamera.target.x; + screenSpaceCamera.target.x -= worldSpaceCamera.target.x; + screenSpaceCamera.target.x *= virtualRatio; + } + + // Round worldCamera's Y, keep the decimals on screenSpaceCamera. + if (screenSpaceCamera.target.y >= 1 || screenSpaceCamera.target.y <= -1) + { + worldSpaceCamera.target.y = (int)screenSpaceCamera.target.y; + screenSpaceCamera.target.y -= worldSpaceCamera.target.y; + screenSpaceCamera.target.y *= virtualRatio; + } + //---------------------------------------------------------------------------------- + + // Draw + //---------------------------------------------------------------------------------- + BeginDrawing(); + ClearBackground(RED); // This is for debug purposes. If you see red, then you've probably done something wrong. + + BeginTextureMode(renderTexture); + BeginMode2D(worldSpaceCamera); + ClearBackground(RAYWHITE); // This is the color you should see as background color. + + // Draw the rectangles + DrawRectanglePro(firstRectangle, origin, rotation, BLACK); + DrawRectanglePro(secondRectangle, origin, -rotation, RED); + DrawRectanglePro(thirdRectangle, origin, rotation + 45.0f, BLUE); + + EndMode2D(); + EndTextureMode(); + + BeginMode2D(screenSpaceCamera); + + // Draw the render texture with an offset of 1 worldSpace unit/pixel, so that the content behind the renderTexture is not shown. + DrawTexturePro( + renderTexture.texture, + renderTextureSource, + renderTextureDest, + origin, + 0.0f, + WHITE + ); + + EndMode2D(); + + //Debug info + DrawText("Screen resolution: 800x450", 5, 0, 20, DARKBLUE); + DrawText("World resolution: 160x90", 5, 20, 20, DARKGREEN); + DrawFPS(screenWidth - 75, 0); + EndDrawing(); + //---------------------------------------------------------------------------------- + } + + // De-Initialization + //-------------------------------------------------------------------------------------- + UnloadRenderTexture(renderTexture); // RenderTexture unloading + CloseWindow(); // Close window and OpenGL context + //-------------------------------------------------------------------------------------- + + return 0; +} \ No newline at end of file diff --git a/examples/core/core_2d_camera_smooth_pixelperfect.png b/examples/core/core_2d_camera_smooth_pixelperfect.png new file mode 100644 index 0000000000000000000000000000000000000000..aeac7944688c34c2a38b299721cf90915fb22084 GIT binary patch literal 6365 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 - Lower case filename, words separated by underscore, @@ -95,4 +95,4 @@ int main() //-------------------------------------------------------------------------------------- return 0; -} \ No newline at end of file +} From ac204a11f7eb5d03e88188b06d004bb680902bfb Mon Sep 17 00:00:00 2001 From: nobytesgiven <80068279+nobytesgiven@users.noreply.github.com> Date: Tue, 11 May 2021 01:55:43 +0300 Subject: [PATCH 107/121] Redesigned billboards - added rotation/pro functions (#1759) * Redesigned billboards - added rotation/pro functions * updated parameters Co-authored-by: nobytesgiven --- src/models.c | 97 +++++++++++++++++++++++++++++++++++++++------------- src/raylib.h | 4 ++- 2 files changed, 76 insertions(+), 25 deletions(-) diff --git a/src/models.c b/src/models.c index feaadf838..7a0ce8ad6 100644 --- a/src/models.c +++ b/src/models.c @@ -2802,15 +2802,28 @@ void DrawBillboard(Camera camera, Texture2D texture, Vector3 center, float size, { Rectangle source = { 0.0f, 0.0f, (float)texture.width, (float)texture.height }; - DrawBillboardRec(camera, texture, source, center, size, tint); + DrawBillboardRec(camera, texture, source, center, (Vector2){ size, size }, tint); } // Draw a billboard (part of a texture defined by a rectangle) -void DrawBillboardRec(Camera camera, Texture2D texture, Rectangle source, Vector3 center, float size, Color tint) +void DrawBillboardRec(Camera camera, Texture2D texture, Rectangle source, Vector3 center, Vector2 size, Color tint) +{ + DrawBillboardPro(camera, texture, source, center, size, Vector2Zero(), 0.0f, tint); +} + +// Draw a billboard (part of a texture defined by a rectangle) +void DrawBillboardEx(Camera camera, Texture2D texture, Vector3 center, Vector2 origin, float rotation, Vector2 size, Color tint) +{ + Rectangle source = { 0.0f, 0.0f, (float)texture.width, (float)texture.height }; + + DrawBillboardPro(camera, texture, source, center, size, origin, rotation, tint); +} + +void DrawBillboardPro(Camera camera, Texture2D texture, Rectangle source, Vector3 position, Vector2 size, Vector2 origin, float rotation, Color tint) { // NOTE: Billboard size will maintain source rectangle aspect ratio, size will represent billboard width - Vector2 sizeRatio = { size, size*(float)source.height/source.width }; - + Vector2 sizeRatio = { size.y, size.x*(float)source.height/source.width }; + Matrix matView = MatrixLookAt(camera.position, camera.target, camera.up); Vector3 right = { matView.m0, matView.m4, matView.m8 }; @@ -2818,24 +2831,60 @@ void DrawBillboardRec(Camera camera, Texture2D texture, Rectangle source, Vector // NOTE: Billboard locked on axis-Y Vector3 up = { 0.0f, 1.0f, 0.0f }; -/* - a-------b - | | - | * | - | | - d-------c -*/ - right = Vector3Scale(right, sizeRatio.x/2); - up = Vector3Scale(up, sizeRatio.y/2); - Vector3 p1 = Vector3Add(right, up); - Vector3 p2 = Vector3Subtract(right, up); + Vector3 rightScaled = Vector3Scale(right, sizeRatio.x/2); + Vector3 upScaled = Vector3Scale(up, sizeRatio.y/2); + + Vector3 p1 = Vector3Add(rightScaled, upScaled); + Vector3 p2 = Vector3Subtract(rightScaled, upScaled); - Vector3 a = Vector3Subtract(center, p2); - Vector3 b = Vector3Add(center, p1); - Vector3 c = Vector3Add(center, p2); - Vector3 d = Vector3Subtract(center, p1); + Vector3 topLeft = Vector3Scale(p2, -1); + Vector3 topRight = p1; + Vector3 bottomRight = p2; + Vector3 bottomLeft = Vector3Scale(p1, -1); + + if (rotation != 0.0f) + { + float sinRotation = sinf(rotation*DEG2RAD); + float cosRotation = cosf(rotation*DEG2RAD); + + // NOTE: (-1, 1) is the range where origin.x, origin.y is inside the texture + float rotateAboutX = sizeRatio.x*origin.x/2; + float rotateAboutY = sizeRatio.y*origin.y/2; + + float xtvalue, ytvalue; + float rotatedX, rotatedY; + + xtvalue = Vector3DotProduct(right, topLeft) - rotateAboutX; // Project points to x and y coordinates on the billboard plane + ytvalue = Vector3DotProduct(up, topLeft) - rotateAboutY; + rotatedX = xtvalue*cosRotation - ytvalue*sinRotation + rotateAboutX; // Rotate about the point origin + rotatedY = xtvalue*sinRotation + ytvalue*cosRotation + rotateAboutY; + topLeft = Vector3Add(Vector3Scale(up, rotatedY), Vector3Scale(right, rotatedX)); // Translate back to cartesian coordinates + + xtvalue = Vector3DotProduct(right, topRight) - rotateAboutX; + ytvalue = Vector3DotProduct(up, topRight) - rotateAboutY; + rotatedX = xtvalue*cosRotation - ytvalue*sinRotation + rotateAboutX; + rotatedY = xtvalue*sinRotation + ytvalue*cosRotation + rotateAboutY; + topRight = Vector3Add(Vector3Scale(up, rotatedY), Vector3Scale(right, rotatedX)); + xtvalue = Vector3DotProduct(right, bottomRight) - rotateAboutX; + ytvalue = Vector3DotProduct(up, bottomRight) - rotateAboutY; + rotatedX = xtvalue*cosRotation - ytvalue*sinRotation + rotateAboutX; + rotatedY = xtvalue*sinRotation + ytvalue*cosRotation + rotateAboutY; + bottomRight = Vector3Add(Vector3Scale(up, rotatedY), Vector3Scale(right, rotatedX)); + + xtvalue = Vector3DotProduct(right, bottomLeft)-rotateAboutX; + ytvalue = Vector3DotProduct(up, bottomLeft)-rotateAboutY; + rotatedX = xtvalue*cosRotation - ytvalue*sinRotation + rotateAboutX; + rotatedY = xtvalue*sinRotation + ytvalue*cosRotation + rotateAboutY; + bottomLeft = Vector3Add(Vector3Scale(up, rotatedY), Vector3Scale(right, rotatedX)); + } + + topLeft = Vector3Add(topLeft, position); // Translate points to the draw center (position) + topRight = Vector3Add(topRight, position); + bottomRight = Vector3Add(bottomRight, position); + bottomLeft = Vector3Add(bottomLeft, position); + rlCheckRenderBatchLimit(4); rlSetTexture(texture.id); @@ -2845,22 +2894,22 @@ void DrawBillboardRec(Camera camera, Texture2D texture, Rectangle source, Vector // Bottom-left corner for texture and quad rlTexCoord2f((float)source.x/texture.width, (float)source.y/texture.height); - rlVertex3f(a.x, a.y, a.z); + rlVertex3f(topLeft.x, topLeft.y, topLeft.z); // Top-left corner for texture and quad rlTexCoord2f((float)source.x/texture.width, (float)(source.y + source.height)/texture.height); - rlVertex3f(d.x, d.y, d.z); + rlVertex3f(bottomLeft.x, bottomLeft.y, bottomLeft.z); // Top-right corner for texture and quad rlTexCoord2f((float)(source.x + source.width)/texture.width, (float)(source.y + source.height)/texture.height); - rlVertex3f(c.x, c.y, c.z); + rlVertex3f(bottomRight.x, bottomRight.y, bottomRight.z); // Bottom-right corner for texture and quad rlTexCoord2f((float)(source.x + source.width)/texture.width, (float)source.y/texture.height); - rlVertex3f(b.x, b.y, b.z); + rlVertex3f(topRight.x, topRight.y, topRight.z); rlEnd(); - rlSetTexture(0); + rlSetTexture(0); } // Draw a bounding box with wires diff --git a/src/raylib.h b/src/raylib.h index 4caed9134..c525ad2ff 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -1444,7 +1444,9 @@ RLAPI void DrawModelWires(Model model, Vector3 position, float scale, Color tint RLAPI void DrawModelWiresEx(Model model, Vector3 position, Vector3 rotationAxis, float rotationAngle, Vector3 scale, Color tint); // Draw a model wires (with texture if set) with extended parameters RLAPI void DrawBoundingBox(BoundingBox box, Color color); // Draw bounding box (wires) RLAPI void DrawBillboard(Camera camera, Texture2D texture, Vector3 center, float size, Color tint); // Draw a billboard texture -RLAPI void DrawBillboardRec(Camera camera, Texture2D texture, Rectangle source, Vector3 center, float size, Color tint); // Draw a billboard texture defined by source +RLAPI void DrawBillboardRec(Camera camera, Texture2D texture, Rectangle source, Vector3 center, Vector2 size, Color tint); // Draw a billboard texture defined by source +RLAPI void DrawBillboardEx(Camera camera, Texture2D texture, Vector3 center, Vector2 origin, float rotation, Vector2 size, Color tint); // Draw a billboard texture defined by rotation +RLAPI void DrawBillboardPro(Camera camera, Texture2D texture, Rectangle source, Vector3 position, Vector2 size, Vector2 origin, float rotation, Color tint); // Draw a billboard texture defined by source and rotation // Collision detection functions RLAPI bool CheckCollisionSpheres(Vector3 center1, float radius1, Vector3 center2, float radius2); // Detect collision between two spheres From 6bd63de8d052f99e08ec20c0e0f13b2b4b5eed2b Mon Sep 17 00:00:00 2001 From: Ray Date: Tue, 11 May 2021 01:02:53 +0200 Subject: [PATCH 108/121] Reviewed latest PR REMOVED: DrawBillboardEx() --- src/models.c | 19 ++++++------------- src/raylib.h | 5 ++--- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/src/models.c b/src/models.c index 7a0ce8ad6..177a1123f 100644 --- a/src/models.c +++ b/src/models.c @@ -2798,25 +2798,17 @@ void DrawModelWiresEx(Model model, Vector3 position, Vector3 rotationAxis, float } // Draw a billboard -void DrawBillboard(Camera camera, Texture2D texture, Vector3 center, float size, Color tint) +void DrawBillboard(Camera camera, Texture2D texture, Vector3 position, float size, Color tint) { Rectangle source = { 0.0f, 0.0f, (float)texture.width, (float)texture.height }; - DrawBillboardRec(camera, texture, source, center, (Vector2){ size, size }, tint); + DrawBillboardRec(camera, texture, source, position, (Vector2){ size, size }, tint); } // Draw a billboard (part of a texture defined by a rectangle) -void DrawBillboardRec(Camera camera, Texture2D texture, Rectangle source, Vector3 center, Vector2 size, Color tint) +void DrawBillboardRec(Camera camera, Texture2D texture, Rectangle source, Vector3 position, Vector2 size, Color tint) { - DrawBillboardPro(camera, texture, source, center, size, Vector2Zero(), 0.0f, tint); -} - -// Draw a billboard (part of a texture defined by a rectangle) -void DrawBillboardEx(Camera camera, Texture2D texture, Vector3 center, Vector2 origin, float rotation, Vector2 size, Color tint) -{ - Rectangle source = { 0.0f, 0.0f, (float)texture.width, (float)texture.height }; - - DrawBillboardPro(camera, texture, source, center, size, origin, rotation, tint); + DrawBillboardPro(camera, texture, source, position, size, Vector2Zero(), 0.0f, tint); } void DrawBillboardPro(Camera camera, Texture2D texture, Rectangle source, Vector3 position, Vector2 size, Vector2 origin, float rotation, Color tint) @@ -2880,7 +2872,8 @@ void DrawBillboardPro(Camera camera, Texture2D texture, Rectangle source, Vector bottomLeft = Vector3Add(Vector3Scale(up, rotatedY), Vector3Scale(right, rotatedX)); } - topLeft = Vector3Add(topLeft, position); // Translate points to the draw center (position) + // Translate points to the draw center (position) + topLeft = Vector3Add(topLeft, position); topRight = Vector3Add(topRight, position); bottomRight = Vector3Add(bottomRight, position); bottomLeft = Vector3Add(bottomLeft, position); diff --git a/src/raylib.h b/src/raylib.h index c525ad2ff..d0548faba 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -1443,9 +1443,8 @@ RLAPI void DrawModelEx(Model model, Vector3 position, Vector3 rotationAxis, floa RLAPI void DrawModelWires(Model model, Vector3 position, float scale, Color tint); // Draw a model wires (with texture if set) RLAPI void DrawModelWiresEx(Model model, Vector3 position, Vector3 rotationAxis, float rotationAngle, Vector3 scale, Color tint); // Draw a model wires (with texture if set) with extended parameters RLAPI void DrawBoundingBox(BoundingBox box, Color color); // Draw bounding box (wires) -RLAPI void DrawBillboard(Camera camera, Texture2D texture, Vector3 center, float size, Color tint); // Draw a billboard texture -RLAPI void DrawBillboardRec(Camera camera, Texture2D texture, Rectangle source, Vector3 center, Vector2 size, Color tint); // Draw a billboard texture defined by source -RLAPI void DrawBillboardEx(Camera camera, Texture2D texture, Vector3 center, Vector2 origin, float rotation, Vector2 size, Color tint); // Draw a billboard texture defined by rotation +RLAPI void DrawBillboard(Camera camera, Texture2D texture, Vector3 position, float size, Color tint); // Draw a billboard texture +RLAPI void DrawBillboardRec(Camera camera, Texture2D texture, Rectangle source, Vector3 position, Vector2 size, Color tint); // Draw a billboard texture defined by source RLAPI void DrawBillboardPro(Camera camera, Texture2D texture, Rectangle source, Vector3 position, Vector2 size, Vector2 origin, float rotation, Color tint); // Draw a billboard texture defined by source and rotation // Collision detection functions From d8e1a77da558f0c8e684ebb49262b968c9155e15 Mon Sep 17 00:00:00 2001 From: Astie Teddy Date: Wed, 12 May 2021 19:02:13 +0200 Subject: [PATCH 109/121] Update raylib-lua and raylib-wren binding versions (#1766) --- BINDINGS.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BINDINGS.md b/BINDINGS.md index 94fb0c5f4..bd03c3154 100644 --- a/BINDINGS.md +++ b/BINDINGS.md @@ -24,7 +24,7 @@ Here it is a list with the ones I'm aware of: | raylib-lua | 1.7 | [Lua](http://www.lua.org/) | https://github.com/raysan5/raylib-lua | | raylib-lua-ffi | 2.0 | [Lua](http://www.lua.org/) | https://github.com/raysan5/raylib/issues/693 | | raylib-lua-sol | 2.5 | [Lua](http://www.lua.org/) | https://github.com/RobLoach/raylib-lua-sol | -| raylib-lua | 3.5 | [Lua](http://www.lua.org/) | https://github.com/TSnake41/raylib-lua | +| raylib-lua | 3.7 | [Lua](http://www.lua.org/) | https://github.com/TSnake41/raylib-lua | | raylib-luamore | 3.0 | [Lua](http://www.lua.org/) | https://github.com/HDPLocust/raylib-luamore | | raylua | 3.7 | [Lua](http://www.lua.org/) | https://github.com/Rabios/raylua | | LuaJIT-Raylib | 2.6 | [Lua](http://www.lua.org/) | https://github.com/Bambofy/LuaJIT-Raylib | @@ -70,7 +70,7 @@ Here it is a list with the ones I'm aware of: | raylib-chibi | 2.5 | [Chibi-Scheme](https://github.com/ashinn/chibi-scheme) | https://github.com/VincentToups/raylib-chibi | | raylib-gambit-scheme | 3.1-dev | [Gambit Scheme](https://github.com/gambit/gambit) | https://github.com/georgjz/raylib-gambit-scheme | | Euraylib | 3.0 | [Euphoria](https://openeuphoria.org/) | https://github.com/gAndy50/Euraylib | -| raylib-wren | 3.0 | [Wren](http://wren.io/) | https://github.com/TSnake41/raylib-wren | +| raylib-wren | 3.7 | [Wren](http://wren.io/) | https://github.com/TSnake41/raylib-wren | | raylib-odin | 3.0 | [Odin](https://odin-lang.org/) | https://github.com/kevinw/raylib-odin | | raylib-zig | 3.0 | [Zig](https://ziglang.org/) | https://github.com/Not-Nik/raylib-zig | | raylib-jai | 3.1-dev | [Jai](https://github.com/BSVino/JaiPrimer/blob/master/JaiPrimer.md) | https://github.com/kevinw/raylib-jai | From dbe1c9c6e6d7eaa2b54ee8564ccc12fe47323ee7 Mon Sep 17 00:00:00 2001 From: Bxil Date: Wed, 12 May 2021 19:20:27 +0200 Subject: [PATCH 110/121] Removes Whole Program Optimization (#1767) --- projects/VS2017.UWP/raylib.App.UWP/raylib.App.UWP.vcxproj | 1 - projects/VS2017.UWP/raylib.UWP/raylib.UWP.vcxproj | 3 --- projects/VS2017/raylib/raylib.vcxproj | 4 ---- projects/VS2019/raylib/raylib.vcxproj | 4 ---- 4 files changed, 12 deletions(-) diff --git a/projects/VS2017.UWP/raylib.App.UWP/raylib.App.UWP.vcxproj b/projects/VS2017.UWP/raylib.App.UWP/raylib.App.UWP.vcxproj index 25552d479..0c3c0e774 100644 --- a/projects/VS2017.UWP/raylib.App.UWP/raylib.App.UWP.vcxproj +++ b/projects/VS2017.UWP/raylib.App.UWP/raylib.App.UWP.vcxproj @@ -47,7 +47,6 @@ Application false - true $(DefaultPlatformToolset) diff --git a/projects/VS2017.UWP/raylib.UWP/raylib.UWP.vcxproj b/projects/VS2017.UWP/raylib.UWP/raylib.UWP.vcxproj index 773acc6d8..41d5c0f77 100644 --- a/projects/VS2017.UWP/raylib.UWP/raylib.UWP.vcxproj +++ b/projects/VS2017.UWP/raylib.UWP/raylib.UWP.vcxproj @@ -87,19 +87,16 @@ StaticLibrary false - true $(DefaultPlatformToolset) StaticLibrary false - true $(DefaultPlatformToolset) StaticLibrary false - true $(DefaultPlatformToolset) diff --git a/projects/VS2017/raylib/raylib.vcxproj b/projects/VS2017/raylib/raylib.vcxproj index 756c400db..11ecb4048 100644 --- a/projects/VS2017/raylib/raylib.vcxproj +++ b/projects/VS2017/raylib/raylib.vcxproj @@ -69,28 +69,24 @@ StaticLibrary false $(DefaultPlatformToolset) - true Unicode StaticLibrary false $(DefaultPlatformToolset) - true Unicode DynamicLibrary false $(DefaultPlatformToolset) - true Unicode DynamicLibrary false $(DefaultPlatformToolset) - true Unicode diff --git a/projects/VS2019/raylib/raylib.vcxproj b/projects/VS2019/raylib/raylib.vcxproj index 13b2edbd6..0ce079fd1 100644 --- a/projects/VS2019/raylib/raylib.vcxproj +++ b/projects/VS2019/raylib/raylib.vcxproj @@ -69,28 +69,24 @@ StaticLibrary false $(DefaultPlatformToolset) - true Unicode StaticLibrary false $(DefaultPlatformToolset) - true Unicode DynamicLibrary false $(DefaultPlatformToolset) - true Unicode DynamicLibrary false $(DefaultPlatformToolset) - true Unicode From 6c56fe267058d20ebc680a6b1b88daea11520d27 Mon Sep 17 00:00:00 2001 From: Ray Date: Wed, 12 May 2021 19:51:29 +0200 Subject: [PATCH 111/121] Update shell.html --- src/shell.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shell.html b/src/shell.html index 507b35acf..aa0210c32 100644 --- a/src/shell.html +++ b/src/shell.html @@ -76,7 +76,7 @@ jwE50AGjLCVuS8Yt4H7OgZLKK5EKOsLviEWJSL/+0uMi7gLUSBseYwqEbXvSHCec1CJvZPyHCmYQffaB canvas.emscripten { border: 0px none; background: black; - width: 100% + width: 100%; } .spinner { From 45b0dc63cdc24d4613af4725475bd0575d0dae4c Mon Sep 17 00:00:00 2001 From: Guillaume DEVOILLE Date: Thu, 13 May 2021 13:58:51 +0200 Subject: [PATCH 112/121] Fixed GLTF boneWeights uint32 loading (#1768) boneWeights uint32 were loaded in normals instead of boneWeights. --- src/models.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/models.c b/src/models.c index 177a1123f..f9bdbeeae 100644 --- a/src/models.c +++ b/src/models.c @@ -4289,10 +4289,10 @@ static Model LoadGLTF(const char *fileName) for (int a = 0; a < acc->count; a++) { GLTFReadValue(acc, a, readValue, 4, sizeof(unsigned int)); - model.meshes[primitiveIndex].normals[(a*4) + 0] = (float)readValue[0]; - model.meshes[primitiveIndex].normals[(a*4) + 1] = (float)readValue[1]; - model.meshes[primitiveIndex].normals[(a*4) + 2] = (float)readValue[2]; - model.meshes[primitiveIndex].normals[(a*4) + 3] = (float)readValue[3]; + model.meshes[primitiveIndex].boneWeights[(a*4) + 0] = (float)readValue[0]; + model.meshes[primitiveIndex].boneWeights[(a*4) + 1] = (float)readValue[1]; + model.meshes[primitiveIndex].boneWeights[(a*4) + 2] = (float)readValue[2]; + model.meshes[primitiveIndex].boneWeights[(a*4) + 3] = (float)readValue[3]; } } else From 3baba7ffe84b184aa0dd555628a8a4eef92a9526 Mon Sep 17 00:00:00 2001 From: Ray Date: Fri, 14 May 2021 14:01:42 +0200 Subject: [PATCH 113/121] Review some VS warnings and messages --- src/core.c | 14 +++--- src/models.c | 130 +++++++++++++++++++++++++-------------------------- src/shapes.c | 6 +-- 3 files changed, 75 insertions(+), 75 deletions(-) diff --git a/src/core.c b/src/core.c index 00cdfffb1..c59245950 100644 --- a/src/core.c +++ b/src/core.c @@ -2318,7 +2318,7 @@ void SetShaderValueTexture(Shader shader, int locIndex, Texture2D texture) // Returns a ray trace from mouse position Ray GetMouseRay(Vector2 mouse, Camera camera) { - Ray ray; + Ray ray = { 0 }; // Calculate normalized device coordinates // NOTE: y value is negative @@ -4551,14 +4551,14 @@ static void Wait(float ms) while ((nextTime - prevTime) < ms/1000.0f) nextTime = GetTime(); #else #if defined(SUPPORT_PARTIALBUSY_WAIT_LOOP) - #define DEFAULT_PARTIALBUSY_WAIT_TIME 4 - #define PARTIALBUSY_WAIT_FACTOR 0.95f - float halfWait = DEFAULT_PARTIALBUSY_WAIT_TIME; - if (CORE.Time.target > 0) - halfWait = CORE.Time.target * PARTIALBUSY_WAIT_FACTOR; + #define DEFAULT_PARTIALBUSY_WAIT_TIME 4 + #define PARTIALBUSY_WAIT_FACTOR 0.95 + + double halfWait = DEFAULT_PARTIALBUSY_WAIT_TIME; + if (CORE.Time.target > 0) halfWait = CORE.Time.target*PARTIALBUSY_WAIT_FACTOR; double destTime = GetTime() + ms/1000; - if (ms > halfWait) ms -= halfWait; + if (ms > halfWait) ms -= (float)halfWait; #endif #if defined(_WIN32) diff --git a/src/models.c b/src/models.c index 177a1123f..833597c9e 100644 --- a/src/models.c +++ b/src/models.c @@ -465,25 +465,25 @@ void DrawSphereEx(Vector3 centerPos, float radius, int rings, int slices, Color { for (int j = 0; j < slices; j++) { - rlVertex3f(cosf(DEG2RAD*(270+(180/(rings + 1))*i))*sinf(DEG2RAD*(j*360/slices)), - sinf(DEG2RAD*(270+(180/(rings + 1))*i)), - cosf(DEG2RAD*(270+(180/(rings + 1))*i))*cosf(DEG2RAD*(j*360/slices))); - rlVertex3f(cosf(DEG2RAD*(270+(180/(rings + 1))*(i+1)))*sinf(DEG2RAD*((j+1)*360/slices)), - sinf(DEG2RAD*(270+(180/(rings + 1))*(i+1))), - cosf(DEG2RAD*(270+(180/(rings + 1))*(i+1)))*cosf(DEG2RAD*((j+1)*360/slices))); - rlVertex3f(cosf(DEG2RAD*(270+(180/(rings + 1))*(i+1)))*sinf(DEG2RAD*(j*360/slices)), - sinf(DEG2RAD*(270+(180/(rings + 1))*(i+1))), - cosf(DEG2RAD*(270+(180/(rings + 1))*(i+1)))*cosf(DEG2RAD*(j*360/slices))); + rlVertex3f(cosf(DEG2RAD*(270 + (180.0f/(rings + 1))*i))*sinf(DEG2RAD*(360.0f*j/slices)), + sinf(DEG2RAD*(270 + (180.0f/(rings + 1))*i)), + cosf(DEG2RAD*(270 + (180.0f/(rings + 1))*i))*cosf(DEG2RAD*(360.0f*j/slices))); + rlVertex3f(cosf(DEG2RAD*(270 + (180.0f/(rings + 1))*(i + 1)))*sinf(DEG2RAD*(360.0f*(j + 1)/slices)), + sinf(DEG2RAD*(270 + (180.0f/(rings + 1))*(i + 1))), + cosf(DEG2RAD*(270 + (180.0f/(rings + 1))*(i + 1)))*cosf(DEG2RAD*(360.0f*(j + 1)/slices))); + rlVertex3f(cosf(DEG2RAD*(270 + (180.0f/(rings + 1))*(i + 1)))*sinf(DEG2RAD*(360.0f*j/slices)), + sinf(DEG2RAD*(270 + (180.0f/(rings + 1))*(i + 1))), + cosf(DEG2RAD*(270 + (180.0f/(rings + 1))*(i + 1)))*cosf(DEG2RAD*(360.0f*j/slices))); - rlVertex3f(cosf(DEG2RAD*(270+(180/(rings + 1))*i))*sinf(DEG2RAD*(j*360/slices)), - sinf(DEG2RAD*(270+(180/(rings + 1))*i)), - cosf(DEG2RAD*(270+(180/(rings + 1))*i))*cosf(DEG2RAD*(j*360/slices))); - rlVertex3f(cosf(DEG2RAD*(270+(180/(rings + 1))*(i)))*sinf(DEG2RAD*((j+1)*360/slices)), - sinf(DEG2RAD*(270+(180/(rings + 1))*(i))), - cosf(DEG2RAD*(270+(180/(rings + 1))*(i)))*cosf(DEG2RAD*((j+1)*360/slices))); - rlVertex3f(cosf(DEG2RAD*(270+(180/(rings + 1))*(i+1)))*sinf(DEG2RAD*((j+1)*360/slices)), - sinf(DEG2RAD*(270+(180/(rings + 1))*(i+1))), - cosf(DEG2RAD*(270+(180/(rings + 1))*(i+1)))*cosf(DEG2RAD*((j+1)*360/slices))); + rlVertex3f(cosf(DEG2RAD*(270 + (180.0f/(rings + 1))*i))*sinf(DEG2RAD*(360.0f*j/slices)), + sinf(DEG2RAD*(270 + (180.0f/(rings + 1))*i)), + cosf(DEG2RAD*(270 + (180.0f/(rings + 1))*i))*cosf(DEG2RAD*(360.0f*j/slices))); + rlVertex3f(cosf(DEG2RAD*(270 + (180.0f/(rings + 1))*(i)))*sinf(DEG2RAD*(360.0f*(j + 1)/slices)), + sinf(DEG2RAD*(270 + (180.0f/(rings + 1))*(i))), + cosf(DEG2RAD*(270 + (180.0f/(rings + 1))*(i)))*cosf(DEG2RAD*(360.0f*(j + 1)/slices))); + rlVertex3f(cosf(DEG2RAD*(270 + (180.0f/(rings + 1))*(i + 1)))*sinf(DEG2RAD*(360.0f*(j + 1)/slices)), + sinf(DEG2RAD*(270 + (180.0f/(rings + 1))*(i + 1))), + cosf(DEG2RAD*(270 + (180.0f/(rings + 1))*(i + 1)))*cosf(DEG2RAD*(360.0f*(j + 1)/slices))); } } rlEnd(); @@ -508,26 +508,26 @@ void DrawSphereWires(Vector3 centerPos, float radius, int rings, int slices, Col { for (int j = 0; j < slices; j++) { - rlVertex3f(cosf(DEG2RAD*(270+(180/(rings + 1))*i))*sinf(DEG2RAD*(j*360/slices)), - sinf(DEG2RAD*(270+(180/(rings + 1))*i)), - cosf(DEG2RAD*(270+(180/(rings + 1))*i))*cosf(DEG2RAD*(j*360/slices))); - rlVertex3f(cosf(DEG2RAD*(270+(180/(rings + 1))*(i+1)))*sinf(DEG2RAD*((j+1)*360/slices)), - sinf(DEG2RAD*(270+(180/(rings + 1))*(i+1))), - cosf(DEG2RAD*(270+(180/(rings + 1))*(i+1)))*cosf(DEG2RAD*((j+1)*360/slices))); + rlVertex3f(cosf(DEG2RAD*(270 + (180.0f/(rings + 1))*i))*sinf(DEG2RAD*(360.0f*j/slices)), + sinf(DEG2RAD*(270 + (180.0f/(rings + 1))*i)), + cosf(DEG2RAD*(270 + (180.0f/(rings + 1))*i))*cosf(DEG2RAD*(360.0f*j/slices))); + rlVertex3f(cosf(DEG2RAD*(270 + (180.0f/(rings + 1))*(i + 1)))*sinf(DEG2RAD*(360.0f*(j + 1)/slices)), + sinf(DEG2RAD*(270 + (180.0f/(rings + 1))*(i + 1))), + cosf(DEG2RAD*(270 + (180.0f/(rings + 1))*(i + 1)))*cosf(DEG2RAD*(360.0f*(j + 1)/slices))); - rlVertex3f(cosf(DEG2RAD*(270+(180/(rings + 1))*(i+1)))*sinf(DEG2RAD*((j+1)*360/slices)), - sinf(DEG2RAD*(270+(180/(rings + 1))*(i+1))), - cosf(DEG2RAD*(270+(180/(rings + 1))*(i+1)))*cosf(DEG2RAD*((j+1)*360/slices))); - rlVertex3f(cosf(DEG2RAD*(270+(180/(rings + 1))*(i+1)))*sinf(DEG2RAD*(j*360/slices)), - sinf(DEG2RAD*(270+(180/(rings + 1))*(i+1))), - cosf(DEG2RAD*(270+(180/(rings + 1))*(i+1)))*cosf(DEG2RAD*(j*360/slices))); + rlVertex3f(cosf(DEG2RAD*(270 + (180.0f/(rings + 1))*(i + 1)))*sinf(DEG2RAD*(360.0f*(j + 1)/slices)), + sinf(DEG2RAD*(270 + (180.0f/(rings + 1))*(i + 1))), + cosf(DEG2RAD*(270 + (180.0f/(rings + 1))*(i + 1)))*cosf(DEG2RAD*(360.0f*(j + 1)/slices))); + rlVertex3f(cosf(DEG2RAD*(270 + (180.0f/(rings + 1))*(i + 1)))*sinf(DEG2RAD*(360.0f*j/slices)), + sinf(DEG2RAD*(270 + (180.0f/(rings + 1))*(i + 1))), + cosf(DEG2RAD*(270 + (180.0f/(rings + 1))*(i + 1)))*cosf(DEG2RAD*(360.0f*j/slices))); - rlVertex3f(cosf(DEG2RAD*(270+(180/(rings + 1))*(i+1)))*sinf(DEG2RAD*(j*360/slices)), - sinf(DEG2RAD*(270+(180/(rings + 1))*(i+1))), - cosf(DEG2RAD*(270+(180/(rings + 1))*(i+1)))*cosf(DEG2RAD*(j*360/slices))); - rlVertex3f(cosf(DEG2RAD*(270+(180/(rings + 1))*i))*sinf(DEG2RAD*(j*360/slices)), - sinf(DEG2RAD*(270+(180/(rings + 1))*i)), - cosf(DEG2RAD*(270+(180/(rings + 1))*i))*cosf(DEG2RAD*(j*360/slices))); + rlVertex3f(cosf(DEG2RAD*(270 + (180.0f/(rings + 1))*(i + 1)))*sinf(DEG2RAD*(360.0f*j/slices)), + sinf(DEG2RAD*(270 + (180.0f/(rings + 1))*(i + 1))), + cosf(DEG2RAD*(270 + (180.0f/(rings + 1))*(i + 1)))*cosf(DEG2RAD*(360.0f*j/slices))); + rlVertex3f(cosf(DEG2RAD*(270 + (180.0f/(rings + 1))*i))*sinf(DEG2RAD*(360.0f*j/slices)), + sinf(DEG2RAD*(270 + (180.0f/(rings + 1))*i)), + cosf(DEG2RAD*(270 + (180.0f/(rings + 1))*i))*cosf(DEG2RAD*(360.0f*j/slices))); } } rlEnd(); @@ -555,12 +555,12 @@ void DrawCylinder(Vector3 position, float radiusTop, float radiusBottom, float h for (int i = 0; i < 360; i += 360/sides) { rlVertex3f(sinf(DEG2RAD*i)*radiusBottom, 0, cosf(DEG2RAD*i)*radiusBottom); //Bottom Left - rlVertex3f(sinf(DEG2RAD*(i + 360/sides))*radiusBottom, 0, cosf(DEG2RAD*(i + 360/sides))*radiusBottom); //Bottom Right - rlVertex3f(sinf(DEG2RAD*(i + 360/sides))*radiusTop, height, cosf(DEG2RAD*(i + 360/sides))*radiusTop); //Top Right + rlVertex3f(sinf(DEG2RAD*(i + 360.0f/sides))*radiusBottom, 0, cosf(DEG2RAD*(i + 360.0f/sides))*radiusBottom); //Bottom Right + rlVertex3f(sinf(DEG2RAD*(i + 360.0f/sides))*radiusTop, height, cosf(DEG2RAD*(i + 360.0f/sides))*radiusTop); //Top Right rlVertex3f(sinf(DEG2RAD*i)*radiusTop, height, cosf(DEG2RAD*i)*radiusTop); //Top Left rlVertex3f(sinf(DEG2RAD*i)*radiusBottom, 0, cosf(DEG2RAD*i)*radiusBottom); //Bottom Left - rlVertex3f(sinf(DEG2RAD*(i + 360/sides))*radiusTop, height, cosf(DEG2RAD*(i + 360/sides))*radiusTop); //Top Right + rlVertex3f(sinf(DEG2RAD*(i + 360.0f/sides))*radiusTop, height, cosf(DEG2RAD*(i + 360.0f/sides))*radiusTop); //Top Right } // Draw Cap -------------------------------------------------------------------------------------- @@ -568,7 +568,7 @@ void DrawCylinder(Vector3 position, float radiusTop, float radiusBottom, float h { rlVertex3f(0, height, 0); rlVertex3f(sinf(DEG2RAD*i)*radiusTop, height, cosf(DEG2RAD*i)*radiusTop); - rlVertex3f(sinf(DEG2RAD*(i + 360/sides))*radiusTop, height, cosf(DEG2RAD*(i + 360/sides))*radiusTop); + rlVertex3f(sinf(DEG2RAD*(i + 360.0f/sides))*radiusTop, height, cosf(DEG2RAD*(i + 360.0f/sides))*radiusTop); } } else @@ -578,7 +578,7 @@ void DrawCylinder(Vector3 position, float radiusTop, float radiusBottom, float h { rlVertex3f(0, height, 0); rlVertex3f(sinf(DEG2RAD*i)*radiusBottom, 0, cosf(DEG2RAD*i)*radiusBottom); - rlVertex3f(sinf(DEG2RAD*(i + 360/sides))*radiusBottom, 0, cosf(DEG2RAD*(i + 360/sides))*radiusBottom); + rlVertex3f(sinf(DEG2RAD*(i + 360.0f/sides))*radiusBottom, 0, cosf(DEG2RAD*(i + 360.0f/sides))*radiusBottom); } } @@ -586,7 +586,7 @@ void DrawCylinder(Vector3 position, float radiusTop, float radiusBottom, float h for (int i = 0; i < 360; i += 360/sides) { rlVertex3f(0, 0, 0); - rlVertex3f(sinf(DEG2RAD*(i + 360/sides))*radiusBottom, 0, cosf(DEG2RAD*(i + 360/sides))*radiusBottom); + rlVertex3f(sinf(DEG2RAD*(i + 360.0f/sides))*radiusBottom, 0, cosf(DEG2RAD*(i + 360.0f/sides))*radiusBottom); rlVertex3f(sinf(DEG2RAD*i)*radiusBottom, 0, cosf(DEG2RAD*i)*radiusBottom); } rlEnd(); @@ -611,12 +611,12 @@ void DrawCylinderWires(Vector3 position, float radiusTop, float radiusBottom, fl for (int i = 0; i < 360; i += 360/sides) { rlVertex3f(sinf(DEG2RAD*i)*radiusBottom, 0, cosf(DEG2RAD*i)*radiusBottom); - rlVertex3f(sinf(DEG2RAD*(i + 360/sides))*radiusBottom, 0, cosf(DEG2RAD*(i + 360/sides))*radiusBottom); + rlVertex3f(sinf(DEG2RAD*(i + 360.0f/sides))*radiusBottom, 0, cosf(DEG2RAD*(i + 360.0f/sides))*radiusBottom); - rlVertex3f(sinf(DEG2RAD*(i + 360/sides))*radiusBottom, 0, cosf(DEG2RAD*(i + 360/sides))*radiusBottom); - rlVertex3f(sinf(DEG2RAD*(i + 360/sides))*radiusTop, height, cosf(DEG2RAD*(i + 360/sides))*radiusTop); + rlVertex3f(sinf(DEG2RAD*(i + 360.0f/sides))*radiusBottom, 0, cosf(DEG2RAD*(i + 360.0f/sides))*radiusBottom); + rlVertex3f(sinf(DEG2RAD*(i + 360.0f/sides))*radiusTop, height, cosf(DEG2RAD*(i + 360.0f/sides))*radiusTop); - rlVertex3f(sinf(DEG2RAD*(i + 360/sides))*radiusTop, height, cosf(DEG2RAD*(i + 360/sides))*radiusTop); + rlVertex3f(sinf(DEG2RAD*(i + 360.0f/sides))*radiusTop, height, cosf(DEG2RAD*(i + 360.0f/sides))*radiusTop); rlVertex3f(sinf(DEG2RAD*i)*radiusTop, height, cosf(DEG2RAD*i)*radiusTop); rlVertex3f(sinf(DEG2RAD*i)*radiusTop, height, cosf(DEG2RAD*i)*radiusTop); @@ -2159,10 +2159,10 @@ Mesh GenMeshHeightmap(Image heightmap, Vector3 size) Vector3 scaleFactor = { size.x/mapX, size.y/255.0f, size.z/mapZ }; - Vector3 vA; - Vector3 vB; - Vector3 vC; - Vector3 vN; + Vector3 vA = { 0 }; + Vector3 vB = { 0 }; + Vector3 vC = { 0 }; + Vector3 vN = { 0 }; for (int z = 0; z < mapZ-1; z++) { @@ -2908,7 +2908,7 @@ void DrawBillboardPro(Camera camera, Texture2D texture, Rectangle source, Vector // Draw a bounding box with wires void DrawBoundingBox(BoundingBox box, Color color) { - Vector3 size; + Vector3 size = { 0 }; size.x = fabsf(box.max.x - box.min.x); size.y = fabsf(box.max.y - box.min.y); @@ -3027,7 +3027,7 @@ bool CheckCollisionRayBox(Ray ray, BoundingBox box) { bool collision = false; - float t[8]; + float t[8] = { 0 }; t[0] = (box.min.x - ray.position.x)/ray.direction.x; t[1] = (box.max.x - ray.position.x)/ray.direction.x; t[2] = (box.min.y - ray.position.y)/ray.direction.y; @@ -4188,7 +4188,7 @@ static Model LoadGLTF(const char *fileName) if (acc->component_type == cgltf_component_type_r_32f) { - for (int a = 0; a < acc->count; a++) + for (unsigned int a = 0; a < acc->count; a++) { GLTFReadValue(acc, a, model.meshes[primitiveIndex].vertices + (a*3), 3, sizeof(float)); } @@ -4196,7 +4196,7 @@ static Model LoadGLTF(const char *fileName) else if (acc->component_type == cgltf_component_type_r_32u) { int readValue[3]; - for (int a = 0; a < acc->count; a++) + for (unsigned int a = 0; a < acc->count; a++) { GLTFReadValue(acc, a, readValue, 3, sizeof(int)); model.meshes[primitiveIndex].vertices[(a*3) + 0] = (float)readValue[0]; @@ -4222,7 +4222,7 @@ static Model LoadGLTF(const char *fileName) if (acc->component_type == cgltf_component_type_r_32f) { - for (int a = 0; a < acc->count; a++) + for (unsigned int a = 0; a < acc->count; a++) { GLTFReadValue(acc, a, model.meshes[primitiveIndex].normals + (a*3), 3, sizeof(float)); } @@ -4230,7 +4230,7 @@ static Model LoadGLTF(const char *fileName) else if (acc->component_type == cgltf_component_type_r_32u) { int readValue[3]; - for (int a = 0; a < acc->count; a++) + for (unsigned int a = 0; a < acc->count; a++) { GLTFReadValue(acc, a, readValue, 3, sizeof(int)); model.meshes[primitiveIndex].normals[(a*3) + 0] = (float)readValue[0]; @@ -4254,7 +4254,7 @@ static Model LoadGLTF(const char *fileName) { model.meshes[primitiveIndex].texcoords = RL_MALLOC(acc->count*2*sizeof(float)); - for (int a = 0; a < acc->count; a++) + for (unsigned int a = 0; a < acc->count; a++) { GLTFReadValue(acc, a, model.meshes[primitiveIndex].texcoords + (a*2), 2, sizeof(float)); } @@ -4278,7 +4278,7 @@ static Model LoadGLTF(const char *fileName) if (acc->component_type == cgltf_component_type_r_32f) { - for (int a = 0; a < acc->count; a++) + for (unsigned int a = 0; a < acc->count; a++) { GLTFReadValue(acc, a, model.meshes[primitiveIndex].boneWeights + (a*4), 4, sizeof(float)); } @@ -4286,7 +4286,7 @@ static Model LoadGLTF(const char *fileName) else if (acc->component_type == cgltf_component_type_r_32u) { unsigned int readValue[4]; - for (int a = 0; a < acc->count; a++) + for (unsigned int a = 0; a < acc->count; a++) { GLTFReadValue(acc, a, readValue, 4, sizeof(unsigned int)); model.meshes[primitiveIndex].normals[(a*4) + 0] = (float)readValue[0]; @@ -4469,7 +4469,7 @@ static void LoadGLTFBoneAttribute(Model* model, cgltf_accessor* jointsAccessor, model->meshes[primitiveIndex].boneIds = RL_MALLOC(sizeof(int)*jointsAccessor->count*4); short* bones = RL_MALLOC(sizeof(short)*jointsAccessor->count*4); - for (int a = 0; a < jointsAccessor->count; a++) + for (unsigned int a = 0; a < jointsAccessor->count; a++) { GLTFReadValue(jointsAccessor, a, bones + (a*4), 4, sizeof(short)); } @@ -4494,7 +4494,7 @@ static void LoadGLTFBoneAttribute(Model* model, cgltf_accessor* jointsAccessor, model->meshes[primitiveIndex].boneIds = RL_MALLOC(sizeof(int)*jointsAccessor->count*4); unsigned char* bones = RL_MALLOC(sizeof(unsigned char)*jointsAccessor->count*4); - for (int a = 0; a < jointsAccessor->count; a++) + for (unsigned int a = 0; a < jointsAccessor->count; a++) { GLTFReadValue(jointsAccessor, a, bones + (a*4), 4, sizeof(unsigned char)); } @@ -4525,7 +4525,7 @@ static void BindGLTFPrimitiveToBones(Model* model, const cgltf_data* data, int p { if (model->meshes[primitiveIndex].boneIds == NULL && data->nodes_count > 0) { - for (int nodeId = 0; nodeId < data->nodes_count; nodeId++) + for (unsigned int nodeId = 0; nodeId < data->nodes_count; nodeId++) { if (data->nodes[nodeId].mesh == &(data->meshes[primitiveIndex])) { @@ -4602,7 +4602,7 @@ static void LoadGLTFModelIndices(Model* model, cgltf_accessor* indexAccessor, in model->meshes[primitiveIndex].indices = RL_MALLOC(model->meshes[primitiveIndex].triangleCount*3*sizeof(unsigned short)); unsigned short readValue = 0; - for (int a = 0; a < indexAccessor->count; a++) + for (unsigned int a = 0; a < indexAccessor->count; a++) { GLTFReadValue(indexAccessor, a, &readValue, 1, sizeof(short)); model->meshes[primitiveIndex].indices[a] = readValue; @@ -4614,7 +4614,7 @@ static void LoadGLTFModelIndices(Model* model, cgltf_accessor* indexAccessor, in model->meshes[primitiveIndex].indices = RL_MALLOC(model->meshes[primitiveIndex].triangleCount*3*sizeof(unsigned short)); unsigned char readValue = 0; - for (int a = 0; a < indexAccessor->count; a++) + for (unsigned int a = 0; a < indexAccessor->count; a++) { GLTFReadValue(indexAccessor, a, &readValue, 1, sizeof(char)); model->meshes[primitiveIndex].indices[a] = (unsigned short)readValue; @@ -4626,7 +4626,7 @@ static void LoadGLTFModelIndices(Model* model, cgltf_accessor* indexAccessor, in model->meshes[primitiveIndex].indices = RL_MALLOC(model->meshes[primitiveIndex].triangleCount*3*sizeof(unsigned short)); unsigned int readValue; - for (int a = 0; a < indexAccessor->count; a++) + for (unsigned int a = 0; a < indexAccessor->count; a++) { GLTFReadValue(indexAccessor, a, &readValue, 1, sizeof(unsigned int)); model->meshes[primitiveIndex].indices[a] = (unsigned short)readValue; diff --git a/src/shapes.c b/src/shapes.c index 9f03bfb3e..5ed7acbb1 100644 --- a/src/shapes.c +++ b/src/shapes.c @@ -144,7 +144,7 @@ void DrawLineBezier(Vector2 startPos, Vector2 endPos, float thick, Color color) #endif Vector2 previous = startPos; - Vector2 current; + Vector2 current = { 0 }; for (int i = 1; i <= BEZIER_LINE_DIVISIONS; i++) { @@ -770,8 +770,8 @@ void DrawRectangleLinesEx(Rectangle rec, float lineThick, Color color) { if ((lineThick > rec.width) || (lineThick > rec.height)) { - if (rec.width > rec.height) lineThick = (int)rec.height/2; - else if (rec.width < rec.height) lineThick = (int)rec.width/2; + if (rec.width > rec.height) lineThick = rec.height/2; + else if (rec.width < rec.height) lineThick = rec.width/2; } // When rec = { x, y, 8.0f, 6.0f } and lineThick = 2, the following From a84e98ba6c2032646238b26c29eadf67b009ac6b Mon Sep 17 00:00:00 2001 From: Gianni Alessandroni <45824238+NotManyIdeasDev@users.noreply.github.com> Date: Fri, 14 May 2021 18:06:47 +0200 Subject: [PATCH 114/121] Hotfix for smooth pixel-perfect camera example [core_2d_camera_smooth_pixelperfect.c] (#1771) * Hotfix for glitchy camera Super small fix that was causing the camera to glitch every x amount of seconds/pixels. Works much better now, 3/4 lines changed. * fixed dumb visual studio formatting problems --- .../core/core_2d_camera_smooth_pixelperfect.c | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/examples/core/core_2d_camera_smooth_pixelperfect.c b/examples/core/core_2d_camera_smooth_pixelperfect.c index 3594c4abc..ae40cdfc1 100644 --- a/examples/core/core_2d_camera_smooth_pixelperfect.c +++ b/examples/core/core_2d_camera_smooth_pixelperfect.c @@ -70,21 +70,15 @@ int main(void) // Set the camera's target to the values computed above. screenSpaceCamera.target = (Vector2){ cameraX, cameraY }; - // Round worldCamera's X, keep the decimals on screenSpaceCamera. - if (screenSpaceCamera.target.x >= 1 || screenSpaceCamera.target.x <= -1) - { - worldSpaceCamera.target.x = (int)screenSpaceCamera.target.x; - screenSpaceCamera.target.x -= worldSpaceCamera.target.x; - screenSpaceCamera.target.x *= virtualRatio; - } + //Round worldSpace coordinates, keep decimals into screenSpace coordinates. + worldSpaceCamera.target.x = (int)screenSpaceCamera.target.x; + screenSpaceCamera.target.x -= worldSpaceCamera.target.x; + screenSpaceCamera.target.x *= virtualRatio; + + worldSpaceCamera.target.y = (int)screenSpaceCamera.target.y; + screenSpaceCamera.target.y -= worldSpaceCamera.target.y; + screenSpaceCamera.target.y *= virtualRatio; - // Round worldCamera's Y, keep the decimals on screenSpaceCamera. - if (screenSpaceCamera.target.y >= 1 || screenSpaceCamera.target.y <= -1) - { - worldSpaceCamera.target.y = (int)screenSpaceCamera.target.y; - screenSpaceCamera.target.y -= worldSpaceCamera.target.y; - screenSpaceCamera.target.y *= virtualRatio; - } //---------------------------------------------------------------------------------- // Draw From b90ac7bd3145a171de388f51adb5e7fd116e44e8 Mon Sep 17 00:00:00 2001 From: Guillaume DEVOILLE Date: Sat, 15 May 2021 00:41:33 +0200 Subject: [PATCH 115/121] Fixed over-allocation of buffer (#1772) output->framePoses[frame] is over-allocated. framePoses is a 2D array: - first dimension: frames (allocated l. 4717) - second dimension: nodes (allocated l. 4731) Second dimension should be allocated of nodes_count transformations only. --- src/models.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/models.c b/src/models.c index 51788d7a6..1e0297d6f 100644 --- a/src/models.c +++ b/src/models.c @@ -4728,7 +4728,7 @@ static ModelAnimation *LoadGLTFModelAnimations(const char *fileName, int *animCo // Initiate with zero bone translations for (int frame = 0; frame < output->frameCount; frame++) { - output->framePoses[frame] = RL_MALLOC(output->frameCount*data->nodes_count*sizeof(Transform)); + output->framePoses[frame] = RL_MALLOC(data->nodes_count*sizeof(Transform)); for (unsigned int i = 0; i < data->nodes_count; i++) { From 7b6b87ec5bd401408fea4cd4371169ee904d5028 Mon Sep 17 00:00:00 2001 From: Ray Date: Thu, 20 May 2021 19:14:20 +0200 Subject: [PATCH 116/121] Update VS2019 project: rlgl_standalone --- examples/others/rlgl_standalone.c | 2 +- .../VS2019/examples/rlgl_standalone.vcxproj | 46 ++++++++++--------- 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/examples/others/rlgl_standalone.c b/examples/others/rlgl_standalone.c index f1fce8582..47233afd8 100644 --- a/examples/others/rlgl_standalone.c +++ b/examples/others/rlgl_standalone.c @@ -176,7 +176,7 @@ int main(void) // Draw '3D' elements in the scene //----------------------------------------------- // Calculate projection matrix (from perspective) and view matrix from camera look at - Matrix matProj = MatrixPerspective(camera.fovy*DEG2RAD, (double)screenWidth/(double)screenHeight, 0.01, 1000.0); + Matrix matProj = MatrixPerspective((double)(camera.fovy*DEG2RAD), (double)screenWidth/(double)screenHeight, 0.01, 1000.0); Matrix matView = MatrixLookAt(camera.position, camera.target, camera.up); rlSetMatrixModelview(matView); // Set internal modelview matrix (default shader) diff --git a/projects/VS2019/examples/rlgl_standalone.vcxproj b/projects/VS2019/examples/rlgl_standalone.vcxproj index 75dced4bb..466740431 100644 --- a/projects/VS2019/examples/rlgl_standalone.vcxproj +++ b/projects/VS2019/examples/rlgl_standalone.vcxproj @@ -209,8 +209,9 @@ Console true - $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -227,8 +228,9 @@ Console true - $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -244,8 +246,9 @@ Console true - $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -265,8 +268,9 @@ Console true - $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ - kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -291,8 +295,9 @@ true true true - kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ + opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + @@ -313,8 +318,9 @@ true true true - kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ + opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + @@ -335,8 +341,9 @@ true true true - kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ + opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -363,8 +370,9 @@ true true true - kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ + opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" @@ -375,11 +383,7 @@ - - - - {e89d61ac-55de-4482-afd4-df7242ebc859} - + From 9360e4e2c130767f58d787193de0b913bab8cddf Mon Sep 17 00:00:00 2001 From: Ray Date: Thu, 20 May 2021 19:14:42 +0200 Subject: [PATCH 117/121] Comment minor tweak --- src/raylib.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/raylib.h b/src/raylib.h index d0548faba..51be68d78 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -964,7 +964,7 @@ RLAPI void HideCursor(void); // Hides curso RLAPI bool IsCursorHidden(void); // Check if cursor is not visible RLAPI void EnableCursor(void); // Enables cursor (unlock cursor) RLAPI void DisableCursor(void); // Disables cursor (lock cursor) -RLAPI bool IsCursorOnScreen(void); // Check if cursor is on the current screen. +RLAPI bool IsCursorOnScreen(void); // Check if cursor is on the screen // Drawing-related functions RLAPI void ClearBackground(Color color); // Set background color (framebuffer clear color) From e401d5c48e05efdd8b2cd9857df1f26b03299154 Mon Sep 17 00:00:00 2001 From: Ray Date: Thu, 20 May 2021 19:24:28 +0200 Subject: [PATCH 118/121] WARNING: RENAMED: MeshBoundingBox() -> GetMeshBoundingBox() Renamed for consistency with other function in raylib. --- examples/models/models_loading.c | 4 ++-- examples/models/models_mesh_picking.c | 2 +- src/models.c | 2 +- src/raylib.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/models/models_loading.c b/examples/models/models_loading.c index a7d34bbd7..91e25f4dc 100644 --- a/examples/models/models_loading.c +++ b/examples/models/models_loading.c @@ -43,7 +43,7 @@ int main(void) Vector3 position = { 0.0f, 0.0f, 0.0f }; // Set model position - BoundingBox bounds = MeshBoundingBox(model.meshes[0]); // Set model bounds + BoundingBox bounds = GetMeshBoundingBox(model.meshes[0]); // Set model bounds // NOTE: bounds are calculated from the original size of the model, // if model is scaled on drawing, bounds must be also scaled @@ -78,7 +78,7 @@ int main(void) model = LoadModel(droppedFiles[0]); // Load new model model.materials[0].maps[MATERIAL_MAP_DIFFUSE].texture = texture; // Set current map diffuse texture - bounds = MeshBoundingBox(model.meshes[0]); + bounds = GetMeshBoundingBox(model.meshes[0]); // TODO: Move camera position from target enough distance to visualize model properly } diff --git a/examples/models/models_mesh_picking.c b/examples/models/models_mesh_picking.c index 78c7c45c6..5dda8df5c 100644 --- a/examples/models/models_mesh_picking.c +++ b/examples/models/models_mesh_picking.c @@ -40,7 +40,7 @@ int main(void) tower.materials[0].maps[MATERIAL_MAP_DIFFUSE].texture = texture; // Set model diffuse texture Vector3 towerPos = { 0.0f, 0.0f, 0.0f }; // Set model position - BoundingBox towerBBox = MeshBoundingBox(tower.meshes[0]); // Get mesh bounding box + BoundingBox towerBBox = GetMeshBoundingBox(tower.meshes[0]); // Get mesh bounding box bool hitMeshBBox = false; bool hitTriangle = false; diff --git a/src/models.c b/src/models.c index 1e0297d6f..f21c930de 100644 --- a/src/models.c +++ b/src/models.c @@ -2617,7 +2617,7 @@ Mesh GenMeshCubicmap(Image cubicmap, Vector3 cubeSize) // Compute mesh bounding box limits // NOTE: minVertex and maxVertex should be transformed by model transform matrix -BoundingBox MeshBoundingBox(Mesh mesh) +BoundingBox GetMeshBoundingBox(Mesh mesh) { // Get min and max vertex to construct bounds (AABB) Vector3 minVertex = { 0 }; diff --git a/src/raylib.h b/src/raylib.h index 51be68d78..916ea3726 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -1433,7 +1433,7 @@ RLAPI Mesh GenMeshHeightmap(Image heightmap, Vector3 size); RLAPI Mesh GenMeshCubicmap(Image cubicmap, Vector3 cubeSize); // Generate cubes-based map mesh from image data // Mesh manipulation functions -RLAPI BoundingBox MeshBoundingBox(Mesh mesh); // Compute mesh bounding box limits +RLAPI BoundingBox GetMeshBoundingBox(Mesh mesh); // Compute mesh bounding box limits RLAPI void MeshTangents(Mesh *mesh); // Compute mesh tangents RLAPI void MeshBinormals(Mesh *mesh); // Compute mesh binormals From f33cec64aac2cae70bda939a988c8dc32e491c99 Mon Sep 17 00:00:00 2001 From: Ray Date: Thu, 20 May 2021 19:25:09 +0200 Subject: [PATCH 119/121] Use output->boneCount instead of nodes_count --- src/models.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/models.c b/src/models.c index f21c930de..b9d24e101 100644 --- a/src/models.c +++ b/src/models.c @@ -4718,7 +4718,7 @@ static ModelAnimation *LoadGLTFModelAnimations(const char *fileName, int *animCo // output->framerate = // TODO: Use framerate instead of const timestep // Name and parent bones - for (unsigned int j = 0; j < data->nodes_count; j++) + for (unsigned int j = 0; j < output->boneCount; j++) { strcpy(output->bones[j].name, data->nodes[j].name == 0 ? "ANIMJOINT" : data->nodes[j].name); output->bones[j].parent = (data->nodes[j].parent != NULL) ? (int)(data->nodes[j].parent - data->nodes) : -1; @@ -4728,9 +4728,9 @@ static ModelAnimation *LoadGLTFModelAnimations(const char *fileName, int *animCo // Initiate with zero bone translations for (int frame = 0; frame < output->frameCount; frame++) { - output->framePoses[frame] = RL_MALLOC(data->nodes_count*sizeof(Transform)); + output->framePoses[frame] = RL_MALLOC(output->boneCount*sizeof(Transform)); - for (unsigned int i = 0; i < data->nodes_count; i++) + for (unsigned int i = 0; i < output->boneCount; i++) { output->framePoses[frame][i].translation = Vector3Zero(); output->framePoses[frame][i].rotation = QuaternionIdentity(); From 23a08a483e17d8c8e8b4774527027bb14ec6b933 Mon Sep 17 00:00:00 2001 From: Ray Date: Thu, 20 May 2021 19:27:04 +0200 Subject: [PATCH 120/121] WARNING: RENAMED: IsMusicPlaying() -> IsMusicStreamPlaying() --- src/raudio.c | 6 +++--- src/raudio.h | 2 +- src/raylib.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/raudio.c b/src/raudio.c index 5db2407a1..639d6cd54 100644 --- a/src/raudio.c +++ b/src/raudio.c @@ -1540,7 +1540,7 @@ void PlayMusicStream(Music music) // For music streams, we need to make sure we maintain the frame cursor position // This is a hack for this section of code in UpdateMusicStream() // NOTE: In case window is minimized, music stream is stopped, just make sure to - // play again on window restore: if (IsMusicPlaying(music)) PlayMusicStream(music); + // play again on window restore: if (IsMusicStreamPlaying(music)) PlayMusicStream(music); ma_uint32 frameCursorPos = music.stream.buffer->frameCursorPos; PlayAudioStream(music.stream); // WARNING: This resets the cursor position. music.stream.buffer->frameCursorPos = frameCursorPos; @@ -1714,12 +1714,12 @@ void UpdateMusicStream(Music music) { // NOTE: In case window is minimized, music stream is stopped, // just make sure to play again on window restore - if (IsMusicPlaying(music)) PlayMusicStream(music); + if (IsMusicStreamPlaying(music)) PlayMusicStream(music); } } // Check if any music is playing -bool IsMusicPlaying(Music music) +bool IsMusicStreamPlaying(Music music) { return IsAudioStreamPlaying(music.stream); } diff --git a/src/raudio.h b/src/raudio.h index e37f4b274..a38c69571 100644 --- a/src/raudio.h +++ b/src/raudio.h @@ -169,7 +169,7 @@ Music LoadMusicStream(const char *fileName); // Load music st Music LoadMusicStreamFromMemory(const char *fileType, unsigned char* data, int dataSize); // Load music stream from data void UnloadMusicStream(Music music); // Unload music stream void PlayMusicStream(Music music); // Start music playing -bool IsMusicPlaying(Music music); // Check if music is playing +bool IsMusicStreamPlaying(Music music); // Check if music is playing void UpdateMusicStream(Music music); // Updates buffers for music streaming void StopMusicStream(Music music); // Stop music playing void PauseMusicStream(Music music); // Pause music playing diff --git a/src/raylib.h b/src/raylib.h index 916ea3726..b0b6b9f66 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -1502,7 +1502,7 @@ RLAPI Music LoadMusicStream(const char *fileName); // Load mu RLAPI Music LoadMusicStreamFromMemory(const char *fileType, unsigned char* data, int dataSize); // Load music stream from data RLAPI void UnloadMusicStream(Music music); // Unload music stream RLAPI void PlayMusicStream(Music music); // Start music playing -RLAPI bool IsMusicPlaying(Music music); // Check if music is playing +RLAPI bool IsMusicStreamPlaying(Music music); // Check if music is playing RLAPI void UpdateMusicStream(Music music); // Updates buffers for music streaming RLAPI void StopMusicStream(Music music); // Stop music playing RLAPI void PauseMusicStream(Music music); // Pause music playing From 4a099c3658f13224e923843abbdb1e718ed3a22b Mon Sep 17 00:00:00 2001 From: Ray Date: Thu, 20 May 2021 20:37:46 +0200 Subject: [PATCH 121/121] Review ExportImage() to use SaveFileData() #1779 --- src/textures.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/textures.c b/src/textures.c index de0d76ba8..db562bd97 100644 --- a/src/textures.c +++ b/src/textures.c @@ -416,7 +416,13 @@ bool ExportImage(Image image, const char *fileName) } #if defined(SUPPORT_FILEFORMAT_PNG) - if (IsFileExtension(fileName, ".png")) success = stbi_write_png(fileName, image.width, image.height, channels, imgData, image.width*channels); + if (IsFileExtension(fileName, ".png")) + { + int dataSize = 0; + unsigned char *fileData = stbi_write_png_to_mem((const unsigned char *)imgData, image.width*channels, image.width, image.height, channels, &dataSize); + success = SaveFileData(fileName, fileData, dataSize); + RL_FREE(fileData); + } #else if (false) {} #endif

$Ijx`;ls0ZFCFn+Y$B~J&Di^M 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 literal 0 HcmV?d00001 diff --git a/examples/others/resources/shaders/glsl100/point_particle.fs b/examples/others/resources/shaders/glsl100/point_particle.fs new file mode 100644 index 000000000..cf0fd72c2 --- /dev/null +++ b/examples/others/resources/shaders/glsl100/point_particle.fs @@ -0,0 +1,16 @@ +#version 100 + +precision mediump float; + +// Input uniform values +uniform vec4 color; + +// NOTE: Add here your custom variables + +void main() +{ + // Each point is drawn as a screen space square of gl_PointSize size. gl_PointCoord contains where we are inside of + // it. (0, 0) is the top left, (1, 1) the bottom right corner. + // Draw each point as a colored circle with alpha 1.0 in the center and 0.0 at the outer edges. + gl_FragColor = vec4(color.rgb, color.a * (1.0 - length(gl_PointCoord.xy - vec2(0.5))*2.0)); +} \ No newline at end of file diff --git a/examples/others/resources/shaders/glsl100/point_particle.vs b/examples/others/resources/shaders/glsl100/point_particle.vs new file mode 100644 index 000000000..890834c49 --- /dev/null +++ b/examples/others/resources/shaders/glsl100/point_particle.vs @@ -0,0 +1,24 @@ +#version 100 + +// Input vertex attributes +attribute vec3 vertexPosition; + +// Input uniform values +uniform mat4 mvp; +uniform float currentTime; + +// NOTE: Add here your custom variables + +void main() +{ + // Unpack data from vertexPosition + vec2 pos = vertexPosition.xy; + float period = vertexPosition.z; + + // Calculate final vertex position (jiggle it around a bit horizontally) + pos += vec2(100.0, 0.0) * sin(period * currentTime); + gl_Position = mvp * vec4(pos.x, pos.y, 0.0, 1.0); + + // Calculate the screen space size of this particle (also vary it over time) + gl_PointSize = 10.0 - 5.0 * abs(sin(period * currentTime)); +} \ No newline at end of file diff --git a/examples/others/resources/shaders/glsl330/point_particle.fs b/examples/others/resources/shaders/glsl330/point_particle.fs new file mode 100644 index 000000000..f08462105 --- /dev/null +++ b/examples/others/resources/shaders/glsl330/point_particle.fs @@ -0,0 +1,17 @@ +#version 330 + +// Input uniform values +uniform vec4 color; + +// Output fragment color +out vec4 finalColor; + +// NOTE: Add here your custom variables + +void main() +{ + // Each point is drawn as a screen space square of gl_PointSize size. gl_PointCoord contains where we are inside of + // it. (0, 0) is the top left, (1, 1) the bottom right corner. + // Draw each point as a colored circle with alpha 1.0 in the center and 0.0 at the outer edges. + finalColor = vec4(color.rgb, color.a * (1 - length(gl_PointCoord.xy - vec2(0.5))*2)); +} \ No newline at end of file diff --git a/examples/others/resources/shaders/glsl330/point_particle.vs b/examples/others/resources/shaders/glsl330/point_particle.vs new file mode 100644 index 000000000..e43b91de3 --- /dev/null +++ b/examples/others/resources/shaders/glsl330/point_particle.vs @@ -0,0 +1,24 @@ +#version 330 + +// Input vertex attributes +in vec3 vertexPosition; + +// Input uniform values +uniform mat4 mvp; +uniform float currentTime; + +// NOTE: Add here your custom variables + +void main() +{ + // Unpack data from vertexPosition + vec2 pos = vertexPosition.xy; + float period = vertexPosition.z; + + // Calculate final vertex position (jiggle it around a bit horizontally) + pos += vec2(100, 0) * sin(period * currentTime); + gl_Position = mvp * vec4(pos, 0.0, 1.0); + + // Calculate the screen space size of this particle (also vary it over time) + gl_PointSize = 10 - 5 * abs(sin(period * currentTime)); +} \ No newline at end of file From 9011b936cfb182b85d73688e95ed5b87e734a623 Mon Sep 17 00:00:00 2001 From: Ray Date: Mon, 19 Apr 2021 22:34:30 +0200 Subject: [PATCH 042/121] Create raylib_logo_animation.gif --- logo/raylib_logo_animation.gif | Bin 0 -> 40634 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 logo/raylib_logo_animation.gif diff --git a/logo/raylib_logo_animation.gif b/logo/raylib_logo_animation.gif new file mode 100644 index 0000000000000000000000000000000000000000..e5fa331f3e13f8668cab70fce0b9e270636990ef GIT binary patch literal 40634 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 literal 0 HcmV?d00001 From 9b0dd543e08c243bde2d792ec309631ef1e5372f Mon Sep 17 00:00:00 2001 From: Ray Date: Mon, 19 Apr 2021 22:36:33 +0200 Subject: [PATCH 043/121] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4218635e7..bcfd0bd0d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ - + **raylib is a simple and easy-to-use library to enjoy videogames programming.** From d1537bfd6131b09b1e1581224f13edd4f4331fbd Mon Sep 17 00:00:00 2001 From: Ray Date: Mon, 19 Apr 2021 22:39:59 +0200 Subject: [PATCH 044/121] Update raylib_logo_animation.gif --- logo/raylib_logo_animation.gif | Bin 40634 -> 42100 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/logo/raylib_logo_animation.gif b/logo/raylib_logo_animation.gif index e5fa331f3e13f8668cab70fce0b9e270636990ef..28ccba1f5971f6cd0c650cf98d09c07f7909929f 100644 GIT binary patch literal 42100 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