From 03104bcdef83cdad12e86ab3169c95740179ab6f Mon Sep 17 00:00:00 2001 From: houzh Date: Fri, 9 Dec 2022 11:04:41 +0000 Subject: [PATCH] fix x64 porting cmakelist.txt --- apps/samples/CMakeLists.txt | 3 +-- cmake/options.cmake | 2 -- src/gui/core/app.cc | 2 +- src/porting/x64/CMakeLists.txt | 1 - 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/apps/samples/CMakeLists.txt b/apps/samples/CMakeLists.txt index f6fc48fb..df7edb5e 100755 --- a/apps/samples/CMakeLists.txt +++ b/apps/samples/CMakeLists.txt @@ -26,13 +26,12 @@ file(GLOB ExamplesFileList RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cc") add_custom_target(build_app_examples COMMENT A target that requires all the examples.) if(NOT ENABLE_PLPLOT) -list(REMOVE_ITEM ExamplesFileList plot.cc) + list(REMOVE_ITEM ExamplesFileList plot.cc) endif() add_definitions(--include cdtypes.h) add_definitions(--include cdlog.h) foreach(Example ${ExamplesFileList}) message(STATUS "\tCreating build rule for ${Example}") - # Get the name without extension or directory get_filename_component(ExampleName ${Example} NAME_WE) # Define example executable add_executable(${ExampleName} ${Example}) diff --git a/cmake/options.cmake b/cmake/options.cmake index d5d964f1..27320a89 100755 --- a/cmake/options.cmake +++ b/cmake/options.cmake @@ -44,14 +44,12 @@ list(APPEND CDROID_DEPLIBS ${FREETYPE2_LIBRARIES} ${CAIRO_LIBRARIES} ${ZIP_LIBRARIES} - ${UNIBREAK_LIBRARIES} ${EXPAT_LIBRARIES} ${JSONCPP_LIBRARIES} ${ZLIB_LIBRARIES} ${BROTLIDEC_LIBRARIES} ${BZIP2_LIBRARIES} ) -#string(REPLACE ";" " " CDROID_DEPLIBS ${CDROID_DEPLIBS}) if(ENABLE_FRIBIDI) find_package(Fribidi REQUIRED) list(APPEND CDROID_DEPLIBS ${FRIBIDI_LIBRARIES}) diff --git a/src/gui/core/app.cc b/src/gui/core/app.cc index 80bf1419..6747bb40 100755 --- a/src/gui/core/app.cc +++ b/src/gui/core/app.cc @@ -157,7 +157,7 @@ void App::removeEventHandler(const EventHandler*handler){ } int App::exec(){ - while(!mQuitFlag)Looper::getDefault()->pollAll(5); + while(!mQuitFlag)Looper::getDefault()->pollAll(1); return mExitCode; } diff --git a/src/porting/x64/CMakeLists.txt b/src/porting/x64/CMakeLists.txt index 12469b84..e7a4b9e6 100755 --- a/src/porting/x64/CMakeLists.txt +++ b/src/porting/x64/CMakeLists.txt @@ -88,7 +88,6 @@ endif() list(APPEND X64LIBS pthread) find_package(ZLIB) -message("ZLIB_INCLUDE=${ZLIB_INCLUDE_DIR} X64LIBS=${X64LIBS}" CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR}) include_directories(./ ../common ../include ${DRM_INCLUDE_DIR}