69ca6cd5b2
Conflicts: indra/llmessage/llcurl.cpp indra/llmessage/llcurl.h indra/newview/app_settings/settings.xml indra/newview/llappviewer.cpp indra/newview/llmeshrepository.cpp Resolved: indra/llmessage/llcurl.cpp: Basically removed (not used anyway) indra/llmessage/llcurl.h: Basically removed (just includes aiculr.h now) indra/newview/app_settings/settings.xml: CurlUseMultipleThreads was remvoved. CurlMaximumNumberOfHandles and CurlRequestTimeOut are still in there, but unused at the moment. indra/newview/llappviewer.cpp: CurlMaximumNumberOfHandles and CurlRequestTimeOut are unused at the moment. indra/newview/llmeshrepository.cpp: Lock mSignal always (is unlocked inside wait()). Use mSignal lock to see if we are waiting; remove mWaiting. Return false from the MeshFetch functions iff we have to retry a HTTP fetch. Catch the error exception thrown by getByteRange instead of using it's return value (always returns true anyway).
66 lines
1.4 KiB
CMake
66 lines
1.4 KiB
CMake
# -*- cmake -*-
|
|
|
|
project(statemachine)
|
|
|
|
include(00-Common)
|
|
include(LLCommon)
|
|
include(LLPlugin)
|
|
include(LLMessage)
|
|
include(LLMath)
|
|
include(LLVFS)
|
|
include(LLXML)
|
|
include(LLXUIXML)
|
|
include(LLWindow)
|
|
include(LLUI)
|
|
include(LLRender)
|
|
include(LLImage)
|
|
include(LLCharacter)
|
|
include(LLInventory)
|
|
include(LLPrimitive)
|
|
|
|
include_directories(
|
|
${CMAKE_SOURCE_DIR}/newview
|
|
${LLCOMMON_INCLUDE_DIRS}
|
|
${LLPLUGIN_INCLUDE_DIRS}
|
|
${LLMESSAGE_INCLUDE_DIRS}
|
|
${LLMATH_INCLUDE_DIRS}
|
|
${LLVFS_INCLUDE_DIRS}
|
|
${LLXML_INCLUDE_DIRS}
|
|
${LLXUIXML_INCLUDE_DIRS}
|
|
${LLWINDOW_INCLUDE_DIRS}
|
|
${LLUI_INCLUDE_DIRS}
|
|
${LLRENDER_INCLUDE_DIRS}
|
|
${LLIMAGE_INCLUDE_DIRS}
|
|
${LLCHARACTER_INCLUDE_DIRS}
|
|
${LLINVENTORY_INCLUDE_DIRS}
|
|
${LLPRIMITIVE_INCLUDE_DIRS}
|
|
)
|
|
|
|
set(statemachine_SOURCE_FILES
|
|
aistatemachine.cpp
|
|
aicurleasyrequeststatemachine.cpp
|
|
aifilepicker.cpp
|
|
aifetchinventoryfolder.cpp
|
|
aievent.cpp
|
|
aitimer.cpp
|
|
)
|
|
|
|
set(statemachine_HEADER_FILES
|
|
CMakeLists.txt
|
|
aistatemachine.h
|
|
aicurleasyrequeststatemachine.h
|
|
aifilepicker.h
|
|
aidirpicker.h
|
|
aifetchinventoryfolder.h
|
|
aievent.h
|
|
aitimer.h
|
|
)
|
|
|
|
set_source_files_properties(${statemachine_HEADER_FILES}
|
|
PROPERTIES HEADER_FILE_ONLY TRUE)
|
|
|
|
list(APPEND statemachine_SOURCE_FILES ${statemachine_HEADER_FILES})
|
|
|
|
add_library (statemachine ${statemachine_SOURCE_FILES})
|
|
add_dependencies(statemachine prepare)
|