All: Correct more format strings on Windows (fixes #1817)

mgba-emu · Jul 11, 2020 · 8e3be05 · 8e3be05
1 parent 4b14c8d
commit 8e3be05
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/CHANGES b/CHANGES
@@ -9,6 +9,7 @@ Emulation fixes:
  - GBA Video: Fix invalid read in mode 4 mosaic
 Other fixes:
  - All: Correct format strings for some numbers on Windows (fixes mgba.io/i/1794)
+ - All: Correct more format strings on Windows (fixes mgba.io/i/1817)
  - GB Core: Fix extracting SRAM when none is present
  - GBA Savedata: Fix extracting save when not yet configured in-game
  - Qt: Fix file handle leak on opening an invalid ROM

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -17,6 +17,10 @@ if(NOT MSVC)
 		set(GCC_STD "gnu99")
 	endif()
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-missing-field-initializers -std=${GCC_STD}")
+	if(WIN32)
+		# mingw32 likes to complain about using the "wrong" format strings despite them actually working
+		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-format")
+	endif()
 else()
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS /wd4003 /wd4244 /wd4146")
 endif()

diff --git a/include/mgba-util/common.h b/include/mgba-util/common.h
@@ -14,6 +14,10 @@
 #define CXX_GUARD_END
 #endif
 
+#ifdef __MINGW32__
+#define __USE_MINGW_ANSI_STDIO 1
+#endif
+
 CXX_GUARD_START
 
 #include <ctype.h>