From e1656d14a7b4c70a8002f15458fcbe8019601486 Mon Sep 17 00:00:00 2001
From: rti <none@none>
Date: Wed, 4 Aug 2010 16:31:28 +0200
Subject: [PATCH] Fixed: minor compile and link errors related to Ogg/Vorbis
 and nelsnd_lowlevel

---
 code/nel/CMakeModules/FindOgg.cmake      | 3 +--
 code/nel/CMakeModules/FindVorbis.cmake   | 3 +--
 code/nel/src/sound/driver/CMakeLists.txt | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/code/nel/CMakeModules/FindOgg.cmake b/code/nel/CMakeModules/FindOgg.cmake
index c9a8ae6f9..8762afc5d 100644
--- a/code/nel/CMakeModules/FindOgg.cmake
+++ b/code/nel/CMakeModules/FindOgg.cmake
@@ -11,7 +11,7 @@ ENDIF(OGG_LIBRARY AND OGG_INCLUDE_DIR)
 
 
 FIND_PATH(OGG_INCLUDE_DIR
-  ogg.h
+  ogg/ogg.h
   PATHS
   $ENV{OGG_DIR}/include
   /usr/local/include
@@ -20,7 +20,6 @@ FIND_PATH(OGG_INCLUDE_DIR
   /opt/local/include
   /opt/csw/include
   /opt/include
-  PATH_SUFFIXES ogg
 )
 
 FIND_LIBRARY(OGG_LIBRARY
diff --git a/code/nel/CMakeModules/FindVorbis.cmake b/code/nel/CMakeModules/FindVorbis.cmake
index 08cbabb90..95883fa59 100644
--- a/code/nel/CMakeModules/FindVorbis.cmake
+++ b/code/nel/CMakeModules/FindVorbis.cmake
@@ -11,7 +11,7 @@ ENDIF(VORBIS_LIBRARY AND VORBIS_INCLUDE_DIR)
 
 
 FIND_PATH(VORBIS_INCLUDE_DIR
-  vorbisfile.h
+  vorbis/vorbisfile.h
   PATHS
   $ENV{VORBIS_DIR}/include
   /usr/local/include
@@ -20,7 +20,6 @@ FIND_PATH(VORBIS_INCLUDE_DIR
   /opt/local/include
   /opt/csw/include
   /opt/include
-  PATH_SUFFIXES vorbis
 )
 
 FIND_LIBRARY(VORBIS_LIBRARY
diff --git a/code/nel/src/sound/driver/CMakeLists.txt b/code/nel/src/sound/driver/CMakeLists.txt
index 88f238e4e..c720886e1 100644
--- a/code/nel/src/sound/driver/CMakeLists.txt
+++ b/code/nel/src/sound/driver/CMakeLists.txt
@@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h)
 nl_target_lib(nelsnd_lowlevel ${SRC})
 
 INCLUDE_DIRECTORIES(${OGG_INCLUDE_DIR} ${VORBIS_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(nelsnd_lowlevel ${VORBIS_LIBRARY} ${VORBISFILE_LIBRARY} ${OGG_LIBRARY})
+TARGET_LINK_LIBRARIES(nelsnd_lowlevel nelmisc ${VORBIS_LIBRARY} ${VORBISFILE_LIBRARY} ${OGG_LIBRARY})
 nl_default_props(nelsnd_lowlevel "Library: NeL Sound Lowlevel")
 NL_ADD_STATIC_VID_DRIVERS(nelsnd_lowlevel)
 nl_add_lib_suffix(nelsnd_lowlevel)