From d32dda4d1e8b6c7392514b3e93f98ade8db5d846 Mon Sep 17 00:00:00 2001 From: Peter0x44 Date: Thu, 19 Dec 2024 00:32:15 +0000 Subject: [PATCH 1/2] Use mingw32-make in build-MinGW-W64.bat Not all mingw-w64 toolchains on windows are guaranteed to have make, but virtually all of them have mingw32-make. MSYS2 UCRT does not provide make, but does provide mingw32-make. So users who have added UCRT to the PATH (Not advisable!) but not msys64 will have errors about a missing make. VSCode's tasks.json uses mingw32-make anyway, so it's better to stay consistent with it. --- build-MinGW-W64.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-MinGW-W64.bat b/build-MinGW-W64.bat index 04894a6..379d454 100644 --- a/build-MinGW-W64.bat +++ b/build-MinGW-W64.bat @@ -1,5 +1,5 @@ cd build premake5.exe gmake2 cd .. -make SHELL=CMD clean -pause \ No newline at end of file +mingw32-make SHELL=CMD clean +pause From 771f00231841509f3eacf0e6c705d09659ef5164 Mon Sep 17 00:00:00 2001 From: Jeffery Myers Date: Tue, 14 Jan 2025 16:21:54 -0800 Subject: [PATCH 2/2] Update both C and C++ to 17, and make them consistent across targets --- .vscode/c_cpp_properties.json | 12 ++++++------ build/premake5.lua | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index 69fbcd4..0932e96 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -14,8 +14,8 @@ "GRAPHICS_API_OPENGL_33", "PLATFORM_DESKTOP" ], - "cStandard": "c99", - "cppStandard": "c++14", + "cStandard": "c17", + "cppStandard": "c++17", "intelliSenseMode": "gcc-x64" }, { @@ -36,8 +36,8 @@ "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks" ], "compilerPath": "/usr/bin/clang", - "cStandard": "c11", - "cppStandard": "c++14", + "cStandard": "c17", + "cppStandard": "c++17", "intelliSenseMode": "clang-x64" }, { @@ -55,8 +55,8 @@ "PLATFORM_DESKTOP" ], "compilerPath": "/usr/bin/clang", - "cStandard": "c11", - "cppStandard": "c++14", + "cStandard": "c17", + "cppStandard": "c++17", "intelliSenseMode": "clang-x64" } diff --git a/build/premake5.lua b/build/premake5.lua index 49c23b5..91155dc 100644 --- a/build/premake5.lua +++ b/build/premake5.lua @@ -167,7 +167,7 @@ if (downloadRaylib) then links {"raylib"} - cdialect "C99" + cdialect "C17" cppdialect "C++17" includedirs {raylib_dir .. "/src" }