diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2016-12-05 17:01:38 -0500 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2016-12-05 17:01:38 -0500 |
commit | 05d58c91ef55fd90ea2f3e0f1a1199ac5e690b30 (patch) | |
tree | 70ae80b97c738ceee3b4ba530454e97a8698b6cb /indra/media_plugins/libvlc/CMakeLists.txt | |
parent | 68413474c4479eee9bdbeb34ea131475ba1d646e (diff) | |
parent | 4ca084f7a06acc4ef861c1f4df2f857f8836b85e (diff) |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/media_plugins/libvlc/CMakeLists.txt')
-rw-r--r-- | indra/media_plugins/libvlc/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/media_plugins/libvlc/CMakeLists.txt b/indra/media_plugins/libvlc/CMakeLists.txt index 535d29125b..32574c7afa 100644 --- a/indra/media_plugins/libvlc/CMakeLists.txt +++ b/indra/media_plugins/libvlc/CMakeLists.txt @@ -33,13 +33,13 @@ include_directories(SYSTEM ### media_plugin_libvlc -if(NOT WORD_SIZE EQUAL 32) +if(NOT ADDRESS_SIZE EQUAL 32) if(WINDOWS) - add_definitions(/FIXED:NO) + ##add_definitions(/FIXED:NO) else(WINDOWS) # not windows therefore gcc LINUX and DARWIN add_definitions(-fPIC) endif(WINDOWS) -endif(NOT WORD_SIZE EQUAL 32) +endif(NOT ADDRESS_SIZE EQUAL 32) set(media_plugin_libvlc_SOURCE_FILES media_plugin_libvlc.cpp |