Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Move version.h and build_overrides.h under Shared folder #1956

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

Merged
ccw808 merged 7 commits into master from feature/shared-version
Feb 3, 2021

Conversation

@patrikjuvonen
Copy link
Contributor

@patrikjuvonen patrikjuvonen commented Dec 29, 2020

Only ccw can merge this

Work done by @qaisjp, moved build_overrides.h under Shared as well as suggested by @ccw808.

As they have minimal differences this makes maintaining easier to have the contents shared between client and server.

Only @ccw808 can merge because this requires build server modifications to support the new build_overrides.h filepath.

//
// To compile a client:
// 1. set MTASA_VERSION_TYPE to VERSION_TYPE_CUSTOM
// 2. Use netc.dll from the latest unstable build (nightly.mtasa.com)
Copy link
Member

@Dutchman101 Dutchman101 Jan 3, 2021

Choose a reason for hiding this comment

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

This comment looks wrong.. the netc.dll made for custom builds (from install-data.bat), which is located at https://mirror.mtasa.com/bdata/netc.dll, should be used.

ccw808 reacted with thumbs up emoji
Copy link
Contributor Author

@patrikjuvonen patrikjuvonen Jan 3, 2021

Choose a reason for hiding this comment

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

That's the current comment on master (https://github.com/multitheftauto/mtasa-blue/blob/master/Client/version.h#L10)

What would be an accurate fix?

Suggested change
// 2. Use netc.dll from the latest unstable build (nightly.mtasa.com)
// 2. Run install-data for netc.dll

This comment was marked as outdated.

Copy link
Contributor Author

@patrikjuvonen patrikjuvonen Jan 16, 2021

Choose a reason for hiding this comment

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

@Dutchman101 Any comment on this?

Copy link
Member

@Dutchman101 Dutchman101 Jan 16, 2021

Choose a reason for hiding this comment

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

To correct the existing comment(s) that are incorrect.. either in this PR or a new one. Like just refer to the existing build instructions or install-data without specific mention of netc. I would suggest to just refer to the build instructions readme.

@botder botder modified the milestones: 1.6, Spring Maintenance Feb 3, 2021
@ccw808 ccw808 merged commit 66409a3 into master Feb 3, 2021
@ccw808 ccw808 deleted the feature/shared-version branch February 3, 2021 16:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Dutchman101 Dutchman101 Dutchman101 requested changes

@ccw808 ccw808 Awaiting requested review from ccw808

Labels

enhancement New feature or request

Projects

None yet

Milestone

1.5.9

Development

Successfully merging this pull request may close these issues.

AltStyle によって変換されたページ (->オリジナル) /