Skip to content
Snippets Groups Projects
Commit ade56642 authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

Disable cef on linux temporarily, fix freetype path for old prebuilt, disable nghttp2

parent b4bccf1d
No related branches found
No related tags found
No related merge requests found
...@@ -7,7 +7,7 @@ if (USESYSTEMLIBS) ...@@ -7,7 +7,7 @@ if (USESYSTEMLIBS)
pkg_check_modules(FREETYPE REQUIRED freetype2) pkg_check_modules(FREETYPE REQUIRED freetype2)
else (USESYSTEMLIBS) else (USESYSTEMLIBS)
use_prebuilt_binary(freetype) use_prebuilt_binary(freetype)
set(FREETYPE_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/freetype/) set(FREETYPE_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/freetype/ ${LIBS_PREBUILT_DIR}/include/freetype2/)
set(FREETYPE_LIBRARIES freetype) set(FREETYPE_LIBRARIES freetype)
endif (USESYSTEMLIBS) endif (USESYSTEMLIBS)
......
...@@ -12,7 +12,7 @@ else (USESYSTEMLIBS) ...@@ -12,7 +12,7 @@ else (USESYSTEMLIBS)
elseif (DARWIN) elseif (DARWIN)
set(NGHTTP2_LIBRARIES libnghttp2.dylib) set(NGHTTP2_LIBRARIES libnghttp2.dylib)
else (WINDOWS) else (WINDOWS)
set(NGHTTP2_LIBRARIES libnghttp2.a) set(NGHTTP2_LIBRARIES)
endif (WINDOWS) endif (WINDOWS)
set(NGHTTP2_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/nghttp2) set(NGHTTP2_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/nghttp2)
endif (USESYSTEMLIBS) endif (USESYSTEMLIBS)
...@@ -13,6 +13,8 @@ if (WINDOWS) ...@@ -13,6 +13,8 @@ if (WINDOWS)
add_subdirectory(libvlc) add_subdirectory(libvlc)
endif (LIBVLCPLUGIN) endif (LIBVLCPLUGIN)
endif (WINDOWS) endif (WINDOWS)
add_subdirectory(cef) if(NOT LINUX)
add_subdirectory(cef)
endif()
### add_subdirectory(example) ### add_subdirectory(example)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment