mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'loaden-develop' into develop

Browse Source
This commit is contained in:
Jinhao 2018-04-07 23:09:02 +08:00
commit 82a6070145
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitignore vendored
View File

@ -7,6 +7,7 @@ bii/cmake/*
bii/deps/* bii/deps/*
build/vc2013-bkl/* build/vc2013-bkl/*
build/makefile-bkl/* build/makefile-bkl/*
build/compile_commands.json
*.obj *.obj
*.exe *.exe
*.pdb *.pdb
@ -44,6 +45,6 @@ cmake-build-debug/
cmake_install.cmake cmake_install.cmake
*.DS_Store *.DS_Store
*.db *.db
*.opendb *.opendb
.vscode .vscode

2
CMakeLists.txt
View File

@ -128,7 +128,7 @@ if(UNIX)
include(FindFreetype) 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 -lfontconfig)
endif() endif()
endif() endif()