christoph/wamr
1
Fork 0
Code Releases Activity

Optimize samples build process and build 64 bit binaries by default (#90)

Browse Source 
* Optimize samples build process

* Samples: build 64 bit version by default
This commit is contained in:
Weining
2019-08-02 14:00:35 +08:00
committed by wenyongh
parent 09d5149081
commit 3b19306869
17 changed files with 177 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
samples/gui/wasm-runtime-wgl/linux-build/CMakeLists.txt
View File

@ -7,27 +7,8 @@ set(WASM_DIR ${REPO_ROOT_DIR}/core/iwasm)
set(APP_MGR_DIR ${REPO_ROOT_DIR}/core/app-mgr)
set(SHARED_DIR ${REPO_ROOT_DIR}/core/shared-lib)
set (lv_drivers_name lv_drivers)
set (lv_name lvgl)
set (LV_DRIVERS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../src/platform/linux/${lv_drivers_name})
set (LVGL_DIR ${WASM_DIR}/lib/3rdparty/${lv_name})
if ((NOT EXISTS ${LVGL_DIR}) OR (NOT EXISTS ${LV_DRIVERS_DIR}))
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt.in ${CMAKE_CURRENT_BINARY_DIR}/download_lvgl_drivers/CMakeLists.txt)
execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" .
RESULT_VARIABLE result
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/download_lvgl_drivers )
if(result)
message(FATAL_ERROR "CMake step for lvgl drivers failed: ${result}")
endif()
execute_process(COMMAND ${CMAKE_COMMAND} --build .
RESULT_VARIABLE result
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/download_lvgl_drivers )
if(result)
message(FATAL_ERROR "Build step for lvgl drivers failed: ${result}")
endif()
endif()
set (LV_DRIVERS_DIR ${WASM_DIR}/lib/3rdparty/lv_drivers)
set (LVGL_DIR ${WASM_DIR}/lib/3rdparty/lvgl)
file(GLOB_RECURSE LV_DRIVERS_SOURCES "${LV_DRIVERS_DIR}/*.c" )
@ -95,10 +76,12 @@ include (${SHARED_DIR}/coap/lib_coap.cmake)
set (PROJECT_SRC_DIR ${CMAKE_CURRENT_LIST_DIR}/../src/platform/${TARGET_PLATFORM})
include_directories(${SHARED_DIR}/include)
include_directories(${PROJECT_SRC_DIR})
add_definitions (-DWASM_ENABLE_BASE_LIB)
add_definitions (-Dattr_container_malloc=bh_malloc)
add_definitions (-Dattr_container_free=bh_free)
add_definitions (-DLV_CONF_INCLUDE_SIMPLE)
add_library (vmlib
${WASM_PLATFORM_LIB_SOURCE}