From 9f64a2149f3a0842ced34b8b981ffe3a8efc6d13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Lucas=20Golini?= Date: Sun, 27 Aug 2023 17:58:19 -0300 Subject: [PATCH] Fix typo in containers.hpp. Improve export compile commands for macosx. --- include/eepp/core/containers.hpp | 2 +- premake5.lua | 9 ++ projects/macos/ee.config | 1 + projects/macos/ee.files | 150 ++++++++++++++++++++++--------- projects/macos/ee.includes | 3 + 5 files changed, 120 insertions(+), 45 deletions(-) diff --git a/include/eepp/core/containers.hpp b/include/eepp/core/containers.hpp index a42fd89fd..1b588182c 100644 --- a/include/eepp/core/containers.hpp +++ b/include/eepp/core/containers.hpp @@ -12,7 +12,7 @@ namespace EE { #ifdef EEPP_NO_THIRDPARTY_CONTAINERS -template using UnorderedMap = std::ununordered_map; +template using UnorderedMap = std::unordered_map; template using UnorderedSet = std::unordered_set; diff --git a/premake5.lua b/premake5.lua index dd7173678..df954fb49 100644 --- a/premake5.lua +++ b/premake5.lua @@ -125,6 +125,7 @@ function set_kind() else kind("WindowedApp") end + cppdialect "C++17" end link_list = { } @@ -386,6 +387,9 @@ function build_link_configuration( package_name, use_ee_icon ) if _OPTIONS["with-gles2"] and not _OPTIONS["force-gles1"] then linkoptions{ "-s FULL_ES2=1" } end + + filter { "action:export-compile-commands", "system:macosx" } + buildoptions { "-std=c++17" } end function generate_os_links() @@ -713,6 +717,9 @@ function build_eepp( build_name ) filter "action:vs*" incdirs { "src/thirdparty/libzip/vs" } buildoptions { "/bigobj" } + + filter { "action:export-compile-commands", "system:macosx" } + buildoptions { "-std=c++17" } end function target_dir_lib(path) @@ -1020,6 +1027,8 @@ workspace "eepp" target_dir_lib("") filter "action:not vs*" buildoptions { "-Wall" } + filter { "action:export-compile-commands", "system:macosx" } + buildoptions { "-std=c++17" } -- Library project "eepp-static" diff --git a/projects/macos/ee.config b/projects/macos/ee.config index 9358a2eb0..f43f359f8 100644 --- a/projects/macos/ee.config +++ b/projects/macos/ee.config @@ -13,3 +13,4 @@ #define DR_MP3_IMPLEMENTATION #define DR_FLAC_IMPLEMENTATION #define STB_IMAGE_IMPLEMENTATION +#define ECODE_USE_BACKWARD diff --git a/projects/macos/ee.files b/projects/macos/ee.files index 9283ff6c2..73d0021aa 100644 --- a/projects/macos/ee.files +++ b/projects/macos/ee.files @@ -38,6 +38,7 @@ ../../include/eepp/audio/soundsource.hpp ../../include/eepp/audio/soundstream.hpp ../../include/eepp/config.hpp +../../include/eepp/core/containers.hpp ../../include/eepp/core/core.hpp ../../include/eepp/core/debug.hpp ../../include/eepp/core.hpp @@ -59,6 +60,7 @@ ../../include/eepp/graphics/drawablesearcher.hpp ../../include/eepp/graphics/fontbmfont.hpp ../../include/eepp/graphics/font.hpp +../../include/eepp/graphics/fontfamily.hpp ../../include/eepp/graphics/fontmanager.hpp ../../include/eepp/graphics/fontsprite.hpp ../../include/eepp/graphics/fontstyleconfig.hpp @@ -263,6 +265,7 @@ ../../include/eepp/system/resourceloader.hpp ../../include/eepp/system/resourcemanager.hpp ../../include/eepp/system/scopedbuffer.hpp +../../include/eepp/system/scopedop.hpp ../../include/eepp/system/singleton.hpp ../../include/eepp/system/sys.hpp ../../include/eepp/system/thread.hpp @@ -461,6 +464,7 @@ ../../include/eepp/window/window.hpp ../../Makefile ../../Makefile.base +../../include/eepp/ui/uistacklayout.hpp ../../premake4.lua ../../premake5.lua ../../src/eepp/audio/alcheck.cpp @@ -541,6 +545,7 @@ ../../src/eepp/graphics/drawablesearcher.cpp ../../src/eepp/graphics/fontbmfont.cpp ../../src/eepp/graphics/font.cpp +../../src/eepp/graphics/fontfamily.cpp ../../src/eepp/graphics/fontmanager.cpp ../../src/eepp/graphics/fontsprite.cpp ../../src/eepp/graphics/fonttruetype.cpp @@ -618,26 +623,62 @@ ../../src/eepp/graphics/vertexbuffervbo.cpp ../../src/eepp/graphics/view.cpp ../../src/eepp/main/eepp_main.cpp +../../src/eepp/ui/doc/languages/angelscript.cpp +../../src/eepp/ui/doc/languages/angelscript.hpp +../../src/eepp/ui/doc/languages/batchscript.cpp +../../src/eepp/ui/doc/languages/batchscript.hpp +../../src/eepp/ui/doc/languages/crystal.cpp +../../src/eepp/ui/doc/languages/crystal.hpp +../../src/eepp/ui/doc/languages/css.cpp +../../src/eepp/ui/doc/languages/css.hpp +../../src/eepp/ui/doc/languages/d.cpp +../../src/eepp/ui/doc/languages/d.hpp +../../src/eepp/ui/doc/languages/elixir.cpp +../../src/eepp/ui/doc/languages/elixir.hpp +../../src/eepp/ui/doc/languages/elm.cpp +../../src/eepp/ui/doc/languages/elm.hpp +../../src/eepp/ui/doc/languages/fstab.cpp +../../src/eepp/ui/doc/languages/fstab.hpp +../../src/eepp/ui/doc/languages/gdscript.cpp +../../src/eepp/ui/doc/languages/gdscript.hpp +../../src/eepp/ui/doc/languages/glsl.cpp +../../src/eepp/ui/doc/languages/glsl.hpp +../../src/eepp/ui/doc/languages/hare.cpp +../../src/eepp/ui/doc/languages/hare.hpp +../../src/eepp/ui/doc/languages/hlsl.cpp +../../src/eepp/ui/doc/languages/hlsl.hpp +../../src/eepp/ui/doc/languages/htaccess.cpp +../../src/eepp/ui/doc/languages/htaccess.hpp +../../src/eepp/ui/doc/languages/html.cpp +../../src/eepp/ui/doc/languages/html.hpp +../../src/eepp/ui/doc/languages/julia.cpp +../../src/eepp/ui/doc/languages/julia.hpp +../../src/eepp/ui/doc/languages/kotlin.cpp +../../src/eepp/ui/doc/languages/kotlin.hpp +../../src/eepp/ui/doc/languages/markdown.cpp +../../src/eepp/ui/doc/languages/markdown.hpp +../../src/eepp/ui/doc/languages/nelua.cpp +../../src/eepp/ui/doc/languages/nelua.hpp +../../src/eepp/ui/doc/languages/objeck.cpp +../../src/eepp/ui/doc/languages/objeck.hpp +../../src/eepp/ui/doc/languages/odin.cpp ../../src/eepp/ui/doc/languages/odin.hpp +../../src/eepp/ui/doc/languages/pascal.cpp ../../src/eepp/ui/doc/languages/pascal.hpp +../../src/eepp/ui/doc/languages/perl.cpp ../../src/eepp/ui/doc/languages/perl.hpp +../../src/eepp/ui/doc/languages/pico-8.cpp ../../src/eepp/ui/doc/languages/pico-8.hpp +../../src/eepp/ui/doc/languages/po.cpp ../../src/eepp/ui/doc/languages/po.hpp +../../src/eepp/ui/doc/languages/postgresql.cpp ../../src/eepp/ui/doc/languages/postgresql.hpp -../../src/eepp/ui/doc/languages/r.hpp ../../src/eepp/ui/doc/languages/rust.hpp -../../src/eepp/ui/doc/languages/sass.hpp +../../src/eepp/ui/doc/languages/sass.cpp +../../src/eepp/ui/doc/languages/solidity.cpp ../../src/eepp/ui/doc/languages/solidity.hpp ../../src/eepp/ui/doc/languages/sql.hpp -../../src/eepp/ui/doc/languages/swift.hpp -../../src/eepp/ui/doc/languages/teal.hpp -../../src/eepp/ui/doc/languages/toml.hpp -../../src/eepp/ui/doc/languages/v.hpp -../../src/eepp/ui/doc/languages/vb.hpp -../../src/eepp/ui/doc/languages/verilog.hpp ../../src/eepp/ui/doc/languages/x86assembly.hpp -../../src/eepp/ui/doc/languages/xml.hpp -../../src/eepp/ui/doc/languages/zig.hpp ../../src/modules/maps/src/eepp/maps/gameobject.cpp ../../src/modules/maps/src/eepp/maps/gameobjectobject.cpp ../../src/modules/maps/src/eepp/maps/gameobjectpolygon.cpp @@ -815,6 +856,15 @@ ../../src/eepp/system/virtualfilesystem.cpp ../../src/eepp/system/zip.cpp ../../src/eepp/ui/abstract/filesystemmodel.hpp +../../src/eepp/ui/doc/languages/hlsl.cpp +../../src/eepp/ui/doc/languages/htaccess.cpp +../../src/eepp/ui/doc/languages/objeck.cpp +../../src/eepp/ui/doc/languages/pascal.cpp +../../src/eepp/ui/doc/languages/pico-8.cpp +../../src/eepp/ui/doc/languages/postgresql.cpp +../../src/eepp/ui/doc/languages/postgresql.hpp +../../src/eepp/ui/doc/languages/x86assembly.cpp +../../src/eepp/ui/doc/languages/x86assembly.hpp ../../src/eepp/ui/models/model.cpp ../../src/eepp/ui/models/modelselection.cpp ../../src/eepp/ui/abstract/uiabstracttableview.cpp @@ -842,64 +892,53 @@ ../../src/eepp/ui/css/stylesheetvariable.cpp ../../src/eepp/ui/css/timingfunction.cpp ../../src/eepp/ui/css/transitiondefinition.cpp -../../src/eepp/ui/doc/languages/angelscript.cpp -../../src/eepp/ui/doc/languages/angelscript.hpp -../../src/eepp/ui/doc/languages/batchscript.cpp -../../src/eepp/ui/doc/languages/batchscript.hpp -../../src/eepp/ui/doc/languages/crystal.cpp -../../src/eepp/ui/doc/languages/crystal.hpp -../../src/eepp/ui/doc/languages/css.cpp -../../src/eepp/ui/doc/languages/css.hpp -../../src/eepp/ui/doc/languages/d.cpp -../../src/eepp/ui/doc/languages/d.hpp -../../src/eepp/ui/doc/languages/elixir.cpp -../../src/eepp/ui/doc/languages/elixir.hpp -../../src/eepp/ui/doc/languages/elm.cpp -../../src/eepp/ui/doc/languages/elm.hpp -../../src/eepp/ui/doc/languages/fstab.cpp -../../src/eepp/ui/doc/languages/fstab.hpp -../../src/eepp/ui/doc/languages/gdscript.cpp -../../src/eepp/ui/doc/languages/gdscript.hpp ../../src/eepp/ui/doc/languages/glsl.cpp ../../src/eepp/ui/doc/languages/glsl.hpp -../../src/eepp/ui/doc/languages/hare.cpp -../../src/eepp/ui/doc/languages/hare.hpp ../../src/eepp/ui/doc/languages/hlsl.cpp ../../src/eepp/ui/doc/languages/hlsl.hpp ../../src/eepp/ui/doc/languages/htaccess.cpp ../../src/eepp/ui/doc/languages/htaccess.hpp -../../src/eepp/ui/doc/languages/html.cpp -../../src/eepp/ui/doc/languages/html.hpp -../../src/eepp/ui/doc/languages/julia.cpp -../../src/eepp/ui/doc/languages/julia.hpp -../../src/eepp/ui/doc/languages/kotlin.cpp -../../src/eepp/ui/doc/languages/kotlin.hpp -../../src/eepp/ui/doc/languages/markdown.cpp -../../src/eepp/ui/doc/languages/markdown.hpp -../../src/eepp/ui/doc/languages/nelua.cpp -../../src/eepp/ui/doc/languages/nelua.hpp ../../src/eepp/ui/doc/languages/objeck.cpp ../../src/eepp/ui/doc/languages/objeck.hpp -../../src/eepp/ui/doc/languages/odin.cpp +../../src/eepp/ui/doc/languages/odin.hpp ../../src/eepp/ui/doc/languages/pascal.cpp +../../src/eepp/ui/doc/languages/pascal.hpp ../../src/eepp/ui/doc/languages/perl.cpp +../../src/eepp/ui/doc/languages/perl.hpp ../../src/eepp/ui/doc/languages/pico-8.cpp +../../src/eepp/ui/doc/languages/pico-8.hpp ../../src/eepp/ui/doc/languages/po.cpp +../../src/eepp/ui/doc/languages/po.hpp ../../src/eepp/ui/doc/languages/postgresql.cpp +../../src/eepp/ui/doc/languages/postgresql.hpp ../../src/eepp/ui/doc/languages/r.cpp +../../src/eepp/ui/doc/languages/r.hpp ../../src/eepp/ui/doc/languages/rust.cpp +../../src/eepp/ui/doc/languages/rust.hpp ../../src/eepp/ui/doc/languages/sass.cpp +../../src/eepp/ui/doc/languages/sass.hpp ../../src/eepp/ui/doc/languages/solidity.cpp +../../src/eepp/ui/doc/languages/solidity.hpp ../../src/eepp/ui/doc/languages/sql.cpp +../../src/eepp/ui/doc/languages/sql.hpp ../../src/eepp/ui/doc/languages/swift.cpp +../../src/eepp/ui/doc/languages/swift.hpp ../../src/eepp/ui/doc/languages/teal.cpp +../../src/eepp/ui/doc/languages/teal.hpp ../../src/eepp/ui/doc/languages/toml.cpp +../../src/eepp/ui/doc/languages/toml.hpp ../../src/eepp/ui/doc/languages/v.cpp +../../src/eepp/ui/doc/languages/v.hpp ../../src/eepp/ui/doc/languages/vb.cpp +../../src/eepp/ui/doc/languages/vb.hpp ../../src/eepp/ui/doc/languages/verilog.cpp +../../src/eepp/ui/doc/languages/verilog.hpp ../../src/eepp/ui/doc/languages/x86assembly.cpp +../../src/eepp/ui/doc/languages/x86assembly.hpp ../../src/eepp/ui/doc/languages/xml.cpp +../../src/eepp/ui/doc/languages/xml.hpp ../../src/eepp/ui/doc/languages/zig.cpp +../../src/eepp/ui/doc/languages/zig.hpp ../../src/eepp/ui/doc/syntaxcolorscheme.cpp ../../src/eepp/ui/doc/syntaxdefinition.cpp ../../src/eepp/ui/doc/syntaxdefinitionmanager.cpp @@ -975,6 +1014,7 @@ ../../src/eepp/ui/uispinbox.cpp ../../src/eepp/ui/uisplitter.cpp ../../src/eepp/ui/uisprite.cpp +../../src/eepp/ui/uistacklayout.cpp ../../src/eepp/ui/uistackwidget.cpp ../../src/eepp/ui/uistate.cpp ../../src/eepp/ui/uistyle.cpp @@ -1223,16 +1263,20 @@ ../../src/thirdparty/efsw/src/test/efsw-test.cpp ../../src/tools/ecode/appconfig.cpp ../../src/tools/ecode/appconfig.hpp +../../src/tools/ecode/commandpalette.cpp +../../src/tools/ecode/commandpalette.hpp ../../src/tools/ecode/ecode.cpp ../../src/tools/ecode/ecode.hpp ../../src/tools/ecode/docsearchcontroller.cpp ../../src/tools/ecode/docsearchcontroller.hpp -../../src/tools/ecode/filelocator.cpp -../../src/tools/ecode/filelocator.hpp +../../src/tools/ecode/featureshealth.cpp +../../src/tools/ecode/featureshealth.hpp ../../src/tools/ecode/filesystemlistener.cpp ../../src/tools/ecode/filesystemlistener.hpp ../../src/tools/ecode/globalsearchcontroller.cpp ../../src/tools/ecode/globalsearchcontroller.hpp +../../src/tools/ecode/iconmanager.cpp +../../src/tools/ecode/iconmanager.hpp ../../src/tools/ecode/ignorematcher.cpp ../../src/tools/ecode/ignorematcher.hpp ../../src/tools/ecode/macos/macos.hpp @@ -1243,6 +1287,7 @@ ../../src/tools/ecode/plugins/formatter/formatterplugin.hpp ../../src/tools/ecode/notificationcenter.cpp ../../src/tools/ecode/notificationcenter.hpp +../../src/tools/ecode/pathhelper.hpp ../../src/tools/ecode/plugins/linter/linterplugin.cpp ../../src/tools/ecode/plugins/linter/linterplugin.hpp ../../src/tools/ecode/plugins/lsp/lspclientplugin.cpp @@ -1257,17 +1302,34 @@ ../../src/tools/ecode/plugins/lsp/lspprotocol.hpp ../../src/tools/ecode/plugins/pluginmanager.cpp ../../src/tools/ecode/plugins/pluginmanager.hpp +../../src/tools/ecode/plugins/xmltools/xmltoolsplugin.cpp +../../src/tools/ecode/plugins/xmltools/xmltoolsplugin.hpp +../../src/tools/ecode/projectbuild.cpp +../../src/tools/ecode/projectbuild.hpp ../../src/tools/ecode/projectdirectorytree.cpp ../../src/tools/ecode/projectdirectorytree.hpp ../../src/tools/ecode/projectsearch.cpp ../../src/tools/ecode/projectsearch.hpp -../../src/tools/ecode/scopedop.hpp +../../src/tools/ecode/settingsmenu.cpp +../../src/tools/ecode/settingsmenu.hpp +../../src/tools/ecode/statusbuildoutputcontroller.cpp +../../src/tools/ecode/statusbuildoutputcontroller.hpp +../../src/tools/ecode/statusterminalcontroller.cpp +../../src/tools/ecode/statusterminalcontroller.hpp ../../src/tools/ecode/terminalmanager.cpp ../../src/tools/ecode/terminalmanager.hpp +../../src/tools/ecode/uibuildsettings.cpp +../../src/tools/ecode/uibuildsettings.hpp ../../src/tools/ecode/uicodeeditorsplitter.cpp ../../src/tools/ecode/uicodeeditorsplitter.hpp +../../src/tools/ecode/uistatusbar.cpp +../../src/tools/ecode/uistatusbar.hpp ../../src/tools/ecode/uitreeviewglobalsearch.cpp ../../src/tools/ecode/uitreeviewglobalsearch.hpp +../../src/tools/ecode/uiwelcomescreen.cpp +../../src/tools/ecode/uiwelcomescreen.hpp +../../src/tools/ecode/universallocator.cpp +../../src/tools/ecode/universallocator.hpp ../../src/tools/ecode/version.cpp ../../src/tools/ecode/version.hpp ../../src/tools/ecode/widgetcommandexecuter.hpp diff --git a/projects/macos/ee.includes b/projects/macos/ee.includes index 36e5390bb..ec993a379 100644 --- a/projects/macos/ee.includes +++ b/projects/macos/ee.includes @@ -11,3 +11,6 @@ ../../src/modules/eterm/include/ ../../src/modules/maps/include/ ../../src/modules/maps/src/ +../../src/modules/physics/include/ +../../src/modules/physics/src/ +../../src/tools/ecode