From c2432f8d0d569e5d90a2e22ce3207cd183293b33 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Mon, 28 Nov 2022 09:54:09 -0800
Subject: [PATCH] Rename SDLmain to SDL_main and SDLtest to SDL_test for
consistency with other SDL libraries
---
Android.mk | 2 +-
CMakeLists.txt | 32 +++++++++----------
SDL3Config.cmake.in | 14 ++++----
VisualC-GDK/SDL.sln | 4 +--
.../SDL_main.vcxproj} | 4 +--
.../SDL_test.vcxproj} | 4 +--
.../testgamecontroller.vcxproj | 4 +--
VisualC-GDK/tests/testgdk/testgdk.vcxproj | 6 ++--
.../tests/testsprite2/testsprite2.vcxproj | 6 ++--
VisualC/SDL.sln | 4 +--
.../SDL_main.vcxproj} | 4 +--
.../SDL_test.vcxproj} | 4 +--
VisualC/pkg-support/cmake/sdl3-config.cmake | 26 +++++++--------
VisualC/tests/checkkeys/checkkeys.vcxproj | 4 +--
.../tests/controllermap/controllermap.vcxproj | 2 +-
VisualC/tests/loopwave/loopwave.vcxproj | 2 +-
VisualC/tests/testatomic/testatomic.vcxproj | 4 +--
.../testautomation/testautomation.vcxproj | 4 +--
VisualC/tests/testdraw2/testdraw2.vcxproj | 6 ++--
VisualC/tests/testfile/testfile.vcxproj | 4 +--
.../testgamecontroller.vcxproj | 2 +-
VisualC/tests/testgesture/testgesture.vcxproj | 6 ++--
VisualC/tests/testgl2/testgl2.vcxproj | 6 ++--
VisualC/tests/testgles2/testgles2.vcxproj | 4 +--
.../tests/testjoystick/testjoystick.vcxproj | 4 +--
.../tests/testoverlay2/testoverlay2.vcxproj | 2 +-
.../tests/testplatform/testplatform.vcxproj | 4 +--
VisualC/tests/testpower/testpower.vcxproj | 4 +--
.../testrendertarget/testrendertarget.vcxproj | 4 +--
VisualC/tests/testrumble/testrumble.vcxproj | 4 +--
VisualC/tests/testscale/testscale.vcxproj | 4 +--
VisualC/tests/testsensor/testsensor.vcxproj | 2 +-
VisualC/tests/testshape/testshape.vcxproj | 4 +--
VisualC/tests/testsprite2/testsprite2.vcxproj | 4 +--
.../tests/testsurround/testsurround.vcxproj | 4 +--
VisualC/tests/testvulkan/testvulkan.vcxproj | 4 +--
VisualC/tests/testwm2/testwm2.vcxproj | 4 +--
VisualC/tests/testyuv/testyuv.vcxproj | 4 +--
.../resources/CMake/sdl3-config.cmake | 6 ++--
build-scripts/androidbuildlibs.sh | 2 +-
cmake/test/CMakeLists.txt | 22 ++++++-------
cmake/test/jni/Android.mk | 2 +-
docs/README-android.md | 4 +--
docs/README-cmake.md | 15 +++++----
docs/README-gdk.md | 14 ++++----
docs/README-migration.md | 8 +++--
docs/README-n3ds.md | 2 +-
docs/README-visualc.md | 4 +--
docs/README-winrt.md | 2 +-
include/SDL3/SDL_main.h | 4 +--
src/main/psp/SDL_psp_main.c | 2 +-
test/CMakeLists.txt | 16 +++++-----
52 files changed, 158 insertions(+), 155 deletions(-)
rename VisualC-GDK/{SDLmain/SDLmain.vcxproj => SDL_main/SDL_main.vcxproj} (99%)
rename VisualC-GDK/{SDLtest/SDLtest.vcxproj => SDL_test/SDL_test.vcxproj} (99%)
rename VisualC/{SDLmain/SDLmain.vcxproj => SDL_main/SDL_main.vcxproj} (99%)
rename VisualC/{SDLtest/SDLtest.vcxproj => SDL_test/SDL_test.vcxproj} (97%)
diff --git a/Android.mk b/Android.mk
index 3107e7d7a263..195b2613a6b6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -122,7 +122,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
LOCAL_MODULE := SDL3_main
-LOCAL_MODULE_FILENAME := libSDL3main
+LOCAL_MODULE_FILENAME := libSDL3_main
include $(BUILD_STATIC_LIBRARY)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6334fa982225..fcd0977c57b0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -429,7 +429,7 @@ foreach(_SUB ${SDL_SUBSYSTEMS})
endforeach()
# Allow some projects to be built conditionally.
-set_option(SDL3_DISABLE_SDL3MAIN "Disable building/installation of SDL3main" OFF)
+set_option(SDL3_DISABLE_SDL3MAIN "Disable building/installation of SDL3_main" OFF)
set_option(SDL3_DISABLE_INSTALL "Disable installation of SDL3" ${SDL3_SUBPROJECT})
set_option(SDL3_DISABLE_UNINSTALL "Disable uninstallation of SDL3" OFF)
@@ -2042,7 +2042,7 @@ elseif(WINDOWS)
if(MINGW OR CYGWIN)
if(NOT SDL3_DISABLE_SDL3MAIN)
list(APPEND SDL_CFLAGS "-Dmain=SDL_main")
- list(INSERT SDL_LIBS 0 "-lSDL3main")
+ list(INSERT SDL_LIBS 0 "-lSDL3_main")
endif(NOT SDL3_DISABLE_SDL3MAIN)
list(INSERT SDL_LIBS 0 "-lmingw32" "-mwindows")
endif()
@@ -2680,7 +2680,7 @@ elseif(PSP)
psppower
)
if(NOT SDL3_DISABLE_SDL3MAIN)
- list(INSERT SDL_LIBS 0 "-lSDL3main")
+ list(INSERT SDL_LIBS 0 "-lSDL3_main")
endif(NOT SDL3_DISABLE_SDL3MAIN)
elseif(PS2)
@@ -3191,11 +3191,11 @@ endif()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} ${EXTRA_CFLAGS_BUILD}")
if(NOT WINDOWS_STORE AND NOT SDL3_DISABLE_SDL3MAIN)
- # Build SDLmain
- add_library(SDL3main STATIC ${SDLMAIN_SOURCES})
+ # Build SDL_main
+ add_library(SDL3_main STATIC ${SDLMAIN_SOURCES})
# alias target for in-tree builds
- add_library(SDL3::SDL3main ALIAS SDL3main)
- target_include_directories(SDL3main
+ add_library(SDL3::SDL3_main ALIAS SDL3_main)
+ target_include_directories(SDL3_main
PRIVATE
"$<BUILD_INTERFACE:${SDL3_BINARY_DIR}/include-config-$<LOWER_CASE:$<CONFIG>>>"
PUBLIC
@@ -3204,18 +3204,18 @@ if(NOT WINDOWS_STORE AND NOT SDL3_DISABLE_SDL3MAIN)
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
)
if (WIN32)
- target_link_libraries(SDL3main PRIVATE shell32)
+ target_link_libraries(SDL3_main PRIVATE shell32)
endif()
if(MINGW OR CYGWIN)
cmake_minimum_required(VERSION 3.13)
if(CMAKE_SIZEOF_VOID_P EQUAL 4)
- target_link_options(SDL3main PUBLIC "$<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:-Wl,--undefined=_WinMain@16>")
+ target_link_options(SDL3_main PUBLIC "$<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:-Wl,--undefined=_WinMain@16>")
else()
- target_link_options(SDL3main PUBLIC "$<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:-Wl,--undefined=WinMain>")
+ target_link_options(SDL3_main PUBLIC "$<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:-Wl,--undefined=WinMain>")
endif()
endif()
if (NOT ANDROID)
- set_target_properties(SDL3main PROPERTIES DEBUG_POSTFIX "${SDL_CMAKE_DEBUG_POSTFIX}")
+ set_target_properties(SDL3_main PROPERTIES DEBUG_POSTFIX "${SDL_CMAKE_DEBUG_POSTFIX}")
endif()
endif()
@@ -3341,9 +3341,9 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DSDL_BUILD_MICRO_VERSION=${SDL_MICRO_VERSIO
if(SDL_TEST)
file(GLOB TEST_SOURCES ${SDL3_SOURCE_DIR}/src/test/*.c)
add_library(SDL3_test STATIC ${TEST_SOURCES})
- add_library(SDL3::SDL3test ALIAS SDL3_test)
+ add_library(SDL3::SDL3_test ALIAS SDL3_test)
set_target_properties(SDL3_test PROPERTIES
- EXPORT_NAME SDL3test)
+ EXPORT_NAME SDL3_test)
target_include_directories(SDL3_test
PRIVATE
"$<BUILD_INTERFACE:${SDL3_BINARY_DIR}/include-config-$<LOWER_CASE:$<CONFIG>>>"
@@ -3365,7 +3365,7 @@ if(NOT SDL3_DISABLE_INSTALL)
endif()
if(NOT WINDOWS_STORE AND NOT SDL3_DISABLE_SDL3MAIN)
- install(TARGETS SDL3main EXPORT SDL3mainTargets
+ install(TARGETS SDL3_main EXPORT SDL3mainTargets
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
@@ -3425,7 +3425,7 @@ if(NOT SDL3_DISABLE_INSTALL)
)
if(ANDROID AND NOT CMAKE_VERSION VERSION_LESS 3.7)
install(EXPORT_ANDROID_MK SDL3mainTargets
- DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/ndk-modules/SDL3main")
+ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/ndk-modules/SDL3_main")
endif()
endif()
@@ -3449,7 +3449,7 @@ if(NOT SDL3_DISABLE_INSTALL)
)
if(ANDROID AND NOT CMAKE_VERSION VERSION_LESS 3.7)
install(EXPORT_ANDROID_MK SDL3testTargets
- DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/ndk-modules/SDL3test")
+ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/ndk-modules/SDL3_test")
endif()
endif()
diff --git a/SDL3Config.cmake.in b/SDL3Config.cmake.in
index 792aefdc3156..4a86ba7a30ab 100644
--- a/SDL3Config.cmake.in
+++ b/SDL3Config.cmake.in
@@ -23,11 +23,11 @@ if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/SDL3staticTargets.cmake")
endif()
if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/SDL3mainTargets.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/SDL3mainTargets.cmake")
- set(SDL3_SDL3main_FOUND TRUE)
+ set(SDL3_SDL3_main_FOUND TRUE)
endif()
if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/SDL3testTargets.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/SDL3testTargets.cmake")
- set(SDL3_SDL3test_FOUND TRUE)
+ set(SDL3_SDL3_test_FOUND TRUE)
endif()
check_required_components(SDL3)
@@ -56,10 +56,10 @@ set(SDL3_STATIC_LIBRARIES SDL3::SDL3-static)
set(SDL3_STATIC_PRIVATE_LIBS)
set(SDL3MAIN_LIBRARY)
-if(TARGET SDL3::SDL3main)
- set(SDL3MAIN_LIBRARY SDL3::SDL3main)
- list(INSERT SDL3_LIBRARIES 0 SDL3::SDL3main)
- list(INSERT SDL3_STATIC_LIBRARIES 0 SDL3::SDL3main)
+if(TARGET SDL3::SDL3_main)
+ set(SDL3MAIN_LIBRARY SDL3::SDL3_main)
+ list(INSERT SDL3_LIBRARIES 0 SDL3::SDL3_main)
+ list(INSERT SDL3_STATIC_LIBRARIES 0 SDL3::SDL3_main)
endif()
-set(SDL3TEST_LIBRARY SDL3::SDL3test)
+set(SDL3TEST_LIBRARY SDL3::SDL3_test)
diff --git a/VisualC-GDK/SDL.sln b/VisualC-GDK/SDL.sln
index 827c9ff4bd4c..a9d9532e2f99 100644
--- a/VisualC-GDK/SDL.sln
+++ b/VisualC-GDK/SDL.sln
@@ -6,11 +6,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{D69D5741
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL3", "SDL\SDL.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL3main", "SDLmain\SDLmain.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL3_main", "SDL_main\SDL_main.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsprite2", "tests\testsprite2\testsprite2.vcxproj", "{40FB7794-D3C3-4CFE-BCF4-A80C96635682}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL3test", "SDLtest\SDLtest.vcxproj", "{DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL3_test", "SDL_test\SDL_test.vcxproj", "{DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testgamecontroller", "tests\testgamecontroller\testgamecontroller.vcxproj", "{55812185-D13C-4022-9C81-32E0F4A08305}"
EndProject
diff --git a/VisualC-GDK/SDLmain/SDLmain.vcxproj b/VisualC-GDK/SDL_main/SDL_main.vcxproj
similarity index 99%
rename from VisualC-GDK/SDLmain/SDLmain.vcxproj
rename to VisualC-GDK/SDL_main/SDL_main.vcxproj
index df88a77417a9..ffa45df25b06 100644
--- a/VisualC-GDK/SDLmain/SDLmain.vcxproj
+++ b/VisualC-GDK/SDL_main/SDL_main.vcxproj
@@ -30,9 +30,9 @@
<ClCompile Include="..\..\src\main\gdk\SDL_gdk_main.c" />
</ItemGroup>
<PropertyGroup Label="Globals">
- <ProjectName>SDL3main</ProjectName>
+ <ProjectName>SDL3_main</ProjectName>
<ProjectGuid>{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}</ProjectGuid>
- <RootNamespace>SDLmain</RootNamespace>
+ <RootNamespace>SDL_main</RootNamespace>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
diff --git a/VisualC-GDK/SDLtest/SDLtest.vcxproj b/VisualC-GDK/SDL_test/SDL_test.vcxproj
similarity index 99%
rename from VisualC-GDK/SDLtest/SDLtest.vcxproj
rename to VisualC-GDK/SDL_test/SDL_test.vcxproj
index 9ed131a38280..9be904dd6082 100644
--- a/VisualC-GDK/SDLtest/SDLtest.vcxproj
+++ b/VisualC-GDK/SDL_test/SDL_test.vcxproj
@@ -27,9 +27,9 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
- <ProjectName>SDL3test</ProjectName>
+ <ProjectName>SDL3_test</ProjectName>
<ProjectGuid>{DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}</ProjectGuid>
- <RootNamespace>SDLtest</RootNamespace>
+ <RootNamespace>SDL_test</RootNamespace>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
diff --git a/VisualC-GDK/tests/testgamecontroller/testgamecontroller.vcxproj b/VisualC-GDK/tests/testgamecontroller/testgamecontroller.vcxproj
index ca6473c8cbfc..12c6dd867a83 100644
--- a/VisualC-GDK/tests/testgamecontroller/testgamecontroller.vcxproj
+++ b/VisualC-GDK/tests/testgamecontroller/testgamecontroller.vcxproj
@@ -273,7 +273,7 @@
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="..\..\SDLmain\SDLmain.vcxproj">
+ <ProjectReference Include="..\..\SDL_main\SDL_main.vcxproj">
<Project>{da956fd3-e142-46f2-9dd5-c78bebb56b7a}</Project>
<Private>false</Private>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
@@ -441,4 +441,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/VisualC-GDK/tests/testgdk/testgdk.vcxproj b/VisualC-GDK/tests/testgdk/testgdk.vcxproj
index f024a89a56e4..23b357775e7a 100644
--- a/VisualC-GDK/tests/testgdk/testgdk.vcxproj
+++ b/VisualC-GDK/tests/testgdk/testgdk.vcxproj
@@ -297,13 +297,13 @@
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="..\..\SDLmain\SDLmain.vcxproj">
+ <ProjectReference Include="..\..\SDL_main\SDL_main.vcxproj">
<Project>{da956fd3-e142-46f2-9dd5-c78bebb56b7a}</Project>
<Private>false</Private>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="..\..\SDLtest\SDLtest.vcxproj">
+ <ProjectReference Include="..\..\SDL_test\SDL_test.vcxproj">
<Project>{da956fd3-e143-46f2-9fe5-c77bebc56b1a}</Project>
<Private>false</Private>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
@@ -398,4 +398,4 @@ copy "%(FullPath)" "$(OutDir)\"</Command>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/VisualC-GDK/tests/testsprite2/testsprite2.vcxproj b/VisualC-GDK/tests/testsprite2/testsprite2.vcxproj
index 651a346e53f1..9c9b21059d69 100644
--- a/VisualC-GDK/tests/testsprite2/testsprite2.vcxproj
+++ b/VisualC-GDK/tests/testsprite2/testsprite2.vcxproj
@@ -297,13 +297,13 @@
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="..\..\SDLmain\SDLmain.vcxproj">
+ <ProjectReference Include="..\..\SDL_main\SDL_main.vcxproj">
<Project>{da956fd3-e142-46f2-9dd5-c78bebb56b7a}</Project>
<Private>false</Private>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="..\..\SDLtest\SDLtest.vcxproj">
+ <ProjectReference Include="..\..\SDL_test\SDL_test.vcxproj">
<Project>{da956fd3-e143-46f2-9fe5-c77bebc56b1a}</Project>
<Private>false</Private>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
@@ -392,4 +392,4 @@ copy "%(FullPath)" "$(OutDir)\"</Command>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/VisualC/SDL.sln b/VisualC/SDL.sln
index ebb836d4731a..c628ba91b60b 100644
--- a/VisualC/SDL.sln
+++ b/VisualC/SDL.sln
@@ -4,7 +4,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{D69D5741
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL3", "SDL\SDL.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL3main", "SDLmain\SDLmain.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL3_main", "SDL_main\SDL_main.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "checkkeys", "tests\checkkeys\checkkeys.vcxproj", "{26828762-C95D-4637-9CB1-7F0979523813}"
EndProject
@@ -40,7 +40,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testshape", "tests\testshap
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsprite2", "tests\testsprite2\testsprite2.vcxproj", "{40FB7794-D3C3-4CFE-BCF4-A80C96635682}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL3test", "SDLtest\SDLtest.vcxproj", "{DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL3_test", "SDL_test\SDL_test.vcxproj", "{DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testgamecontroller", "tests\testgamecontroller\testgamecontroller.vcxproj", "{55812185-D13C-4022-9C81-32E0F4A08305}"
EndProject
diff --git a/VisualC/SDLmain/SDLmain.vcxproj b/VisualC/SDL_main/SDL_main.vcxproj
similarity index 99%
rename from VisualC/SDLmain/SDLmain.vcxproj
rename to VisualC/SDL_main/SDL_main.vcxproj
index 6da048b6998e..6fccbc8fcc5b 100644
--- a/VisualC/SDLmain/SDLmain.vcxproj
+++ b/VisualC/SDL_main/SDL_main.vcxproj
@@ -19,9 +19,9 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
- <ProjectName>SDL3main</ProjectName>
+ <ProjectName>SDL3_main</ProjectName>
<ProjectGuid>{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}</ProjectGuid>
- <RootNamespace>SDLmain</RootNamespace>
+ <RootNamespace>SDL_main</RootNamespace>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
diff --git a/VisualC/SDLtest/SDLtest.vcxproj b/VisualC/SDL_test/SDL_test.vcxproj
similarity index 97%
rename from VisualC/SDLtest/SDLtest.vcxproj
rename to VisualC/SDL_test/SDL_test.vcxproj
index 3faca9916e39..a7d641936b85 100644
--- a/VisualC/SDLtest/SDLtest.vcxproj
+++ b/VisualC/SDL_test/SDL_test.vcxproj
@@ -19,9 +19,9 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
- <ProjectName>SDL3test</ProjectName>
+ <ProjectName>SDL3_test</ProjectName>
<ProjectGuid>{DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}</ProjectGuid>
- <RootNamespace>SDLtest</RootNamespace>
+ <RootNamespace>SDL_test</RootNamespace>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
diff --git a/VisualC/pkg-support/cmake/sdl3-config.cmake b/VisualC/pkg-support/cmake/sdl3-config.cmake
index c35d6b873d16..ca63e2b8c62a 100644
--- a/VisualC/pkg-support/cmake/sdl3-config.cmake
+++ b/VisualC/pkg-support/cmake/sdl3-config.cmake
@@ -48,9 +48,9 @@ set(SDL3_INCLUDE_DIRS "${SDL3_INCLUDE_DIR}")
set_and_check(SDL3_BINDIR "${SDL3_PREFIX}/lib/${_sdl_arch_subdir}")
set_and_check(SDL3_LIBDIR "${SDL3_PREFIX}/lib/${_sdl_arch_subdir}")
-set(SDL3_LIBRARIES SDL3::SDL3main SDL3::SDL3)
-set(SDL3MAIN_LIBRARY SDL3::SDL3main)
-set(SDL3TEST_LIBRARY SDL3::SDL3test)
+set(SDL3_LIBRARIES SDL3::SDL3_main SDL3::SDL3)
+set(SDL3MAIN_LIBRARY SDL3::SDL3_main)
+set(SDL3TEST_LIBRARY SDL3::SDL3_test)
# All targets are created, even when some might not be requested though COMPONENTS.
@@ -77,32 +77,32 @@ endif()
unset(_sdl3_library)
unset(_sdl3_dll_library)
-set(_sdl3main_library "${SDL3_LIBDIR}/SDL3main.lib")
+set(_sdl3main_library "${SDL3_LIBDIR}/SDL3_main.lib")
if(EXISTS "${_sdl3main_library}")
- if(NOT TARGET SDL3::SDL3main)
- add_library(SDL3::SDL3main STATIC IMPORTED)
- set_target_properties(SDL3::SDL3main
+ if(NOT TARGET SDL3::SDL3_main)
+ add_library(SDL3::SDL3_main STATIC IMPORTED)
+ set_target_properties(SDL3::SDL3_main
PROPERTIES
IMPORTED_LOCATION "${_sdl3main_library}"
)
endif()
- set(SDL3_SDL3main_FOUND TRUE)
+ set(SDL3_SDL3_main_FOUND TRUE)
else()
set(SDL3_SDL3_FOUND FALSE)
endif()
unset(_sdl3main_library)
-set(_sdl3test_library "${SDL3_LIBDIR}/SDL3test.lib")
+set(_sdl3test_library "${SDL3_LIBDIR}/SDL3_test.lib")
if(EXISTS "${_sdl3test_library}")
- if(NOT TARGET SDL3::SDL3test)
- add_library(SDL3::SDL3test STATIC IMPORTED)
- set_target_properties(SDL3::SDL3test
+ if(NOT TARGET SDL3::SDL3_test)
+ add_library(SDL3::SDL3_test STATIC IMPORTED)
+ set_target_properties(SDL3::SDL3_test
PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${SDL3_INCLUDE_DIRS}"
IMPORTED_LOCATION "${_sdl3test_library}"
)
endif()
- set(SDL3_SDL3test_FOUND TRUE)
+ set(SDL3_SDL3_test_FOUND TRUE)
else()
set(SDL3_SDL3_FOUND FALSE)
endif()
diff --git a/VisualC/tests/checkkeys/checkkeys.vcxproj b/VisualC/tests/checkkeys/checkkeys.vcxproj
index 3f068377b970..0c0dc65209cd 100644
--- a/VisualC/tests/checkkeys/checkkeys.vcxproj
+++ b/VisualC/tests/checkkeys/checkkeys.vcxproj
@@ -194,13 +194,13 @@
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="..\..\SDLmain\SDLmain.vcxproj">
+ <ProjectReference Include="..\..\SDL_main\SDL_main.vcxproj">
<Project>{da956fd3-e142-46f2-9dd5-c78bebb56b7a}</Project>
<Private>false</Private>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="..\..\SDLtest\SDLtest.vcxproj">
+ <ProjectReference Include="..\..\SDL_test\SDL_test.vcxproj">
<Project>{da956fd3-e143-46f2-9fe5-c77bebc56b1a}</Project>
<Private>false</Private>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
diff --git a/VisualC/tests/controllermap/controllermap.vcxproj b/VisualC/tests/controllermap/controllermap.vcxproj
index 66d8ef1fa5c5..971e83d33f83 100644
--- a/VisualC/tests/controllermap/controllermap.vcxproj
+++ b/VisualC/tests/controllermap/controllermap.vcxproj
@@ -188,7 +188,7 @@
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="..\..\SDLmain\SDLmain.vcxproj">
+ <ProjectReference Include="..\..\SDL_main\SDL_main.vcxproj">
<Project>{da956fd3-e142-46f2-9dd5-c78bebb56b7a}</Project>
<Private>false</Private>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
diff --git a/VisualC/tests/loopwave/loopwave.vcxproj b/VisualC/tests/loopwave/loopwave.vcxproj
index c3fbf1c5465a..2ecd0bef42ea 100644
--- a/VisualC/tests/loopwave/loopwave.vcxproj
+++ b/VisualC/tests/loopwave/loopwave.vcxproj
@@ -194,7 +194,7 @@
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="..\..\SDLmain\SDLmain.vcxproj">
+ <ProjectReference Include="..\..\SDL_main\SDL_main.vcxproj">
<Project>{da956fd3-e142-46f2-9dd5-c78bebb56b7a}</Project>
<Private>false</Private>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
diff --git a/VisualC/tests/testatomic/testatomic.vcxproj b/VisualC/tests/testatomic/testatomic.vcxproj
index 25e89048e755..7cc930881ef5 100644
--- a/VisualC/tests/testatomic/testatomic.vcxproj
+++ b/VisualC/tests/testatomic/testatomic.vcxproj
@@ -188,7 +188,7 @@
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="..\..\SDLmain\SDLmain.vcxproj">
+ <ProjectReference Include="..\..\SDL_main\SDL_main.vcxproj">
<Project>{da956fd3-e142-46f2-9dd5-c78bebb56b7a}</Project>
<Private>false</Private>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
@@ -201,4 +201,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/VisualC/tests/testautomation/testautomation.vcxproj b/VisualC/tests/testautomation/testautomation.vcxproj
index d58dc0b3264e..eb11891bfc08 100644
--- a/VisualC/tests/testautomation/testautomation.vcxproj
+++ b/VisualC/tests/testautomation/testautomation.vcxproj
@@ -188,13 +188,13 @@
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="..\..\SDLmain\SDLmain.vcxproj">
+ <ProjectReference Include="..\..\SDL_main\SDL_main.vcxproj">
<Project>{da956fd3-e142-46f2-9dd5-c78bebb56b7a}</Project>
<Private>false</Private>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="..\..\SDLtest\SDLtest.vcxproj">
+ <ProjectReference Include="..\..\SDL_test\SDL_test.vcxproj">
<Project>{da956fd3-e143-46f2-9fe5-c77bebc56b1a}</Project>
<Private>false</Private>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
diff --git a/VisualC/tests/testdraw2/testdraw2.vcxproj b/VisualC/tests/testdraw2/testdraw2.vcxproj
index 08adaddc3350..7cc41590b756 100644
--- a/VisualC/tests/testdraw2/testdraw2.vcxproj
+++ b/VisualC/tests/testdraw2/testdraw2.vcxproj
@@ -188,13 +188,13 @@
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="..\..\SDLmain\SDLmain.vcxproj">
+ <ProjectReference Include="..\..\SDL_main\SDL_main.vcxproj">
<Project>{da956fd3-e142-46f2-9dd5-c78bebb56b7a}</Project>
<Private>false</Private>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="..\..\SDLtest\SDLtest.vcxproj">
+ <ProjectReference Include="..\..\SDL_test\SDL_test.vcxproj">
<Project>{da956fd3-e143-46f2-9fe5-c77bebc56b1a}</Project>
<Private>false</Private>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
@@ -207,4 +207,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/VisualC/tests/testfile/testfile.vcxproj b/VisualC/tests/testfile/testfile.vcxproj
index 718a4475d0cb..702f50558323 100644
--- a/VisualC/tests/testfile/testfile.vcxproj
+++ b/VisualC/tests/testfile/testfile.vcxproj
@@ -188,7 +188,7 @@
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="..\..\SDLmain\SDLmain.vcxproj">
+ <ProjectReference Include="..\..\SDL_main\SDL_main.vcxproj">
<Project>{da956fd3-e142-46f2-9dd5-c78bebb56b7a}</Project>
<Private>false</Private>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
@@ -201,4 +201,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/VisualC/tests/testgamecontroller/testgamecontroller.vcxproj b/VisualC/tests/testgamecontroller/testgamecontroller.vcxproj
index d3710e293f0a..f62fe2fd94fe 100644
--- a/VisualC/tests/testgamecontroller/testgamecontroller.vcxproj
+++ b/VisualC/tests/testgamecontroller/testgamecontroller.vcxproj
@@ -188,7 +188,7 @@
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="..\..\SDLmain\SDLmain.vcxproj">
+ <ProjectReference Include="..\..\SDL_main\SDL_main.vcxproj">
<Project>{da956fd3-e142-46f2-9dd5-c78bebb56b7a}</Project>
<Private>false</Private>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
diff --git a/VisualC/tests/testgesture/testgesture.vcxproj b/VisualC/tests/testgesture/testgesture.vcxproj
index 6230336dfbf5..3883762d78b4 100644
--- a/VisualC/tests/testgesture/testgesture.vcxproj
+++ b/VisualC/tests/testgesture/testgesture.vcxproj
@@ -188,13 +188,13 @@
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="..\..\SDLmain\SDLmain.vcxproj">
+ <ProjectReference Include="..\..\SDL_main\SDL_main.vcxproj">
<Project>{da956fd3-e142-46f2-9dd5-c78bebb56b7a}</Project>
<Private>false</Private>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="..\..\SDLtest\SDLtest.vcxproj">
+ <ProjectReference Include="..\..\SDL_test\SDL_test.vcxproj">
<Project>{da956fd3-e143-46f2-9fe5-c77bebc56b1a}</Project>
<Private>false</Private>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
@@ -207,4 +207,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/VisualC/tests/testgl2/testgl2.vcxproj b/VisualC/tests/testgl2/testgl2.vcxproj
index 4bf138259075..352ff5b2d3df 100644
--- a/VisualC/tests/testgl2/testgl2.vcxproj
+++ b/VisualC/tests/testgl2/testgl2.vcxproj
@@ -192,13 +192,13 @@
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="..\..\SDLmain\SDLmain.vcxproj">
+ <ProjectReference Include="..\..\SDL_main\SDL_main.vcxproj">
<Project>{da956fd3-e142-46f2-9dd5-c78bebb56b7a}</Project>
<Private>false</Private>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
(Patch may be truncated, please check the link at the top of this post.)