diff options
| author | Zezula Ladislav <ladislav.zezula@avast.com> | 2018-04-03 15:13:41 +0200 |
|---|---|---|
| committer | Zezula Ladislav <ladislav.zezula@avast.com> | 2018-04-03 15:13:41 +0200 |
| commit | 67fde87202c8ad1bb2d23e2ecb69ddeb215e6c8f (patch) | |
| tree | 6c962beda9af4d178d110e43261e202b2204e4b4 | |
| parent | 008a48ed998dedcae4a6c7646c8f8562eb8af906 (diff) | |
+ Fixed build warnings in VS 2015
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/adpcm/adpcm.cpp | 4 | ||||
| -rw-r--r-- | test/StormTest.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6d8d041..28f5280 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,9 +6,9 @@ set(LIBRARY_NAME storm) include(CMakeDependentOption) option(BUILD_SHARED_LIBS "Compile shared libraries" OFF) -cmake_dependent_option(STORM_BUILD_TESTS +option(STORM_BUILD_TESTS "Compile StormLib test application" OFF - "BUILD_TESTING" OFF # Stay coherent with CTest variables +# "BUILD_TESTING" OFF # Stay coherent with CTest variables ) set(SRC_FILES diff --git a/src/adpcm/adpcm.cpp b/src/adpcm/adpcm.cpp index e551bda..c8086ab 100644 --- a/src/adpcm/adpcm.cpp +++ b/src/adpcm/adpcm.cpp @@ -101,9 +101,9 @@ class TADPCMStream return true; } - int LengthProcessed(void * pvBuffer) + int LengthProcessed(void * pvOutBuffer) { - return pbBuffer - (unsigned char *)pvBuffer; + return (int)((unsigned char *)pbBuffer - (unsigned char *)pvOutBuffer); } unsigned char * pbBufferEnd; diff --git a/test/StormTest.cpp b/test/StormTest.cpp index dc20920..e6ca2cb 100644 --- a/test/StormTest.cpp +++ b/test/StormTest.cpp @@ -37,7 +37,7 @@ #ifdef PLATFORM_WINDOWS
#define WORK_PATH_ROOT _T("E:\\Multimedia\\MPQs")
-static const TCHAR szListFileDir[] = { '1', '9', '9', '5', ' ', '-', ' ', 'T', 'e', 's', 't', ' ', 'M', 'P', 'Q', 's', '\\', 'l', 'i', 's', 't', 'f', 'i', 'l', 'e', 's', '-', 0x65B0, 0x5EFA, 0x6587, 0x4EF6, 0x5939, 0 };
+static const TCHAR szListFileDir[] = { '1', '9', '9', '5', ' ', '-', ' ', 'T', 'e', 's', 't', ' ', 'M', 'P', 'Q', 's', '\\', 'l', 'i', 's', 't', 'f', 'i', 'l', 'e', 's', '-', (TCHAR)0x65B0, (TCHAR)0x5EFA, (TCHAR)0x6587, (TCHAR)0x4EF6, (TCHAR)0x5939, 0 };
#endif
#ifdef PLATFORM_LINUX
|