Ticket #118: hildon.patch

File hildon.patch, 2.8 kB (added by sroret, 5 months ago)

Activate HILDON variable and flags

  • CMakeLists.txt

    old new  
    110110#MULTITHREADING 
    111111OPTION (WEBKIT_USE_MULTIPLE_THREADS "Compile Webkit with multiple threads support." OFF) 
    112112 
     113# Use HILDON on N800 
     114OPTION (WEBKIT_USE_N800_HILDON "Compile Webkit with Maemo HILDON support for N8xx." OFF) 
     115 
    113116INCLUDE (CMakeListsCustomer.txt OPTIONAL) 
    114117 
    115118####################################### 
    …… 
    231234    PKG_CHECK_MODULES (XT REQUIRED xt) 
    232235ENDIF (WEBKIT_USE_NPAPI AND ${OWBAL_PLATFORM_GRAPHICS} STREQUAL "GTK") 
    233236 
     237IF (WEBKIT_USE_N800_HILDON) 
     238    PKG_CHECK_MODULES (HILDON hildon-1) 
     239    IF (NOT HILDON_FOUND) 
     240        MESSAGE (SEND_ERROR "hildon-1 ${MESSAGE_NOT_FOUND}\n${MESSAGE_CHOOSE} hildon-1 library.") 
     241    ENDIF (NOT HILDON_FOUND) 
     242ENDIF (WEBKIT_USE_N800_HILDON) 
    234243 
    235244####################################### 
    236245# Set global compilation flags        # 

  • WebKit/ChangeLogOWB

    old new  
     12008-07-04  Sebastien Roret <sroret@pleyo.com> 
     2 
     3        Reviewed by NOBODY (OOPS!). 
     4        Added HILDON cflags use. 
     5 
     6        * OrigynWebBrowser/CMakeLists.txt: 
     7        * gtk/CMakeLists.txt: 
     8 
    192008-07-04  Mario Bensi  <mbensi@pleyo.com> 
    210 
    311        Reviewed by Olivier DOLE. 

  • WebKit/OrigynWebBrowser/CMakeLists.txt

    old new  
    7575    ) 
    7676ENDIF (${OWBAL_PLATFORM_GRAPHICS} STREQUAL "GTK") 
    7777 
     78IF (WEBKIT_USE_N800_HILDON) 
     79    # be sure to add -DMAEMO_CHANGES 
     80    ADD_DEFINITIONS (${HILDON_CFLAGS_OTHER}) 
     81    INCLUDE_DIRECTORIES (${HILDON_INCLUDE_DIRS}) 
     82ENDIF (WEBKIT_USE_N800_HILDON) 
     83 
    7884IF (WEBKIT_USE_I18N STREQUAL "GENERIC") 
    7985    INCLUDE_DIRECTORIES ( 
    8086        ${CMAKE_SOURCE_DIR}/JavaScriptCore/icu 

  • WebKit/gtk/CMakeLists.txt

    old new  
    4747    ${CMAKE_SOURCE_DIR}/WebCore/rendering 
    4848) 
    4949 
     50IF (WEBKIT_USE_N800_HILDON) 
     51    # be sure to add -DMAEMO_CHANGES 
     52    ADD_DEFINITIONS (${HILDON_CFLAGS_OTHER}) 
     53    INCLUDE_DIRECTORIES (${HILDON_INCLUDE_DIRS}) 
     54ENDIF (WEBKIT_USE_N800_HILDON) 
     55 
    5056ADD_CUSTOM_COMMAND (OUTPUT ${CMAKE_BINARY_DIR}/generated_sources/WebKit/webkit-marshal.h ${CMAKE_BINARY_DIR}/generated_sources/WebKit/webkit-marshal.cpp 
    5157    WORKING_DIRECTORY ${CMAKE_BINARY_DIR} 
    5258    COMMAND mkdir -p generated_sources/WebKit