Cross platform float max

polymergames · Jul 17, 2018 · 3353b60 · 3353b60
1 parent eb3b26d
commit 3353b60
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/ios-project/Diamond/Diamond.xcodeproj/project.pbxproj b/ios-project/Diamond/Diamond.xcodeproj/project.pbxproj
@@ -432,6 +432,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				BITCODE_GENERATION_MODE = marker;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@@ -487,6 +488,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				BITCODE_GENERATION_MODE = bitcode;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";

diff --git a/src/graphics/D_UIView.cpp b/src/graphics/D_UIView.cpp
@@ -104,8 +104,8 @@ void Diamond::UIView::updateLayout() {
     }
 
     if ((m_props.flags & UIViewProps::FIT_CONTENTS) && !m_children.empty()) {
-        tD_pos minx = FLT_MAX, miny = FLT_MAX;
-        tD_pos maxx = -FLT_MAX, maxy = -FLT_MAX;
+        tD_pos minx = std::numeric_limits<float>::max(), miny = std::numeric_limits<float>::max();
+        tD_pos maxx = -std::numeric_limits<float>::max(), maxy = -std::numeric_limits<float>::max();
 
         for (auto child : m_children) {
             if (child->isActive()) {