Merge branch 'buck-yeh-patch-1' into hotfix-1.5.6
This commit is contained in:
commit
56143087c3
@ -131,7 +131,7 @@ endif(APPLE)
|
|||||||
|
|
||||||
if(UNIX)
|
if(UNIX)
|
||||||
list(APPEND NANA_LINKS -lX11)
|
list(APPEND NANA_LINKS -lX11)
|
||||||
find_package(Freetype)
|
include(FindFreetype)
|
||||||
if (FREETYPE_FOUND)
|
if (FREETYPE_FOUND)
|
||||||
include_directories( ${FREETYPE_INCLUDE_DIRS})
|
include_directories( ${FREETYPE_INCLUDE_DIRS})
|
||||||
list(APPEND NANA_LINKS -lXft)
|
list(APPEND NANA_LINKS -lXft)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user