From af06203a4ae178f0892365bf9ce21ce5ac589a9d Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Sun, 28 Jun 2015 21:39:56 -0300 Subject: [PATCH] Moved the appveyor script to a subfolder and updated it to properly choose Visual Studio 2012 and to create a post-build zip file. --- appveyor.yml => extra/appveyor/appveyor.yml | 14 ++++++++++++-- src/modules/graphics/opengl/OpenGL.cpp | 6 +++--- src/modules/sound/lullaby/VorbisDecoder.cpp | 6 +++--- src/modules/sound/lullaby/VorbisDecoder.h | 2 +- 4 files changed, 19 insertions(+), 9 deletions(-) rename appveyor.yml => extra/appveyor/appveyor.yml (65%) diff --git a/appveyor.yml b/extra/appveyor/appveyor.yml similarity index 65% rename from appveyor.yml rename to extra/appveyor/appveyor.yml index c7507bf78..86eb2cbd4 100644 --- a/appveyor.yml +++ b/extra/appveyor/appveyor.yml @@ -25,12 +25,22 @@ install: - move love libs\love before_build: -- cmake -H. -Bbuild +- cmake -G "Visual Studio 12" -H. -Bbuild build_script: - cmake --build build --target love/love --config Release +after_build: +# TODO: Find the C++ and C runtime .dll's and zip them. +- 7z a love.zip %APPVEYOR_BUILD_FOLDER%\build\love\Release\*.dll +- 7z a love.zip %APPVEYOR_BUILD_FOLDER%\build\love\Release\love.exe +- 7z a love.zip %APPVEYOR_BUILD_FOLDER%\build\love\changes.txt +- 7z a love.zip %APPVEYOR_BUILD_FOLDER%\build\love\license.txt + before_test: - test_script: + + +artifacts: +- path: love.zip diff --git a/src/modules/graphics/opengl/OpenGL.cpp b/src/modules/graphics/opengl/OpenGL.cpp index d1c6ec8ae..a6d7d2aa1 100644 --- a/src/modules/graphics/opengl/OpenGL.cpp +++ b/src/modules/graphics/opengl/OpenGL.cpp @@ -92,7 +92,7 @@ void OpenGL::setupContext() GLint maxvertexattribs = 1; glGetIntegerv(GL_MAX_VERTEX_ATTRIBS, &maxvertexattribs); - state.enabledAttribArrays = 1u << uint32(maxvertexattribs - 1); + state.enabledAttribArrays = (uint32) ((1ull << uint32(maxvertexattribs)) - 1); useVertexAttribArrays(0); // Get the current viewport. @@ -391,8 +391,8 @@ void OpenGL::useVertexAttribArrays(uint32 arraybits) state.enabledAttribArrays = arraybits; // glDisableVertexAttribArray will make the constant value for a vertex - // attribute undefined. We rely on the per-vertex color attribte being white - // when no per-vertex color is used, so we set it here. + // attribute undefined. We rely on the per-vertex color attribute being + // white when no per-vertex color is used, so we set it here. // FIXME: Is there a better place to do this? if ((diff & ATTRIBFLAG_COLOR) && !(arraybits & ATTRIBFLAG_COLOR)) glVertexAttrib4f(ATTRIB_COLOR, 1.0f, 1.0f, 1.0f, 1.0f); diff --git a/src/modules/sound/lullaby/VorbisDecoder.cpp b/src/modules/sound/lullaby/VorbisDecoder.cpp index ef0653a54..7cff4aabb 100644 --- a/src/modules/sound/lullaby/VorbisDecoder.cpp +++ b/src/modules/sound/lullaby/VorbisDecoder.cpp @@ -63,7 +63,7 @@ static size_t vorbisRead(void *ptr /* ptr to the data that the vorbis files need if (actualSizeToRead) { // Copy the data from the start of the file PLUS how much we have already read in - memcpy(ptr, (char *)vorbisData->dataPtr + vorbisData->dataRead, actualSizeToRead); + memcpy(ptr, (const char *)vorbisData->dataPtr + vorbisData->dataRead, actualSizeToRead); // Increase by how much we have read by vorbisData->dataRead += (actualSizeToRead); } @@ -109,7 +109,7 @@ static int vorbisSeek(void *datasource /* ptr to the data that the vorbis files vorbisData->dataRead = vorbisData->dataSize+1; break; default: - throw love::Exception("Unknown seek command in vorbisSeek\n"); + throw love::Exception("Unknown seek command in vorbisSeek"); break; }; @@ -143,7 +143,7 @@ VorbisDecoder::VorbisDecoder(Data *data, const std::string &ext, int bufferSize) #endif // Initialize OGG file - oggFile.dataPtr = (char *) data->getData(); + oggFile.dataPtr = (const char *) data->getData(); oggFile.dataSize = (int) data->getSize(); oggFile.dataRead = 0; diff --git a/src/modules/sound/lullaby/VorbisDecoder.h b/src/modules/sound/lullaby/VorbisDecoder.h index ea6f26970..ebd815c5b 100644 --- a/src/modules/sound/lullaby/VorbisDecoder.h +++ b/src/modules/sound/lullaby/VorbisDecoder.h @@ -40,7 +40,7 @@ namespace lullaby // Struct for handling data struct SOggFile { - char *dataPtr; // Pointer to the data in memory + const char *dataPtr; // Pointer to the data in memory int dataSize; // Size of the data int dataRead; // How much we've read so far };