From f3a11914f86065bd5e760ba083fb1d84d9394594 Mon Sep 17 00:00:00 2001 From: Daniel Chappuis Date: Fri, 29 Oct 2021 08:49:30 +0200 Subject: [PATCH] Fix compilation issues in testbed application on Windows --- testbed/scenes/boxtower/BoxTowerScene.cpp | 2 ++ testbed/src/Scene.cpp | 2 ++ testbed/src/TestbedLogger.h | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/testbed/scenes/boxtower/BoxTowerScene.cpp b/testbed/scenes/boxtower/BoxTowerScene.cpp index c32eb47d..d3d77216 100644 --- a/testbed/scenes/boxtower/BoxTowerScene.cpp +++ b/testbed/scenes/boxtower/BoxTowerScene.cpp @@ -24,6 +24,8 @@ ********************************************************************************/ // Libraries +#define _USE_MATH_DEFINES +#include #include "BoxTowerScene.h" // Namespaces diff --git a/testbed/src/Scene.cpp b/testbed/src/Scene.cpp index db5ec8ae..37ef5fe4 100644 --- a/testbed/src/Scene.cpp +++ b/testbed/src/Scene.cpp @@ -24,6 +24,8 @@ ********************************************************************************/ // Libraries +#define _USE_MATH_DEFINES +#include #include "Scene.h" #include diff --git a/testbed/src/TestbedLogger.h b/testbed/src/TestbedLogger.h index 2718ac5e..06fdac32 100644 --- a/testbed/src/TestbedLogger.h +++ b/testbed/src/TestbedLogger.h @@ -53,7 +53,7 @@ class TestbedLogger : public reactphysics3d::Logger { reactphysics3d::DefaultLogger::Formatter* getFormatter(reactphysics3d::DefaultLogger::Format format) const; /// Add a stream destination to the logger - void addStreamDestination(std::ostream& outputStream, uint logLevelFlag, reactphysics3d::DefaultLogger::Format format); + void addStreamDestination(std::ostream& outputStream, reactphysics3d::uint logLevelFlag, reactphysics3d::DefaultLogger::Format format); public: @@ -64,7 +64,7 @@ class TestbedLogger : public reactphysics3d::Logger { ~TestbedLogger(); /// Add a log file destination to the logger - void addFileDestination(const std::string& worldName, uint logLevelFlag, reactphysics3d::DefaultLogger::Format format); + void addFileDestination(const std::string& worldName, reactphysics3d::uint logLevelFlag, reactphysics3d::DefaultLogger::Format format); /// Log something