Merge pull request #885 from cyberbotics/sync-master-3c3f849954ac1076b492679a906662ec988e9865

Sync libcontroller master

Author: omichel

webots_ros2_driver/webots/lib/controller/python/vehicle/car.py

@@ -41,7 +41,7 @@ def __init__(self):
         elif sys.platform == 'win32':
             path = os.path.join('lib', 'controller', 'car.dll')
         elif sys.platform == 'darwin':
-            path = os.path.join('Contents', 'MacOS', 'lib', 'controller', 'libcar.dylib')
+            path = os.path.join('Contents', 'lib', 'controller', 'libcar.dylib')
         self.api = ctypes.cdll.LoadLibrary(os.path.join(os.environ['WEBOTS_HOME'], path))
         self.api.wbu_car_get_front_wheel_radius.restype = ctypes.c_double
         self.api.wbu_car_get_indicator_period.restype = ctypes.c_double

webots_ros2_driver/webots/lib/controller/python/vehicle/driver.py

@@ -43,7 +43,7 @@ def loadApi() -> ctypes.cdll:
             car = 'car.dll'
             driver = 'driver.dll'
         elif sys.platform == 'darwin':
-            path = os.path.join('Contents', 'MacOS', 'lib', 'controller')
+            path = os.path.join('Contents', 'lib', 'controller')
             car = 'libcar.dylib'
             driver = 'libdriver.dylib'
         ctypes.cdll.LoadLibrary(os.path.join(os.environ['WEBOTS_HOME'], path, car))