Add Appveyor script, fix 32bit Windows compilation

This commit is contained in:
Lukas W
2018-06-17 10:04:14 +02:00
parent 3a7b5207b4
commit 820d006c4e
3 changed files with 25 additions and 3 deletions

22
.appveyor.yml Normal file
View File

@@ -0,0 +1,22 @@
clone_depth: 1
version: "{build}"
image: Visual Studio 2015
platform:
- x86
- x64
environment:
matrix:
- compiler: msvc
install:
- vcpkg install --triplet %PLATFORM%-windows fftw3 libsamplerate libsndfile sdl2
build_script:
- cd %APPVEYOR_BUILD_FOLDER%
- mkdir build
- cd build
- ps: $env:CMAKE_PLATFORM="$(if ($env:PLATFORM -eq 'x64') { 'x64' } else { '' })"
- ps: $env:QT_SUFFIX="$(if ($env:PLATFORM -eq 'x64') { '_64' } else { '' })"
- cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_PREFIX_PATH=c:/Qt/5.9.5/msvc2015%QT_SUFFIX%;c:/tools/vcpkg/installed/%PLATFORM%-windows -DCMAKE_GENERATOR_PLATFORM="%CMAKE_PLATFORM%" ..
- cmake --build . -- /maxcpucount:4
- cmake --build . --target tests
cache:
- c:/tools/vcpkg/installed

View File

@@ -474,7 +474,7 @@ ELSE()
ENDIF(WANT_DEBUG_FPE)
# check for libsamplerate
FIND_PACKAGE(Samplerate 0.1.8 REQUIRED)
FIND_PACKAGE(Samplerate 0.1.8 MODULE REQUIRED)
# set compiler flags
IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")

View File

@@ -88,8 +88,8 @@ private:
surroundSampleFrame * m_outBuf;
#ifdef LMMS_HAVE_SDL2
uint64_t m_currentBufferFramePos;
uint64_t m_currentBufferFramesCount;
size_t m_currentBufferFramePos;
size_t m_currentBufferFramesCount;
#else
Uint8 * m_convertedBuf;
int m_convertedBufPos;