mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-26 15:39:51 +00:00
Code Issues Projects Releases Wiki Activity

Remove unused SOUND_INPUT_INCLUDES cmake variable.

Browse Source 
(cherry picked from commit 0220e82259bd799e93eb6ae5f2288ba4c71fcd3e)

Conflicts:
	apps/openmw/CMakeLists.txt
This commit is contained in:
scrawl 2015-11-14 17:17:22 +01:00 committed by cc9cii
parent 940e982d65
commit d3caeaf898
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -119,8 +119,6 @@ else()
endif() endif()
endif() endif()
set(SOUND_INPUT_LIBRARY ${FFMPEG_LIBRARIES})
# TinyXML # TinyXML
option(USE_SYSTEM_TINYXML "Use system TinyXML library instead of internal." OFF) option(USE_SYSTEM_TINYXML "Use system TinyXML library instead of internal." OFF)
if(USE_SYSTEM_TINYXML) if(USE_SYSTEM_TINYXML)

4
apps/openmw/CMakeLists.txt
View File

@ -109,7 +109,6 @@ endif ()
# Sound stuff - here so CMake doesn't stupidly recompile EVERYTHING # Sound stuff - here so CMake doesn't stupidly recompile EVERYTHING
# when we change the backend. # when we change the backend.
include_directories( include_directories(
${SOUND_INPUT_INCLUDES}
${FFMPEG_INCLUDE_DIRS} ${FFMPEG_INCLUDE_DIRS}
) )
@ -126,6 +125,9 @@ target_link_libraries(openmw
${Boost_FILESYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY}
${Boost_PROGRAM_OPTIONS_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY}
${Boost_WAVE_LIBRARY} ${Boost_WAVE_LIBRARY}
${OPENAL_LIBRARY}
${FFMPEG_LIBRARIES}
${BULLET_LIBRARIES}
${MYGUI_LIBRARIES} ${MYGUI_LIBRARIES}
${SDL2_LIBRARY} ${SDL2_LIBRARY}
${MYGUI_PLATFORM_LIBRARIES} ${MYGUI_PLATFORM_LIBRARIES}