diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-03-28 04:10:23 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-03-28 04:10:23 +0300 |
| commit | 6ff6d6928328ff2110f028a374ade49415d5a0ba (patch) | |
| tree | 4337ddc2e83368a2d606b97df08dc206e002ac67 /src/utils | |
| parent | 475aea387f846561d5029807f804ff789d59e69f (diff) | |
| download | plus-6ff6d6928328ff2110f028a374ade49415d5a0ba.tar.gz plus-6ff6d6928328ff2110f028a374ade49415d5a0ba.tar.bz2 plus-6ff6d6928328ff2110f028a374ade49415d5a0ba.tar.xz plus-6ff6d6928328ff2110f028a374ade49415d5a0ba.zip | |
Remove physfs support.
Diffstat (limited to 'src/utils')
| -rw-r--r-- | src/utils/dumplibs.cpp | 26 | ||||
| -rw-r--r-- | src/utils/dumplibs_unittest.cc | 27 |
2 files changed, 0 insertions, 53 deletions
diff --git a/src/utils/dumplibs.cpp b/src/utils/dumplibs.cpp index b53a6c753..40e558e4c 100644 --- a/src/utils/dumplibs.cpp +++ b/src/utils/dumplibs.cpp @@ -32,12 +32,6 @@ PRAGMACLANG6(GCC diagnostic ignored "-Wold-style-cast") #include <SDL_net.h> PRAGMACLANG6(GCC diagnostic pop) #include <SDL_ttf.h> -#ifdef USE_PHYSFS -PRAGMA45(GCC diagnostic push) -PRAGMA45(GCC diagnostic ignored "-Wlong-long") -#include <physfs.h> -PRAGMA45(GCC diagnostic pop) -#endif // USE_PHYSFS #include <zlib.h> #include <curl/curl.h> @@ -120,15 +114,6 @@ void dumpLibs() logger->log(" libcurl: %s", LIBCURL_VERSION); logger->log(" libpng: %s", PNG_LIBPNG_VER_STRING); -#ifdef USE_PHYSFS - PHYSFS_Version physfsVersion; - PHYSFS_VERSION(&physfsVersion); - const std::string physfsCompiled = strprintf("%d.%d.%d", - physfsVersion.major, - physfsVersion.minor, - physfsVersion.patch); - logger->log(" libphysfs: %s", physfsCompiled.c_str()); -#endif // USE_PHYSFS dumpCompiledSdlVersion("SDL", SDL); dumpCompiledSdlVersion("SDL_net", SDL_NET); @@ -140,14 +125,6 @@ void dumpLibs() #if ZLIB_VERNUM >= 0x1020 logger->log(" zLib: %s", zlibVersion()); #endif // ZLIB_VERNUM >= 0x1020 -#ifdef USE_PHYSFS - PHYSFS_getLinkedVersion(&physfsVersion); - const std::string physfsLinked = strprintf("%d.%d.%d", - physfsVersion.major, - physfsVersion.minor, - physfsVersion.patch); - logger->log(" libphysfs: %s", physfsLinked.c_str()); -#endif // USE_PHYSFS #ifdef LIBXML_TEST_VERSION LIBXML_TEST_VERSION #endif // LIBXML_TEST_VERSION @@ -167,9 +144,6 @@ void dumpLibs() dumpLinkedSdlVersion("SDL_ttf", TTF_Linked_Version()); compareVersions("zLib", ZLIB_VERSION, zlibVersion()); -#ifdef USE_PHYSFS - compareVersions("libphysfs", physfsCompiled.c_str(), physfsLinked.c_str()); -#endif // USE_PHYSFS #ifdef USE_SDL2 compareSDLVersions("SDL", sdlVersionJoin(SDL), &sdlVersion); #else // USE_SDL2 diff --git a/src/utils/dumplibs_unittest.cc b/src/utils/dumplibs_unittest.cc index 4d0f55c7d..1833fe714 100644 --- a/src/utils/dumplibs_unittest.cc +++ b/src/utils/dumplibs_unittest.cc @@ -31,12 +31,6 @@ PRAGMACLANG6(GCC diagnostic ignored "-Wold-style-cast") #include <SDL_net.h> PRAGMACLANG6(GCC diagnostic pop) #include <SDL_ttf.h> -#ifdef USE_PHYSFS -PRAGMA45(GCC diagnostic push) -PRAGMA45(GCC diagnostic ignored "-Wlong-long") -#include <physfs.h> -PRAGMA45(GCC diagnostic pop) -#endif // USE_PHYSFS #include <zlib.h> #include "debug.h" @@ -52,27 +46,6 @@ TEST_CASE("dumplibs tests") REQUIRE(build == link); } -#ifdef USE_PHYSFS - SECTION("physfs") - { - PHYSFS_Version buildVersion; - PHYSFS_Version linkVersion; - PHYSFS_VERSION(&buildVersion); - PHYSFS_getLinkedVersion(&linkVersion); - - const std::string build = strprintf("%d.%d.%d", - buildVersion.major, - buildVersion.minor, - buildVersion.patch); - const std::string link = strprintf("%d.%d.%d", - linkVersion.major, - linkVersion.minor, - linkVersion.patch); - - REQUIRE(build == link); - } -#endif // USE_PHYSFS - SECTION("sdl") { const SDL_version *linkVersion = nullptr; |