id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-04-24 10:38:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix system vs. bundled library logic, suppress gcc/clang warnings for some third party source libs (jpeg, zlib, minizip)

Browse source
This commit is contained in:
Stephen Saunders 2023-06-26 15:39:13 -04:00
parent c0e6c7a5dd
commit a99c11730e
2 changed files with 65 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

95
neo/CMakeLists.txt
View file

@ -314,33 +314,10 @@ if(STANDALONE)
set(DOOM_CLASSIC OFF)
endif()
if (USE_SYSTEM_ZLIB)
find_package(ZLIB REQUIRED)
endif(USE_SYSTEM_ZLIB)
if (ZLIB_FOUND)
include_directories(${ZLIB_INCLUDE_DIRS})
set(ZLIB_LIBRARY ${ZLIB_LIBRARIES})
else (ZLIB_FOUND)
include_directories("libs/zlib")
set(ZLIB_LIBRARY "" )
endif (ZLIB_FOUND)
if(USE_SYSTEM_LIBPNG)
find_package(PNG REQUIRED)
endif (USE_SYSTEM_LIBPNG)
if (PNG_FOUND)
include_directories(${PNG_INCLUDE_DIRS})
set(PNG_LIBRARY ${PNG_LIBRARIES})
else (PNG_FOUND)
include_directories("libs/png")
set(PNG_LIBRARY "" )
endif (PNG_FOUND)
if(USE_SYSTEM_LIBJPEG)
find_package(JPEG REQUIRED)
endif(USE_SYSTEM_LIBJPEG)
# SRS - set libjpeg as first include path to prioritize bundled format_message() fix
if (USE_SYSTEM_LIBJPEG)
find_package(JPEG)
endif (USE_SYSTEM_LIBJPEG)
if (JPEG_FOUND)
include_directories(${JPEG_INCLUDE_DIRS})
@ -351,6 +328,44 @@ else (JPEG_FOUND)
set(JPEG_LIBRARY "" )
endif (JPEG_FOUND)
if (USE_SYSTEM_LIBPNG)
find_package(PNG)
endif (USE_SYSTEM_LIBPNG)
# SRS - if system libpng was found, then system zlib was also found via cmake dependency
if (PNG_FOUND)
include_directories(${PNG_INCLUDE_DIRS})
set(PNG_LIBRARY ${PNG_LIBRARIES})
else (PNG_FOUND)
include_directories("libs/png")
set(PNG_LIBRARY "" )
# SRS - search for system zlib only if we have not already searched via system libpng
if (USE_SYSTEM_ZLIB AND NOT USE_SYSTEM_LIBPNG)
find_package(ZLIB)
endif (USE_SYSTEM_ZLIB AND NOT USE_SYSTEM_LIBPNG)
if (USE_SYSTEM_ZLIB AND ZLIB_FOUND)
include_directories(${ZLIB_INCLUDE_DIRS})
set(ZLIB_LIBRARY ${ZLIB_LIBRARIES})
else (USE_SYSTEM_ZLIB AND ZLIB_FOUND)
include_directories("libs/zlib")
set(ZLIB_LIBRARY "" )
endif (USE_SYSTEM_ZLIB AND ZLIB_FOUND)
endif (PNG_FOUND)
#SRS - move rapidjson before vulkan and other includes to prioritize bundled iterator fixes
if (USE_SYSTEM_RAPIDJSON)
find_package(rapidjson)
endif (USE_SYSTEM_RAPIDJSON)
if (RAPIDJSON_FOUND)
include_directories("${RAPIDJSON_INCLUDE_DIRS}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${RAPIDJSON_CXX_FLAGS}")
else (RAPIDJSON_FOUND)
include_directories("libs/rapidjson/include")
endif (RAPIDJSON_FOUND)
include_directories("libs/imgui")
macro(SET_OPTION option value)
@ -441,19 +456,6 @@ endif()
include_directories(${NVRHI_DIR}/include)
if(USE_SYSTEM_RAPIDJSON)
find_package(rapidjson REQUIRED)
endif(USE_SYSTEM_RAPIDJSON)
if (RAPIDJSON_FOUND)
include_directories("${RAPIDJSON_INCLUDE_DIRS}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${RAPIDJSON_CXX_FLAGS}")
else (RAPIDJSON_FOUND)
include_directories("libs/rapidjson/include")
endif (RAPIDJSON_FOUND)
include_directories("libs/optick")
if(OPTICK)
@ -1539,14 +1541,14 @@ if(MSVC)
)
endif()
# SRS - disable certain MSVC-specific warnings for select third-party source libraries, consider updating versions in the future?
# SRS - disable certain MSVC warnings for select third-party source libraries, consider updating versions in the future?
set_source_files_properties(
${JPEG_SOURCES}
${PNG_SOURCES}
${OGGVORBIS_SOURCES}
PROPERTIES
COMPILE_FLAGS "/wd4101 /wd4267" # C4101: unreferenced local variable, C4267: type conversion with possible loss of data
)
)
list(APPEND RBDOOM3_SOURCES ${WIN32_RESOURCES})
@ -1685,6 +1687,15 @@ else()
LIST(APPEND _compiler_FLAGS " -I${item}")
ENDFOREACH(item)
endif()
# SRS - disable certain gcc/clang warnings for select third-party source libraries, consider updating versions in the future?
set_source_files_properties(
${JPEG_SOURCES}
${ZLIB_SOURCES}
${MINIZIP_SOURCES}
PROPERTIES
COMPILE_FLAGS "-Wno-stringop-overread -Wno-deprecated-non-prototype"
)
GET_DIRECTORY_PROPERTY(_directory_flags DEFINITIONS)
LIST(APPEND _compiler_FLAGS ${_directory_flags})

12
neo/swf/SWF_Image.cpp
View file

@ -43,13 +43,25 @@ These are the static callback functions the jpeg library calls
void swf_jpeg_error_exit( jpeg_common_struct* cinfo )
{
char buffer[JMSG_LENGTH_MAX] = {0};
#ifdef USE_NEWER_JPEG
// SRS - use system jpeg lib with standard format_message() API
( *cinfo->err->format_message )( cinfo, buffer );
#else
// SRS - use bundled jpeg lib with secure format_message() API
( *cinfo->err->format_message )( cinfo, buffer, sizeof( buffer ) );
#endif
throw idException( buffer );
}
void swf_jpeg_output_message( jpeg_common_struct* cinfo )
{
char buffer[JMSG_LENGTH_MAX] = {0};
#ifdef USE_NEWER_JPEG
// SRS - use system jpeg lib with standard format_message() API
( *cinfo->err->format_message )( cinfo, buffer );
#else
// SRS - use bundled jpeg lib with secure format_message() API
( *cinfo->err->format_message )( cinfo, buffer, sizeof( buffer ) );
#endif
idLib::Printf( "%s\n", buffer );
}
void swf_jpeg_init_source( jpeg_decompress_struct* cinfo )