diff --git a/CMakeLists.txt b/CMakeLists.txt index fcbb0a57..27f073fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,17 +30,16 @@ ENDIF(CMAKE_COMPILER_IS_GNUCXX) INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIRS} - ${LUA_INCLUDE_DIRS} - ${YAMLCPP_INCLUDE_DIRS} - ${PHYSFS_INCLUDE_DIRS} + ${OPENGL_INCLUDE_DIR} + ${LUA_INCLUDE_DIR} + ${YAMLCPP_INCLUDE_DIR} + ${PHYSFS_INCLUDE_DIR} ${GMP_INCLUDE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/src/framework") LINK_DIRECTORIES( ${Boost_LIBRARY_DIRS} - ${LUA_LIBRARY_DIRS} - ${PHYSFS_LIBRARY_DIRS} - ${YAMLCPP_LIBRARY_DIRS}) + ${LUA_LIBRARY_DIRS}) # setup definitions ADD_DEFINITIONS(-D_REENTRANT) @@ -126,10 +125,9 @@ ADD_EXECUTABLE(otclient ${SOURCES}) # target link libraries TARGET_LINK_LIBRARIES(otclient ${Boost_LIBRARIES} - ${OPENGL_LIBRARY} + ${OPENGL_LIBRARIES} ${LUA_LIBRARIES} ${YAMLCPP_LIBRARY} ${PHYSFS_LIBRARY} - ${PNG_LIBRARY} ${GMP_LIBRARIES} ${ADDITIONAL_LIBRARIES}) diff --git a/src/framework/util/apngloader.cpp b/src/framework/util/apngloader.cpp index f22fe0ae..740f3967 100644 --- a/src/framework/util/apngloader.cpp +++ b/src/framework/util/apngloader.cpp @@ -594,8 +594,6 @@ int load_apng(unsigned char *filedata, unsigned int filesize, struct apng_data * channels = 2; else if (coltype == 6) channels = 4; - if(coltype == 3) - printf("coltype %d w %d h %d\n", coltype, w, h); pixeldepth = depth*channels; bpp = (pixeldepth + 7) >> 3; @@ -878,11 +876,11 @@ int load_apng(unsigned char *filedata, unsigned int filesize, struct apng_data * return 0; } - void free_apng(struct apng_data *apng) { if(apng->pdata) free(apng->pdata); if(apng->frames_delay) free(apng->frames_delay); -} \ No newline at end of file +} +