Wuzzy
/
BlockColor-Engine
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed some missing linking to libraries

This commit is contained in:
Perttu Ahola 2011-01-08 18:21:22 +02:00
parent d435dedb89
commit d90a183b01
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/CMakeLists.txt
View File

@ -12,9 +12,10 @@ if(UNIX)
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)
find_package(JPEG REQUIRED) find_package(JPEG REQUIRED)
find_package(BZip2 REQUIRED) find_package(BZip2 REQUIRED)
find_package(PNG REQUIRED)
endif(BUILD_CLIENT) endif(BUILD_CLIENT)
find_package(ZLIB REQUIRED) find_package(ZLIB REQUIRED)
set(SERVER_PLATFORM_LIBS -lpthread) set(PLATFORM_LIBS -lpthread)
elseif(WIN32) elseif(WIN32)
# Windows # Windows
# Surpress some warnings # Surpress some warnings
@ -98,6 +99,7 @@ include_directories(
${ZLIB_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}
${CMAKE_BUILD_TYPE} ${CMAKE_BUILD_TYPE}
"${PROJECT_SOURCE_DIR}/jthread" "${PROJECT_SOURCE_DIR}/jthread"
${PNG_INCLUDE_DIR}
) )
set(EXECUTABLE_OUTPUT_PATH ../bin) set(EXECUTABLE_OUTPUT_PATH ../bin)
@ -111,7 +113,10 @@ if(BUILD_CLIENT)
${OPENGL_LIBRARIES} ${OPENGL_LIBRARIES}
${JPEG_LIBRARIES} ${JPEG_LIBRARIES}
${BZIP2_LIBRARIES} ${BZIP2_LIBRARIES}
${PNG_LIBRARIES}
${X11_LIBRARIES}
jthread jthread
${PLATFORM_LIBS}
) )
endif(BUILD_CLIENT) endif(BUILD_CLIENT)
if(BUILD_SERVER) if(BUILD_SERVER)
@ -120,7 +125,7 @@ if(BUILD_SERVER)
minetestserver minetestserver
${ZLIB_LIBRARIES} ${ZLIB_LIBRARIES}
jthread jthread
${SERVER_PLATFORM_LIBS} ${PLATFORM_LIBS}
) )
endif(BUILD_SERVER) endif(BUILD_SERVER)