diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-03-09 12:58:50 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-03-09 12:58:50 -0500 |
| commit | 633bd44b4a9dbf7f4f262929b28848e04b446b26 (patch) | |
| tree | dc3261611d5b07282c9a4210d49893be779c7d2a /indra/newview/CMakeLists.txt | |
| parent | 35dd27d5e57b2957aaa904cce841fccd4cfff850 (diff) | |
| parent | 1b624f5ea686292652978c72d39e5546efe23d0f (diff) | |
merge changes for vmrg-225
Diffstat (limited to 'indra/newview/CMakeLists.txt')
| -rw-r--r-- | indra/newview/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 37b23803f2..3c9bde34b7 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1345,7 +1345,9 @@ if (WINDOWS) DXGUID_LIBRARY ) +# see EXP-1765 - theory is opengl32.lib needs to be included before gdi32.lib (windows libs) set(viewer_LIBRARIES + opengl32 ${WINDOWS_LIBRARIES} comdlg32 ${DINPUT_LIBRARY} @@ -1355,7 +1357,6 @@ if (WINDOWS) odbccp32 ole32 oleaut32 - opengl32 shell32 Vfw32 winspool |