Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a flag that allows building standard targets in Emscripten. #410

Merged
merged 1 commit into from
Jun 4, 2018
Merged

Add a flag that allows building standard targets in Emscripten. #410

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ option(ENABLE_DISTCC "Enable distcc support." OFF)
option(ENABLE_EXTRA_SPEED "" OFF)
option(ENABLE_EXTRA_WARNINGS "" OFF)
option(ENABLE_GOMA "Enable goma support." OFF)
option(ENABLE_JS_GLUE "Enable JS Glue and JS targets when using Emscripten." ON)
option(ENABLE_MESH_COMPRESSION "" ON)
option(ENABLE_POINT_CLOUD_COMPRESSION "" ON)
option(ENABLE_PREDICTIVE_EDGEBREAKER "" ON)
Expand Down Expand Up @@ -547,7 +548,6 @@ set(draco_js_enc_sources
"${draco_src_root}/javascript/emscripten/draco_encoder_glue_wrapper.cc"
"${draco_src_root}/javascript/emscripten/encoder_webidl_wrapper.cc")


set(draco_test_sources
"${draco_src_root}/attributes/point_attribute_test.cc"
"${draco_src_root}/compression/attributes/prediction_schemes/prediction_scheme_normal_octahedron_canonicalized_transform_test.cc"
Expand Down Expand Up @@ -597,14 +597,12 @@ set(draco_maya_plug_sources
"${draco_src_root}/maya/draco_maya_plugin.cc"
"${draco_src_root}/maya/draco_maya_plugin.h")



include_directories("${draco_root}/src" "${draco_build_dir}")
include_directories("${draco_root}/src" "${draco_build_dir}")

#
# Draco targets.
#
if (EMSCRIPTEN)
if (EMSCRIPTEN AND ENABLE_JS_GLUE)
# Draco js decoder.
require_compiler_flag("-s ALLOW_MEMORY_GROWTH=1" YES)
require_compiler_flag("-Wno-almost-asm" YES)
Expand Down Expand Up @@ -650,7 +648,6 @@ if (EMSCRIPTEN)
message(FATAL_ERROR "Glue generation failed.")
endif ()


# Add a custom rule depending on the IDL to regenerate
# ${draco_build_dir}/glue_decoder.cpp as needed.
add_custom_command(OUTPUT ${draco_build_dir}/glue_decoder.cpp
Expand All @@ -673,7 +670,6 @@ if (EMSCRIPTEN)
WORKING_DIRECTORY ${draco_build_dir}
VERBATIM)


set(draco_decoder_src
${draco_attributes_sources}
${draco_compression_attributes_dec_sources}
Expand All @@ -691,6 +687,7 @@ if (EMSCRIPTEN)
${draco_point_cloud_sources}
${draco_points_dec_sources}
${draco_version_sources})

set(draco_encoder_src
${draco_attributes_sources}
${draco_compression_attributes_enc_sources}
Expand All @@ -709,7 +706,6 @@ if (EMSCRIPTEN)
${draco_points_enc_sources}
${draco_version_sources})


add_executable(draco_decoder
${draco_js_dec_sources}
${draco_decoder_src})
Expand Down