cmake: fix uses of undefined macro identifiers (-Wundef)

webosbrew · Nov 17, 2023 · d81d986 · d81d986
1 parent cc7c0a2
commit d81d986
Show file tree

Hide file tree

Showing 430 changed files with 1,289 additions and 1,260 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -585,6 +585,11 @@ if(USE_GCC OR USE_CLANG OR USE_INTELCC OR USE_QCC)
     endif()
   endif()
 
+  check_c_compiler_flag(-Wundef HAVE_GCC_WUNDEF)
+  if(HAVE_GCC_WUNDEF)
+    list(APPEND EXTRA_CFLAGS "-Wundef")
+  endif()
+
   check_c_compiler_flag(-fno-strict-aliasing HAVE_GCC_NO_STRICT_ALIASING)
   if(HAVE_GCC_NO_STRICT_ALIASING)
     list(APPEND EXTRA_CFLAGS "-fno-strict-aliasing")

diff --git a/docs/README-ios.md b/docs/README-ios.md
@@ -273,7 +273,7 @@ e.g.
     {
         ... initialize game ...
 
-    #if __IPHONEOS__
+    #ifdef __IPHONEOS__
         // Initialize the Game Center for scoring and matchmaking
         InitGameCenter();
 

diff --git a/include/SDL_config.h.cmake b/include/SDL_config.h.cmake
@@ -49,7 +49,7 @@
 
 /* Comment this if you want to build without any C library requirements */
 #cmakedefine HAVE_LIBC 1
-#if HAVE_LIBC
+#ifdef HAVE_LIBC
 
 /* Useful headers */
 #cmakedefine STDC_HEADERS 1

diff --git a/include/SDL_config.h.in b/include/SDL_config.h.in
@@ -53,7 +53,7 @@
 
 /* Comment this if you want to build without any C library requirements */
 #undef HAVE_LIBC
-#if HAVE_LIBC
+#ifdef HAVE_LIBC
 
 /* Useful headers */
 #undef STDC_HEADERS

diff --git a/include/SDL_config_winrt.h b/include/SDL_config_winrt.h
@@ -54,7 +54,7 @@
 
 /* Useful headers */
 #define HAVE_DXGI_H 1
-#if WINAPI_FAMILY != WINAPI_FAMILY_PHONE_APP
+#if !SDL_WINAPI_FAMILY_PHONE
 #define HAVE_XINPUT_H 1
 #endif
 
@@ -161,7 +161,7 @@
 #define SDL_AUDIO_DRIVER_DUMMY  1
 
 /* Enable various input drivers */
-#if WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
+#if SDL_WINAPI_FAMILY_PHONE
 #define SDL_JOYSTICK_DISABLED 1
 #define SDL_HAPTIC_DISABLED 1
 #else
@@ -208,9 +208,9 @@
 #define SDL_VIDEO_RENDER_D3D11  1
 
 /* Disable D3D12 as it's not implemented for WinRT */
-#define SDL_VIDEO_RENDER_D3D12  0
+/* #undef SDL_VIDEO_RENDER_D3D12 */
 
-#if SDL_VIDEO_OPENGL_ES2
+#ifdef SDL_VIDEO_OPENGL_ES2
 #define SDL_VIDEO_RENDER_OGL_ES2 1
 #endif
 

diff --git a/include/SDL_platform.h b/include/SDL_platform.h
@@ -166,6 +166,12 @@
 #define WINAPI_FAMILY_WINRT 0
 #endif /* HAVE_WINAPIFAMILY_H */
 
+#if (HAVE_WINAPIFAMILY_H) && defined(WINAPI_FAMILY_PHONE_APP)
+#define SDL_WINAPI_FAMILY_PHONE (WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP)
+#else
+#define SDL_WINAPI_FAMILY_PHONE 0
+#endif
+
 #if WINAPI_FAMILY_WINRT
 #undef __WINRT__
 #define __WINRT__ 1