From ede3c5755357c32289742e2482c3ff2114158ec3 Mon Sep 17 00:00:00 2001
From: "\"Matt Raykowski\"" <matt.raykowski@gmail.com>
Date: Wed, 9 Jun 2010 07:23:30 -0500
Subject: [PATCH] Changed: #842 panolpy_maker finds libsquish, OpenAL driver
 finds EFX-Util on Windows.

---
 code/nel/src/sound/driver/openal/CMakeLists.txt | 5 +++++
 code/nel/tools/3d/panoply_maker/CMakeLists.txt  | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/code/nel/src/sound/driver/openal/CMakeLists.txt b/code/nel/src/sound/driver/openal/CMakeLists.txt
index edc428acc..7dbacd820 100644
--- a/code/nel/src/sound/driver/openal/CMakeLists.txt
+++ b/code/nel/src/sound/driver/openal/CMakeLists.txt
@@ -8,6 +8,11 @@ SET_TARGET_PROPERTIES(nel_drv_openal PROPERTIES VERSION ${NL_VERSION})
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 IF(WIN32)
+  # Find and include EFX-Util on Windows.
+  FIND_PACKAGE(EFXUtil)
+  INCLUDE_DIRECTORIES(${EFXUTIL_INCLUDE_DIR})
+  TARGET_LINK_LIBRARIES(nel_drv_openal ${EFXUTIL_LIBRARY})
+  
   SET_TARGET_PROPERTIES(nel_drv_openal PROPERTIES COMPILE_FLAGS "/Yustdopenal.h")
   SET_SOURCE_FILES_PROPERTIES(stdopenal.cpp PROPERTIES COMPILE_FLAGS "/Ycstdopenal.h")
   SET_TARGET_PROPERTIES(nel_drv_openal PROPERTIES 
diff --git a/code/nel/tools/3d/panoply_maker/CMakeLists.txt b/code/nel/tools/3d/panoply_maker/CMakeLists.txt
index 8bdc5fea8..62b644c86 100644
--- a/code/nel/tools/3d/panoply_maker/CMakeLists.txt
+++ b/code/nel/tools/3d/panoply_maker/CMakeLists.txt
@@ -2,8 +2,10 @@ FILE(GLOB SRC *.cpp *.h ../s3tc_compressor_lib/*.h ../s3tc_compressor_lib/*.cpp)
 
 ADD_EXECUTABLE(panoply_maker ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${S3TC_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(panoply_maker ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${S3TC_LIBRARY} nelmisc nel3d)
+FIND_PACKAGE(Squish REQUIRED)
+
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${SQUISH_INCLUDE_DIR})
+TARGET_LINK_LIBRARIES(panoply_maker ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${SQUISH_LIBRARY} nelmisc nel3d)
 IF(WIN32)
   SET_TARGET_PROPERTIES(panoply_maker PROPERTIES 
     LINK_FLAGS "/NODEFAULTLIB:libcmt /NODEFAULTLIB:libc"