Merge branch 'main' of https://github.com/JosephA1997/fake-mario

Editor/Build-Editor.lua

@@ -1,7 +1,6 @@
 project "Editor"
 	language "C++"
 	cppdialect "C++17"
-	cdialect "C17"
 	systemversion "latest"
 	targetname "Editor"
 	links {"Engine-Core"}

Engine-Core/Build-Core.lua

@@ -1,7 +1,6 @@
 project "Engine-Core"
 	language "C++"
 	cppdialect "C++17"
-	cdialect "C17"
 	systemversion "latest"
 	kind "StaticLib"
 	
@@ -31,6 +30,12 @@ project "Engine-Core"
 
 		libdirs {vs_sfmldir .."/lib"}
 
+	filter {"action:vs*", "system:windows", "configurations:Debug"}
+		postbuildcommands 
+		{
+			'{COPY} "%{prj.location}/vendor/sfml/lib/*.pdb" "%{cfg.targetdir}"'
+		}
+
 	--not visual studio --
   filter {"not action:vs*", "system:windows"}
     targetdir (corelibdir)

Engine-Core/vendor/SFML/include/SFML/Config.hpp

@@ -30,7 +30,7 @@
 ////////////////////////////////////////////////////////////
 #define SFML_VERSION_MAJOR      3
 #define SFML_VERSION_MINOR      0
-#define SFML_VERSION_PATCH      1
+#define SFML_VERSION_PATCH      2
 #define SFML_VERSION_IS_RELEASE true
 
 

Engine-Core/vendor/SFML/include/SFML/Network/Packet.hpp

@@ -191,10 +191,6 @@ public:
     /// }
     /// \endcode
     ///
-    /// Don't focus on the return type, it's equivalent to bool but
-    /// it disallows unwanted implicit conversions to integer or
-    /// pointer types.
-    ///
     /// \return `true` if last data extraction from packet was successful
     ///
     /// \see `endOfPacket`

Engine-Core/vendor/SFML/include/SFML/System/Utf.inl

@@ -337,7 +337,7 @@ In Utf<16>::decode(In begin, In end, char32_t& output, char32_t replacement)
     else
     {
         // We can make a direct copy
-        output = first;
+        output = static_cast<char32_t>(first);
     }
 
     return begin;

Engine-Core/vendor/SFML/include/SFML/Window/Mouse.hpp

@@ -113,6 +113,10 @@ enum class Wheel
 ///
 /// \param position New position of the mouse
 ///
+/// \warning On macOS the OS API used for `setPosition` requires granting
+///     of Accessibility permission for your application.
+///     See also: https://support.apple.com/guide/mac-help/allow-accessibility-apps-to-access-your-mac-mh43185/
+///
 ////////////////////////////////////////////////////////////
 SFML_WINDOW_API void setPosition(Vector2i position);
 
@@ -125,6 +129,10 @@ SFML_WINDOW_API void setPosition(Vector2i position);
 /// \param position New position of the mouse
 /// \param relativeTo Reference window
 ///
+/// \warning On macOS the OS API used for `setPosition` requires granting
+///     of Accessibility permission for your application.
+///     See also: https://support.apple.com/guide/mac-help/allow-accessibility-apps-to-access-your-mac-mh43185/
+///
 ////////////////////////////////////////////////////////////
 SFML_WINDOW_API void setPosition(Vector2i position, const WindowBase& relativeTo);
 } // namespace Mouse

Game/Build-Game.lua

@@ -1,7 +1,6 @@
 project "Game"
 	language "C++"
 	cppdialect "C++17"
-	cdialect "C17"
 	systemversion "latest"
 	targetname "Game"
 	links {"Engine-Core"}