File tree Expand file tree Collapse file tree 6 files changed +17
-3
lines changed Expand file tree Collapse file tree 6 files changed +17
-3
lines changed Original file line number Diff line number Diff line change 26
26
* .VC.db
27
27
* .VC.VC.opendb
28
28
29
+ # # Commonly used CMake directories
30
+ /build * /
31
+
29
32
# # Xcode artifacts
30
33
project.xcworkspace
31
34
xcuserdata
Original file line number Diff line number Diff line change @@ -59,6 +59,7 @@ Other Changes:
59
59
VkPhysicalDeviceLimits::nonCoherentAtomSize. (#3957) [@AgentX1994]
60
60
- Examples: Add OpenGL ES 2.0 support to modern GL examples. (#2837, #3951) [@lethal-guitar, @hinxx]
61
61
- Examples: Vulkan: Rebuild swapchain on VK_SUBOPTIMAL_KHR. (#3881)
62
+ - Examples: SDL2: Link with shell32.lib required by SDL2main.lib since SDL 2.0.12. [#3988]
62
63
- Docs: Improvements to minor mistakes in documentation comments (#3923) [@ANF-Studios]
63
64
64
65
Original file line number Diff line number Diff line change 3
3
@ set OUT_EXE = example_sdl_directx11
4
4
@ set INCLUDES = /I..\.. /I..\..\backends /I%SDL2_DIR% \include /I " %WindowsSdkDir% Include\um" /I " %WindowsSdkDir% Include\shared" /I " %DXSDK_DIR% Include"
5
5
@ set SOURCES = main.cpp ..\..\backends\imgui_impl_sdl.cpp ..\..\backends\imgui_impl_dx11.cpp ..\..\imgui*.cpp
6
- @ set LIBS = /LIBPATH:%SDL2_DIR% \lib\x86 SDL2.lib SDL2main.lib /LIBPATH:" %DXSDK_DIR% /Lib/x86" d3d11.lib d3dcompiler.lib
6
+ @ set LIBS = /LIBPATH:%SDL2_DIR% \lib\x86 SDL2.lib SDL2main.lib /LIBPATH:" %DXSDK_DIR% /Lib/x86" d3d11.lib d3dcompiler.lib shell32.lib
7
7
mkdir %OUT_DIR%
8
8
cl /nologo /Zi /MD %INCLUDES% %SOURCES% /Fe%OUT_DIR% /%OUT_EXE% .exe /Fo%OUT_DIR% / /link %LIBS% /subsystem:console
Original file line number Diff line number Diff line change 3
3
@ set OUT_EXE = example_sdl_opengl2
4
4
@ set INCLUDES = /I..\.. /I..\..\backends /I%SDL2_DIR% \include
5
5
@ set SOURCES = main.cpp ..\..\backends\imgui_impl_sdl.cpp ..\..\backends\imgui_impl_opengl2.cpp ..\..\imgui*.cpp
6
- @ set LIBS = /LIBPATH:%SDL2_DIR% \lib\x86 SDL2.lib SDL2main.lib opengl32.lib
6
+ @ set LIBS = /LIBPATH:%SDL2_DIR% \lib\x86 SDL2.lib SDL2main.lib opengl32.lib shell32.lib
7
7
mkdir %OUT_DIR%
8
8
cl /nologo /Zi /MD %INCLUDES% %SOURCES% /Fe%OUT_DIR% /%OUT_EXE% .exe /Fo%OUT_DIR% / /link %LIBS% /subsystem:console
Original file line number Diff line number Diff line change 3
3
@ set OUT_EXE = example_sdl_opengl3
4
4
@ set INCLUDES = /I..\.. /I..\..\backends /I%SDL2_DIR% \include /I..\libs\gl3w
5
5
@ set SOURCES = main.cpp ..\..\backends\imgui_impl_sdl.cpp ..\..\backends\imgui_impl_opengl3.cpp ..\..\imgui*.cpp ..\libs\gl3w\GL\gl3w.c
6
- @ set LIBS = /LIBPATH:%SDL2_DIR% \lib\x86 SDL2.lib SDL2main.lib opengl32.lib
6
+ @ set LIBS = /LIBPATH:%SDL2_DIR% \lib\x86 SDL2.lib SDL2main.lib opengl32.lib shell32.lib
7
7
mkdir %OUT_DIR%
8
8
cl /nologo /Zi /MD %INCLUDES% %SOURCES% /Fe%OUT_DIR% /%OUT_EXE% .exe /Fo%OUT_DIR% / /link %LIBS% /subsystem:console
Original file line number Diff line number Diff line change
1
+ @ REM Build for Visual Studio compiler. Run your copy of vcvars32.bat or vcvarsall.bat to setup command-line compiler.
2
+
3
+ @ set OUT_EXE = example_sdl_vulkan
4
+ @ set INCLUDES = /I..\.. /I..\..\backends /I%SDL2_DIR% \include /I %VULKAN_SDK% \include
5
+ @ set SOURCES = main.cpp ..\..\backends\imgui_impl_sdl.cpp ..\..\backends\imgui_impl_vulkan.cpp ..\..\imgui*.cpp
6
+ @ set LIBS = /LIBPATH:%SDL2_DIR% \lib\x86 /libpath:%VULKAN_SDK% \lib32 SDL2.lib SDL2main.lib shell32.lib vulkan-1.lib
7
+
8
+ @ set OUT_DIR = Debug
9
+ mkdir %OUT_DIR%
10
+ cl /nologo /Zi /MD %INCLUDES% %SOURCES% /Fe%OUT_DIR% /%OUT_EXE% .exe /Fo%OUT_DIR% / /link %LIBS% /subsystem:console
You can’t perform that action at this time.
0 commit comments