diff --git a/apps/w9/R.h b/apps/w9/R.h index 8ec45b3d..523e1ca8 100644 --- a/apps/w9/R.h +++ b/apps/w9/R.h @@ -19,13 +19,12 @@ namespace R{ static constexpr int text1 = 0x0000271A ;/*10010*/ static constexpr int text2 = 0x0000271B ;/*10011*/ static constexpr int increment = 0x0000271C ;/*10012*/ - static constexpr int numberpicker_input = 0x0000271D ;/*10013*/ - static constexpr int decrement = 0x0000271E ;/*10014*/ - static constexpr int option1 = 0x0000271F ;/*10015*/ - static constexpr int option2 = 0x00002720 ;/*10016*/ - static constexpr int option3 = 0x00002721 ;/*10017*/ - static constexpr int option4 = 0x00002722 ;/*10018*/ - static constexpr int option5 = 0x00002723 ;/*10019*/ + static constexpr int decrement = 0x0000271D ;/*10013*/ + static constexpr int option1 = 0x0000271E ;/*10014*/ + static constexpr int option2 = 0x0000271F ;/*10015*/ + static constexpr int option3 = 0x00002720 ;/*10016*/ + static constexpr int option4 = 0x00002721 ;/*10017*/ + static constexpr int option5 = 0x00002722 ;/*10018*/ };/*namespace id*/ namespace strings{ diff --git a/apps/w9/assets/values/ID.xml b/apps/w9/assets/values/ID.xml index f8367650..27f463aa 100644 --- a/apps/w9/assets/values/ID.xml +++ b/apps/w9/assets/values/ID.xml @@ -13,12 +13,11 @@ 0x0000271a 0x0000271b 0x0000271c - 0x0000271d - 0x0000271e - 0x0000271f - 0x00002720 - 0x00002721 - 0x00002722 - 0x00002723 + 0x0000271d + 0x0000271e + 0x0000271f + 0x00002720 + 0x00002721 + 0x00002722 diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 0d22896e..a2c94c4b 100755 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -74,8 +74,8 @@ configure_file(cdroid.pc.in cdroid.pc @ONLY) install (TARGETS cdroid DESTINATION lib) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cdroid.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig) +install(FILES ${CDROID_DEPLIBS} DESTINATION lib) install (DIRECTORY ${PROJECT_SOURCE_DIR} DESTINATION include/ FILES_MATCHING PATTERN "*.h" PATTERN "view" EXCLUDE PATTERN "core" EXCLUDE) -install (FILES ${LOOPERHEADERS} DESTINATION include/looper) diff --git a/src/gui/widget/html/CMakeLists.txt b/src/gui/widget/html/CMakeLists.txt index 541d1c5b..9838d9d7 100644 --- a/src/gui/widget/html/CMakeLists.txt +++ b/src/gui/widget/html/CMakeLists.txt @@ -25,6 +25,7 @@ set(HEADERS containers/linux/container_linux.h ) +if(litehtml_FOUND) add_library(${PROJECT_NAME} ${SOURCE} ${HEADERS}) include_directories( ./ src containers @@ -39,7 +40,6 @@ include_directories( ${CMAKE_BINARY_DIR}/include/freetype2 ) -if(litehtml_FOUND) target_link_options(${PROJECT_NAME} PRIVATE ${LB_LIBS_LDFLAGS}) target_link_libraries(${PROJECT_NAME} litehtml )#CURL::libcurl ${LB_LIBS_LIBRARIES}) set_target_properties(${PROJECT_NAME} PROPERTIES CXX_STANDARD 11 C_STANDARD 99)