Various updates

5 files changed, 53 insertions, 68 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 10005e3..cc546db 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -117,7 +117,6 @@ ENDIF ( NOT WITH_SERVER )
 IF ( WITH_SERVER )
 	ADD_DEFINITIONS ( -DPUBLIC_SERVER )
 	ADD_DEFINITIONS ( -DNO_SOUND )
-	SET ( NO_Audio "ON" )
 	INCLUDE_DIRECTORIES ( ${WORKDIR}/server )
 ENDIF ( WITH_SERVER )
 ###############################################################################
@@ -134,31 +133,29 @@ ENDIF ( Apple )
 MESSAGE ( STATUS "<Locating ZIP library>" )
 MESSAGE ( STATUS "<******************************>" )
 FIND_PACKAGE ( ZIP REQUIRED )
-IF ( WITH_OPENGL )
-	MESSAGE ( STATUS "<Locating OpenGL stuff>" )
-	MESSAGE ( STATUS "<******************************>" )
-	FIND_PACKAGE ( OpenGL REQUIRED )
-	FIND_PACKAGE ( GLU REQUIRED )
-ENDIF ( WITH_OPENGL )
-MESSAGE ( STATUS "<Locating SDL stuff>" )
-MESSAGE ( STATUS "<******************************>" )
 
 IF ( NOT WITH_SERVER )
+	IF ( WITH_OPENGL )
+		MESSAGE ( STATUS "<Locating OpenGL>" )
+		MESSAGE ( STATUS "<******************************>" )
+		FIND_PACKAGE ( OpenGL REQUIRED )
+		INCLUDE_DIRECTORIES ( ${OPENGL_INCLUDE_DIR} )
+	ENDIF ( WITH_OPENGL )
+	MESSAGE ( STATUS "<Locating SDL>" )
+	MESSAGE ( STATUS "<******************************>" )
 	FIND_PACKAGE ( SDL REQUIRED )
 	FIND_PACKAGE ( SDL_image REQUIRED )
 	FIND_PACKAGE ( SDL_ttf REQUIRED )
 	IF ( WITH_AUDIO )
 		FIND_PACKAGE ( SDL_mixer REQUIRED )
+		INCLUDE_DIRECTORIES ( ${SDLMIXER_INCLUDE_DIR} )
 	ENDIF ( WITH_AUDIO )
+	INCLUDE_DIRECTORIES (
+		${SDL_INCLUDE_DIR}
+		${SDLTTF_INCLUDE_DIR}
+		${SDLIMAGE_INCLUDE_DIR}
+	)
 ENDIF ( NOT WITH_SERVER )
-INCLUDE_DIRECTORIES (
-	${SDL_INCLUDE_DIR}
-	${SDLTTF_INCLUDE_DIR}
-	${SDLIMAGE_INCLUDE_DIR}
-)
-IF ( WITH_AUDIO )
-	INCLUDE_DIRECTORIES ( ${SDLMIXER_INCLUDE_DIR} )
-ENDIF ( WITH_AUDIO )
 ###############################################################################
 # BUNDLING (INTERNAL STUFF USERS/PACKAGERS SHOULD NEVER USE)
 ###############################################################################
diff --git a/cmake/FindGLU.cmake b/cmake/FindGLU.cmake
deleted file mode 100644
index fa56a51..0000000
--- a/cmake/FindGLU.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-# Use of this file is deprecated, and is here for backwards compatibility with CMake 1.4
-# GLU library is now found by FindOpenGL.cmake
-#
-#
-
-INCLUDE(FindOpenGL)
-
-IF (OPENGL_GLU_FOUND)
-  SET (GLU_LIBRARY ${OPENGL_LIBRARIES})
-  SET (GLU_INCLUDE_PATH ${OPENGL_INCLUDE_DIR})
-ENDIF (OPENGL_GLU_FOUND)
-
diff --git a/cmake/FindZIP.cmake b/cmake/FindZIP.cmake
index 0bbdce4..fd3ae7d 100644
--- a/cmake/FindZIP.cmake
+++ b/cmake/FindZIP.cmake
@@ -1,34 +1,34 @@
-# - Find zzip
-# Find the native ZZIP includes and library
+# - Find zip
+# Find the native ZIP includes and library
 #
-#  ZZIP_INCLUDE_DIR - where to find zzip.h, etc.
-#  ZZIP_LIBRARIES   - List of libraries when using zzip.
-#  ZZIP_FOUND       - True if zzip found.
+#  ZIP_INCLUDE_DIR - where to find zzip.h, etc.
+#  ZIP_LIBRARIES   - List of libraries when using zzip.
+#  ZIP_FOUND       - True if zzip found.
 
 
-IF (ZZIP_INCLUDE_DIR)
+IF (ZIP_INCLUDE_DIR)
   # Already in cache, be silent
-  SET(ZZIP_FIND_QUIETLY TRUE)
-ENDIF (ZZIP_INCLUDE_DIR)
+  SET(ZIP_FIND_QUIETLY TRUE)
+ENDIF (ZIP_INCLUDE_DIR)
 
-FIND_PATH(ZZIP_INCLUDE_DIR zip.h)
+FIND_PATH(ZIP_INCLUDE_DIR zip.h)
 
