Small fixes (tried to compile with Visual Studio)

include/Script.h

@@ -144,12 +144,7 @@ class Script {
     void readStringPackage(BinaryFile& f, std::vector<std::string>& v, unsigned int n);
     void readScriptPackage(BinaryFile& f, std::vector<std::vector<uint16_t>>& v, unsigned int n);
 
-    const bool opcodeHasOperand[OP_UNKNOWN] {
-        true, true, true, true, true, true,
-        false, true, true, false, true, false,
-        true, false, false, false, true, true,
-        true, true, true, false, false
-    };
+    const static bool opcodeHasOperand[OP_UNKNOWN];
 
     // Header
     uint32_t version; // Always 3, for TR2/3 on PC and PSX

include/global.h

@@ -81,11 +81,14 @@ typedef enum {
 #include <OpenGL/gl3.h>
 #else // __APPLE__
 #ifdef _WIN32
-#include <windows.h>
-#endif // _WIN32
+#include <GL/glew.h>
+#include <GL/wglew.h>
+#pragma comment(lib, "glew32.lib")
+#else // _WIN32
 //! \todo gl3 header?
 #include <GL/gl.h>
 #include <GL/glext.h>
+#endif // _WIN32
 #endif // __APPLE__
 
 /*! \todo Is there a better way to handle this?

src/CMakeLists.txt

@@ -45,6 +45,14 @@ if (GLM_FOUND)
     include_directories (SYSTEM  ${GLM_INCLUDE_DIRS})
 endif (GLM_FOUND)
 
+if (WIN32)
+    find_package (GLEW REQUIRED)
+    if (GLEW_FOUND)
+        include_directories (SYSTEM ${GLEW_INCLUDE_DIRS})
+        set (LIBS ${LIBS} ${GLEW_LIBRARIES})
+    endif (GLEW_FOUND)
+endif (WIN32)
+
 #################################################################
 
 # Set Source files

src/Script.cpp

@@ -8,6 +8,13 @@
 #include "global.h"
 #include "Script.h"
 
+const bool Script::opcodeHasOperand[OP_UNKNOWN] {
+    true, true, true, true, true, true,
+    false, true, true, false, true, false,
+    true, false, false, false, true, true,
+    true, true, true, false, false
+};
+
 Script::Script() : puzzles(4), pickups(2), keys(4) {
     version = 0;
     firstOption = 0;

src/SoundManager.cpp

@@ -45,6 +45,8 @@ int SoundManager::prepareSources() {
             assertGreaterThanEqual(ret, 0);
         }
     }
+
+    return 0;
 }
 
 void SoundManager::addSoundSource(float x, float y, float z, int id, int flags) {

src/loader/LoaderTR2.cpp

@@ -1113,12 +1113,13 @@ void LoaderTR2::loadExternalSoundFile(std::string f) {
         // riffSize is (fileLength - 8)
         uint32_t riffSize = sfx.readU32();
 
-        unsigned char buff[riffSize + 8];
+        unsigned char* buff = new unsigned char[riffSize + 8];
         sfx.seek(sfx.tell() - 8);
         for (int i = 0; i < (riffSize + 8); i++)
             buff[i] = sfx.readU8();
 
         int ret = Sound::loadBuffer(buff, riffSize + 8);
+        delete [] buff;
         assertGreaterThanEqual(ret, 0);
 
         riffCount++;

src/system/Shader.cpp

@@ -241,7 +241,7 @@ void Shader::drawGL(ShaderBuffer& vertices, ShaderBuffer& uvs, glm::vec4 color,
                     Shader& shader) {
     assert(vertices.getSize() == uvs.getSize());
     if (mode == GL_TRIANGLES) {
-        assert((vertices.getSize() % 3) == 0)
+        assert((vertices.getSize() % 3) == 0);
     }
 
     shader.use();
@@ -295,7 +295,7 @@ void Shader::drawGL(ShaderBuffer& vertices, ShaderBuffer& colors, glm::mat4 MVP,
                     unsigned int mode, Shader& shader) {
     assert(vertices.getSize() == colors.getSize());
     if (mode == GL_TRIANGLES) {
-        assert((vertices.getSize() % 3) == 0)
+        assert((vertices.getSize() % 3) == 0);
     }
 
     shader.use();
@@ -311,7 +311,7 @@ void Shader::drawGL(ShaderBuffer& vertices, ShaderBuffer& colors, ShaderBuffer&
                     glm::mat4 MVP, unsigned int mode, Shader& shader) {
     assert(vertices.getSize() == colors.getSize());
     if (mode == GL_TRIANGLES) {
-        assert((indices.getSize() % 3) == 0)
+        assert((indices.getSize() % 3) == 0);
     }
 
     shader.use();

src/utils/filesystem.cpp

@@ -49,8 +49,8 @@ std::string getHomeDirectory() {
     assertEqual(SHGetFolderPath(nullptr, CSIDL_PROFILE, nullptr, 0, path), S_OK);
     size_t lenPath = strlen(path);
     for (unsigned int i = 0; i < lenPath; i++)
-        if (dir[i] == '\\')
-            dir[i] = '/';
+        if (path[i] == '\\')
+            path[i] = '/';
     return std::string(path);
 
 #else