summaryrefslogtreecommitdiffhomepage
path: root/editor
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2022-10-24 12:11:03 +0200
committerStanislaw Halik <sthalik@misaki.pl>2022-10-24 12:11:03 +0200
commit700942f351d85f326bb1d6725e688920dc8de942 (patch)
tree02e73c1259dc3c119eb63a807f26959d686437b2 /editor
parentfe16065ae990c667b59a59230546bbfaf60ef523 (diff)
a
Diffstat (limited to 'editor')
-rw-r--r--editor/CMakeLists.txt3
-rw-r--r--editor/app.cpp14
2 files changed, 8 insertions, 9 deletions
diff --git a/editor/CMakeLists.txt b/editor/CMakeLists.txt
index dd308a02..aef82fec 100644
--- a/editor/CMakeLists.txt
+++ b/editor/CMakeLists.txt
@@ -4,8 +4,7 @@ file(GLOB sources "*.cpp" CONFIGURE_ARGS)
corrade_add_resource(res "../resources.conf")
if(MSVC)
- #set_property(SOURCE "${res}" APPEND PROPERTY COMPILE_OPTIONS "-W0")
- set_property(SOURCE "${res}" PROPERTY COMPILE_OPTIONS "-W0")
+ set_property(SOURCE "${res}" APPEND PROPERTY COMPILE_OPTIONS "-W0")
else()
set_property(SOURCE "${res}" APPEND PROPERTY COMPILE_OPTIONS "-w")
endif()
diff --git a/editor/app.cpp b/editor/app.cpp
index 699d3abc..da3678d7 100644
--- a/editor/app.cpp
+++ b/editor/app.cpp
@@ -95,6 +95,13 @@ int app::run_from_argv(const int argc, const char* const* const argv)
return ret;
}
+} // namespace floormat
+
+int main(int argc, char** argv)
+{
+ return floormat::app::run_from_argv(argc, argv);
+}
+
#ifdef _MSC_VER
#include <cstdlib> // for __arg{c,v}
#ifdef __clang__
@@ -111,10 +118,3 @@ extern "C" int __stdcall WinMain(void*, void*, void*, int)
# pragma clang diagnostic pop
#endif
#endif
-
-} // namespace floormat
-
-int main(int argc, char** argv)
-{
- return floormat::app::run_from_argv(argc, argv);
-}