diff options
author | jackpoz <giacomopoz@gmail.com> | 2015-06-28 22:55:19 +0200 |
---|---|---|
committer | DDuarte <dnpd.dd@gmail.com> | 2015-06-29 15:54:00 +0100 |
commit | 622ff39f49e0b401c6a1a95727ad73ab96faa5e4 (patch) | |
tree | 186cb83530f49b1dfca51257fcf6d0b7db31be48 /dep/g3dlite/source | |
parent | a48f8f4de9c0fc8251fdbb90a09be9e64fc6a19e (diff) |
Core/Dependencies: Fix some warnings in G3D
(cherry picked from commit c86cf03dcefad845ca52b1bb1c9b1baa89105462)
Diffstat (limited to 'dep/g3dlite/source')
-rw-r--r-- | dep/g3dlite/source/FileSystem.cpp | 3 | ||||
-rw-r--r-- | dep/g3dlite/source/debugAssert.cpp | 2 | ||||
-rw-r--r-- | dep/g3dlite/source/fileutils.cpp | 10 | ||||
-rw-r--r-- | dep/g3dlite/source/prompt.cpp | 2 |
4 files changed, 17 insertions, 0 deletions
diff --git a/dep/g3dlite/source/FileSystem.cpp b/dep/g3dlite/source/FileSystem.cpp index 32a84e77048..06e6ff00a5e 100644 --- a/dep/g3dlite/source/FileSystem.cpp +++ b/dep/g3dlite/source/FileSystem.cpp @@ -137,6 +137,9 @@ void FileSystem::Dir::computeZipListing(const std::string& zipfile, const std::s zip_close(z); z = NULL; +#else + (void)zipfile; + (void)_pathInsideZipfile; #endif } diff --git a/dep/g3dlite/source/debugAssert.cpp b/dep/g3dlite/source/debugAssert.cpp index 92ce2376490..cfccf9a0cc5 100644 --- a/dep/g3dlite/source/debugAssert.cpp +++ b/dep/g3dlite/source/debugAssert.cpp @@ -121,6 +121,8 @@ static void createErrorMessage( const char* moduleName = strrchr(modulePath, '\\'); outTitle = outTitle + string(" - ") + string(moduleName ? (moduleName + 1) : modulePath); + #else + (void)outTitle; #endif // Build the message. diff --git a/dep/g3dlite/source/fileutils.cpp b/dep/g3dlite/source/fileutils.cpp index 966cca7d4bf..2788adad3bc 100644 --- a/dep/g3dlite/source/fileutils.cpp +++ b/dep/g3dlite/source/fileutils.cpp @@ -396,6 +396,10 @@ bool zipfileExists(const std::string& filename, std::string& outZipfile, } } +#else + (void)filename; + (void)outZipfile; + (void)outInternalFile; #endif // not a valid directory structure ever, // obviously no .zip was found within the path @@ -756,6 +760,12 @@ static void getFileOrDirListZip(const std::string& path, zip_close( z ); fileSet.getMembers(files); +#else + (void)path; + (void)prefix; + (void)files; + (void)wantFiles; + (void)includePath; #endif } diff --git a/dep/g3dlite/source/prompt.cpp b/dep/g3dlite/source/prompt.cpp index ee520d85db7..6927fd03b85 100644 --- a/dep/g3dlite/source/prompt.cpp +++ b/dep/g3dlite/source/prompt.cpp @@ -572,6 +572,8 @@ int prompt( return result; } #endif +#else + (void)useGui; #endif /* G3DFIX: exclude GUI prompt code */ return textPrompt(windowTitle, prompt, choice, numChoices); } |