Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Build System Rewrite] mapjson now takes output directory parameters. #1949

Merged
merged 3 commits into from
Aug 29, 2024

Conversation

Icedude907
Copy link
Contributor

@Icedude907 Icedude907 commented Nov 11, 2023

Hey all, I'm back.
This time, I'll try and spread my commits out into smaller chunks.

Previous PR was #1920

3 changes:

  • mapjson takes parameters for output directories (C++11 compatible at GriffinRichards Request)
  • the Makefile no longer has redundant code shared with make_tools.mk
  • files generated by mapjson are .gitignored correctly & made in the correct order

More to come soon

Discord contact info

icedude907

Removed generated files (layouts.h, map_groups.h) from git.
make_tools.mk Outdated Show resolved Hide resolved
map_data_rules.mk Outdated Show resolved Hide resolved
@Icedude907 Icedude907 force-pushed the build-mapjson-improvement branch from 6812f15 to 2b75819 Compare November 23, 2023 22:57
Copy link
Member

@GriffinRichards GriffinRichards left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I won't be back at a computer until Monday (so I haven't tested this any more) but from what I looked at on my phone this looks good to me

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants