From 5be0e2fd179c08931329e0697ee59e3b07d27b32 Mon Sep 17 00:00:00 2001
From: Blyron <samaniegoaaron112@gmail.com>
Date: Mon, 6 May 2024 16:29:17 +0200
Subject: [PATCH 1/2] Fix OSM2ODR build

---
 Util/BuildTools/BuildOSM2ODR.bat | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/Util/BuildTools/BuildOSM2ODR.bat b/Util/BuildTools/BuildOSM2ODR.bat
index 5a4fb36e0..77a4eff2b 100644
--- a/Util/BuildTools/BuildOSM2ODR.bat
+++ b/Util/BuildTools/BuildOSM2ODR.bat
@@ -71,7 +71,7 @@ rem ============================================================================
 rem Set the visual studio solution directory
 rem
 set OSM2ODR_VSPROJECT_PATH=%INSTALLATION_DIR:/=\%osm2odr-visualstudio\
-set OSM2ODR_SOURCE_PATH=%INSTALLATION_DIR:/=\%om2odr-source\
+set OSM2ODR_SOURCE_PATH=%INSTALLATION_DIR:/=\%osm2odr-source\
 set OSM2ODR_INSTALL_PATH=%ROOT_PATH:/=\%PythonAPI\carla\dependencies\
 set OSM2ODR__SERVER_INSTALL_PATH=%ROOT_PATH:/=\%Unreal\CarlaUE4\Plugins\Carla\CarlaDependencies
 set CARLA_DEPENDENCIES_FOLDER=%ROOT_PATH:/=\%Unreal\CarlaUE4\Plugins\Carla\CarlaDependencies\
@@ -92,24 +92,19 @@ if %REMOVE_INTERMEDIATE% == true (
 
 rem Build OSM2ODR
 if %BUILD_OSM2ODR% == true (
-    cd "%OSM2ODR_SOURCE_PATH%"
+    cd "%INSTALLATION_DIR%"
     if not exist "%OSM2ODR_SOURCE_PATH%" (
         curl --retry 5 --retry-max-time 120 -L -o OSM2ODR.zip https://github.com/carla-simulator/sumo/archive/%CURRENT_OSM2ODR_COMMIT%.zip
         tar -xf OSM2ODR.zip
         del OSM2ODR.zip
-        ren sumo-%CURRENT_OSM2ODR_COMMIT% %OSM2ODR_SOURCE_PATH%
+        ren sumo-%CURRENT_OSM2ODR_COMMIT% osm2odr-source
     )
-
+    
+    cd ..
     if not exist "%OSM2ODR_VSPROJECT_PATH%" mkdir "%OSM2ODR_VSPROJECT_PATH%"
     cd "%OSM2ODR_VSPROJECT_PATH%"
 
-    echo.%GENERATOR% | findstr /C:"Visual Studio" >nul && (
-        set PLATFORM=-A x64
-    ) || (
-        set PLATFORM=
-    )
-
-    cmake -G %GENERATOR% %PLATFORM%^
+    cmake -G %GENERATOR% -A x64^
         -DCMAKE_CXX_FLAGS_RELEASE="/MD /MP"^
         -DCMAKE_INSTALL_PREFIX="%OSM2ODR_INSTALL_PATH:\=/%"^
         -DPROJ_INCLUDE_DIR=%INSTALLATION_DIR:/=\%\proj-install\include^

From f7ed6c25e98eae8b246bf33c6e1ef58e4ae0386d Mon Sep 17 00:00:00 2001
From: MattRoweEAIF <125647690+MattRoweEAIF@users.noreply.github.com>
Date: Mon, 30 Sep 2024 13:45:22 +0200
Subject: [PATCH 2/2] fix typo in title (#8225)

---
 Docs/build_windows_ue5.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Docs/build_windows_ue5.md b/Docs/build_windows_ue5.md
index 70b1eeb9e..6dd02c35c 100644
--- a/Docs/build_windows_ue5.md
+++ b/Docs/build_windows_ue5.md
@@ -1,7 +1,7 @@
 !!! warning
         This is a work in progress!! This version of CARLA is not considered a stable release. Over the following months many significant changes may be made to this branch which could break any modifications you make. We advise you to treat this branch as experimental.
 
-# Building CARLA in Windowswith Unreal Engine 5.3
+# Building CARLA in Windows with Unreal Engine 5.3
 
 ## Set up the environment