Xcode fixes (#72)

`B2_DEBUG` type conversion
erincatto · Dec 10, 2023 · d484c6c · d484c6c
1 parent 8ae4fae
commit d484c6c
Show file tree

Hide file tree

Showing 13 changed files with 31 additions and 27 deletions.
diff --git a/include/box2d/types.h b/include/box2d/types.h
@@ -19,6 +19,12 @@
 #define B2_ZERO_INIT {0}
 #endif
 
+#ifdef NDEBUG
+#define B2_DEBUG 0
+#else
+#define B2_DEBUG 1
+#endif
+
 #define B2_ARRAY_COUNT(A) (int)(sizeof(A) / sizeof(A[0]))
 #define B2_MAYBE_UNUSED(x) ((void)(x))
 #define B2_NULL_INDEX (-1)

diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
@@ -94,10 +94,7 @@ set_target_properties(samples PROPERTIES
 target_include_directories(samples PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${JSMN_DIR})
 target_link_libraries(samples PUBLIC box2d imgui glfw glad enkiTS)
 
-if (${CMAKE_BUILD_TYPE} STREQUAL Debug)
-	target_compile_definitions(samples PRIVATE _DEBUG)
-endif ()
-
+# target_compile_definitions(samples PRIVATE "$<$<CONFIG:DEBUG>:SAMPLES_DEBUG>")
 # message(STATUS "runtime = ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
 # message(STATUS "binary = ${CMAKE_CURRENT_BINARY_DIR}")
 

diff --git a/samples/collection/sample_events.cpp b/samples/collection/sample_events.cpp
@@ -269,7 +269,7 @@ class Sensor : public Sample
 			Ring* ring = (Ring*)b2Body_GetUserData(ringBodyId);
 			if (ring != nullptr && ring->valid)
 			{
-				int index = ring - m_rings;
+				int index = (int)(ring - m_rings);
 				assert(0 <= index && index < e_count);
 
 				// Defer destruction to avoid double destruction and event invalidation (orphaned shape ids)

diff --git a/samples/sample.h b/samples/sample.h
@@ -17,10 +17,10 @@
 
 struct Settings;
 
-#if defined(_DEBUG)
-constexpr bool g_sampleDebug = true;
-#else
+#ifdef NDEBUG
 constexpr bool g_sampleDebug = false;
+#else
+constexpr bool g_sampleDebug = true;
 #endif
 
 #define RAND_LIMIT 32767

diff --git a/samples/settings.cpp b/samples/settings.cpp
@@ -23,7 +23,7 @@ static bool ReadFile(char*& data, int& size, const char* filename)
 	}
 
 	fseek(file, 0, SEEK_END);
-	size = ftell(file);
+	size = (int)ftell(file);
 	fseek(file, 0, SEEK_SET);
 
 	if (size == 0)
@@ -102,7 +102,7 @@ void Settings::Load()
 			const char* s = data + tokens[i + 1].start;
 			strncpy(buffer, s, count);
 			char* dummy;
-			m_sampleIndex = strtol(buffer, &dummy, 10);
+			m_sampleIndex = (int)strtol(buffer, &dummy, 10);
 		}
 		else if (jsoneq(data, &tokens[i], "drawShapes") == 0)
 		{

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -85,6 +85,7 @@ target_include_directories(box2d
 )
 
 target_link_libraries(box2d PRIVATE simde)
+#target_compile_definitions(box2d PRIVATE "$<$<CONFIG:DEBUG>:B2_DEBUG>")
 
 message(STATUS "CMake C compiler: ${CMAKE_C_COMPILER_ID}")
 message(STATUS "CMake C++ compiler: ${CMAKE_CXX_COMPILER_ID}")
@@ -96,7 +97,7 @@ if (MSVC)
 		target_compile_options(box2d PRIVATE /W4 /WX /experimental:c11atomics)
 		target_compile_options(box2d PRIVATE /arch:AVX2)
 		# target_compile_options(box2d PRIVATE /arch:SSE2)
-		# target_compile_definitions(box2d PUBLIC "$<$<CONFIG:RELWITHDEBINFO>:B2_ENABLE_ASSERT>")
+		target_compile_definitions(box2d PUBLIC "$<$<CONFIG:RELWITHDEBINFO>:B2_ENABLE_ASSERT>")
 	elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
 		message(STATUS "CMake using Clang-CL")
 		target_compile_options(box2d PRIVATE /W4 /WX /std:c17 /arch:AVX2)

diff --git a/src/block_allocator.c b/src/block_allocator.c
@@ -153,7 +153,7 @@ void* b2AllocBlock(b2BlockAllocator* allocator, int32_t size)
 
 		b2Chunk* chunk = allocator->chunks + allocator->chunkCount;
 		chunk->blocks = (b2Block*)b2Alloc(b2_chunkSize);
-#if defined(_DEBUG)
+#if B2_DEBUG
 		memset(chunk->blocks, 0xcd, b2_chunkSize);
 #endif
 		int32_t blockSize = b2_blockSizes[index];
@@ -194,7 +194,7 @@ void b2FreeBlock(b2BlockAllocator* allocator, void* p, int32_t size)
 	int32_t index = b2_sizeMap.values[size];
 	B2_ASSERT(0 <= index && index < b2_blockSizeCount);
 
-#if defined(_DEBUG)
+#if B2_DEBUG
 	// Verify the memory address and size is valid.
 	int32_t blockSize = b2_blockSizes[index];
 	bool found = false;

diff --git a/src/core.h b/src/core.h
@@ -64,7 +64,7 @@
 #error Unknown platform
 #endif
 
-#if defined(_DEBUG) || defined(B2_ENABLE_ASSERT)
+#if !defined(NDEBUG) || defined(B2_ENABLE_ASSERT)
 #define B2_ASSERT(condition)                                                                                                               \
 	do                                                                                                                                     \
 	{                                                                                                                                      \
@@ -75,8 +75,8 @@
 #define B2_ASSERT(...) ((void)0)
 #endif
 
-#if defined(_DEBUG)
-#define B2_VALIDATE 1
-#else
+#if defined(NDEBUG)
 #define B2_VALIDATE 0
+#else
+#define B2_VALIDATE 1
 #endif
diff --git a/src/dynamic_tree.c b/src/dynamic_tree.c
@@ -530,7 +530,7 @@ static void b2RotateNodes(b2DynamicTree* tree, int32_t iA)
 		if (costCE < bestCost)
 		{
 			bestRotation = b2_rotateCE;
-			bestCost = costCE;
+			// bestCost = costCE;
 		}
 
 		switch (bestRotation)

diff --git a/src/graph.c b/src/graph.c
@@ -975,7 +975,7 @@ void b2SolverTask(int32_t startIndex, int32_t endIndex, uint32_t threadIndexDont
 		B2_ASSERT(stages[stageIndex].type == b2_stagePrepareJoints);
 		b2ExecuteMainStage(stages + stageIndex, context, syncBits);
 		stageIndex += 1;
-		jointSyncIndex += 1;
+		// jointSyncIndex += 1;
 
 		uint32_t constraintSyncIndex = 1;
 		syncBits = (constraintSyncIndex << 16) | stageIndex;
@@ -1054,7 +1054,7 @@ void b2SolverTask(int32_t startIndex, int32_t endIndex, uint32_t threadIndexDont
 				b2ExecuteMainStage(stages + iterStageIndex, context, syncBits);
 				iterStageIndex += 1;
 			}
-			graphSyncIndex += 1;
+			// graphSyncIndex += 1;
 
 			b2ApplyOverflowRestitution(context);
 		}

diff --git a/src/table.c b/src/table.c
@@ -11,7 +11,7 @@
 #include <stdbool.h>
 #include <string.h>
 
-#if _DEBUG
+#if B2_DEBUG
 int32_t g_probeCount;
 #endif
 
@@ -91,7 +91,7 @@ static inline uint32_t b2KeyHash(uint64_t key)
 	return (uint32_t)h;
 }
 
-#if _DEBUG
+#if B2_DEBUG
 int32_t g_probeCount;
 #endif
 
@@ -102,7 +102,7 @@ int32_t b2FindSlot(const b2HashSet* set, uint64_t key, uint32_t hash)
 	const b2SetItem* items = set->items;
 	while (items[index].hash != 0 && items[index].key != key)
 	{
-#if _DEBUG
+#if B2_DEBUG
 		g_probeCount += 1;
 #endif
 		index = (index + 1) & (capacity - 1);

diff --git a/src/timer.c b/src/timer.c
@@ -87,7 +87,7 @@ float b2GetMilliseconds(const b2Timer* timer)
 	struct timeval t;
 	gettimeofday(&t, 0);
 	time_t start_sec = timer->start_sec;
-	suseconds_t start_usec = timer->start_usec;
+	suseconds_t start_usec = (suseconds_t)timer->start_usec;
 
 	// http://www.gnu.org/software/libc/manual/html_node/Elapsed-Time.html
 	if (t.tv_usec < start_usec)
@@ -111,7 +111,7 @@ float b2GetMillisecondsAndReset(b2Timer* timer)
 	struct timeval t;
 	gettimeofday(&t, 0);
 	time_t start_sec = timer->start_sec;
-	suseconds_t start_usec = timer->start_usec;
+	suseconds_t start_usec = (suseconds_t)timer->start_usec;
 
 	// http://www.gnu.org/software/libc/manual/html_node/Elapsed-Time.html
 	if (t.tv_usec < start_usec)

diff --git a/test/test_table.c b/test/test_table.c
@@ -54,7 +54,7 @@ int TableTest(void)
 
 		ENSURE(set.count == (itemCount - removeCount));
 
-#ifdef _DEBUG
+#if B2_DEBUG
 		extern int32_t g_probeCount;
 		g_probeCount = 0;
 #endif
@@ -80,7 +80,7 @@ int TableTest(void)
 		float ms = b2GetMilliseconds(&timer);
 		printf("set: count = %d, b2ContainsKey = %.5f ms, ave = %.5f us\n", itemCount, ms, 1000.0f * ms / itemCount);
 
-#ifdef _DEBUG
+#if B2_DEBUG
 		float aveProbeCount = (float)g_probeCount / (float)itemCount;
 		printf("item count = %d, probe count = %d, ave probe count %.2f\n", itemCount, g_probeCount, aveProbeCount);
 #endif