diff -r c803d89ae74d -r 5a289ef40fdb misc/physfs/CMakeLists.txt --- a/misc/physfs/CMakeLists.txt Tue Nov 20 17:50:17 2012 +0100 +++ b/misc/physfs/CMakeLists.txt Tue Nov 20 18:33:09 2012 +0100 @@ -34,7 +34,9 @@ INCLUDE(CheckLibraryExists) INCLUDE(CheckCSourceCompiles) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src) +include_directories(${SDL_INCLUDE_DIR}) #hw +include_directories(${LUA_INCLUDE_DIR}) #hw IF(MACOSX) # Fallback to older OS X on PowerPC to support wider range of systems... @@ -135,6 +137,10 @@ src/archiver_wad.c src/archiver_zip.c src/archiver_iso9660.c + #custom files from Hedgewars + extras/physfsrwops.c + extras/physfslualoader.c + extras/hwpacksmounter.c ${PHYSFS_BEOS_SRCS} ) @@ -254,8 +260,14 @@ ADD_DEFINITIONS(-DPHYSFS_SUPPORTS_ISO9660=1) ENDIF(PHYSFS_ARCHIVE_ISO9660) +IF(WINDOWS) + OPTION(PHYSFS_BUILD_STATIC "Build static library" FALSE) + OPTION(PHYSFS_BUILD_SHARED "Build shared library" TRUE) +ELSE(WINDOWS) + OPTION(PHYSFS_BUILD_STATIC "Build static library" TRUE) + OPTION(PHYSFS_BUILD_SHARED "Build shared library" FALSE) +ENDIF(WINDOWS) -OPTION(PHYSFS_BUILD_STATIC "Build static library" TRUE) IF(PHYSFS_BUILD_STATIC) ADD_LIBRARY(physfs STATIC ${PHYSFS_SRCS}) SET_TARGET_PROPERTIES(physfs PROPERTIES OUTPUT_NAME "physfs") @@ -263,15 +275,15 @@ SET(PHYSFS_INSTALL_TARGETS ${PHYSFS_INSTALL_TARGETS} ";physfs") ENDIF(PHYSFS_BUILD_STATIC) -#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}) -# SET_TARGET_PROPERTIES(physfs PROPERTIES SOVERSION ${PHYSFS_SOVERSION}) -# TARGET_LINK_LIBRARIES(physfs ${OPTIONAL_LIBRARY_LIBS} ${OTHER_LDFLAGS}) -# SET(PHYSFS_LIB_TARGET physfs) -# SET(PHYSFS_INSTALL_TARGETS ${PHYSFS_INSTALL_TARGETS} ";physfs") -#ENDIF(PHYSFS_BUILD_SHARED) +IF(PHYSFS_BUILD_SHARED) + find_package(SDL REQUIRED) + ADD_LIBRARY(physfs SHARED ${PHYSFS_SRCS}) + SET_TARGET_PROPERTIES(physfs PROPERTIES VERSION ${PHYSFS_VERSION}) + SET_TARGET_PROPERTIES(physfs PROPERTIES SOVERSION ${PHYSFS_SOVERSION}) + TARGET_LINK_LIBRARIES(physfs ${OPTIONAL_LIBRARY_LIBS} ${OTHER_LDFLAGS} SDL) + SET(PHYSFS_LIB_TARGET physfs) + SET(PHYSFS_INSTALL_TARGETS ${PHYSFS_INSTALL_TARGETS} ";physfs") +ENDIF(PHYSFS_BUILD_SHARED) IF(NOT PHYSFS_BUILD_SHARED AND NOT PHYSFS_BUILD_STATIC) MESSAGE(FATAL "Both shared and static libraries are disabled!") @@ -280,7 +292,6 @@ # CMake FAQ says I need this... IF(PHYSFS_BUILD_SHARED AND PHYSFS_BUILD_STATIC) SET_TARGET_PROPERTIES(physfs PROPERTIES CLEAN_DIRECT_OUTPUT 1) - SET_TARGET_PROPERTIES(physfs-static PROPERTIES CLEAN_DIRECT_OUTPUT 1) ENDIF(PHYSFS_BUILD_SHARED AND PHYSFS_BUILD_STATIC) OPTION(PHYSFS_BUILD_TEST "Build stdio test program." FALSE)