From 6025860a61386bf767b29c3ec5fd0d31285f1056 Mon Sep 17 00:00:00 2001
From: Tomas Chvatal <scarabeus@gentoo.org>
Date: Fri, 29 Apr 2011 00:21:00 +0200
Subject: Include and link physfs properly.

---
 CMakeLists.txt     |  4 +++-
 src/CMakeLists.txt | 14 +++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4eaa81b..b825a06 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -173,10 +173,12 @@ MESSAGE ( STATUS "<Loading PkgConfig>" )
 FIND_PACKAGE ( PkgConfig REQUIRED )
 IF ( WITH_PHYSFS )
 	FIND_PACKAGE ( PhysFS REQUIRED )
+	INCLUDE_DIRECTORIES( ${PHYSFS_INCLUDE_DIR} )
 ELSE ( WITH_PHYSFS )
 	pkg_check_modules(ZIP REQUIRED libzip)
+	INCLUDE_DIRECTORIES( ${ZIP_INCLUDE_DIRS} )
 ENDIF ( WITH_PHYSFS )
-INCLUDE_DIRECTORIES( ${ZIP_INCLUDE_DIRS} )
+
 IF ( NOT BUILD_SERVER )
 	# cairo not needed until we start actually using the svg files
 	#pkg_check_modules(CAIRO REQUIRED cairo>=1.8.8)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 39862f0..77df5e5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,11 +3,12 @@
 ###############################################################################
 # LINKING ( for binary )
 ###############################################################################
-IF ( BUILD_SERVER )
-	LINK_LIBRARIES (
-		${ZIP_LIBRARIES}
-	)
-ELSE ( BUILD_SERVER )
+IF ( WITH_PHYSFS )
+	LINK_LIBRARIES ( ${PHYSFS_LIBRARY} )
+ELSE ( WITH_PHYSFS )
+	LINK_LIBRARIES ( ${ZIP_LIBRARIES} )
+ENDIF ( WITH_PHYSFS )
+IF ( NOT BUILD_SERVER )
 	IF ( WITH_OPENGL )
 		LINK_LIBRARIES ( ${OPENGL_LIBRARIES} )
 	ENDIF ( WITH_OPENGL )
@@ -26,11 +27,10 @@ ELSE ( BUILD_SERVER )
 		)
 	ENDIF ( WITH_AUDIO )
 	LINK_LIBRARIES (
-		${ZIP_LIBRARIES}
 		${CAIRO_LIBRARIES}
 		${FONTCONFIG_LIBRARIES}
 	)
-ENDIF ( BUILD_SERVER )
+ENDIF ( NOT BUILD_SERVER )
 IF( WIN32 )
 	LINK_LIBRARIES( -lwsock32 -lintl )
 ENDIF ( WIN32 )
-- 
cgit v1.2.3