From d113af8afb2dd4d3b72276fd7fcf8f1157e04e63 Mon Sep 17 00:00:00 2001 From: Ben Doherty Date: Thu, 3 Jan 2019 16:59:34 -0800 Subject: [PATCH] Add return 0 to main functions to avoid crashes on Windows (#674) --- samples/suzanne.cpp | 2 ++ samples/vk_animation.cpp | 2 ++ samples/vk_depthtesting.cpp | 2 ++ samples/vk_hellopbr.cpp | 2 ++ samples/vk_hellotriangle.cpp | 2 ++ samples/vk_imgui.cpp | 2 ++ samples/vk_shadowtest.cpp | 2 ++ samples/vk_strobecolor.cpp | 2 ++ samples/vk_texturedquad.cpp | 2 ++ samples/vk_vbotest.cpp | 2 ++ samples/vk_viewtest.cpp | 2 ++ 11 files changed, 22 insertions(+) diff --git a/samples/suzanne.cpp b/samples/suzanne.cpp index 8668fd0c89..c90141338a 100644 --- a/samples/suzanne.cpp +++ b/samples/suzanne.cpp @@ -115,4 +115,6 @@ int main(int argc, char** argv) { }; FilamentApp::get().run(config, setup, cleanup); + + return 0; } diff --git a/samples/vk_animation.cpp b/samples/vk_animation.cpp index 41013aca9d..4abd45d94c 100644 --- a/samples/vk_animation.cpp +++ b/samples/vk_animation.cpp @@ -138,4 +138,6 @@ int main(int argc, char** argv) { }); FilamentApp::get().run(config, setup, cleanup); + + return 0; } diff --git a/samples/vk_depthtesting.cpp b/samples/vk_depthtesting.cpp index 41615a6642..293126c685 100644 --- a/samples/vk_depthtesting.cpp +++ b/samples/vk_depthtesting.cpp @@ -135,4 +135,6 @@ int main(int argc, char** argv) { }); FilamentApp::get().run(config, setup, cleanup); + + return 0; } diff --git a/samples/vk_hellopbr.cpp b/samples/vk_hellopbr.cpp index b0097e9bed..877fe1923a 100644 --- a/samples/vk_hellopbr.cpp +++ b/samples/vk_hellopbr.cpp @@ -97,4 +97,6 @@ int main(int argc, char** argv) { }); FilamentApp::get().run(config, setup, cleanup); + + return 0; } diff --git a/samples/vk_hellotriangle.cpp b/samples/vk_hellotriangle.cpp index 485a9fee41..a20de8979f 100644 --- a/samples/vk_hellotriangle.cpp +++ b/samples/vk_hellotriangle.cpp @@ -122,4 +122,6 @@ int main(int argc, char** argv) { }); FilamentApp::get().run(config, setup, cleanup); + + return 0; } diff --git a/samples/vk_imgui.cpp b/samples/vk_imgui.cpp index fefff60005..4fb48c170a 100644 --- a/samples/vk_imgui.cpp +++ b/samples/vk_imgui.cpp @@ -54,4 +54,6 @@ int main(int argc, char** argv) { config.title = "ImGui Demo"; auto nop = [](filament::Engine*, filament::View*, filament::Scene*) {}; FilamentApp::get().run(config, nop, nop, imgui); + + return 0; } diff --git a/samples/vk_shadowtest.cpp b/samples/vk_shadowtest.cpp index a196753344..bdebae07b8 100644 --- a/samples/vk_shadowtest.cpp +++ b/samples/vk_shadowtest.cpp @@ -124,6 +124,8 @@ int main(int argc, char** argv) { }); FilamentApp::get().run(config, setup, cleanup); + + return 0; } static GroundPlane createGroundPlane(Engine* engine) { diff --git a/samples/vk_strobecolor.cpp b/samples/vk_strobecolor.cpp index 71cffd0e29..cf28ed6572 100644 --- a/samples/vk_strobecolor.cpp +++ b/samples/vk_strobecolor.cpp @@ -47,4 +47,6 @@ int main(int argc, char** argv) { }); FilamentApp::get().run(config, setup, cleanup); + + return 0; } diff --git a/samples/vk_texturedquad.cpp b/samples/vk_texturedquad.cpp index d1b970d723..e5023c7ed1 100644 --- a/samples/vk_texturedquad.cpp +++ b/samples/vk_texturedquad.cpp @@ -165,4 +165,6 @@ int main(int argc, char** argv) { }); FilamentApp::get().run(config, setup, cleanup); + + return 0; } diff --git a/samples/vk_vbotest.cpp b/samples/vk_vbotest.cpp index bbf949658d..ca12ede01e 100644 --- a/samples/vk_vbotest.cpp +++ b/samples/vk_vbotest.cpp @@ -90,4 +90,6 @@ int main(int argc, char** argv) { }; FilamentApp::get().run(config, setup, cleanup); + + return 0; } diff --git a/samples/vk_viewtest.cpp b/samples/vk_viewtest.cpp index 7f4abfe58f..37c560c8cd 100644 --- a/samples/vk_viewtest.cpp +++ b/samples/vk_viewtest.cpp @@ -72,4 +72,6 @@ int main(int argc, char** argv) { }; FilamentApp::get().run(config, setup, cleanup); + + return 0; }