Upgraded to VS2015 64-bit compiler

.gitignore

@@ -10,6 +10,7 @@
 *.dll
 *.dylib
 *.pdb
+*.ilk
 
 # Qt-es
 

src/.qmake.conf

@@ -1,5 +1,8 @@
 # CONFIG += PUBLIC_RELEASE
 
+QMAKE_CXXFLAGS += /WX \		# Treat warnings as errors
+	/wd4267					# Disable C4267: conversion from 'size_t' to 'type', possible loss of data
+
 BUILD_DIR = $$PWD/../build
 EXTERNALS_DIR = $$PWD/../externals
 PWE_MAIN_INCLUDE = $$PWD

src/Common/CFourCC.h

@@ -50,10 +50,10 @@ public:
     inline TString ToString() const
     {
         char CharArray[4] = {
-            ( (mFourCC >> 24) & 0xFF),
-            ( (mFourCC >> 16) & 0xFF),
-            ( (mFourCC >>  8) & 0xFF),
-            ( (mFourCC >>  0) & 0xFF)
+            (char) ((mFourCC >> 24) & 0xFF),
+            (char) ((mFourCC >> 16) & 0xFF),
+            (char) ((mFourCC >>  8) & 0xFF),
+            (char) ((mFourCC >>  0) & 0xFF)
         };
 
         return TString(CharArray, 4);

src/Common/Common.pro

@@ -24,8 +24,10 @@ CONFIG (debug, debug|release) {
 
     # Debug Libs
     LIBS += -L$$BUILD_DIR/FileIO/ -lFileIOd \
-            -L$$EXTERNALS_DIR/boost_1_56_0/lib32-msvc-12.0 -llibboost_filesystem-vc120-mt-gd-1_56 \
-            -L$$EXTERNALS_DIR/tinyxml2/lib/ -ltinyxml2d
+            -L$$EXTERNALS_DIR/boost_1_63_0/lib64-msvc-14.0 -llibboost_filesystem-vc140-mt-gd-1_63 \
+            -L$$EXTERNALS_DIR/lzo-2.09/lib -llzo2d \
+            -L$$EXTERNALS_DIR/tinyxml2/lib -ltinyxml2d \
+            -L$$EXTERNALS_DIR/zlib/lib -lzlibd
 
     # Debug Target Dependencies
     win32 {
@@ -40,8 +42,10 @@ CONFIG (release, debug|release) {
 
     # Release Libs
     LIBS += -L$$BUILD_DIR/FileIO/ -lFileIO \
-            -L$$EXTERNALS_DIR/boost_1_56_0/lib32-msvc-12.0 -llibboost_filesystem-vc120-mt-1_56 \
-            -L$$EXTERNALS_DIR/tinyxml2/lib/ -ltinyxml2
+            -L$$EXTERNALS_DIR/boost_1_63_0/lib64-msvc-140 -llibboost_filesystem-vc140-mt-1_63 \
+            -L$$EXTERNALS_DIR/lzo-2.09/lib -llzo2 \
+            -L$$EXTERNALS_DIR/tinyxml2/lib -ltinyxml2 \
+            -L$$EXTERNALS_DIR/zlib/lib -lzlib
 
     # Release Target Dependencies
     win32 {
@@ -49,14 +53,10 @@ CONFIG (release, debug|release) {
     }
 }
 
-# Debug/Release Libs
-LIBS += -L$$EXTERNALS_DIR/lzo-2.08/lib -llzo-2.08 \
-        -L$$EXTERNALS_DIR/zlib/lib -lzdll
-
 # Include Paths
 INCLUDEPATH += $$PWE_MAIN_INCLUDE \
-               $$EXTERNALS_DIR/boost_1_56_0 \
-               $$EXTERNALS_DIR/lzo-2.08/include \
+               $$EXTERNALS_DIR/boost_1_63_0 \
+               $$EXTERNALS_DIR/lzo-2.09/include \
                $$EXTERNALS_DIR/tinyxml2/include \
                $$EXTERNALS_DIR/zlib/include
 

src/Common/CompressionUtil.cpp

@@ -83,10 +83,12 @@ namespace CompressionUtil
         else return true;
     }
 
-    bool DecompressLZO(u8 *pSrc, u32 SrcLen, u8 *pDst, lzo_uint& rTotalOut)
+    bool DecompressLZO(u8 *pSrc, u32 SrcLen, u8 *pDst, u32& rTotalOut)
     {
         lzo_init();
-        s32 Error = lzo1x_decompress(pSrc, SrcLen, pDst, &rTotalOut, LZO1X_MEM_DECOMPRESS);
+        lzo_uint TotalOut;
+        s32 Error = lzo1x_decompress(pSrc, SrcLen, pDst, &TotalOut, LZO1X_MEM_DECOMPRESS);
+        rTotalOut = (u32) TotalOut;
 
         if (Error)
         {
@@ -130,7 +132,7 @@ namespace CompressionUtil
 
                 if (PeekMagic == 0x78DA || PeekMagic == 0x789C || PeekMagic == 0x7801)
                 {
-                    bool Success = DecompressZlib(pSrc, Size, pDst, pDstEnd - pDst, TotalOut);
+                    bool Success = DecompressZlib(pSrc, Size, pDst, (u32) (pDstEnd - pDst), TotalOut);
                     if (!Success) return false;
                 }
 
@@ -187,7 +189,7 @@ namespace CompressionUtil
         lzo_init();
 
         u8 *pWorkMem = new u8[LZO1X_999_MEM_COMPRESS];
-        s32 Error = lzo1x_999_compress(pSrc, SrcLen, pDst, &rTotalOut, pWorkMem);
+        s32 Error = lzo1x_999_compress(pSrc, SrcLen, pDst, (lzo_uint*) &rTotalOut, pWorkMem);
         delete[] pWorkMem;
 
         if (Error)
@@ -208,7 +210,7 @@ namespace CompressionUtil
         {
             // Each segment is compressed separately. Segment size should always be 0x4000 unless there's less than 0x4000 bytes left.
             u16 Size;
-            u32 Remaining = pSrcEnd - pSrc;
+            u32 Remaining = (u32) (pSrcEnd - pSrc);
 
             if (Remaining < 0x4000) Size = (u16) Remaining;
             else Size = 0x4000;
@@ -246,7 +248,7 @@ namespace CompressionUtil
             pDst += TotalOut;
         }
 
-        rTotalOut = pDst - pDstStart;
+        rTotalOut = (u32) (pDst - pDstStart);
         return true;
     }
 

src/Common/Serialization/CBinaryReader.h

@@ -89,7 +89,7 @@ public:
                     mpStream->Seek(ChildSize, SEEK_CUR);
                 else
                 {
-                    mParamStack.push_back( SParameter { mpStream->Tell() - 6, NextSize, false, false } );
+                    mParamStack.push_back( SParameter { (u32) mpStream->Tell() - 6, NextSize, false, false } );
                     return true;
                 }
             }

src/Common/Serialization/CBinaryWriter.h

@@ -63,7 +63,7 @@ public:
                 mpStream->WriteShort(-1); // Sub-param count filler
         }
 
-        mParamStack.push_back( SParameter { mpStream->Tell(), 0, false } );
+        mParamStack.push_back( SParameter { (u32) mpStream->Tell(), 0, false } );
 
         u32 ParamID = TString(pkName).Hash32();
         mpStream->WriteLong(ParamID);

src/Core/Core.pro

@@ -27,8 +27,10 @@ CONFIG (debug, debug|release) {
     LIBS += -L$$BUILD_DIR/FileIO/ -lFileIOd \
             -L$$BUILD_DIR/Common/ -lCommond \
             -L$$BUILD_DIR/Math/ -lMathd \
-            -L$$EXTERNALS_DIR/assimp/lib/ -lassimp-vc120-mtd \
-            -L$$EXTERNALS_DIR/tinyxml2/lib/ -ltinyxml2d
+            -L$$EXTERNALS_DIR/assimp/lib/ -lassimp-vc140-mtd \
+            -L$$EXTERNALS_DIR/lzo-2.09/lib/ -llzo2d \
+            -L$$EXTERNALS_DIR/tinyxml2/lib/ -ltinyxml2d \
+            -L$$EXTERNALS_DIR/zlib/lib/ -lzlibd
 
     # Debug Target Dependencies
     win32 {
@@ -47,8 +49,10 @@ CONFIG (release, debug|release) {
     LIBS += -L$$BUILD_DIR/FileIO/ -lFileIO \
             -L$$BUILD_DIR/Common/ -lCommon \
             -L$$BUILD_DIR/Math/ -lMath \
-            -L$$EXTERNALS_DIR/assimp/lib/ -lassimp-vc120-mt \
-            -L$$EXTERNALS_DIR/tinyxml2/lib/ -ltinyxml2
+            -L$$EXTERNALS_DIR/assimp/lib/ -lassimp-vc140-mt \
+            -L$$EXTERNALS_DIR/lzo-2.09/lib/ -llzo2 \
+            -L$$EXTERNALS_DIR/tinyxml2/lib/ -ltinyxml2 \
+            -L$$EXTERNALS_DIR/zlib/lib/ -lzlib
 
     # Release Target Dependencies
     win32 {
@@ -59,16 +63,15 @@ CONFIG (release, debug|release) {
 }
 
 # Debug/Release Libs
-LIBS += -L$$EXTERNALS_DIR/glew-1.9.0/lib/ -lglew32s \
-        -L$$EXTERNALS_DIR/lzo-2.08/lib -llzo-2.08 \
-        -L$$EXTERNALS_DIR/zlib/lib -lzdll
+LIBS += -L$$EXTERNALS_DIR/glew-2.0.0/lib/Release/x64 -lglew32s \
+        -lopengl32
 
 # Include Paths
 INCLUDEPATH += $$PWE_MAIN_INCLUDE \
                $$EXTERNALS_DIR/assimp/include \
-               $$EXTERNALS_DIR/glew-1.9.0/include \
+               $$EXTERNALS_DIR/glew-2.0.0/include \
                $$EXTERNALS_DIR/glm/glm \
-               $$EXTERNALS_DIR/lzo-2.08/include \
+               $$EXTERNALS_DIR/lzo-2.09/include \
                $$EXTERNALS_DIR/tinyxml2/include \
                $$EXTERNALS_DIR/zlib/include
 

src/Core/OpenGL/CIndexBuffer.cpp

@@ -75,7 +75,7 @@ void CIndexBuffer::DrawElements()
 void CIndexBuffer::DrawElements(u32 Offset, u32 Size)
 {
     Bind();
-    glDrawElements(mPrimitiveType, Size, GL_UNSIGNED_SHORT, (void*) (Offset * 2));
+    glDrawElements(mPrimitiveType, Size, GL_UNSIGNED_SHORT, (char*)0 + (Offset * 2));
     Unbind();
 }
 

src/Editor/Editor.pro

@@ -32,9 +32,11 @@ CONFIG(debug, debug|release) {
             -L$$BUILD_DIR/Common/ -lCommond \
             -L$$BUILD_DIR/Math/ -lMathd \
             -L$$BUILD_DIR/Core/ -lCored \
-            -L$$EXTERNALS_DIR/assimp/lib/ -lassimp-vc120-mtd \
-            -L$$EXTERNALS_DIR/boost_1_56_0/lib32-msvc-12.0 -llibboost_filesystem-vc120-mt-gd-1_56 \
-            -L$$EXTERNALS_DIR/tinyxml2/lib/ -ltinyxml2d
+            -L$$EXTERNALS_DIR/assimp/lib/ -lassimp-vc140-mtd \
+            -L$$EXTERNALS_DIR/boost_1_63_0/lib64-msvc-14.0 -llibboost_filesystem-vc140-mt-gd-1_63 \
+            -L$$EXTERNALS_DIR/lzo-2.09/lib/ -llzo2d \
+            -L$$EXTERNALS_DIR/tinyxml2/lib/ -ltinyxml2d \
+            -L$$EXTERNALS_DIR/zlib/lib/ -lzlibd
 
     # Debug Target Dependencies
     win32 {
@@ -57,9 +59,11 @@ CONFIG(release, debug|release) {
             -L$$BUILD_DIR/Common/ -lCommon \
             -L$$BUILD_DIR/Math/ -lMath \
             -L$$BUILD_DIR/Core/ -lCore \
-            -L$$EXTERNALS_DIR/assimp/lib/ -lassimp-vc120-mt \
-            -L$$EXTERNALS_DIR/boost_1_56_0/lib32-msvc-12.0 -llibboost_filesystem-vc120-mt-1_56 \
-            -L$$EXTERNALS_DIR/tinyxml2/lib/ -ltinyxml2
+            -L$$EXTERNALS_DIR/assimp/lib/ -lassimp-vc140-mt \
+            -L$$EXTERNALS_DIR/boost_1_63_0/lib64-msvc-14.0 -llibboost_filesystem-vc140-mt-1_63 \
+            -L$$EXTERNALS_DIR/lzo-2.09/lib/ -llzo2 \
+            -L$$EXTERNALS_DIR/tinyxml2/lib/ -ltinyxml2 \
+            -L$$EXTERNALS_DIR/zlib/lib/ -lzlib
 
     # Release Target Dependencies
     win32 {
@@ -71,16 +75,15 @@ CONFIG(release, debug|release) {
 }
 
 # Debug/Release Libs
-LIBS += -L$$EXTERNALS_DIR/glew-1.9.0/lib/ -lglew32s \
-        -L$$EXTERNALS_DIR/lzo-2.08/lib -llzo-2.08 \
-        -L$$EXTERNALS_DIR/zlib/lib -lzdll
+LIBS += -L$$EXTERNALS_DIR/glew-2.0.0/lib/Release/x64 -lglew32s \
+        -lopengl32
 
 # Include Paths
 INCLUDEPATH += $$PWE_MAIN_INCLUDE \
                $$EXTERNALS_DIR/assimp/include \
-               $$EXTERNALS_DIR/glew-1.9.0/include \
+               $$EXTERNALS_DIR/glew-2.0.0/include \
                $$EXTERNALS_DIR/glm/glm \
-               $$EXTERNALS_DIR/lzo-2.08/include \
+               $$EXTERNALS_DIR/lzo-2.09/include \
                $$EXTERNALS_DIR/tinyxml2/include \
                $$EXTERNALS_DIR/zlib/include
 

src/Editor/PropertyEdit/CPropertyModel.cpp

@@ -476,7 +476,7 @@ QModelIndex CPropertyModel::index(int Row, int Column, const QModelIndex& rkPare
 
     // Other property
     if (pParent->Type() == eColorProperty || pParent->Type() == eVector3Property || pParent->Type() == eBitfieldProperty || pParent->Type() == eCharacterProperty)
-        return createIndex(Row, Column, u32(pParent) | 0x1);
+        return createIndex(Row, Column, u64(pParent) | 0x1);
 
     return QModelIndex();
 }

src/Editor/WorldEditor/CInstancesModel.cpp

@@ -68,7 +68,7 @@ QModelIndex CInstancesModel::index(int Row, int Column, const QModelIndex& rkPar
     if (Type == eRootIndex)
     {
         if (Row < mBaseItems.count())
-            return createIndex(Row, Column, quint32(0));
+            return createIndex(Row, Column, quint64(0));
         else
             return QModelIndex();
     }
@@ -125,7 +125,7 @@ QModelIndex CInstancesModel::parent(const QModelIndex& rkChild) const
     if (Type == eObjectTypeIndex)
     {
         u32 NodeTypeRow = (rkChild.internalId() & TYPES_NODE_TYPE_MASK) >> TYPES_NODE_TYPE_SHIFT;
-        return createIndex(NodeTypeRow, 0, quint32(0));
+        return createIndex(NodeTypeRow, 0, quint64(0));
     }
 
     // Object type parent

src/FileIO/FileIO.pro

@@ -5,7 +5,6 @@
 #-------------------------------------------------
 
 QT       -= core gui
-QMAKE_CXXFLAGS += /WX
 DEFINES += PWE_FILEIO
 
 CONFIG += staticlib

src/Math/Math.pro

@@ -25,7 +25,9 @@ CONFIG (debug, debug|release) {
     # Debug Libs
     LIBS += -L$$BUILD_DIR/FileIO/ -lFileIOd \
             -L$$BUILD_DIR/Common/ -lCommond \
-            -L$$EXTERNALS_DIR/tinyxml2/lib/ -ltinyxml2d
+            -L$$EXTERNALS_DIR/lzo-2.09/lib/ -llzo2d \
+            -L$$EXTERNALS_DIR/tinyxml2/lib/ -ltinyxml2d \
+            -L$$EXTERNALS_DIR/zlib/lib/ -lzlibd
 
     # Debug Target Dependencies
     win32 {
@@ -42,7 +44,9 @@ CONFIG (release, debug|release) {
     # Release Libs
     LIBS += -L$$BUILD_DIR/FileIO/ -lFileIO \
             -L$$BUILD_DIR/Common/ -lCommon \
-            -L$$EXTERNALS_DIR/tinyxml2/lib/ -ltinyxml2
+            -L$$EXTERNALS_DIR/lzo-2.09/lib/ -llzo2 \
+            -L$$EXTERNALS_DIR/tinyxml2/lib/ -ltinyxml2 \
+            -L$$EXTERNALS_DIR/zlib/lib/ -lzlib
 
     # Release Target Dependencies
     win32 {
@@ -51,14 +55,10 @@ CONFIG (release, debug|release) {
     }
 }
 
-# Debug/Release Libs
-LIBS += -L$$EXTERNALS_DIR/lzo-2.08/lib -llzo-2.08 \
-        -L$$EXTERNALS_DIR/zlib/lib -lzdll
-
 # Include Paths
 INCLUDEPATH += $$PWE_MAIN_INCLUDE \
                $$EXTERNALS_DIR/glm/glm \
-               $$EXTERNALS_DIR/lzo-2.08/include \
+               $$EXTERNALS_DIR/lzo-2.09/include \
                $$EXTERNALS_DIR/tinyxml2/include \
                $$EXTERNALS_DIR/zlib/include
 

src/PrimeWorldEditor.pro

@@ -4,7 +4,6 @@
 #
 #-------------------------------------------------
 
-QMAKE_CXXFLAGS += /WX
 TEMPLATE = subdirs
 
 SUBDIRS += \