diff --git a/modules/core_lib/util.lua b/modules/core_lib/util.lua index 2f4707d5..b73cb1ec 100644 --- a/modules/core_lib/util.lua +++ b/modules/core_lib/util.lua @@ -6,6 +6,10 @@ function print(...) g_logger.log(LogInfo, msg) end +function info(msg) + g_logger.log(LogInfo, msg) +end + function warning(msg) g_logger.log(LogWarning, msg) end diff --git a/modules/game_console/console.lua b/modules/game_console/console.lua index 9275a5da..9d6b7299 100644 --- a/modules/game_console/console.lua +++ b/modules/game_console/console.lua @@ -101,7 +101,7 @@ local function onCreatureSpeak(name, level, speaktype, message, channelId, creat Console.addText(message, speaktype, channel) else -- 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 diff --git a/src/framework/CMakeLists.txt b/src/framework/CMakeLists.txt index e813c359..7e07510b 100644 --- a/src/framework/CMakeLists.txt +++ b/src/framework/CMakeLists.txt @@ -87,6 +87,7 @@ FIND_PACKAGE(OpenAL REQUIRED) FIND_PACKAGE(VorbisFile REQUIRED) FIND_PACKAGE(Vorbis REQUIRED) FIND_PACKAGE(Ogg REQUIRED) +FIND_PACKAGE(PNG REQUIRED) IF(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo") MESSAGE(STATUS "Debug information: ON") @@ -147,6 +148,7 @@ INCLUDE_DIRECTORIES( ${PHYSFS_INCLUDE_DIR} ${GMP_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} + ${PNG_INCLUDE_DIR} "${CMAKE_CURRENT_LIST_DIR}/.." ) @@ -159,6 +161,7 @@ SET(framework_LIBRARIES ${VORBISFILE_LIBRARY} ${VORBIS_LIBRARY} ${OGG_LIBRARY} ${OPENGL_LIBRARIES} ${OPENAL_LIBRARY} + ${PNG_LIBRARY} ${ADDITIONAL_LIBRARIES} ) diff --git a/src/framework/cmake/FindPNG.cmake b/src/framework/cmake/FindPNG.cmake new file mode 100644 index 00000000..bc3555d1 --- /dev/null +++ b/src/framework/cmake/FindPNG.cmake @@ -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)