Updates for emscripten, along with travis builds

This commit is contained in:
Jonny
2019-02-28 18:13:00 +00:00
committed by Joshua Brookover
parent 95cb070eb2
commit 22805562b0
2 changed files with 20 additions and 1 deletions

View File

@@ -71,6 +71,18 @@ matrix:
env:
- AMALGAMATED=ON
- name: "Emscripten"
os: linux
dist: xenial
language: node_js
services:
- docker
before_script:
- docker run -dit --name emscripten -v $(pwd):/src trzeci/emscripten:sdk-incoming-64bit bash
script:
- docker exec -it emscripten emconfigure cmake . -DBGFX_BUILD_TOOLS=OFF
- docker exec -it emscripten emmake make
script:
- mkdir build && cd build
- cmake $CMAKE_FLAGS -DBGFX_INSTALL_EXAMPLES=ON -DBGFX_AMALGAMATED=$AMALGAMATED -DBX_AMALGAMATED=$AMALGAMATED ..

View File

@@ -143,13 +143,20 @@ function( add_example ARG_NAME )
target_compile_definitions( example-${ARG_NAME} PRIVATE "-D_CRT_SECURE_NO_WARNINGS" "-D__STDC_FORMAT_MACROS" "-DENTRY_CONFIG_IMPLEMENT_MAIN=1" )
# Configure shaders
if( NOT ARG_COMMON )
if( NOT ARG_COMMON AND NOT IOS AND NOT EMSCRIPTEN)
foreach( SHADER ${SHADERS} )
add_bgfx_shader( ${SHADER} ${ARG_NAME} )
endforeach()
source_group( "Shader Files" FILES ${SHADERS})
endif()
if (NOT ARG_COMMON AND EMSCRIPTEN)
target_link_libraries(example-${ARG_NAME}
"-s PRECISE_F32=1"
"-s TOTAL_MEMORY=268435456"
"--memory-init-file 1")
endif()
# Directory name
set_target_properties( example-${ARG_NAME} PROPERTIES FOLDER "bgfx/examples" )
endfunction()