-SET(ZZIP_NAMES zip)
-FIND_LIBRARY(ZZIP_LIBRARY NAMES ${ZZIP_NAMES} )
+SET(ZIP_NAMES zip)
+FIND_LIBRARY(ZIP_LIBRARY NAMES ${ZZIP_NAMES} )
 
-# handle the QUIETLY and REQUIRED arguments and set ZZIP_FOUND to TRUE if 
+# handle the QUIETLY and REQUIRED arguments and set ZIP_FOUND to TRUE if 
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZZIP DEFAULT_MSG ZZIP_LIBRARY ZZIP_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZIP DEFAULT_MSG ZIP_LIBRARY ZIP_INCLUDE_DIR)
 
-IF(ZZIP_FOUND)
-  SET( ZZIP_LIBRARIES ${ZZIP_LIBRARY} )
-ELSE(ZZIP_FOUND)
-   SET(ZZIP_FOUND FALSE)
-      IF (ZZIP_REQUIRED)
-			        MESSAGE(FATAL_ERROR "zziplib not found")
-	  ENDIF (ZZIP_REQUIRED)
-  SET( ZZIP_LIBRARIES )
-ENDIF(ZZIP_FOUND)
+IF(ZIP_FOUND)
+  SET( ZIP_LIBRARIES ${ZZIP_LIBRARY} )
+ELSE(ZIP_FOUND)
+   SET(ZIP_FOUND FALSE)
+      IF (ZIP_REQUIRED)
+			        MESSAGE(FATAL_ERROR "libzip not found")
+	  ENDIF (ZIP_REQUIRED)
+  SET( ZIP_LIBRARIES )
+ENDIF(ZIP_FOUND)
 
-MARK_AS_ADVANCED( ZZIP_LIBRARY ZZIP_INCLUDE_DIR )
+MARK_AS_ADVANCED( ZIP_LIBRARY ZIP_INCLUDE_DIR )
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index bc41aed..99318d5 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -1,6 +1,8 @@
 ###############################################################################
 # WE NEED GETTEXT
 ##############################################################################
+MESSAGE ( STATUS "<Locating Gettext>" )
+MESSAGE ( STATUS "<******************************>" )
 FIND_PACKAGE ( Gettext REQUIRED )
 IF ( NOT GETTEXT_MSGFMT_EXECUTABLE )
 	MESSAGE ( FATAL_ERROR "Please install the msgfmt binary" )
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a82ae56..e5a5464 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,16 +4,16 @@
 # LINKING ( for binary )
 ###############################################################################
 IF ( WITH_SERVER )
-	LINK_LIBRARIES (  ${ZZIP_LIBRARY} ${CMAKE_DL_LIBS} )
+	LINK_LIBRARIES (  ${ZIP_LIBRARY} ${CMAKE_DL_LIBS} )
 ELSE ( WITH_SERVER )
 	IF ( WITH_OPENGL )
-		LINK_LIBRARIES ( ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} )
+		LINK_LIBRARIES ( ${OPENGL_LIBRARIES} )
 	ENDIF ( WITH_OPENGL )
 	IF  ( WITH_AUDIO )
-		LINK_LIBRARIES ( ${ZZIP_LIBRARY} ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY}
+		LINK_LIBRARIES ( ${ZIP_LIBRARY} ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY}
 		${SDLTTF_LIBRARY} ${SDLMIXER_LIBRARY} )
 	ELSE ( WITH_AUDIO )
-		LINK_LIBRARIES ( ${ZZIP_LIBRARY} ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY}
+		LINK_LIBRARIES ( ${ZIP_LIBRARY} ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY}
 		${SDLTTF_LIBRARY} )
 	ENDIF ( WITH_AUDIO )
 	LINK_LIBRARIES ( SDLmain )
@@ -89,19 +89,19 @@ INCLUDE_DIRECTORIES ( ${CMAKE_BINARY_DIR}/src/base/ )
 IF ( ENABLE_IPV6 )
 	ADD_DEFINITIONS ( -DSUPPORT_IPv6 )
 ENDIF ( ENABLE_IPV6 )
-
 ###############################################################################
 # AUDIO CHECK
 ###############################################################################
-IF ( WITH_AUDIO )
-	MESSAGE ( STATUS "<Building with audio as requested>" )
-	MESSAGE ( STATUS "<******************************>" )
-	SET ( SRC_compile ${SRC_base} ${SRC_client} ${SRC_audio} )
-	INCLUDE_DIRECTORIES ( ${WORKDIR}/audio )
-	INCLUDE_DIRECTORIES ( ${SDLMIXER_INCLUDE_DIR} )
-ELSE ( WITH_AUDIO )
-	ADD_DEFINITIONS ( -DNO_SOUND )
-ENDIF ( WITH_AUDIO )
+IF ( NOT WITH_SERVER )
+	IF ( WITH_AUDIO )
+		MESSAGE ( STATUS "<Building with audio as requested>" )
+		MESSAGE ( STATUS "<******************************>" )
+		SET ( SRC_compile ${SRC_base} ${SRC_client} ${SRC_audio} )
+		INCLUDE_DIRECTORIES ( ${WORKDIR}/audio )
+	ELSE ( WITH_AUDIO )
+		ADD_DEFINITIONS ( -DNO_SOUND )
+	ENDIF ( WITH_AUDIO )
+ENDIF ( NOT WITH_SERVER )
 ###############################################################################
 # OPENGL CHECK
 ###############################################################################