TiManGames / AmnesiaTheDarkDescent

GNU General Public License v3.0
30 stars 8 forks source link

Misc Fixes #63

Closed Saito720 closed 1 month ago

Saito720 commented 1 month ago

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.

jkulawik commented 1 month ago

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:

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