diff --git a/code/nel/tools/3d/tile_edit_qt/CMakeLists.txt b/code/nel/tools/3d/tile_edit_qt/CMakeLists.txt index 1e619f496..18fdd5d05 100644 --- a/code/nel/tools/3d/tile_edit_qt/CMakeLists.txt +++ b/code/nel/tools/3d/tile_edit_qt/CMakeLists.txt @@ -1,6 +1,9 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/pic) INCLUDE( ${QT_USE_FILE} ) +FIND_PACKAGE(JPEG) +INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR}) + FILE(GLOB TILE_EDIT_SRC *.cpp *.h) FILE(GLOB PIC_SRC pic/*.c pic/*.cpp) SET(TILE_EDIT_HDR items_edit_dlg.h tile_browser_dlg.h tile_edit_dlg.h tile_rotation_dlg.h tiles_model.h tile_widget.h) @@ -18,7 +21,7 @@ SOURCE_GROUP(PICLibrary FILES ${PIC_SRC}) ADD_EXECUTABLE(tile_edit_qt ${TILE_EDIT_SRC} ${PIC_SRC} ${TILE_EDIT_MOC_SRCS} ${TILE_EDIT_RC_SRCS} ${TILE_EDIT_UI_HDRS}) -TARGET_LINK_LIBRARIES(tile_edit_qt ${QT_LIBRARIES} nelmisc nel3d) +TARGET_LINK_LIBRARIES(tile_edit_qt ${QT_LIBRARIES} ${JPEG_LIBRARY} nelmisc nel3d) NL_DEFAULT_PROPS(tile_edit_qt "NeL, Tools, 3D: Qt Tile Editor") NL_ADD_RUNTIME_FLAGS(tile_edit_qt) diff --git a/code/nel/tools/3d/tile_edit_qt/pic/PIC_System.c b/code/nel/tools/3d/tile_edit_qt/pic/PIC_System.c index f47bc7064..4e97fed78 100644 --- a/code/nel/tools/3d/tile_edit_qt/pic/PIC_System.c +++ b/code/nel/tools/3d/tile_edit_qt/pic/PIC_System.c @@ -1,6 +1,8 @@ #include #include +#if !defined(__APPLE__) #include +#endif #include #include @@ -9,7 +11,9 @@ static unsigned long PIC_Sys_MEM_Allocated; static unsigned long PIC_Sys_MEM_NbAllocs; -#ifdef __GNUC__ +#if defined(__APPLE__) +#define _msize malloc_size +#elif defined(__GNUC__) #define _msize malloc_usable_size #endif /* __GNUC__ */