AxioDL/PrimeWorldEditor
2
0
Fork 0
mirror of https://github.com/AxioDL/PrimeWorldEditor.git synced 2025-12-21 02:39:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgraded to VS2015 64-bit compiler

Browse Source
This commit is contained in:
Aruki
2017-02-04 09:36:37 -07:00
parent 7f9bed653b
commit fbdf9023d1
81 changed files with 65 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Core/Core.pro
View File

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

2
src/Core/OpenGL/CIndexBuffer.cpp
View File

@@ -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();
}