diff options
| author | trav90 <travawine@palemoon.org> | 2018-10-19 23:05:00 -0500 |
|---|---|---|
| committer | trav90 <travawine@palemoon.org> | 2018-10-19 23:05:03 -0500 |
| commit | d2499ead93dc4298c0882fe98902acb1b5209f99 (patch) | |
| tree | cb0b942aed59e5108f9a3e9d64e7b77854383421 /third_party/aom/build/cmake/exports.cmake | |
| parent | 41fbdea457bf50c0a43e1c27c5cbf7f0a3a9eb33 (diff) | |
| download | UXP-d2499ead93dc4298c0882fe98902acb1b5209f99.tar UXP-d2499ead93dc4298c0882fe98902acb1b5209f99.tar.gz UXP-d2499ead93dc4298c0882fe98902acb1b5209f99.tar.lz UXP-d2499ead93dc4298c0882fe98902acb1b5209f99.tar.xz UXP-d2499ead93dc4298c0882fe98902acb1b5209f99.zip | |
Update libaom to commit ID 1e227d41f0616de9548a673a83a21ef990b62591
Diffstat (limited to 'third_party/aom/build/cmake/exports.cmake')
| -rw-r--r-- | third_party/aom/build/cmake/exports.cmake | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/third_party/aom/build/cmake/exports.cmake b/third_party/aom/build/cmake/exports.cmake index 5abfc9a5f..e0813dc0f 100644 --- a/third_party/aom/build/cmake/exports.cmake +++ b/third_party/aom/build/cmake/exports.cmake @@ -34,7 +34,8 @@ function(setup_exports_target) -DAOM_SYM_FILE="${aom_sym_file}" -DAOM_MSVC=${MSVC} -DAOM_XCODE=${XCODE} -DCONFIG_NAME=$<CONFIG> -DCONFIG_AV1_DECODER=${CONFIG_AV1_DECODER} - -DCONFIG_AV1_ENCODER=${CONFIG_AV1_ENCODER} -P + -DCONFIG_AV1_ENCODER=${CONFIG_AV1_ENCODER} + -DENABLE_TESTS=${ENABLE_TESTS} -P "${AOM_ROOT}/build/cmake/generate_exports.cmake" SOURCES ${AOM_EXPORTS_SOURCES} DEPENDS ${AOM_EXPORTS_SOURCES}) @@ -47,10 +48,12 @@ function(setup_exports_target) set_property(TARGET aom APPEND_STRING PROPERTY LINK_FLAGS "-exported_symbols_list ${aom_sym_file}") elseif(WIN32) - message(FATAL_ERROR "Windows DLL builds not supported yet.") if(NOT MSVC) set_property(TARGET aom APPEND_STRING PROPERTY LINK_FLAGS "-Wl,--version-script ${aom_sym_file}") + else() + set_property(TARGET aom APPEND_STRING + PROPERTY LINK_FLAGS "/DEF:${aom_sym_file}") endif() # TODO(tomfinegan): Sort out the import lib situation and flags for MSVC. |