add libpng as dependency
* NOTE: you will need to download the new required libraries
This commit is contained in:
parent
1c12bc3fb2
commit
cc965bb77b
|
@ -6,6 +6,10 @@ function print(...)
|
||||||
g_logger.log(LogInfo, msg)
|
g_logger.log(LogInfo, msg)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function info(msg)
|
||||||
|
g_logger.log(LogInfo, msg)
|
||||||
|
end
|
||||||
|
|
||||||
function warning(msg)
|
function warning(msg)
|
||||||
g_logger.log(LogWarning, msg)
|
g_logger.log(LogWarning, msg)
|
||||||
end
|
end
|
||||||
|
|
|
@ -101,7 +101,7 @@ local function onCreatureSpeak(name, level, speaktype, message, channelId, creat
|
||||||
Console.addText(message, speaktype, channel)
|
Console.addText(message, speaktype, channel)
|
||||||
else
|
else
|
||||||
-- server sent a message on a channel that is not open
|
-- server sent a message on a channel that is not open
|
||||||
warning('message in channel id ', channelId, ' which is unknown, this is a server bug, relogin if you want to see messages in this channel')
|
warning('message in channel id ' .. channelId .. ' which is unknown, this is a server bug, relogin if you want to see messages in this channel')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -87,6 +87,7 @@ FIND_PACKAGE(OpenAL REQUIRED)
|
||||||
FIND_PACKAGE(VorbisFile REQUIRED)
|
FIND_PACKAGE(VorbisFile REQUIRED)
|
||||||
FIND_PACKAGE(Vorbis REQUIRED)
|
FIND_PACKAGE(Vorbis REQUIRED)
|
||||||
FIND_PACKAGE(Ogg REQUIRED)
|
FIND_PACKAGE(Ogg REQUIRED)
|
||||||
|
FIND_PACKAGE(PNG REQUIRED)
|
||||||
|
|
||||||
IF(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
|
IF(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
|
||||||
MESSAGE(STATUS "Debug information: ON")
|
MESSAGE(STATUS "Debug information: ON")
|
||||||
|
@ -147,6 +148,7 @@ INCLUDE_DIRECTORIES(
|
||||||
${PHYSFS_INCLUDE_DIR}
|
${PHYSFS_INCLUDE_DIR}
|
||||||
${GMP_INCLUDE_DIR}
|
${GMP_INCLUDE_DIR}
|
||||||
${ZLIB_INCLUDE_DIR}
|
${ZLIB_INCLUDE_DIR}
|
||||||
|
${PNG_INCLUDE_DIR}
|
||||||
"${CMAKE_CURRENT_LIST_DIR}/.."
|
"${CMAKE_CURRENT_LIST_DIR}/.."
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -159,6 +161,7 @@ SET(framework_LIBRARIES
|
||||||
${VORBISFILE_LIBRARY} ${VORBIS_LIBRARY} ${OGG_LIBRARY}
|
${VORBISFILE_LIBRARY} ${VORBIS_LIBRARY} ${OGG_LIBRARY}
|
||||||
${OPENGL_LIBRARIES}
|
${OPENGL_LIBRARIES}
|
||||||
${OPENAL_LIBRARY}
|
${OPENAL_LIBRARY}
|
||||||
|
${PNG_LIBRARY}
|
||||||
${ADDITIONAL_LIBRARIES}
|
${ADDITIONAL_LIBRARIES}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,10 @@
|
||||||
|
# Try to find the PNG librairy
|
||||||
|
# PNG_FOUND - system has PNG
|
||||||
|
# PNG_INCLUDE_DIR - the PNG include directory
|
||||||
|
# PNG_LIBRARY - the PNG library
|
||||||
|
|
||||||
|
FIND_PATH(PNG_INCLUDE_DIR NAMES png.h)
|
||||||
|
FIND_LIBRARY(PNG_LIBRARY NAMES libpng15.a libpng.a png15 png)
|
||||||
|
INCLUDE(FindPackageHandleStandardArgs)
|
||||||
|
FIND_PACKAGE_HANDLE_STANDARD_ARGS(PNG DEFAULT_MSG PNG_LIBRARY PNG_INCLUDE_DIR)
|
||||||
|
MARK_AS_ADVANCED(PNG_LIBRARY PNG_INCLUDE_DIR)
|
Loading…
Reference in New Issue