Include SDL_build_config.h without a 'build_config/' prefix

madebr · Aug 22, 2024 · 5daa33d · 5daa33d
1 parent 46903e6
commit 5daa33d
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 28 deletions.
diff --git a/Android.mk b/Android.mk
@@ -10,7 +10,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := SDL3
 
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/include $(LOCAL_PATH)/src
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include $(LOCAL_PATH)/include/build_config $(LOCAL_PATH)/src
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -456,7 +456,7 @@ endif()
 sdl_compile_definitions(PRIVATE "USING_GENERATED_CONFIG_H")
 sdl_include_directories(
  PRIVATE
- "${SDL3_BINARY_DIR}/include-config-$<LOWER_CASE:$<CONFIG>>"
+ "${SDL3_BINARY_DIR}/include-config-$<LOWER_CASE:$<CONFIG>>/build_config"
  "${SDL3_BINARY_DIR}/include"
  "${SDL3_SOURCE_DIR}/include"
 )
@@ -3305,7 +3305,7 @@ if(SDL_SHARED)
  target_link_libraries(SDL3-shared PRIVATE ${SDL_CMAKE_DEPENDS})
  target_include_directories(SDL3-shared
  PRIVATE
- "$<BUILD_INTERFACE:${SDL3_BINARY_DIR}/include-config-$<LOWER_CASE:$<CONFIG>>>"
+ "$<BUILD_INTERFACE:${SDL3_BINARY_DIR}/include-config-$<LOWER_CASE:$<CONFIG>>>/build_config"
  "$<BUILD_INTERFACE:${SDL3_SOURCE_DIR}/src>"
  )
  target_link_libraries(SDL3-shared PUBLIC $<TARGET_NAME:SDL3::Headers>)
@@ -3332,7 +3332,7 @@ if(SDL_STATIC)
  target_link_libraries(SDL3-static PRIVATE ${SDL_CMAKE_DEPENDS})
  target_include_directories(SDL3-static
  PRIVATE
- "$<BUILD_INTERFACE:${SDL3_BINARY_DIR}/include-config-$<LOWER_CASE:$<CONFIG>>>"
+ "$<BUILD_INTERFACE:${SDL3_BINARY_DIR}/include-config-$<LOWER_CASE:$<CONFIG>>>/build_config"
  "$<BUILD_INTERFACE:${SDL3_SOURCE_DIR}/src>"
  )
  target_link_libraries(SDL3-static PUBLIC $<TARGET_NAME:SDL3::Headers>)

diff --git a/VisualC-GDK/SDL/SDL.vcxproj b/VisualC-GDK/SDL/SDL.vcxproj
@@ -116,7 +116,7 @@
  </Midl>
  <ClCompile>
  <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\include\build_config;$(ProjectDir)\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
  <PreprocessorDefinitions>DLL_EXPORT;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  <BufferSecurityCheck>false</BufferSecurityCheck>
@@ -146,7 +146,7 @@
  </Midl>
  <ClCompile>
  <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\include\build_config;$(ProjectDir)\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
  <PreprocessorDefinitions>DLL_EXPORT;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  <BufferSecurityCheck>false</BufferSecurityCheck>
@@ -180,7 +180,7 @@
  </Midl>
  <ClCompile>
  <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\include\build_config;$(ProjectDir)\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
  <PreprocessorDefinitions>DLL_EXPORT;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  <BufferSecurityCheck>false</BufferSecurityCheck>
@@ -213,7 +213,7 @@
  <TypeLibraryName>.\Release/SDL.tlb</TypeLibraryName>
  </Midl>
  <ClCompile>
- <AdditionalIncludeDirectories>$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\include\build_config;$(ProjectDir)\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
  <PreprocessorDefinitions>DLL_EXPORT;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  <BufferSecurityCheck>false</BufferSecurityCheck>
@@ -244,7 +244,7 @@
  <TypeLibraryName>.\Release/SDL.tlb</TypeLibraryName>
  </Midl>
  <ClCompile>
- <AdditionalIncludeDirectories>$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\include\build_config;$(ProjectDir)\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
  <PreprocessorDefinitions>DLL_EXPORT;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  <BufferSecurityCheck>false</BufferSecurityCheck>
@@ -279,7 +279,7 @@
  <TypeLibraryName>.\Release/SDL.tlb</TypeLibraryName>
  </Midl>
  <ClCompile>
- <AdditionalIncludeDirectories>$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\include\build_config;$(ProjectDir)\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
  <PreprocessorDefinitions>DLL_EXPORT;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  <BufferSecurityCheck>false</BufferSecurityCheck>

diff --git a/VisualC-WinRT/SDL-UWP.vcxproj b/VisualC-WinRT/SDL-UWP.vcxproj
@@ -800,7 +800,7 @@
  <ClCompile>
  <PrecompiledHeader>Use</PrecompiledHeader>
  <CompileAsWinRT>false</CompileAsWinRT>
