Reorder deps a bit.

3 files changed, 24 insertions, 75 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7042dea..85cc49f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -190,14 +190,10 @@ IF ( NOT BUILD_SERVER )
 	pkg_check_modules(SDLIMAGE REQUIRED SDL_image)
 	INCLUDE_DIRECTORIES ( ${SDLIMAGE_INCLUDE_DIRS} )
 	pkg_check_modules(SDLTTF REQUIRED SDL_image)
-	FIND_PACKAGE ( SDL_ttf REQUIRED )
 	IF ( WITH_AUDIO )
 		pkg_check_modules(SDLMIXER REQUIRED SDL_mixer)
 		INCLUDE_DIRECTORIES ( ${SDLMIXER_INCLUDE_DIRS} )
 	ENDIF ( WITH_AUDIO )
-	INCLUDE_DIRECTORIES (
-		${SDLIMAGE_INCLUDE_DIR}
-	)
 ENDIF ( NOT BUILD_SERVER )
 ###############################################################################
 # GETTEXT SUPPORT
diff --git a/cmake/FindSDL_ttf.cmake b/cmake/FindSDL_ttf.cmake
deleted file mode 100644
index 32dbbad..0000000
--- a/cmake/FindSDL_ttf.cmake
+++ /dev/null
@@ -1,64 +0,0 @@
-# Locate SDL_ttf library
-# This module defines
-# SDLTTF_LIBRARY, the name of the library to link against
-# SDLTTF_FOUND, if false, do not try to link to SDL
-# SDLTTF_INCLUDE_DIR, where to find SDL/SDL.h
-#
-# $SDLDIR is an environment variable that would
-# correspond to the ./configure --prefix=$SDLDIR
-# used in building SDL.
-#
-# Created by Eric Wing. This was influenced by the FindSDL.cmake 
-# module, but with modifications to recognize OS X frameworks and 
-# additional Unix paths (FreeBSD, etc).
-
-FIND_PATH(SDLTTF_INCLUDE_DIR SDL_ttf.h
-  HINTS
-  $ENV{SDLTTFDIR}
-  $ENV{SDLDIR}
-  PATH_SUFFIXES include
-  PATHS
-  ~/Library/Frameworks
-  /Library/Frameworks
-  /usr/local/include/SDL
-  /usr/include/SDL
-  /usr/local/include/SDL12
-  /usr/local/include/SDL11 # FreeBSD ports
-  /usr/include/SDL12
-  /usr/include/SDL11
-  /usr/local/include
-  /usr/include
-  /sw/include/SDL # Fink
-  /sw/include
-  /opt/local/include/SDL # DarwinPorts
-  /opt/local/include
-  /opt/csw/include/SDL # Blastwave
-  /opt/csw/include 
-  /opt/include/SDL
-  /opt/include
-  ${CMAKE_SOURCE_DIR}/packaging/windows/SDL/include #tuxanci
-)
-
-FIND_LIBRARY(SDLTTF_LIBRARY 
-  NAMES SDL_ttf
-  HINTS
-  $ENV{SDLTTFDIR}
-  $ENV{SDLDIR}
-  PATHS
-  ~/Library/Frameworks
-  /Library/Frameworks
-  /usr/local
-  /usr
-  /sw
-  /opt/local
-  /opt/csw
-  /opt
-  ${CMAKE_SOURCE_DIR}/packaging/windows/SDL/
-    PATH_SUFFIXES lib64 lib
-)
-
-SET(SDLTTF_FOUND "NO")
-IF(SDLTTF_LIBRARY AND SDLTTF_INCLUDE_DIR)
-  SET(SDLTTF_FOUND "YES")
-ENDIF(SDLTTF_LIBRARY AND SDLTTF_INCLUDE_DIR)
-
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 22a0b4f..2feedd0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,19 +4,31 @@
 # LINKING ( for binary )
 ###############################################################################
 IF ( BUILD_SERVER )
-	LINK_LIBRARIES (  ${ZIP_LIBRARIES} ${CMAKE_DL_LIBS} )
+	LINK_LIBRARIES (
+		${ZIP_LIBRARIES}
+		${CMAKE_DL_LIBS}
+	)
 ELSE ( BUILD_SERVER )
 	IF ( WITH_OPENGL )
 		LINK_LIBRARIES ( ${OPENGL_LIBRARIES} )
 	ENDIF ( WITH_OPENGL )
 	IF  ( WITH_AUDIO )
-		LINK_LIBRARIES ( ${ZIP_LIBRARIES} ${SDL_LIBRARIES} ${SDLIMAGE_LIBRARIES}
-		${SDLTTF_LIBRARY} ${SDLMIXER_LIBRARIES} )
+		LINK_LIBRARIES (
+			${SDL_LIBRARIES}
+			${SDLIMAGE_LIBRARIES}
+			${SDLMIXER_LIBRARIES}
+		)
 	ELSE ( WITH_AUDIO )
-		LINK_LIBRARIES ( ${ZIP_LIBRARIES} ${SDL_LIBRARIES} ${SDLIMAGE_LIBRARIES}
-		${SDLTTF_LIBRARY} )
+		LINK_LIBRARIES (
+			${SDL_LIBRARIES}
+			${SDLIMAGE_LIBRARIES}
+		)
 	ENDIF ( WITH_AUDIO )
-	LINK_LIBRARIES ( ${CAIRO_LIBRARIES} ${FONTCONFIG_LIBRARIES} SDLmain )
+	LINK_LIBRARIES (
+		${ZIP_LIBRARIES}
+		${CAIRO_LIBRARIES}
+		${FONTCONFIG_LIBRARIES}
+	)
 ENDIF ( BUILD_SERVER )
 
 ###############################################################################
@@ -45,7 +57,12 @@ ENDIF ( ENABLE_IPV6 )
 # AUDIO CHECK
 ###############################################################################
 IF ( NOT BUILD_SERVER )
-	SET ( SRC_compile ${SRC_net} ${SRC_widget} ${SRC_screen} ${SRC_base} ${SRC_client} )
+	SET ( SRC_compile ${SRC_net}
+		${SRC_widget}
+		${SRC_screen}
+		${SRC_base}
+		${SRC_client}
+	)
 	IF ( WITH_AUDIO )
 		MESSAGE ( STATUS "<Building with audio as requested>" )
 		SET ( SRC_compile ${SRC_compile} ${SRC_audio} )