--- a/CMakeLists.txt Sun Oct 21 00:34:14 2012 +0400
+++ b/CMakeLists.txt Sun Oct 21 01:28:33 2012 +0400
@@ -239,6 +239,9 @@
#main engine
add_subdirectory(hedgewars)
+# physfs library
+add_subdirectory(misc/physfs)
+
#Android related build scripts
if(ANDROID)
#run cmake -DANDROID=1 to enable this
--- a/QTfrontend/CMakeLists.txt Sun Oct 21 00:34:14 2012 +0400
+++ b/QTfrontend/CMakeLists.txt Sun Oct 21 01:28:33 2012 +0400
@@ -42,6 +42,7 @@
include_directories(${SDLMIXER_INCLUDE_DIR})
include_directories(${FFMPEG_INCLUDE_DIR})
include_directories(${CMAKE_SOURCE_DIR}/misc/quazip)
+include_directories(${CMAKE_SOURCE_DIR}/misc/physfs/src)
if(UNIX)
# HACK: in freebsd cannot find iconv.h included via SDL.h
include_directories("/usr/local/include")
@@ -176,6 +177,7 @@
set(HW_LINK_LIBS
quazip
+ physfs
${QT_LIBRARIES}
${SDL_LIBRARY}
${SDLMIXER_LIBRARY}
--- a/misc/physfs/CMakeLists.txt Sun Oct 21 00:34:14 2012 +0400
+++ b/misc/physfs/CMakeLists.txt Sun Oct 21 01:28:33 2012 +0400
@@ -255,7 +255,7 @@
ENDIF(PHYSFS_ARCHIVE_ISO9660)
-OPTION(PHYSFS_BUILD_STATIC "Build static library" FALSE)
+OPTION(PHYSFS_BUILD_STATIC "Build static library" TRUE)
IF(PHYSFS_BUILD_STATIC)
ADD_LIBRARY(physfs-static STATIC ${PHYSFS_SRCS})
SET_TARGET_PROPERTIES(physfs-static PROPERTIES OUTPUT_NAME "physfs")
@@ -263,7 +263,7 @@
SET(PHYSFS_INSTALL_TARGETS ${PHYSFS_INSTALL_TARGETS} ";physfs-static")
ENDIF(PHYSFS_BUILD_STATIC)
-OPTION(PHYSFS_BUILD_SHARED "Build shared library" TRUE)
+OPTION(PHYSFS_BUILD_SHARED "Build shared library" FALSE)
IF(PHYSFS_BUILD_SHARED)
ADD_LIBRARY(physfs SHARED ${PHYSFS_SRCS})
SET_TARGET_PROPERTIES(physfs PROPERTIES VERSION ${PHYSFS_VERSION})
@@ -310,7 +310,7 @@
#CMake's SWIG support is basically useless.
#FIND_PACKAGE(SWIG)
-OPTION(PHYSFS_BUILD_SWIG "Build ${_LANG} bindings." TRUE)
+OPTION(PHYSFS_BUILD_SWIG "Build ${_LANG} bindings." FALSE)
MARK_AS_ADVANCED(PHYSFS_BUILD_SWIG)
FIND_PROGRAM(SWIG swig DOC "Path to swig command line app: http://swig.org/")
@@ -507,12 +507,12 @@
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
COMMENT "Building source tarball '${PHYSFS_TARBALL}'..."
)
- ADD_CUSTOM_TARGET(
- uninstall
- "${CMAKE_CURRENT_SOURCE_DIR}/extras/uninstall.sh"
- WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
- COMMENT "Uninstall the project..."
- )
+# ADD_CUSTOM_TARGET(
+# uninstall
+# "${CMAKE_CURRENT_SOURCE_DIR}/extras/uninstall.sh"
+# WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
+# COMMENT "Uninstall the project..."
+# )
ENDIF(UNIX)
MACRO(MESSAGE_BOOL_OPTION _NAME _VALUE)