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

Misc Fixes #63

Merged
merged 4 commits into from
Jul 14, 2024
Merged

Misc Fixes #63

merged 4 commits into from
Jul 14, 2024

Conversation

Saito720
Copy link

@Saito720 Saito720 commented Jul 5, 2024

Removed AMFP color grading for MinGW since it's in an unfinished state. Turned off USERDIR_RESOURCES and set the CXX standard to 14 for MinGW.

CXX 14 works without issue. It's the definition just prior to 17. CXX 17 introduced the byte definition conflicts.

…e. Turned off USERDIR_RESOURCES and set the CXX standard to 14 for MinGW.
@jkulawik
Copy link
Collaborator

jkulawik commented Jul 5, 2024

What was the issue with color grading? We don't need it (in fact it would probably be better to review and test that whole feature) but I'm curious.

I'd suggest a few changes:

  • Nitpick, but it would be clearer if USERDIR_RESOURCES was a single option and then was set if MINGW is on
  • Instead of using __MINGW32__ for the colorgrading stuff, it would be good to make that an option and then set it to false for MinGW. So something like this:
option(COLORGRADING_SUPPORT "Add support for color grading areas during compilation" OFF)

if(MINGW)
    set(COLORGRADING_SUPPORT OFF) // or something like this
endif()

// in the HPL2 CMake
if(COLORGRADING_SUPPORT)
    add_compile_definitions(COLORGRADING_SUPPORT)
endif()

On top of that, it would probably be good to check if there is no colorgrading files being added when it's not used. See how with FBX some files are only added if the option is on.

and then in code (note that you'd have to change ifndef do ifdef):

#ifdef COLORGRADING_SUPPORT

@jkulawik jkulawik merged commit c89ead4 into TiManGames:main Jul 14, 2024
@Saito720 Saito720 deleted the misc-fixes branch July 15, 2024 18:50
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