gesche
/
tibia-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmake fixes

This commit is contained in:
Eduardo Bart 2011-05-13 22:28:59 -03:00
parent 5408d333fb
commit 177cc8ba65
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@ -30,17 +30,16 @@ ENDIF(CMAKE_COMPILER_IS_GNUCXX)
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${LUA_INCLUDE_DIRS} ${OPENGL_INCLUDE_DIR}
${YAMLCPP_INCLUDE_DIRS} ${LUA_INCLUDE_DIR}
${PHYSFS_INCLUDE_DIRS} ${YAMLCPP_INCLUDE_DIR}
${PHYSFS_INCLUDE_DIR}
${GMP_INCLUDE_DIR} ${GMP_INCLUDE_DIR}
"${CMAKE_CURRENT_SOURCE_DIR}/src/framework") "${CMAKE_CURRENT_SOURCE_DIR}/src/framework")
LINK_DIRECTORIES( LINK_DIRECTORIES(
${Boost_LIBRARY_DIRS} ${Boost_LIBRARY_DIRS}
${LUA_LIBRARY_DIRS} ${LUA_LIBRARY_DIRS})
${PHYSFS_LIBRARY_DIRS}
${YAMLCPP_LIBRARY_DIRS})
# setup definitions # setup definitions
ADD_DEFINITIONS(-D_REENTRANT) ADD_DEFINITIONS(-D_REENTRANT)
@ -126,10 +125,9 @@ ADD_EXECUTABLE(otclient ${SOURCES})
# target link libraries # target link libraries
TARGET_LINK_LIBRARIES(otclient TARGET_LINK_LIBRARIES(otclient
${Boost_LIBRARIES} ${Boost_LIBRARIES}
${OPENGL_LIBRARY} ${OPENGL_LIBRARIES}
${LUA_LIBRARIES} ${LUA_LIBRARIES}
${YAMLCPP_LIBRARY} ${YAMLCPP_LIBRARY}
${PHYSFS_LIBRARY} ${PHYSFS_LIBRARY}
${PNG_LIBRARY}
${GMP_LIBRARIES} ${GMP_LIBRARIES}
${ADDITIONAL_LIBRARIES}) ${ADDITIONAL_LIBRARIES})

4
src/framework/util/apngloader.cpp
View File

@ -594,8 +594,6 @@ int load_apng(unsigned char *filedata, unsigned int filesize, struct apng_data *
channels = 2; channels = 2;
else if (coltype == 6) else if (coltype == 6)
channels = 4; channels = 4;
if(coltype == 3)
printf("coltype %d w %d h %d\n", coltype, w, h);
pixeldepth = depth*channels; pixeldepth = depth*channels;
bpp = (pixeldepth + 7) >> 3; bpp = (pixeldepth + 7) >> 3;
@ -878,7 +876,6 @@ int load_apng(unsigned char *filedata, unsigned int filesize, struct apng_data *
return 0; return 0;
} }
void free_apng(struct apng_data *apng) void free_apng(struct apng_data *apng)
{ {
if(apng->pdata) if(apng->pdata)
@ -886,3 +883,4 @@ void free_apng(struct apng_data *apng)
if(apng->frames_delay) if(apng->frames_delay)
free(apng->frames_delay); free(apng->frames_delay);
} }