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

Move teapot files into llcommon.

master
Nicky 2016-01-06 11:50:43 +01:00
parent 35b8c1cc8a
commit ebf410523f
10 changed files with 6 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/CMakeLists.txt
View File

@ -85,10 +85,6 @@ if (ENABLE_MEDIA_PLUGINS)
# viewer media plugins
add_subdirectory(${LIBS_OPEN_PREFIX}media_plugins)
endif (ENABLE_MEDIA_PLUGINS)
# <FS:AW opensim currency support>
#teapot helper library
add_subdirectory(${LIBS_OPEN_PREFIX}teapot)
# </FS:AW opensim currency support>
if (LINUX)
add_subdirectory(${VIEWER_PREFIX}linux_crash_logger)

1
indra/cmake/CMakeLists.txt
View File

@ -97,7 +97,6 @@ set(cmake_SOURCE_FILES
PulseAudio.cmake
Python.cmake
QuickTimePlugin.cmake
Teapot.cmake # <FS:AW opensim currency support>
TemplateCheck.cmake
Tut.cmake
UI.cmake

9
indra/cmake/Teapot.cmake
View File

@ -1,9 +0,0 @@
# -*- cmake -*-
set(TEAPOT_INCLUDE_DIRS
${LIBS_OPEN_DIR}/teapot
)
set(TEAPOT_LIBRARIES teapot )

6
indra/llcommon/CMakeLists.txt
View File

@ -261,6 +261,12 @@ list(APPEND llcommon_HEADER_FILES ${llcommon_ND_HEADER_FILES} )
# </FS:ND>
# <FS:ND> Add files from teapot (AW OpenSim currency support )
list(APPEND llcommon_SOURCE_FILES "tea.cpp" )
list(APPEND llcommon_HEADER_FILES "tea.h" )
# </FS:ND>
set_source_files_properties(${llcommon_HEADER_FILES}
PROPERTIES HEADER_FILE_ONLY TRUE)

0
indra/teapot/tea.cpp → indra/llcommon/tea.cpp
View File

0
indra/teapot/tea.h → indra/llcommon/tea.h
View File

2
indra/llinventory/CMakeLists.txt
View File

@ -8,14 +8,12 @@ include(LLMath)
include(LLMessage)
include(LLVFS)
include(LLXML)
include(Teapot)# <FS:AW opensim currency support>
include_directories(
${LLCOMMON_INCLUDE_DIRS}
${LLMATH_INCLUDE_DIRS}
${LLMESSAGE_INCLUDE_DIRS}
${LLXML_INCLUDE_DIRS}
${TEAPOT_INCLUDE_DIRS}# <FS:AW opensim currency support>
)
include_directories(SYSTEM
${LLCOMMON_SYSTEM_INCLUDE_DIRS}

3
indra/llui/CMakeLists.txt
View File

@ -12,7 +12,6 @@ include(LLRender)
include(LLWindow)
include(LLVFS)
include(LLXML)
include(Teapot)# <FS:AW opensim currency support>
include_directories(
${LLCOMMON_INCLUDE_DIRS}
@ -25,7 +24,6 @@ include_directories(
${LLVFS_INCLUDE_DIRS}
${LLXML_INCLUDE_DIRS}
${LIBS_PREBUILD_DIR}/include/hunspell
${TEAPOT_INCLUDE_DIRS}# <FS:AW opensim currency support>
)
include_directories(SYSTEM
${LLCOMMON_SYSTEM_INCLUDE_DIRS}
@ -285,7 +283,6 @@ target_link_libraries(llui
${LLXML_LIBRARIES}
${LLMATH_LIBRARIES}
${HUNSPELL_LIBRARY}
${TEAPOT_LIBRARIES}# <FS:AW opensim currency support>
${LLCOMMON_LIBRARIES} # must be after llimage, llwindow, llrender
)

2
indra/newview/CMakeLists.txt
View File

@ -45,7 +45,6 @@ include(OPENAL)
include(OpenGL)
include(OpenSSL)
include(PNG)
include(Teapot)# <FS:AW opensim currency support>
include(TemplateCheck)
include(UI)
include(UnixInstall)
@ -108,7 +107,6 @@ include_directories(
${OPENAL_LIB_INCLUDE_DIRS}
${LIBS_PREBUILT_DIR}/include/collada/1.4
${GROWL_INCLUDE_DIRS}
${TEAPOT_INCLUDE_DIRS}# <FS:AW opensim currency support>
${COLLADA_INCLUDE_DIRS}
${LLAPPEARANCE_INCLUDE_DIRS}
${CMAKE_CURRENT_SOURCE_DIR}

29
indra/teapot/CMakeLists.txt
View File

@ -1,29 +0,0 @@
# -*- cmake -*-
project(teapot)
include(00-Common)
include(LLCommon)
include(LLVFS)
include_directories(
${LLCOMMON_INCLUDE_DIRS}
${LLCOMMON_SYSTEM_INCLUDE_DIRS}
${LLVFS_INCLUDE_DIRS}
)
set(teapot_SOURCE_FILES
tea.cpp
)
set(teapot_HEADER_FILES
CMakeLists.txt
tea.h
)
set_source_files_properties(${teapot_HEADER_FILES}
PROPERTIES HEADER_FILE_ONLY TRUE)
list(APPEND teapot_SOURCE_FILES ${teapot_HEADER_FILES})
add_library( teapot ${teapot_SOURCE_FILES} )
target_link_libraries( teapot )