livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SH-3406 WIP convert fast timers to lltrace system 

fixed Windows build problem (NOMINMAX redefinition)
master
Richard Linden 2013-01-08 17:48:47 -08:00
parent 3c341a11ab
commit 2f91ffb45c
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/test_apps/llplugintest/llmediaplugintest.cpp
View File

@ -37,6 +37,13 @@
#include "llmediaplugintest.h"
#if LL_WINDOWS
#pragma warning(disable: 4263)
#pragma warning(disable: 4264)
#undef NOMINMAX
#endif
#if __APPLE__
#include <GLUT/glut.h>
#include <CoreFoundation/CoreFoundation.h>
@ -46,10 +53,6 @@
#define GLUI_FREEGLUT
#endif
#if LL_WINDOWS
#pragma warning(disable: 4263)
#pragma warning(disable: 4264)
#endif
#include "glui.h"