Mirror/StormLib
1
0
Fork 0
mirror of https://github.com/ladislav-zezula/StormLib.git synced 2026-01-19 14:35:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

+ Fixed build warnings in VS 2015

Browse Source
This commit is contained in:
Zezula Ladislav
2018-04-03 15:13:41 +02:00
parent 008a48ed99
commit 67fde87202
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -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

4
src/adpcm/adpcm.cpp
View File

@@ -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;

2
test/StormTest.cpp
View File

@@ -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