diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2016-12-07 16:06:32 -0500 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2016-12-07 16:06:32 -0500 |
commit | 6dd0a500ea74a329fc3d5326a8884d6daa42dcff (patch) | |
tree | 2e6cea711be9dd4db3987fec6a241c7a28e3ca9d /indra/media_plugins/example | |
parent | 5bb456d80cfbcdfe87526510f3b8297d315afdd8 (diff) | |
parent | 70a42af076cbe6f12a265d508b4ed96af65d26ba (diff) |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-skip-llcorehttp-test
Diffstat (limited to 'indra/media_plugins/example')
-rw-r--r-- | indra/media_plugins/example/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/media_plugins/example/CMakeLists.txt b/indra/media_plugins/example/CMakeLists.txt index 171645ef04..d2a17b1d76 100644 --- a/indra/media_plugins/example/CMakeLists.txt +++ b/indra/media_plugins/example/CMakeLists.txt @@ -32,13 +32,13 @@ include_directories(SYSTEM ### media_plugin_example -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_example_SOURCE_FILES media_plugin_example.cpp |