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

raylib: update spinner.cc to use RAYLIB_ prefix #34153

Closed
wants to merge 5 commits into from

Conversation

BBBmau
Copy link
Contributor

@BBBmau BBBmau commented Dec 4, 2024

This is necessary since when I was attempting to use hw.h in initial setup PR I ran into errors where they both had defined COLORS with the same name. spinner still works and is just to resolve the duplicate naming between hw.h and raylib.h

@maxime-desroches
Copy link
Contributor

That's not how you want to do it. You will have to modify it on our fork here first and then bump the commit here

@maxime-desroches
Copy link
Contributor

This might also conflict with colors from ncurses that already use the COLOR_... nomenclature (see here)

@BBBmau
Copy link
Contributor Author

BBBmau commented Dec 4, 2024

That's not how you want to do it. You will have to modify it on our fork here first and then bump the commit here

was actually thinking of whether I needed to make the change on the raylib repo or not. Was gonna go back to check but this confirms it. Thanks!

This might also conflict with colors from ncurses that already use the COLOR_... nomenclature (see here)

I don't see how it would conflict since what you linked is specifically being called for the consoleUI, i don't think we'll ever include both consoleui and raylib.h in one at any point in the future. This particular change is necessary since we are requiring both hw.h and raylib.h in one file setup.cc where both name the color the same variable name.

@maxime-desroches
Copy link
Contributor

It's just confusing to have 2 objects with the same name but not the same origin and definition (when grepping for stuff)

@BBBmau
Copy link
Contributor Author

BBBmau commented Dec 5, 2024

It's just confusing to have 2 objects with the same name but not the same origin and definition (when grepping for stuff)

yeah I agree, we can have the prefix be RAYLIB_ just so it's obvious where its being used. I'll make the changes on the raylib repo and change this PR to just be the commit update later today.

@BBBmau BBBmau changed the title raylib.h: rename color to include COLOR_ prefex raylib: update spinner.cc to use RAYLIB_ prefix Dec 6, 2024
@BBBmau BBBmau marked this pull request as draft December 6, 2024 01:32
@BBBmau
Copy link
Contributor Author

BBBmau commented Dec 6, 2024

I'll mark it as ready for review once the PR in raylib gets merged, then i can push the commit onto here.

@maxime-desroches
Copy link
Contributor

You should be good to include hw.h now

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.

2 participants