From c1d164ea300f266ef358e843e2f9ffcf11a6853e Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Thu, 24 Feb 2011 15:37:55 +0100
Subject: [PATCH] Fixed: Removed sound drivers from video macro and fixed
 libraries names

---
 code/CMakeModules/nel.cmake | 44 +++++++++++++++----------------------
 1 file changed, 18 insertions(+), 26 deletions(-)

diff --git a/code/CMakeModules/nel.cmake b/code/CMakeModules/nel.cmake
index 1d2728fb9..dc6b477d0 100644
--- a/code/CMakeModules/nel.cmake
+++ b/code/CMakeModules/nel.cmake
@@ -84,24 +84,8 @@ MACRO(NL_ADD_STATIC_VID_DRIVERS name)
       IF(WITH_DRIVER_DIRECT3D)
         TARGET_LINK_LIBRARIES(${name} nel_drv_direct3d_win)
       ENDIF(WITH_DRIVER_DIRECT3D)
-
-      IF(WITH_DRIVER_DSOUND)
-        TARGET_LINK_LIBRARIES(${name} nel_drv_dsound)
-      ENDIF(WITH_DRIVER_DSOUND)
-
-      IF(WITH_DRIVER_XAUDIO2)
-        TARGET_LINK_LIBRARIES(${name} nel_drv_xaudio2)
-      ENDIF(WITH_DRIVER_XAUDIO2)
     ENDIF(WIN32)
 
-    IF(WITH_DRIVER_OPENAL)
-      TARGET_LINK_LIBRARIES(${name} nel_drv_openal)
-    ENDIF(WITH_DRIVER_OPENAL)
-
-    IF(WITH_DRIVER_FMOD)
-      TARGET_LINK_LIBRARIES(${name} nel_drv_fmod)
-    ENDIF(WITH_DRIVER_FMOD)
-
     IF(WITH_DRIVER_OPENGL)
       IF(WIN32)
         TARGET_LINK_LIBRARIES(${name} nel_drv_opengl_win)
@@ -116,22 +100,30 @@ MACRO(NL_ADD_STATIC_SND_DRIVERS name)
   IF(WITH_STATIC_DRIVERS)
     IF(WIN32)
       IF(WITH_DRIVER_DSOUND)
-        TARGET_LINK_LIBRARIES(${name} nel_drv_dsound)
+        TARGET_LINK_LIBRARIES(${name} nel_drv_dsound_win)
       ENDIF(WITH_DRIVER_DSOUND)
 
       IF(WITH_DRIVER_XAUDIO2)
-        TARGET_LINK_LIBRARIES(${name} nel_drv_xaudio2)
+        TARGET_LINK_LIBRARIES(${name} nel_drv_xaudio2_win)
       ENDIF(WITH_DRIVER_XAUDIO2)
+
+      IF(WITH_DRIVER_OPENAL)
+        TARGET_LINK_LIBRARIES(${name} nel_drv_openal_win)
+      ENDIF(WITH_DRIVER_OPENAL)
+
+      IF(WITH_DRIVER_FMOD)
+        TARGET_LINK_LIBRARIES(${name} nel_drv_fmod_win)
+      ENDIF(WITH_DRIVER_FMOD)
+    ELSE(WIN32)
+      IF(WITH_DRIVER_OPENAL)
+        TARGET_LINK_LIBRARIES(${name} nel_drv_openal)
+      ENDIF(WITH_DRIVER_OPENAL)
+
+      IF(WITH_DRIVER_FMOD)
+        TARGET_LINK_LIBRARIES(${name} nel_drv_fmod)
+      ENDIF(WITH_DRIVER_FMOD)
     ENDIF(WIN32)
 
-    IF(WITH_DRIVER_OPENAL)
-      TARGET_LINK_LIBRARIES(${name} nel_drv_openal)
-    ENDIF(WITH_DRIVER_OPENAL)
-
-    IF(WITH_DRIVER_FMOD)
-      TARGET_LINK_LIBRARIES(${name} nel_drv_fmod)
-    ENDIF(WITH_DRIVER_FMOD)
-
   ENDIF(WITH_STATIC_DRIVERS)
 ENDMACRO(NL_ADD_STATIC_SND_DRIVERS)