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

Fix variable name in Linux build instructions #261

Merged
merged 1 commit into from May 2, 2024

Conversation

Jayman2000
Copy link
Contributor

Pull Request Type

  • GitHub Workflow changes
  • Documentation or Wiki changes
  • Build and Dependency changes
  • Runtime changes
    • Render changes
    • Audio changes
    • Input changes
    • Network changes
    • Other changes

Description

0b41a1b (CMake: expose BUILD_TESTNG option, rename LOGGER to ENABLE_LOGGER, 2024-04-29) had originally introduced this change. It looks like d132a1c (Merge pull request #251 from winterheart/pstring-unittests, 2024-05-01) unintentionally removed this change.

Related Issues

Checklist

  • I have tested my changes locally and verified that they work as intended.
  • I have documented any new or modified functionality.
  • I have reviewed the changes to ensure they do not introduce any unnecessary complexity or duplicate code.
  • I understand that by submitting this pull request, I am agreeing to license my contributions under the project's license.

Additional Comments

@Lgt2x
Copy link
Collaborator

Lgt2x commented May 1, 2024

while you're at it could you also replace the wrong package spdlog-dev by libspdlog-dev in the Ubuntu install instructions? Thanks!

@Jayman2000
Copy link
Contributor Author

while you're at it could you also replace the wrong package spdlog-dev by libspdlog-dev in the Ubuntu install instructions? Thanks!

I actually already made that change in #259.

@JeodC
Copy link
Member

JeodC commented May 1, 2024

Why would you not merge your two PRs into one if they affect the same file? This will prevent conflicts when one is merged.

@Jayman2000
Copy link
Contributor Author

Why would you not merge your two PRs into one if they affect the same file? This will prevent conflicts when one is merged.

I finished the other PR before I figured out what to do about this issue. The other PR’s branch’s name is build-instructions-dependency-corrections. In order to update that PR, I would have to rename the branch because this fix isn’t dependency-related. Unfortunately, you can’t change a PR branch’s name. Instead, you have to close the old pull request and open a new one. I didn't want to close that pull request, so I decided to open a new one with just this change.

Do you want me to create a new pull request that is a combination of both this PR and #259?

@JeodC
Copy link
Member

JeodC commented May 1, 2024

Nah the explanation is fine. Thanks.

0b41a1b (CMake: expose BUILD_TESTNG option, rename LOGGER to
ENABLE_LOGGER, 2024-04-29) had originally introduced this change. It
looks like d132a1c (Merge pull request DescentDevelopers#251 from
winterheart/pstring-unittests, 2024-05-01) unintentionally removed this
change.
@JeodC JeodC merged commit 67ecea0 into DescentDevelopers:main May 2, 2024
@Jayman2000 Jayman2000 deleted the fix-logger-variable branch May 2, 2024 12:03
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.

None yet

3 participants