summaryrefslogtreecommitdiff
path: root/indra/cmake
diff options
context:
space:
mode:
authorRichard Linden <none@none>2012-11-15 19:46:09 -0800
committerRichard Linden <none@none>2012-11-15 19:46:09 -0800
commitc136b432140f892a56d4996d5ed77e903ff0b32d (patch)
treee1af9a407b0af582349396d8cb51e2e794260d43 /indra/cmake
parent9d77e030d9a0d23cebce616631677459eec1612c (diff)
SH-3406 WIP convert fast timers to lltrace system
eliminated min and max macros from windows.h got rest of viewer to compile against llfasttimer changes
Diffstat (limited to 'indra/cmake')
-rw-r--r--indra/cmake/00-Common.cmake1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 21cb87237d..180714c9c9 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -58,6 +58,7 @@ if (WINDOWS)
add_definitions(
/DLL_WINDOWS=1
+ /DNOMINMAX
/DDOM_DYNAMIC
/DUNICODE
/D_UNICODE