diff options
| author | Chris Tuchs | 2011-05-08 02:54:28 -0700 |
|---|---|---|
| committer | Chris Tuchs | 2011-05-08 02:54:28 -0700 |
| commit | 6260228f2f96ef0b3c66b879f200a2569311723e (patch) | |
| tree | 4b332f1dd5f5b6c193f4a62d58b2744a8204229d /linden | |
| parent | Merge branch 'libotr' of github.com:onefang/meta-impy into libotr (diff) | |
| download | meta-impy-6260228f2f96ef0b3c66b879f200a2569311723e.zip meta-impy-6260228f2f96ef0b3c66b879f200a2569311723e.tar.gz meta-impy-6260228f2f96ef0b3c66b879f200a2569311723e.tar.bz2 meta-impy-6260228f2f96ef0b3c66b879f200a2569311723e.tar.xz | |
Windows build change I am sure of
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/CMakeLists.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt index aaaf74f..ec630c2 100644 --- a/linden/indra/newview/CMakeLists.txt +++ b/linden/indra/newview/CMakeLists.txt | |||
| @@ -46,6 +46,10 @@ endif (WINDOWS) | |||
| 46 | include(libgcrypt) | 46 | include(libgcrypt) |
| 47 | include(libgpg-error) | 47 | include(libgpg-error) |
| 48 | 48 | ||
| 49 | if (WINDOWS) | ||
| 50 | include(libotr) | ||
| 51 | # on windows always build libotr from source and statically link in libgcrypt and libgpg-error | ||
| 52 | endif (WINDOWS) | ||
| 49 | if (DARWIN OR LINUX) | 53 | if (DARWIN OR LINUX) |
| 50 | if (STATIC_LIBOTR_ETC) | 54 | if (STATIC_LIBOTR_ETC) |
| 51 | include(libotr) # to build libotr from source and statically link in libgcrypt and libgpg-error | 55 | include(libotr) # to build libotr from source and statically link in libgcrypt and libgpg-error |