diff options
author | Oz Linden <oz@lindenlab.com> | 2014-04-08 11:41:12 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2014-04-08 11:41:12 -0400 |
commit | 375c05ac43ed56c8ad9670dfdfc801085075a2a2 (patch) | |
tree | 2dcee4ef5757823430d5e234e23eedb1a3354d19 /indra/newview/CMakeLists.txt | |
parent | a60875e549aa90f1cef450aabaf23570cf20a22e (diff) | |
parent | 7e966f28da79d2d24f93a2615c8807421300700c (diff) |
merge changes for 3.7.5-release
Diffstat (limited to 'indra/newview/CMakeLists.txt')
-rwxr-xr-x | indra/newview/CMakeLists.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 5d24f05a1e..34eab9fa33 100755 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1284,6 +1284,8 @@ set_source_files_properties( if (DARWIN) LIST(APPEND viewer_SOURCE_FILES llappviewermacosx.cpp) + LIST(APPEND viewer_SOURCE_FILES llappviewermacosx-objc.mm) + LIST(APPEND viewer_SOURCE_FILES llappviewermacosx-objc.h) LIST(APPEND viewer_SOURCE_FILES llfilepicker_mac.mm) LIST(APPEND viewer_HEADER_FILES llfilepicker_mac.h) |