Tune caves

[oweals/minetest.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b0cece120479a16f00d6e4a5d750c8da75c153a7..2f963e24d35fdbb191cb6fddc83d2e74d08c6c79 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -74,6 +74,7 @@ if(USE_SOUND)
        set(SOUND_INCLUDE_DIRS
                ${OPENAL_INCLUDE_DIR}
                ${VORBIS_INCLUDE_DIR}
+               ${OGG_INCLUDE_DIR}
                )
        set(SOUND_LIBRARIES
                ${OPENAL_LIBRARY}
@@ -105,6 +106,12 @@ if(WIN32)
                        CACHE FILEPATH "Path to zlibwapi.dll (for installation)")
        set(IRRLICHT_SOURCE_DIR "${PROJECT_SOURCE_DIR}/../../irrlicht-1.7.2"
                        CACHE PATH "irrlicht dir")
+       if(ENABLE_SOUND)
+               set(OPENAL_DLL "" CACHE FILEPATH "Path to OpenAL32.dll for installation (optional)")
+               set(OGG_DLL "" CACHE FILEPATH "Path to libogg.dll for installation (optional)")
+               set(VORBIS_DLL "" CACHE FILEPATH "Path to libvorbis.dll for installation (optional)")
+               set(VORBISFILE_DLL "" CACHE FILEPATH "Path to libvorbisfile.dll for installation (optional)")
+       endif()
 else()
        # Unix probably
        if(BUILD_CLIENT)
@@ -146,6 +153,7 @@ configure_file(
 )
 
 set(common_SRCS
+       voxelalgorithms.cpp
        sound.cpp
        quicktune.cpp
        subgame.cpp
@@ -366,6 +374,25 @@ endif()
 #
 # Installation
 #
+if(WIN32)
+       if(DEFINED ZLIB_DLL)
+               install(FILES ${ZLIB_DLL} DESTINATION ${BINDIR})
+       endif()
+       if(USE_SOUND)
+               if(OPENAL_DLL)
+                       install(FILES ${OPENAL_DLL} DESTINATION ${BINDIR})
+               endif()
+               if(OGG_DLL)
+                       install(FILES ${OGG_DLL} DESTINATION ${BINDIR})
+               endif()
+               if(VORBIS_DLL)
+                       install(FILES ${VORBIS_DLL} DESTINATION ${BINDIR})
+               endif()
+               if(VORBISFILE_DLL)
+                       install(FILES ${VORBISFILE_DLL} DESTINATION ${BINDIR})
+               endif()
+       endif()
+endif()
 
 if(BUILD_CLIENT)
        install(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR})
@@ -382,9 +409,6 @@ if(BUILD_CLIENT)
                if(DEFINED IRRLICHT_DLL)
                        install(FILES ${IRRLICHT_DLL} DESTINATION ${BINDIR})
                endif()
-               if(DEFINED ZLIB_DLL)
-                       install(FILES ${ZLIB_DLL} DESTINATION ${BINDIR})
-               endif()
                if(USE_GETTEXT)
                        if(DEFINED GETTEXT_DLL)
                                install(FILES ${GETTEXT_DLL} DESTINATION ${BINDIR})