- <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ProjectDir)\..\include;$(ProjectDir)\..\include\build_config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  <PreprocessorDefinitions>DLL_EXPORT;_CRT_SECURE_NO_WARNINGS;SDL_BUILDING_WINRT=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  <PrecompiledHeaderFile>SDL_internal.h</PrecompiledHeaderFile>
  </ClCompile>
@@ -815,7 +815,7 @@
  <ClCompile>
  <PrecompiledHeader>Use</PrecompiledHeader>
  <CompileAsWinRT>false</CompileAsWinRT>
- <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ProjectDir)\..\include;$(ProjectDir)\..\include\build_config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  <PreprocessorDefinitions>DLL_EXPORT;_CRT_SECURE_NO_WARNINGS;SDL_BUILDING_WINRT=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  <PrecompiledHeaderFile>SDL_internal.h</PrecompiledHeaderFile>
  </ClCompile>
@@ -830,7 +830,7 @@
  <ClCompile>
  <PrecompiledHeader>Use</PrecompiledHeader>
  <CompileAsWinRT>false</CompileAsWinRT>
- <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ProjectDir)\..\include;$(ProjectDir)\..\include\build_config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  <PreprocessorDefinitions>DLL_EXPORT;_CRT_SECURE_NO_WARNINGS;SDL_BUILDING_WINRT=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  <PrecompiledHeaderFile>SDL_internal.h</PrecompiledHeaderFile>
  </ClCompile>
@@ -845,7 +845,7 @@
  <ClCompile>
  <PrecompiledHeader>Use</PrecompiledHeader>
  <CompileAsWinRT>false</CompileAsWinRT>
- <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ProjectDir)\..\include;$(ProjectDir)\..\include\build_config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  <PreprocessorDefinitions>DLL_EXPORT;_CRT_SECURE_NO_WARNINGS;SDL_BUILDING_WINRT=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  <PrecompiledHeaderFile>SDL_internal.h</PrecompiledHeaderFile>
  </ClCompile>
@@ -860,7 +860,7 @@
  <ClCompile>
  <PrecompiledHeader>Use</PrecompiledHeader>
  <CompileAsWinRT>false</CompileAsWinRT>
- <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ProjectDir)\..\include;$(ProjectDir)\..\include\build_config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  <PreprocessorDefinitions>DLL_EXPORT;_CRT_SECURE_NO_WARNINGS;SDL_BUILDING_WINRT=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  <PrecompiledHeaderFile>SDL_internal.h</PrecompiledHeaderFile>
  </ClCompile>
@@ -875,7 +875,7 @@
  <ClCompile>
  <PrecompiledHeader>Use</PrecompiledHeader>
  <CompileAsWinRT>false</CompileAsWinRT>
- <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ProjectDir)\..\include;$(ProjectDir)\..\include\build_config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  <PreprocessorDefinitions>DLL_EXPORT;_CRT_SECURE_NO_WARNINGS;SDL_BUILDING_WINRT=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  <PrecompiledHeaderFile>SDL_internal.h</PrecompiledHeaderFile>
  </ClCompile>
@@ -890,7 +890,7 @@
  <ClCompile>
  <PrecompiledHeader>Use</PrecompiledHeader>
  <CompileAsWinRT>false</CompileAsWinRT>
- <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ProjectDir)\..\include;$(ProjectDir)\..\include\build_config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  <PreprocessorDefinitions>DLL_EXPORT;_CRT_SECURE_NO_WARNINGS;SDL_BUILDING_WINRT=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  <PrecompiledHeaderFile>SDL_internal.h</PrecompiledHeaderFile>
  </ClCompile>
@@ -905,7 +905,7 @@
  <ClCompile>
  <PrecompiledHeader>Use</PrecompiledHeader>
  <CompileAsWinRT>false</CompileAsWinRT>
- <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ProjectDir)\..\include;$(ProjectDir)\..\include\build_config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  <PreprocessorDefinitions>DLL_EXPORT;_CRT_SECURE_NO_WARNINGS;SDL_BUILDING_WINRT=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  <PrecompiledHeaderFile>SDL_internal.h</PrecompiledHeaderFile>
  </ClCompile>

diff --git a/VisualC/SDL/SDL.vcxproj b/VisualC/SDL/SDL.vcxproj
@@ -108,7 +108,7 @@
  </Midl>
  <ClCompile>
  <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ProjectDir)/../../include;$(ProjectDir)/../../include/build_config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
  <PreprocessorDefinitions>DLL_EXPORT;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  <BufferSecurityCheck>false</BufferSecurityCheck>
@@ -140,7 +140,7 @@
  </Midl>
  <ClCompile>
  <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ProjectDir)/../../include;$(ProjectDir)/../../include/build_config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
  <PreprocessorDefinitions>DLL_EXPORT;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  <BufferSecurityCheck>false</BufferSecurityCheck>
