From 2aee3e654ddd0f1c272ff249cd5bc2fcc3f3bdf6 Mon Sep 17 00:00:00 2001 From: Daniel Gibson Date: Thu, 15 Dec 2022 05:59:27 +0100 Subject: [PATCH] Remove SDL_main from VS Solutions in VisualC/ and VisualC-GDK/ and update README-visualc.md and README-gdk.md accordingly Also moved src/main/windows/version.rc to src/core/windows/ and adjusted VS solutions, CMakeLists.txt and versioning scripts in build-scripts/ accordingly. This will eventually allow us to remove all of src/main/ # Conflicts: # VisualC/tests/testgesture/testgesture.vcxproj --- CMakeLists.txt | 2 +- VisualC-GDK/SDL.sln | 14 -- VisualC-GDK/SDL/SDL.vcxproj | 2 +- VisualC-GDK/SDL/SDL.vcxproj.filters | 2 +- VisualC-GDK/SDL_main/SDL_main.vcxproj | 199 ------------------ .../testgamecontroller.vcxproj | 8 +- VisualC-GDK/tests/testgdk/testgdk.vcxproj | 8 +- .../tests/testsprite2/testsprite2.vcxproj | 8 +- VisualC/SDL.sln | 10 - VisualC/SDL/SDL.vcxproj | 2 +- VisualC/SDL/SDL.vcxproj.filters | 2 +- VisualC/SDL_main/SDL_main.vcxproj | 161 -------------- VisualC/tests/checkkeys/checkkeys.vcxproj | 8 +- .../tests/controllermap/controllermap.vcxproj | 8 +- VisualC/tests/loopwave/loopwave.vcxproj | 8 +- VisualC/tests/testatomic/testatomic.vcxproj | 8 +- .../testautomation/testautomation.vcxproj | 8 +- VisualC/tests/testdraw2/testdraw2.vcxproj | 8 +- VisualC/tests/testfile/testfile.vcxproj | 8 +- .../testgamecontroller.vcxproj | 8 +- VisualC/tests/testgl2/testgl2.vcxproj | 8 +- VisualC/tests/testgles2/testgles2.vcxproj | 8 +- .../tests/testjoystick/testjoystick.vcxproj | 8 +- .../tests/testoverlay2/testoverlay2.vcxproj | 8 +- .../tests/testplatform/testplatform.vcxproj | 8 +- VisualC/tests/testpower/testpower.vcxproj | 8 +- .../testrendertarget/testrendertarget.vcxproj | 8 +- VisualC/tests/testrumble/testrumble.vcxproj | 8 +- VisualC/tests/testscale/testscale.vcxproj | 8 +- VisualC/tests/testsensor/testsensor.vcxproj | 8 +- VisualC/tests/testshape/testshape.vcxproj | 8 +- VisualC/tests/testsprite2/testsprite2.vcxproj | 8 +- .../tests/testsurround/testsurround.vcxproj | 8 +- VisualC/tests/testvulkan/testvulkan.vcxproj | 6 +- VisualC/tests/testwm2/testwm2.vcxproj | 8 +- VisualC/tests/testyuv/testyuv.vcxproj | 8 +- build-scripts/test-versioning.sh | 8 +- build-scripts/update-version.sh | 8 +- docs/README-gdk.md | 2 +- docs/README-visualc.md | 7 +- src/{main => core}/windows/version.rc | 76 +++---- 41 files changed, 82 insertions(+), 627 deletions(-) delete mode 100644 VisualC-GDK/SDL_main/SDL_main.vcxproj delete mode 100644 VisualC/SDL_main/SDL_main.vcxproj rename src/{main => core}/windows/version.rc (96%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 34422ccca..94c29f7a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1988,7 +1988,7 @@ elseif(WINDOWS) endif() endif() - file(GLOB VERSION_SOURCES ${SDL3_SOURCE_DIR}/src/main/windows/*.rc) + file(GLOB VERSION_SOURCES ${SDL3_SOURCE_DIR}/src/core/windows/*.rc) file(GLOB SDLMAIN_SOURCES ${SDL3_SOURCE_DIR}/src/main/windows/*.c) if(MINGW OR CYGWIN) if(NOT SDL3_DISABLE_SDL3MAIN) diff --git a/VisualC-GDK/SDL.sln b/VisualC-GDK/SDL.sln index a9d9532e2..2f6c095b1 100644 --- a/VisualC-GDK/SDL.sln +++ b/VisualC-GDK/SDL.sln @@ -6,8 +6,6 @@ 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}") = "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}") = "SDL3_test", "SDL_test\SDL_test.vcxproj", "{DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}" @@ -38,18 +36,6 @@ Global {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Gaming.Xbox.Scarlett.x64.Build.0 = Release|Gaming.Xbox.Scarlett.x64 {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Gaming.Xbox.XboxOne.x64.ActiveCfg = Release|Gaming.Xbox.XboxOne.x64 {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Gaming.Xbox.XboxOne.x64.Build.0 = Release|Gaming.Xbox.XboxOne.x64 - {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|Gaming.Desktop.x64.ActiveCfg = Debug|Gaming.Desktop.x64 - {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|Gaming.Desktop.x64.Build.0 = Debug|Gaming.Desktop.x64 - {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|Gaming.Xbox.Scarlett.x64.ActiveCfg = Debug|Gaming.Xbox.Scarlett.x64 - {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|Gaming.Xbox.Scarlett.x64.Build.0 = Debug|Gaming.Xbox.Scarlett.x64 - {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|Gaming.Xbox.XboxOne.x64.ActiveCfg = Debug|Gaming.Xbox.XboxOne.x64 - {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|Gaming.Xbox.XboxOne.x64.Build.0 = Debug|Gaming.Xbox.XboxOne.x64 - {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Gaming.Desktop.x64.ActiveCfg = Release|Gaming.Desktop.x64 - {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Gaming.Desktop.x64.Build.0 = Release|Gaming.Desktop.x64 - {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Gaming.Xbox.Scarlett.x64.ActiveCfg = Release|Gaming.Xbox.Scarlett.x64 - {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Gaming.Xbox.Scarlett.x64.Build.0 = Release|Gaming.Xbox.Scarlett.x64 - {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Gaming.Xbox.XboxOne.x64.ActiveCfg = Release|Gaming.Xbox.XboxOne.x64 - {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Gaming.Xbox.XboxOne.x64.Build.0 = Release|Gaming.Xbox.XboxOne.x64 {40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Debug|Gaming.Desktop.x64.ActiveCfg = Debug|Gaming.Desktop.x64 {40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Debug|Gaming.Desktop.x64.Build.0 = Debug|Gaming.Desktop.x64 {40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Debug|Gaming.Desktop.x64.Deploy.0 = Debug|Gaming.Desktop.x64 diff --git a/VisualC-GDK/SDL/SDL.vcxproj b/VisualC-GDK/SDL/SDL.vcxproj index 72ca32793..b90fd808d 100644 --- a/VisualC-GDK/SDL/SDL.vcxproj +++ b/VisualC-GDK/SDL/SDL.vcxproj @@ -771,7 +771,7 @@ - + diff --git a/VisualC-GDK/SDL/SDL.vcxproj.filters b/VisualC-GDK/SDL/SDL.vcxproj.filters index 8a9d954a1..710ae82fa 100644 --- a/VisualC-GDK/SDL/SDL.vcxproj.filters +++ b/VisualC-GDK/SDL/SDL.vcxproj.filters @@ -1363,6 +1363,6 @@ - + diff --git a/VisualC-GDK/SDL_main/SDL_main.vcxproj b/VisualC-GDK/SDL_main/SDL_main.vcxproj deleted file mode 100644 index 2bfadd6b0..000000000 --- a/VisualC-GDK/SDL_main/SDL_main.vcxproj +++ /dev/null @@ -1,199 +0,0 @@ - - - - - Debug - Gaming.Desktop.x64 - - - Debug - Gaming.Xbox.Scarlett.x64 - - - Debug - Gaming.Xbox.XboxOne.x64 - - - Release - Gaming.Desktop.x64 - - - Release - Gaming.Xbox.Scarlett.x64 - - - Release - Gaming.Xbox.XboxOne.x64 - - - - - - - SDL3_main - {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} - SDL_main - 10.0 - - - - StaticLibrary - $(DefaultPlatformToolset) - - - StaticLibrary - $(DefaultPlatformToolset) - - - StaticLibrary - $(DefaultPlatformToolset) - - - StaticLibrary - $(DefaultPlatformToolset) - - - StaticLibrary - $(DefaultPlatformToolset) - - - StaticLibrary - $(DefaultPlatformToolset) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - AllRules.ruleset - AllRules.ruleset - AllRules.ruleset - - - - - - - AllRules.ruleset - AllRules.ruleset - AllRules.ruleset - - - - - - - - - - - $(ProjectDir)/../../include;%(AdditionalIncludeDirectories) - %(AdditionalUsingDirectories) - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - Level3 - OldStyle - true - - - - - - $(ProjectDir)/../../include;%(AdditionalIncludeDirectories) - %(AdditionalUsingDirectories) - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - Level3 - OldStyle - true - - - - - - $(ProjectDir)/../../include;%(AdditionalIncludeDirectories) - %(AdditionalUsingDirectories) - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - Level3 - OldStyle - true - - - - - - Disabled - $(ProjectDir)/../../include;%(AdditionalIncludeDirectories) - %(AdditionalUsingDirectories) - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - MultiThreadedDLL - false - Level3 - OldStyle - true - - - - - - Disabled - $(ProjectDir)/../../include;%(AdditionalIncludeDirectories) - %(AdditionalUsingDirectories) - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - MultiThreadedDLL - false - Level3 - OldStyle - true - - - - - - Disabled - $(ProjectDir)/../../include;%(AdditionalIncludeDirectories) - %(AdditionalUsingDirectories) - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - MultiThreadedDLL - false - Level3 - OldStyle - true - - - - - - diff --git a/VisualC-GDK/tests/testgamecontroller/testgamecontroller.vcxproj b/VisualC-GDK/tests/testgamecontroller/testgamecontroller.vcxproj index 12c6dd867..2926a4c7f 100644 --- a/VisualC-GDK/tests/testgamecontroller/testgamecontroller.vcxproj +++ b/VisualC-GDK/tests/testgamecontroller/testgamecontroller.vcxproj @@ -273,12 +273,6 @@ false true - - {da956fd3-e142-46f2-9dd5-c78bebb56b7a} - false - false - true - @@ -441,4 +435,4 @@ - + \ No newline at end of file diff --git a/VisualC-GDK/tests/testgdk/testgdk.vcxproj b/VisualC-GDK/tests/testgdk/testgdk.vcxproj index 23b357775..22106cb3a 100644 --- a/VisualC-GDK/tests/testgdk/testgdk.vcxproj +++ b/VisualC-GDK/tests/testgdk/testgdk.vcxproj @@ -297,12 +297,6 @@ false true - - {da956fd3-e142-46f2-9dd5-c78bebb56b7a} - false - false - true - {da956fd3-e143-46f2-9fe5-c77bebc56b1a} false @@ -398,4 +392,4 @@ copy "%(FullPath)" "$(OutDir)\" - + \ No newline at end of file diff --git a/VisualC-GDK/tests/testsprite2/testsprite2.vcxproj b/VisualC-GDK/tests/testsprite2/testsprite2.vcxproj index 9c9b21059..770ff8a4b 100644 --- a/VisualC-GDK/tests/testsprite2/testsprite2.vcxproj +++ b/VisualC-GDK/tests/testsprite2/testsprite2.vcxproj @@ -297,12 +297,6 @@ false true - - {da956fd3-e142-46f2-9dd5-c78bebb56b7a} - false - false - true - {da956fd3-e143-46f2-9fe5-c77bebc56b1a} false @@ -392,4 +386,4 @@ copy "%(FullPath)" "$(OutDir)\" - + \ No newline at end of file diff --git a/VisualC/SDL.sln b/VisualC/SDL.sln index 2a8983d95..bfaa2cd0c 100644 --- a/VisualC/SDL.sln +++ b/VisualC/SDL.sln @@ -4,8 +4,6 @@ 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}") = "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 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "loopwave", "tests\loopwave\loopwave.vcxproj", "{AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}" @@ -72,14 +70,6 @@ Global {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Win32.Build.0 = Release|Win32 {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x64.ActiveCfg = Release|x64 {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x64.Build.0 = Release|x64 - {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|Win32.ActiveCfg = Debug|Win32 - {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|Win32.Build.0 = Debug|Win32 - {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|x64.ActiveCfg = Debug|x64 - {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|x64.Build.0 = Debug|x64 - {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Win32.ActiveCfg = Release|Win32 - {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Win32.Build.0 = Release|Win32 - {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|x64.ActiveCfg = Release|x64 - {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|x64.Build.0 = Release|x64 {26828762-C95D-4637-9CB1-7F0979523813}.Debug|Win32.ActiveCfg = Debug|Win32 {26828762-C95D-4637-9CB1-7F0979523813}.Debug|Win32.Build.0 = Debug|Win32 {26828762-C95D-4637-9CB1-7F0979523813}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/VisualC/SDL/SDL.vcxproj b/VisualC/SDL/SDL.vcxproj index 6336b1270..c4e076b31 100644 --- a/VisualC/SDL/SDL.vcxproj +++ b/VisualC/SDL/SDL.vcxproj @@ -646,7 +646,7 @@ - + diff --git a/VisualC/SDL/SDL.vcxproj.filters b/VisualC/SDL/SDL.vcxproj.filters index 8c5fd7132..0dcef11b8 100644 --- a/VisualC/SDL/SDL.vcxproj.filters +++ b/VisualC/SDL/SDL.vcxproj.filters @@ -1336,6 +1336,6 @@ - + diff --git a/VisualC/SDL_main/SDL_main.vcxproj b/VisualC/SDL_main/SDL_main.vcxproj deleted file mode 100644 index 6fccbc8fc..000000000 --- a/VisualC/SDL_main/SDL_main.vcxproj +++ /dev/null @@ -1,161 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - SDL3_main - {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} - SDL_main - 10.0 - - - - StaticLibrary - $(DefaultPlatformToolset) - - - StaticLibrary - $(DefaultPlatformToolset) - - - StaticLibrary - $(DefaultPlatformToolset) - - - StaticLibrary - $(DefaultPlatformToolset) - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - - - - - - - - $(ProjectDir)/../../include;%(AdditionalIncludeDirectories) - %(AdditionalUsingDirectories) - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - StreamingSIMDExtensions - Level3 - OldStyle - true - - - - - X64 - - - $(ProjectDir)/../../include;%(AdditionalIncludeDirectories) - %(AdditionalUsingDirectories) - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - Level3 - OldStyle - true - - - - - - - - - Disabled - $(ProjectDir)/../../include;%(AdditionalIncludeDirectories) - %(AdditionalUsingDirectories) - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - MultiThreadedDLL - false - StreamingSIMDExtensions - Level3 - OldStyle - true - - - - - X64 - - - Disabled - $(ProjectDir)/../../include;%(AdditionalIncludeDirectories) - %(AdditionalUsingDirectories) - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - MultiThreadedDLL - false - Level3 - OldStyle - true - - - - - - - - - diff --git a/VisualC/tests/checkkeys/checkkeys.vcxproj b/VisualC/tests/checkkeys/checkkeys.vcxproj index 0c0dc6520..cb3f0eeea 100644 --- a/VisualC/tests/checkkeys/checkkeys.vcxproj +++ b/VisualC/tests/checkkeys/checkkeys.vcxproj @@ -194,12 +194,6 @@ false true - - {da956fd3-e142-46f2-9dd5-c78bebb56b7a} - false - false - true - {da956fd3-e143-46f2-9fe5-c77bebc56b1a} false @@ -222,4 +216,4 @@ - + \ No newline at end of file diff --git a/VisualC/tests/controllermap/controllermap.vcxproj b/VisualC/tests/controllermap/controllermap.vcxproj index 971e83d33..c9f1473d6 100644 --- a/VisualC/tests/controllermap/controllermap.vcxproj +++ b/VisualC/tests/controllermap/controllermap.vcxproj @@ -188,12 +188,6 @@ false true - - {da956fd3-e142-46f2-9dd5-c78bebb56b7a} - false - false - true - @@ -276,4 +270,4 @@ - + \ No newline at end of file diff --git a/VisualC/tests/loopwave/loopwave.vcxproj b/VisualC/tests/loopwave/loopwave.vcxproj index 2ecd0bef4..197f77942 100644 --- a/VisualC/tests/loopwave/loopwave.vcxproj +++ b/VisualC/tests/loopwave/loopwave.vcxproj @@ -194,12 +194,6 @@ false true - - {da956fd3-e142-46f2-9dd5-c78bebb56b7a} - false - false - true - @@ -228,4 +222,4 @@ - + \ No newline at end of file diff --git a/VisualC/tests/testatomic/testatomic.vcxproj b/VisualC/tests/testatomic/testatomic.vcxproj index 7cc930881..2347709c3 100644 --- a/VisualC/tests/testatomic/testatomic.vcxproj +++ b/VisualC/tests/testatomic/testatomic.vcxproj @@ -188,12 +188,6 @@ false true - - {da956fd3-e142-46f2-9dd5-c78bebb56b7a} - false - false - true - @@ -201,4 +195,4 @@ - + \ No newline at end of file diff --git a/VisualC/tests/testautomation/testautomation.vcxproj b/VisualC/tests/testautomation/testautomation.vcxproj index eb11891bf..6e27404b7 100644 --- a/VisualC/tests/testautomation/testautomation.vcxproj +++ b/VisualC/tests/testautomation/testautomation.vcxproj @@ -188,12 +188,6 @@ false true - - {da956fd3-e142-46f2-9dd5-c78bebb56b7a} - false - false - true - {da956fd3-e143-46f2-9fe5-c77bebc56b1a} false @@ -231,4 +225,4 @@ - + \ No newline at end of file diff --git a/VisualC/tests/testdraw2/testdraw2.vcxproj b/VisualC/tests/testdraw2/testdraw2.vcxproj index 7cc41590b..8fb996801 100644 --- a/VisualC/tests/testdraw2/testdraw2.vcxproj +++ b/VisualC/tests/testdraw2/testdraw2.vcxproj @@ -188,12 +188,6 @@ false true - - {da956fd3-e142-46f2-9dd5-c78bebb56b7a} - false - false - true - {da956fd3-e143-46f2-9fe5-c77bebc56b1a} false @@ -207,4 +201,4 @@ - + \ No newline at end of file diff --git a/VisualC/tests/testfile/testfile.vcxproj b/VisualC/tests/testfile/testfile.vcxproj index 702f50558..b4d94ca47 100644 --- a/VisualC/tests/testfile/testfile.vcxproj +++ b/VisualC/tests/testfile/testfile.vcxproj @@ -188,12 +188,6 @@ false true - - {da956fd3-e142-46f2-9dd5-c78bebb56b7a} - false - false - true - @@ -201,4 +195,4 @@ - + \ No newline at end of file diff --git a/VisualC/tests/testgamecontroller/testgamecontroller.vcxproj b/VisualC/tests/testgamecontroller/testgamecontroller.vcxproj index f62fe2fd9..e4d02580a 100644 --- a/VisualC/tests/testgamecontroller/testgamecontroller.vcxproj +++ b/VisualC/tests/testgamecontroller/testgamecontroller.vcxproj @@ -188,12 +188,6 @@ false true - - {da956fd3-e142-46f2-9dd5-c78bebb56b7a} - false - false - true - @@ -276,4 +270,4 @@ - + \ No newline at end of file diff --git a/VisualC/tests/testgl2/testgl2.vcxproj b/VisualC/tests/testgl2/testgl2.vcxproj index 352ff5b2d..a70d41c5d 100644 --- a/VisualC/tests/testgl2/testgl2.vcxproj +++ b/VisualC/tests/testgl2/testgl2.vcxproj @@ -192,12 +192,6 @@ false true - - {da956fd3-e142-46f2-9dd5-c78bebb56b7a} - false - false - true - {da956fd3-e143-46f2-9fe5-c77bebc56b1a} false @@ -211,4 +205,4 @@ - + \ No newline at end of file diff --git a/VisualC/tests/testgles2/testgles2.vcxproj b/VisualC/tests/testgles2/testgles2.vcxproj index 6437faf44..153b64fdd 100644 --- a/VisualC/tests/testgles2/testgles2.vcxproj +++ b/VisualC/tests/testgles2/testgles2.vcxproj @@ -188,12 +188,6 @@ false true - - {da956fd3-e142-46f2-9dd5-c78bebb56b7a} - false - false - true - {da956fd3-e143-46f2-9fe5-c77bebc56b1a} false @@ -207,4 +201,4 @@ - + \ No newline at end of file diff --git a/VisualC/tests/testjoystick/testjoystick.vcxproj b/VisualC/tests/testjoystick/testjoystick.vcxproj index e5b08f316..e1b1e4fc0 100644 --- a/VisualC/tests/testjoystick/testjoystick.vcxproj +++ b/VisualC/tests/testjoystick/testjoystick.vcxproj @@ -188,12 +188,6 @@ false true - - {da956fd3-e142-46f2-9dd5-c78bebb56b7a} - false - false - true - @@ -201,4 +195,4 @@ - + \ No newline at end of file diff --git a/VisualC/tests/testoverlay2/testoverlay2.vcxproj b/VisualC/tests/testoverlay2/testoverlay2.vcxproj index 6f710eaee..9982dbcff 100644 --- a/VisualC/tests/testoverlay2/testoverlay2.vcxproj +++ b/VisualC/tests/testoverlay2/testoverlay2.vcxproj @@ -188,12 +188,6 @@ false true - - {da956fd3-e142-46f2-9dd5-c78bebb56b7a} - false - false - true - {da956fd3-e143-46f2-9fe5-c77bebc56b1a} false @@ -228,4 +222,4 @@ - + \ No newline at end of file diff --git a/VisualC/tests/testplatform/testplatform.vcxproj b/VisualC/tests/testplatform/testplatform.vcxproj index 0f8ca7fc6..0c66384ba 100644 --- a/VisualC/tests/testplatform/testplatform.vcxproj +++ b/VisualC/tests/testplatform/testplatform.vcxproj @@ -216,12 +216,6 @@ false true - - {da956fd3-e142-46f2-9dd5-c78bebb56b7a} - false - false - true - @@ -229,4 +223,4 @@ - + \ No newline at end of file diff --git a/VisualC/tests/testpower/testpower.vcxproj b/VisualC/tests/testpower/testpower.vcxproj index a03092683..7ffadf346 100644 --- a/VisualC/tests/testpower/testpower.vcxproj +++ b/VisualC/tests/testpower/testpower.vcxproj @@ -188,12 +188,6 @@ false true - - {da956fd3-e142-46f2-9dd5-c78bebb56b7a} - false - false - true - @@ -201,4 +195,4 @@ - + \ No newline at end of file diff --git a/VisualC/tests/testrendertarget/testrendertarget.vcxproj b/VisualC/tests/testrendertarget/testrendertarget.vcxproj index 9ae2e66d3..23f4466ae 100644 --- a/VisualC/tests/testrendertarget/testrendertarget.vcxproj +++ b/VisualC/tests/testrendertarget/testrendertarget.vcxproj @@ -188,12 +188,6 @@ false true - - {da956fd3-e142-46f2-9dd5-c78bebb56b7a} - false - false - true - {da956fd3-e143-46f2-9fe5-c77bebc56b1a} false @@ -246,4 +240,4 @@ - + \ No newline at end of file diff --git a/VisualC/tests/testrumble/testrumble.vcxproj b/VisualC/tests/testrumble/testrumble.vcxproj index 6eaed2c8a..4214849cc 100644 --- a/VisualC/tests/testrumble/testrumble.vcxproj +++ b/VisualC/tests/testrumble/testrumble.vcxproj @@ -188,12 +188,6 @@ false true - - {da956fd3-e142-46f2-9dd5-c78bebb56b7a} - false - false - true - @@ -201,4 +195,4 @@ - + \ No newline at end of file diff --git a/VisualC/tests/testscale/testscale.vcxproj b/VisualC/tests/testscale/testscale.vcxproj index 0c93bca5a..4e4c6f53e 100644 --- a/VisualC/tests/testscale/testscale.vcxproj +++ b/VisualC/tests/testscale/testscale.vcxproj @@ -188,12 +188,6 @@ false true - - {da956fd3-e142-46f2-9dd5-c78bebb56b7a} - false - false - true - {da956fd3-e143-46f2-9fe5-c77bebc56b1a} false @@ -246,4 +240,4 @@ - + \ No newline at end of file diff --git a/VisualC/tests/testsensor/testsensor.vcxproj b/VisualC/tests/testsensor/testsensor.vcxproj index e0955a2eb..cbfa28774 100644 --- a/VisualC/tests/testsensor/testsensor.vcxproj +++ b/VisualC/tests/testsensor/testsensor.vcxproj @@ -188,12 +188,6 @@ false true - - {da956fd3-e142-46f2-9dd5-c78bebb56b7a} - false - false - true - @@ -201,4 +195,4 @@ - + \ No newline at end of file diff --git a/VisualC/tests/testshape/testshape.vcxproj b/VisualC/tests/testshape/testshape.vcxproj index 662bcebcd..70f7a95f8 100644 --- a/VisualC/tests/testshape/testshape.vcxproj +++ b/VisualC/tests/testshape/testshape.vcxproj @@ -188,12 +188,6 @@ false true - - {da956fd3-e142-46f2-9dd5-c78bebb56b7a} - false - false - true - @@ -201,4 +195,4 @@ - + \ No newline at end of file diff --git a/VisualC/tests/testsprite2/testsprite2.vcxproj b/VisualC/tests/testsprite2/testsprite2.vcxproj index 3df89c795..130eca84c 100644 --- a/VisualC/tests/testsprite2/testsprite2.vcxproj +++ b/VisualC/tests/testsprite2/testsprite2.vcxproj @@ -188,12 +188,6 @@ false true - - {da956fd3-e142-46f2-9dd5-c78bebb56b7a} - false - false - true - {da956fd3-e143-46f2-9fe5-c77bebc56b1a} false @@ -228,4 +222,4 @@ - + \ No newline at end of file diff --git a/VisualC/tests/testsurround/testsurround.vcxproj b/VisualC/tests/testsurround/testsurround.vcxproj index a6b350e09..f0de9842a 100644 --- a/VisualC/tests/testsurround/testsurround.vcxproj +++ b/VisualC/tests/testsurround/testsurround.vcxproj @@ -194,12 +194,6 @@ false true - - {da956fd3-e142-46f2-9dd5-c78bebb56b7a} - false - false - true - @@ -207,4 +201,4 @@ - + \ No newline at end of file diff --git a/VisualC/tests/testvulkan/testvulkan.vcxproj b/VisualC/tests/testvulkan/testvulkan.vcxproj index 99446d331..3fb60d7c9 100644 --- a/VisualC/tests/testvulkan/testvulkan.vcxproj +++ b/VisualC/tests/testvulkan/testvulkan.vcxproj @@ -182,10 +182,6 @@ - - {da956fd3-e142-46f2-9dd5-c78bebb56b7a} - false - {da956fd3-e143-46f2-9fe5-c77bebc56b1a} false @@ -201,4 +197,4 @@ - + \ No newline at end of file diff --git a/VisualC/tests/testwm2/testwm2.vcxproj b/VisualC/tests/testwm2/testwm2.vcxproj index a558b55e0..535281a11 100644 --- a/VisualC/tests/testwm2/testwm2.vcxproj +++ b/VisualC/tests/testwm2/testwm2.vcxproj @@ -188,12 +188,6 @@ false true - - {da956fd3-e142-46f2-9dd5-c78bebb56b7a} - false - false - true - {da956fd3-e143-46f2-9fe5-c77bebc56b1a} false @@ -207,4 +201,4 @@ - + \ No newline at end of file diff --git a/VisualC/tests/testyuv/testyuv.vcxproj b/VisualC/tests/testyuv/testyuv.vcxproj index 3773a42bb..22a6ab37e 100644 --- a/VisualC/tests/testyuv/testyuv.vcxproj +++ b/VisualC/tests/testyuv/testyuv.vcxproj @@ -188,12 +188,6 @@ false true - - {da956fd3-e142-46f2-9dd5-c78bebb56b7a} - false - false - true - {da956fd3-e143-46f2-9fe5-c77bebc56b1a} false @@ -231,4 +225,4 @@ - + \ No newline at end of file diff --git a/build-scripts/test-versioning.sh b/build-scripts/test-versioning.sh index d766d06f9..b667cd173 100755 --- a/build-scripts/test-versioning.sh +++ b/build-scripts/test-versioning.sh @@ -47,7 +47,7 @@ else not_ok "android-project/app/src/main/java/org/libsdl/app/SDLActivity.java $version disagrees with SDL_version.h $ref_version" fi -tuple=$(sed -ne 's/^ *FILEVERSION *//p' src/main/windows/version.rc | tr -d '\r') +tuple=$(sed -ne 's/^ *FILEVERSION *//p' src/core/windows/version.rc | tr -d '\r') ref_tuple="${ref_major},${ref_minor},${ref_micro},0" if [ "$ref_tuple" = "$tuple" ]; then @@ -56,7 +56,7 @@ else not_ok "version.rc FILEVERSION $tuple disagrees with SDL_version.h $ref_tuple" fi -tuple=$(sed -ne 's/^ *PRODUCTVERSION *//p' src/main/windows/version.rc | tr -d '\r') +tuple=$(sed -ne 's/^ *PRODUCTVERSION *//p' src/core/windows/version.rc | tr -d '\r') if [ "$ref_tuple" = "$tuple" ]; then ok "version.rc PRODUCTVERSION $tuple" @@ -64,7 +64,7 @@ else not_ok "version.rc PRODUCTVERSION $tuple disagrees with SDL_version.h $ref_tuple" fi -tuple=$(sed -Ene 's/^ *VALUE "FileVersion", "([0-9, ]*)\\0"\r?$/\1/p' src/main/windows/version.rc | tr -d '\r') +tuple=$(sed -Ene 's/^ *VALUE "FileVersion", "([0-9, ]*)\\0"\r?$/\1/p' src/core/windows/version.rc | tr -d '\r') ref_tuple="${ref_major}, ${ref_minor}, ${ref_micro}, 0" if [ "$ref_tuple" = "$tuple" ]; then @@ -73,7 +73,7 @@ else not_ok "version.rc FileVersion $tuple disagrees with SDL_version.h $ref_tuple" fi -tuple=$(sed -Ene 's/^ *VALUE "ProductVersion", "([0-9, ]*)\\0"\r?$/\1/p' src/main/windows/version.rc | tr -d '\r') +tuple=$(sed -Ene 's/^ *VALUE "ProductVersion", "([0-9, ]*)\\0"\r?$/\1/p' src/core/windows/version.rc | tr -d '\r') if [ "$ref_tuple" = "$tuple" ]; then ok "version.rc ProductVersion $tuple" diff --git a/build-scripts/update-version.sh b/build-scripts/update-version.sh index 871102efe..b88a9aaaa 100755 --- a/build-scripts/update-version.sh +++ b/build-scripts/update-version.sh @@ -66,10 +66,10 @@ perl -w -pi -e 's/(\#define SDL_MAJOR_VERSION\s+)\d+/${1}'$MAJOR'/;' include/SDL perl -w -pi -e 's/(\#define SDL_MINOR_VERSION\s+)\d+/${1}'$MINOR'/;' include/SDL3/SDL_version.h perl -w -pi -e 's/(\#define SDL_PATCHLEVEL\s+)\d+/${1}'$PATCH'/;' include/SDL3/SDL_version.h -perl -w -pi -e 's/(FILEVERSION\s+)\d+,\d+,\d+/${1}'$MAJOR','$MINOR','$PATCH'/;' src/main/windows/version.rc -perl -w -pi -e 's/(PRODUCTVERSION\s+)\d+,\d+,\d+/${1}'$MAJOR','$MINOR','$PATCH'/;' src/main/windows/version.rc -perl -w -pi -e 's/(VALUE "FileVersion", ")\d+, \d+, \d+/${1}'$MAJOR', '$MINOR', '$PATCH'/;' src/main/windows/version.rc -perl -w -pi -e 's/(VALUE "ProductVersion", ")\d+, \d+, \d+/${1}'$MAJOR', '$MINOR', '$PATCH'/;' src/main/windows/version.rc +perl -w -pi -e 's/(FILEVERSION\s+)\d+,\d+,\d+/${1}'$MAJOR','$MINOR','$PATCH'/;' src/core/windows/version.rc +perl -w -pi -e 's/(PRODUCTVERSION\s+)\d+,\d+,\d+/${1}'$MAJOR','$MINOR','$PATCH'/;' src/core/windows/version.rc +perl -w -pi -e 's/(VALUE "FileVersion", ")\d+, \d+, \d+/${1}'$MAJOR', '$MINOR', '$PATCH'/;' src/core/windows/version.rc +perl -w -pi -e 's/(VALUE "ProductVersion", ")\d+, \d+, \d+/${1}'$MAJOR', '$MINOR', '$PATCH'/;' src/core/windows/version.rc echo "Running build-scripts/test-versioning.sh to verify changes..." ./build-scripts/test-versioning.sh diff --git a/docs/README-gdk.md b/docs/README-gdk.md index 5c9e45bc8..e90b4e489 100644 --- a/docs/README-gdk.md +++ b/docs/README-gdk.md @@ -53,7 +53,7 @@ These steps assume you already have a game using SDL that runs on Windows x64 al In your game's existing Visual Studio Solution, go to Build > Configuration Manager. From the "Active solution platform" drop-down select "New...". From the drop-down list, select Gaming.Desktop.x64 and copy the settings from the x64 configuration. -### 2. Build SDL3 and SDL3_main for GDK ### +### 2. Build SDL3 for GDK ### Open `VisualC-GDK/SDL.sln` in Visual Studio, you need to build the SDL3 target for the Gaming.Desktop.x64 platform (Release is recommended). You will need to copy/keep track of the `SDL3.dll`, `XCurl.dll` (which is output by Gaming.Desktop.x64), and `SDL3.lib` output files for your game project. diff --git a/docs/README-visualc.md b/docs/README-visualc.md index 4303fd518..44e74d79d 100644 --- a/docs/README-visualc.md +++ b/docs/README-visualc.md @@ -29,7 +29,6 @@ Later, we will refer to the following `.lib` and `.dll` files that have just bee - `./VisualC/Win32/Debug/SDL3.dll` or `./VisualC/Win32/Release/SDL3.dll` - `./VisualC/Win32/Debug/SDL3.lib` or `./VisualC/Win32/Release/SDL3.lib` -- `./VisualC/Win32/Debug/SDL3_main.lib` or `./VisualC/Win32/Release/SDL3_main.lib` _Note for the `x64` versions, just replace `Win32` in the path with `x64`_ @@ -61,10 +60,9 @@ Copy the following file into your Project directory: - `SDL3.dll` -Add the following files to your project (It is not necessary to copy them to your project directory): +Add the following file to your project (It is not necessary to copy it to your project directory): - `SDL3.lib` -- `SDL3_main.lib` To add them to your project, right click on your project, and select `Add files to project`. @@ -78,7 +76,8 @@ and type the names of the libraries to link with in the "Additional Options:" bo Here's a sample SDL snippet to verify everything is setup in your IDE: ``` - #include "SDL.h" + #include + #include // only include this one in the source file with main()! int main( int argc, char* argv[] ) { diff --git a/src/main/windows/version.rc b/src/core/windows/version.rc similarity index 96% rename from src/main/windows/version.rc rename to src/core/windows/version.rc index 4a3b139b3..61a52479b 100644 --- a/src/main/windows/version.rc +++ b/src/core/windows/version.rc @@ -1,38 +1,38 @@ - -#include "winresrc.h" - -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,0,0,0 - PRODUCTVERSION 3,0,0,0 - FILEFLAGSMASK 0x3fL - FILEFLAGS 0x0L - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "CompanyName", "\0" - VALUE "FileDescription", "SDL\0" - VALUE "FileVersion", "3, 0, 0, 0\0" - VALUE "InternalName", "SDL\0" - VALUE "LegalCopyright", "Copyright (C) 2022 Sam Lantinga\0" - VALUE "OriginalFilename", "SDL3.dll\0" - VALUE "ProductName", "Simple DirectMedia Layer\0" - VALUE "ProductVersion", "3, 0, 0, 0\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END + +#include "winresrc.h" + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 3,0,0,0 + PRODUCTVERSION 3,0,0,0 + FILEFLAGSMASK 0x3fL + FILEFLAGS 0x0L + FILEOS 0x40004L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "\0" + VALUE "FileDescription", "SDL\0" + VALUE "FileVersion", "3, 0, 0, 0\0" + VALUE "InternalName", "SDL\0" + VALUE "LegalCopyright", "Copyright (C) 2022 Sam Lantinga\0" + VALUE "OriginalFilename", "SDL3.dll\0" + VALUE "ProductName", "Simple DirectMedia Layer\0" + VALUE "ProductVersion", "3, 0, 0, 0\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END