Convert to SDL3 and static link

This commit is contained in:
Krzosa Karol
2024-07-13 08:58:30 +02:00
parent e6b23b2a98
commit 63bd416e7c
2 changed files with 41 additions and 27 deletions

View File

@@ -112,7 +112,7 @@ Library PrepareIMGUI(S8_String sdl_inc_path) {
Library l = {};
l.include_paths.add("../src/external/imgui/");
l.include_paths.add("../src/external/imgui/backends");
l.sources.add("../src/external/imgui/backends/imgui_impl_sdl2.cpp");
l.sources.add("../src/external/imgui/backends/imgui_impl_sdl3.cpp");
l.sources.add("../src/external/imgui/backends/imgui_impl_opengl3.cpp");
l.sources.add("../src/external/imgui/imgui.cpp");
l.sources.add("../src/external/imgui/imgui_demo.cpp");
@@ -120,7 +120,7 @@ Library PrepareIMGUI(S8_String sdl_inc_path) {
l.sources.add("../src/external/imgui/imgui_tables.cpp");
l.sources.add("../src/external/imgui/imgui_widgets.cpp");
l.objects.add("imgui_impl_sdl2.obj");
l.objects.add("imgui_impl_sdl3.obj");
l.objects.add("imgui_impl_opengl3.obj");
l.objects.add("imgui.obj");
l.objects.add("imgui_demo.obj");
@@ -142,11 +142,8 @@ Library PrepareIMGUI(S8_String sdl_inc_path) {
Library PrepareSDL() {
Library l = {};
l.include_paths.add("../src/external/SDL2/include");
l.objects.add("../src/external/SDL2/lib/x64/SDL2main.lib");
l.objects.add("../src/external/SDL2/lib/x64/SDL2.lib");
OS_Result os_result = OS_CopyFile("../src/external/SDL2/lib/x64/SDL2.dll", "SDL2.dll", true);
if (os_result != OS_SUCCESS) IO_Printf("failed to copy SDL2.dll\n");
l.include_paths.add("../src/external/SDL/include");
l.objects.add("../src/external/SDL/VisualC/x64/Release/SDL3.lib");
return l;
}
@@ -210,7 +207,7 @@ int main() {
cmd.add("/link");
cmd.add("/incremental:no");
cmd.add("/SUBSYSTEM:WINDOWS");
cmd.add("opengl32.lib");
cmd.add("opengl32.lib gdi32.lib winmm.lib Setupapi.lib ole32.lib oleaut32.lib version.lib");
For(libs) For2(o, it.objects) cmd.add(o);
OS_DeleteFile("transcript_browser.pdb");