@@ -174,7 +174,7 @@
  <TypeLibraryName>.\Release/SDL.tlb</TypeLibraryName>
  </Midl>
  <ClCompile>
- <AdditionalIncludeDirectories>$(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ProjectDir)/../../include;$(ProjectDir)/../../include/build_config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
  <PreprocessorDefinitions>DLL_EXPORT;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  <BufferSecurityCheck>false</BufferSecurityCheck>
@@ -207,7 +207,7 @@
  <TypeLibraryName>.\Release/SDL.tlb</TypeLibraryName>
  </Midl>
  <ClCompile>
- <AdditionalIncludeDirectories>$(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ProjectDir)/../../include;$(ProjectDir)/../../include/build_config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
  <PreprocessorDefinitions>DLL_EXPORT;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  <BufferSecurityCheck>false</BufferSecurityCheck>

diff --git a/Xcode/SDL/SDL.xcodeproj/project.pbxproj b/Xcode/SDL/SDL.xcodeproj/project.pbxproj
@@ -2949,6 +2949,7 @@
  GCC_SYMBOLS_PRIVATE_EXTERN = YES;
  HEADER_SEARCH_PATHS = (
  ../../include,
+ ../../include/build_config,
  ../../src,
  ../../src/hidapi/hidapi,
  ../../src/video/khronos,
@@ -3006,6 +3007,7 @@
  GCC_SYMBOLS_PRIVATE_EXTERN = YES;
  HEADER_SEARCH_PATHS = (
  ../../include,
+ ../../include/build_config,
  ../../src,
  ../../src/hidapi/hidapi,
  ../../src/video/khronos,

diff --git a/src/SDL_internal.h b/src/SDL_internal.h
@@ -60,7 +60,7 @@
  SDL_free(ptr); \
  }
 
-#include "build_config/SDL_build_config.h"
+#include "SDL_build_config.h"
 
 #include "dynapi/SDL_dynapi.h"
 

diff --git a/src/dynapi/SDL_dynapi.c b/src/dynapi/SDL_dynapi.c
@@ -19,7 +19,7 @@
  3. This notice may not be removed or altered from any source distribution.
 */
 
-#include "build_config/SDL_build_config.h"
+#include "SDL_build_config.h"
 #include "SDL_dynapi.h"
 #include "SDL_dynapi_unsupported.h"
 

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -297,10 +297,11 @@ add_sdl_test_executable(testaudioinfo SOURCES testaudioinfo.c)
 add_sdl_test_executable(testaudiostreamdynamicresample NEEDS_RESOURCES TESTUTILS SOURCES testaudiostreamdynamicresample.c)
 
 file(GLOB TESTAUTOMATION_SOURCE_FILES testautomation*.c)
-add_sdl_test_executable(testautomation NONINTERACTIVE NONINTERACTIVE_TIMEOUT 120 NEEDS_RESOURCES NO_C90 SOURCES ${TESTAUTOMATION_SOURCE_FILES})
+add_sdl_test_executable(testautomation NONINTERACTIVE NONINTERACTIVE_TIMEOUT 120 NEEDS_RESOURCES BUILD_DEPENDENT NO_C90 SOURCES ${TESTAUTOMATION_SOURCE_FILES})
 if(EMSCRIPTEN)
  target_link_options(testautomation PRIVATE -sALLOW_MEMORY_GROWTH=1 -sMAXIMUM_MEMORY=1gb)
 endif()
+target_include_directories(testautomation AFTER PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../include/build_config")
 add_sdl_test_executable(testmultiaudio NEEDS_RESOURCES TESTUTILS SOURCES testmultiaudio.c)
 add_sdl_test_executable(testaudiohotplug NEEDS_RESOURCES TESTUTILS SOURCES testaudiohotplug.c)
 add_sdl_test_executable(testaudiorecording MAIN_CALLBACKS SOURCES testaudiorecording.c)

diff --git a/test/testautomation_intrinsics.c b/test/testautomation_intrinsics.c
@@ -4,7 +4,7 @@
 
 #ifndef NO_BUILD_CONFIG
 /* Disable intrinsics that are unsupported by the current compiler */
-#include <build_config/SDL_build_config.h>
+#include <SDL_build_config.h>
 #endif
 
 #include <SDL3/SDL.h>

diff --git a/test/testautomation_main.c b/test/testautomation_main.c
@@ -9,7 +9,7 @@
 #include <SDL3/SDL.h>
 #include <SDL3/SDL_test.h>
 #include "testautomation_suites.h"
-#include "build_config/SDL_build_config.h"
+#include "SDL_build_config.h"
 
 /**
  * Tests SDL_InitSubSystem() and SDL_QuitSubSystem()

diff --git a/test/testnative.h b/test/testnative.h
@@ -16,7 +16,7 @@
 
 #include <SDL3/SDL.h>
 
-#include "build_config/SDL_build_config.h"
+#include "SDL_build_config.h"
 
 typedef struct
 {