diff options
Diffstat (limited to 'linden/indra/cmake')
-rw-r--r-- | linden/indra/cmake/00-Common.cmake | 13 | ||||
-rw-r--r-- | linden/indra/cmake/Variables.cmake | 1 |
2 files changed, 14 insertions, 0 deletions
diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake index 3120534..583e15e 100644 --- a/linden/indra/cmake/00-Common.cmake +++ b/linden/indra/cmake/00-Common.cmake | |||
@@ -66,6 +66,10 @@ if (WINDOWS) | |||
66 | /MP | 66 | /MP |
67 | ) | 67 | ) |
68 | 68 | ||
69 | add_definitions( | ||
70 | /DUSE_OTR=1 | ||
71 | ) | ||
72 | |||
69 | if(MSVC80 OR MSVC90) | 73 | if(MSVC80 OR MSVC90) |
70 | set(CMAKE_CXX_FLAGS_RELEASE | 74 | set(CMAKE_CXX_FLAGS_RELEASE |
71 | "${CMAKE_CXX_FLAGS_RELEASE} -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0" | 75 | "${CMAKE_CXX_FLAGS_RELEASE} -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0" |
@@ -146,6 +150,10 @@ if (LINUX) | |||
146 | -pthread | 150 | -pthread |
147 | ) | 151 | ) |
148 | 152 | ||
153 | add_definitions( | ||
154 | -DUSE_OTR=1 | ||
155 | ) | ||
156 | |||
149 | if (SERVER) | 157 | if (SERVER) |
150 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftemplate-depth-60") | 158 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftemplate-depth-60") |
151 | if (EXISTS /etc/debian_version) | 159 | if (EXISTS /etc/debian_version) |
@@ -193,6 +201,11 @@ endif (LINUX) | |||
193 | 201 | ||
194 | if (DARWIN) | 202 | if (DARWIN) |
195 | add_definitions(-DLL_DARWIN=1) | 203 | add_definitions(-DLL_DARWIN=1) |
204 | |||
205 | add_definitions( | ||
206 | -DUSE_OTR=1 | ||
207 | ) | ||
208 | |||
196 | set(CMAKE_CXX_LINK_FLAGS "-Wl,-headerpad_max_install_names,-search_paths_first") | 209 | set(CMAKE_CXX_LINK_FLAGS "-Wl,-headerpad_max_install_names,-search_paths_first") |
197 | set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_CXX_LINK_FLAGS}") | 210 | set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_CXX_LINK_FLAGS}") |
198 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mlong-branch -msse3 -mssse3 -w") | 211 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mlong-branch -msse3 -mssse3 -w") |
diff --git a/linden/indra/cmake/Variables.cmake b/linden/indra/cmake/Variables.cmake index 18f3cdd..65fe841 100644 --- a/linden/indra/cmake/Variables.cmake +++ b/linden/indra/cmake/Variables.cmake | |||
@@ -42,6 +42,7 @@ endif (EXISTS ${CMAKE_SOURCE_DIR}/Server.cmake) | |||
42 | 42 | ||
43 | if (${CMAKE_SYSTEM_NAME} MATCHES "Windows") | 43 | if (${CMAKE_SYSTEM_NAME} MATCHES "Windows") |
44 | set(WINDOWS ON BOOL FORCE) | 44 | set(WINDOWS ON BOOL FORCE) |
45 | set(USE_OTR 0) | ||
45 | set(ARCH i686) | 46 | set(ARCH i686) |
46 | set(LL_ARCH ${ARCH}_win32) | 47 | set(LL_ARCH ${ARCH}_win32) |
47 | set(LL_ARCH_DIR ${ARCH}-win32) | 48 | set(LL_ARCH_DIR ${ARCH}-win32) |