Skip to content

Update Magnum to latest & fix various minor buildsystem issues#1819

Merged
mosra merged 8 commits intomainfrom
update-magnum14
Aug 1, 2022
Merged

Update Magnum to latest & fix various minor buildsystem issues#1819
mosra merged 8 commits intomainfrom
update-magnum14

Conversation

@mosra
Copy link
Copy Markdown
Contributor

@mosra mosra commented Jul 20, 2022

Motivation and Context

Changes that aren't really related to the upcoming second batch renderer PR, thus submitting them separately.

Regular update of Magnum submodules:

  • Adapting to a minor API deprecation (BoolVector -> BitVector, for consistency with new BitArray containers and because it's one character less to type)
  • Using now-builtin std::hash specialization for Containers::String
  • No other changes worth mentioning, the major piece of work done lately isn't published yet

And some minor fixes. For faster iterations I'm having a second build directory that uses a system-installed Magnum and has various features disabled, and various code rot prevented that from working:

  • Various CMake updates that are needed if Magnum is external (and are no-op if it's a subproject)
  • Making a build without Bullet work again
  • Making a build with dynamic Magnum work again

And finally, certain bindings code used a private header from magnum-bindings. It's private so I don't guarantee any forward compatibility, I don't want anybody to use it 😝, and it doesn't even get installed which causes a build failure if Magnum is external. I made a copy of that utility directly inside Habiat and the bindings code now uses that instead.

How Has This Been Tested

Builds locally.

Types of changes

  • Docs change / refactoring / dependency upgrade

@mosra mosra requested review from aclegg3 and eundersander July 20, 2022 18:06
@facebook-github-bot facebook-github-bot added the CLA Signed Do not delete this pull request or issue due to inactivity. label Jul 20, 2022
@Skylion007
Copy link
Copy Markdown
Contributor

Using now-builtin std::hash specialization for Containers::String

Nice.

@Skylion007 Skylion007 closed this Jul 20, 2022
@Skylion007 Skylion007 reopened this Jul 20, 2022
@Skylion007
Copy link
Copy Markdown
Contributor

Hmm... "$SRC_DIR/src/esp/bindings/GfxBindings.cpp:15:10: fatal error: 'esp/bindings/EnumOperators.h' file not found"

@mosra
Copy link
Copy Markdown
Contributor Author

mosra commented Jul 20, 2022

Lol, sorry. Fixed.

@Skylion007
Copy link
Copy Markdown
Contributor

Now clang-format is complaining a bit.

@mosra
Copy link
Copy Markdown
Contributor Author

mosra commented Jul 20, 2022

Fixed.

(Note to self: don't open PRs at 8 PM.)

@mosra mosra merged commit f117ab7 into main Aug 1, 2022
@mosra mosra deleted the update-magnum14 branch August 1, 2022 16:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CLA Signed Do not delete this pull request or issue due to inactivity.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants