diff options
| author | Jacek Antonelli | 2008-11-01 01:32:37 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-11-01 01:32:37 -0500 |
| commit | 695b4cb98be4257af11d9308453d15c3f72c3986 (patch) | |
| tree | 9d9a60a0131f1d8b4a318f379ce9a9a046428b5e /linden/indra/cmake/00-Common.cmake | |
| parent | Package only our free fonts. (diff) | |
| parent | Merge commit 'mccabe/rebranding' into rebranding (diff) | |
| download | meta-impy-695b4cb98be4257af11d9308453d15c3f72c3986.zip meta-impy-695b4cb98be4257af11d9308453d15c3f72c3986.tar.gz meta-impy-695b4cb98be4257af11d9308453d15c3f72c3986.tar.bz2 meta-impy-695b4cb98be4257af11d9308453d15c3f72c3986.tar.xz | |
Merge branch 'rebranding' into next
Conflicts:
linden/indra/newview/viewer_manifest.py
Diffstat (limited to 'linden/indra/cmake/00-Common.cmake')
| -rw-r--r-- | linden/indra/cmake/00-Common.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake index 240853a..977e588 100644 --- a/linden/indra/cmake/00-Common.cmake +++ b/linden/indra/cmake/00-Common.cmake | |||
| @@ -146,7 +146,7 @@ if (LINUX) | |||
| 146 | endif (SERVER) | 146 | endif (SERVER) |
| 147 | 147 | ||
| 148 | if (VIEWER) | 148 | if (VIEWER) |
| 149 | add_definitions(-DAPPID=secondlife) | 149 | add_definitions(-DAPPID=imprudence) |
| 150 | add_definitions(-fvisibility=hidden) | 150 | add_definitions(-fvisibility=hidden) |
| 151 | if (NOT STANDALONE) | 151 | if (NOT STANDALONE) |
| 152 | # this stops us requiring a really recent glibc at runtime | 152 | # this stops us requiring a really recent glibc at runtime |