From d90a183b01042c90c9ea02627f00f585e3083e52 Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Sat, 8 Jan 2011 18:21:22 +0200 Subject: [PATCH] Fixed some missing linking to libraries --- src/CMakeLists.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e55e502f..6aed1543 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -12,9 +12,10 @@ if(UNIX) find_package(OpenGL REQUIRED) find_package(JPEG REQUIRED) find_package(BZip2 REQUIRED) + find_package(PNG REQUIRED) endif(BUILD_CLIENT) find_package(ZLIB REQUIRED) - set(SERVER_PLATFORM_LIBS -lpthread) + set(PLATFORM_LIBS -lpthread) elseif(WIN32) # Windows # Surpress some warnings @@ -98,6 +99,7 @@ include_directories( ${ZLIB_INCLUDE_DIR} ${CMAKE_BUILD_TYPE} "${PROJECT_SOURCE_DIR}/jthread" + ${PNG_INCLUDE_DIR} ) set(EXECUTABLE_OUTPUT_PATH ../bin) @@ -111,7 +113,10 @@ if(BUILD_CLIENT) ${OPENGL_LIBRARIES} ${JPEG_LIBRARIES} ${BZIP2_LIBRARIES} + ${PNG_LIBRARIES} + ${X11_LIBRARIES} jthread + ${PLATFORM_LIBS} ) endif(BUILD_CLIENT) if(BUILD_SERVER) @@ -120,7 +125,7 @@ if(BUILD_SERVER) minetestserver ${ZLIB_LIBRARIES} jthread - ${SERVER_PLATFORM_LIBS} + ${PLATFORM_LIBS} ) endif(BUILD_SERVER) -- 2.30.2