Skip to content

Commit

Permalink
[libromdata] Make zlib/png headers PUBLIC.
Browse files Browse the repository at this point in the history
They're needed for compile-time versions, even though the libraries
themselves aren't needed.

This should fix the AppVeyor build.

This fixes a regression from commit 2aedcdf.
([libromdata] CMakeLists: Link most dependencies in PRIVATE instead of PUBLIC.)
  • Loading branch information
GerbilSoft committed Sep 8, 2024
1 parent f44f5f7 commit 5a73dc7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/libromdata/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -716,14 +716,14 @@ ENDIF(WIN32)
# libromdata is built as a shared library.
IF(ZLIB_FOUND)
TARGET_LINK_LIBRARIES(${PROJECT_NAME} PRIVATE ${ZLIB_LIBRARIES})
TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} PRIVATE ${ZLIB_INCLUDE_DIRS})
TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} PUBLIC ${ZLIB_INCLUDE_DIRS})
TARGET_COMPILE_DEFINITIONS(${PROJECT_NAME} PRIVATE ${ZLIB_DEFINITIONS})
ELSE(ZLIB_FOUND)
MESSAGE(FATAL_ERROR "ZLIB_LIBRARIES has not been set by CheckZLIB.cmake.")
ENDIF(ZLIB_FOUND)
IF(PNG_FOUND)
TARGET_LINK_LIBRARIES(${PROJECT_NAME} PRIVATE ${PNG_LIBRARY})
TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} PRIVATE ${PNG_INCLUDE_DIRS})
TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} PUBLIC ${PNG_INCLUDE_DIRS})
TARGET_COMPILE_DEFINITIONS(${PROJECT_NAME} PRIVATE ${PNG_DEFINITIONS})
ENDIF(PNG_FOUND)
IF(JPEG_FOUND)
Expand Down
2 changes: 1 addition & 1 deletion src/libromdata/Console/WiiCommon.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ RomFields::StringMultiMap_t *WiiCommon::getWiiBannerStrings(
}

uint32_t lc;
if (gcnRegion == GCN_REGION_JPN && id4_region == 'W' && langID == WII_LANG_JAPANESE) {
if (langID == WII_LANG_JAPANESE && gcnRegion == GCN_REGION_JPN && id4_region == 'W') {
// Special case: RVL-001(TWN) has a JPN region code.
// Game discs with disc ID region 'W' are localized
// for Taiwan and use Traditional Chinese in the
Expand Down

0 comments on commit 5a73dc7

Please sign in to comment.