diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2017-05-22 21:30:26 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2017-05-22 21:30:26 -0400 |
| commit | fe64db61d6f10a9b31191090e2318aebc2d53b29 (patch) | |
| tree | 635d4a6bee25c1e4ef55421f147e9e06bf5faeb3 /indra/media_plugins/base | |
| parent | 48af8529a80052e9bc42f81f36896739f8aff861 (diff) | |
| parent | b92ab8f7e659de66140cc6f538c74c1fc81e6a73 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/media_plugins/base')
| -rw-r--r-- | indra/media_plugins/base/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/media_plugins/base/CMakeLists.txt b/indra/media_plugins/base/CMakeLists.txt index 7367b9e5e6..70c81d4023 100644 --- a/indra/media_plugins/base/CMakeLists.txt +++ b/indra/media_plugins/base/CMakeLists.txt @@ -28,13 +28,13 @@ include_directories(SYSTEM ### media_plugin_base -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_base_SOURCE_FILES media_plugin_base.cpp |