Bring llcorehttp into the compile and link phases. Windows looks okay though it's a dead library so far.

master
Monty Brandenberg 2012-04-26 11:35:07 -04:00
parent a54e9c3795
commit 438a6431e4
2 changed files with 10 additions and 7 deletions

View File

@ -44,13 +44,13 @@
/// - Minimal data sharing across threads for correctness and low latency.
///
/// The public interface is declared in a few key header files:
/// - <core-http/bufferarray.h>
/// - <core-http/httpcommon.h>
/// - <core-http/httphandler.h>
/// - <core-http/httpheaders.h>
/// - <core-http/httpoptions.h>
/// - <core-http/httprequest.h>
/// - <core-http/httpresponse.h>
/// - "llcorehttp/bufferarray.h"
/// - "llcorehttp/httpcommon.h"
/// - "llcorehttp/httphandler.h"
/// - "llcorehttp/httpheaders.h"
/// - "llcorehttp/httpoptions.h"
/// - "llcorehttp/httprequest.h"
/// - "llcorehttp/httpresponse.h"
///
/// The library is still under early development and particular users
/// may need access to internal implementation details that are found

View File

@ -18,6 +18,7 @@ include(LLAudio)
include(LLCharacter)
include(LLCommon)
include(LLConvexDecomposition)
include(LLCoreHttp)
include(LLImage)
include(LLImageJ2COJ)
include(LLInventory)
@ -52,6 +53,7 @@ include_directories(
${LLCHARACTER_INCLUDE_DIRS}
${LLCOMMON_INCLUDE_DIRS}
${LLCONVEXDECOMP_INCLUDE_DIRS}
${LLCOREHTTP_INCLUDE_DIRS}
${FMOD_INCLUDE_DIR}
${LLIMAGE_INCLUDE_DIRS}
${LLKDU_INCLUDE_DIRS}
@ -1747,6 +1749,7 @@ target_link_libraries(${VIEWER_BINARY_NAME}
${LLXUIXML_LIBRARIES}
${LSCRIPT_LIBRARIES}
${LLMATH_LIBRARIES}
${LLCOREHTTP_LIBRARIES}
${LLCOMMON_LIBRARIES}
${NDOF_LIBRARY}
${viewer_LIBRARIES}