summaryrefslogtreecommitdiff
path: root/indra/llwindow
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2009-04-17 22:00:04 +0000
committerJames Cook <james@lindenlab.com>2009-04-17 22:00:04 +0000
commit5c2fd1e4fe304e1b6f6d4136f0d1fd3028c3dddd (patch)
treedec1b220c24a60cc220d1cb07fd3545610644f0a /indra/llwindow
parent57b47705d7a4a2927ac7329bd2b5b37c1c1c5115 (diff)
Back out last commit, because it breaks mapserver build on linux, dammit.
Diffstat (limited to 'indra/llwindow')
-rw-r--r--indra/llwindow/CMakeLists.txt13
1 files changed, 0 insertions, 13 deletions
diff --git a/indra/llwindow/CMakeLists.txt b/indra/llwindow/CMakeLists.txt
index 1ffa4fe3c1..afce0c06c3 100644
--- a/indra/llwindow/CMakeLists.txt
+++ b/indra/llwindow/CMakeLists.txt
@@ -55,13 +55,6 @@ set(viewer_HEADER_FILES
llmousehandler.h
)
-# Libraries on which this library depends, needed for Linux builds
-# Sort by high-level to low-level
-set(llwindow_LINK_LIBRARIES
- ${UI_LIBRARIES} # for GTK
- ${SDL_LIBRARY}
- )
-
if (DARWIN)
list(APPEND llwindow_SOURCE_FILES
llkeyboardmacosx.cpp
@@ -105,9 +98,6 @@ if (WINDOWS)
lldxhardware.h
llkeyboardwin32.h
)
- list(APPEND llwindow_LINK_LIBRARIES
- comdlg32 # Common Dialogs for ChooseColor
- )
endif (WINDOWS)
if (SOLARIS)
@@ -143,7 +133,6 @@ if (SERVER AND NOT WINDOWS AND NOT DARWIN)
${llwindow_SOURCE_FILES}
${server_SOURCE_FILES}
)
- target_link_libraries (llwindowheadless ${llwindow_LINK_LIBRARIES})
endif (SERVER AND NOT WINDOWS AND NOT DARWIN)
if (llwindow_HEADER_FILES)
@@ -156,6 +145,4 @@ if (VIEWER)
${llwindow_SOURCE_FILES}
${viewer_SOURCE_FILES}
)
- target_link_libraries (llwindow ${llwindow_LINK_LIBRARIES})
endif (VIEWER)
-