test/Cdroid
1
0
Fork 0
mirror of https://gitee.com/houstudio/Cdroid.git synced 2024-12-02 04:07:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix x64 porting cmakelist.txt

Browse Source
This commit is contained in:
houzh 2022-12-09 11:04:41 +00:00
parent ea203c7b08
commit 03104bcdef
4 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/samples/CMakeLists.txt
View File

@ -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})

2
cmake/options.cmake
View File

@ -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})

2
src/gui/core/app.cc
View File

@ -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;
}

1
src/porting/x64/CMakeLists.txt
View File

@ -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}