From 7815aa65e20efcd6eb00a5b6e50007cd5cd2ab5a Mon Sep 17 00:00:00 2001 From: David Pershouse Date: Thu, 28 Sep 2017 22:42:48 +1000 Subject: [PATCH 1/9] Basic fixes to get building Convert projects to vs2017 Fix easy to solve warnings in vs2017 so that we can keep building as warnings=errors (cast precision and unused code) --- .gitmodules | 6 + 3rdparty/freetype-2.7/src/gzip/zconf.h | 1 - src/moai-assimp/MOAIAssimpAnimation.cpp | 8 +- src/moai-box2d/MOAIBox2DDebugDraw.cpp | 4 +- src/moai-sim/MOAICamera.cpp | 2 +- src/moai-sim/MOAICollisionPrim.cpp | 14 +- src/moai-sim/MOAICollisionProp.cpp | 8 +- src/moai-sim/MOAIDraw.cpp | 5 +- src/moai-sim/MOAIDrawDeck.cpp | 2 +- src/moai-sim/MOAIDrawShapeImmediate.cpp | 2 +- src/moai-sim/MOAIGfxBuffer.cpp | 2 +- src/moai-sim/MOAIGfxGlobalsCache.cpp | 2 +- src/moai-sim/MOAIGfxStateCache.cpp | 6 +- src/moai-sim/MOAIGfxVertexCache.cpp | 2 +- src/moai-sim/MOAIGfxVertexCache.h | 2 +- src/moai-sim/MOAIGraphicsProp.cpp | 2 +- src/moai-sim/MOAIGraphicsPropBase.cpp | 8 +- src/moai-sim/MOAIIndexedPropBase.cpp | 2 +- src/moai-sim/MOAILight.cpp | 11 +- src/moai-sim/MOAILightFormat.cpp | 1 + src/moai-sim/MOAIPartitionHolder.cpp | 1 + src/moai-sim/MOAISpriteDeck2D.cpp | 9 +- src/moai-sim/MOAITextLabel.cpp | 4 +- src/moai-sim/pch.h | 1 + src/zl-gfx/ZLGfxImmediate.cpp | 2 +- src/zl-util/ZLBounds.cpp | 2 +- src/zl-vfs/zl_vfscanf.cpp | 2 + vs2015/assimp/assimp.vcxproj | 19 +- vs2015/box2d/box2d.vcxproj | 11 +- vs2015/buildvm/buildvm.vcxproj | 11 +- vs2015/contrib/contrib.vcxproj | 11 +- vs2015/expat/expat.vcxproj | 11 +- vs2015/freetype/freetype.vcxproj | 108 +++++----- vs2015/freetype/freetype.vcxproj.filters | 135 ++++++------ vs2015/glew/glew.vcxproj | 11 +- vs2015/glewinfo/glewinfo.vcxproj | 23 +- vs2015/hexdump/hexdump.vcxproj | 35 +-- vs2015/jansson/jansson.vcxproj | 12 +- vs2015/kissfft/kissfft.vcxproj | 11 +- vs2015/libcurl/libcurl.vcxproj | 11 +- vs2015/libjpg/libjpg.vcxproj | 11 +- vs2015/libogg/libogg.vcxproj | 11 +- vs2015/libpng/libpng.vcxproj | 19 +- vs2015/libpvr/libpvr.vcxproj | 11 +- vs2015/libtess/libtess.vcxproj | 11 +- vs2015/libvorbis/libvorbis.vcxproj | 11 +- vs2015/libwebp/libwebp.vcxproj | 11 +- vs2015/lua-5.1/lua-5.1.vcxproj | 19 +- vs2015/lua-5.2/lua-5.2.vcxproj | 19 +- vs2015/lua-lib-5.1/lua-lib-5.1.vcxproj | 11 +- vs2015/lua-lib-5.2/lua-lib-5.2.vcxproj | 11 +- vs2015/luac-5.1/luac-5.1.vcxproj | 19 +- vs2015/luac-5.2/luac-5.2.vcxproj | 19 +- vs2015/luaext/luaext.vcxproj | 12 +- vs2015/luajit-lib/luajit-lib.vcxproj | 11 +- vs2015/luajit/luajit.vcxproj | 19 +- vs2015/mbedtls/mbedTLS.vcxproj | 10 +- vs2015/minilua/minilua.vcxproj | 11 +- vs2015/moai-exe-server/moai-server.vcxproj | 19 +- vs2015/moai-exe-test/moai-test.vcxproj | 38 ++-- vs2015/moai-exe/moai.vcxproj | 26 +-- .../moai-lib-assimp/moai-lib-assimp.vcxproj | 21 +- vs2015/moai-lib-box2d/moai-lib-box2d.vcxproj | 19 +- vs2015/moai-lib-core/moai-lib-core.vcxproj | 27 +-- .../moai-lib-crypto/moai-lib-crypto.vcxproj | 19 +- .../moai-lib-http-client.vcxproj | 19 +- .../moai-lib-http-server.vcxproj | 19 +- .../moai-lib-image-jpg.vcxproj | 19 +- .../moai-lib-image-png.vcxproj | 19 +- .../moai-lib-image-pvr.vcxproj | 19 +- .../moai-lib-image-tga.vcxproj | 19 +- .../moai-lib-image-webp.vcxproj | 19 +- .../moai-lib-luaext/moai-lib-luaext.vcxproj | 19 +- vs2015/moai-lib-sdl/moai-lib-sdl.vcxproj | 19 +- vs2015/moai-lib-sim/moai-engine.vcxproj | 148 +++++++++---- .../moai-lib-sim/moai-engine.vcxproj.filters | 199 +++++++++--------- vs2015/moai-lib-test/moai-lib-test.vcxproj | 19 +- vs2015/moai-lib-untz/moai-lib-untz.vcxproj | 19 +- vs2015/moai-lib-util/moai-lib-util.vcxproj | 19 +- vs2015/moai.sln | 85 ++------ vs2015/mongoose/mongoose.vcxproj | 11 +- vs2015/sdl/sdl.vcxproj | 11 +- vs2015/sfmt/sfmt.vcxproj | 11 +- vs2015/sqlite/sqlite.vcxproj | 11 +- vs2015/tinyxml/tinyxml.vcxproj | 11 +- vs2015/tlsf/tlsf.vcxproj | 11 +- vs2015/untz/untz.vcxproj | 12 +- vs2015/visualinfo/visualinfo.vcxproj | 23 +- vs2015/work/work.vcxproj | 15 +- vs2015/zl-lib-core/zl-lib-core.vcxproj | 34 ++- .../zl-lib-core/zl-lib-core.vcxproj.filters | 15 ++ vs2015/zl-lib-crypto/zl-lib-crypto.vcxproj | 31 +-- vs2015/zl-lib-gfx/zl-lib-gfx.vcxproj | 11 +- vs2015/zl-lib-vfs/zl-lib-vfs.vcxproj | 19 +- vs2015/zlib/zlib.vcxproj | 69 +++--- 95 files changed, 985 insertions(+), 905 deletions(-) diff --git a/.gitmodules b/.gitmodules index a6eb87f899..206ecc8134 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,6 +4,12 @@ [submodule "3rdparty/kissfft"] path = 3rdparty/kissfft url = https://github.com/itdaniher/kissfft.git +[submodule "3rdparty/mbedtls"] + path = 3rdparty/mbedtls + url = https://github.com/ARMmbed/mbedtls.git +[submodule "3rdparty/curl"] + path = 3rdparty/curl + url = https://github.com/curl/curl [submodule "3rdparty/assimp"] path = 3rdparty/assimp url = https://github.com/assimp/assimp.git diff --git a/3rdparty/freetype-2.7/src/gzip/zconf.h b/3rdparty/freetype-2.7/src/gzip/zconf.h index fa1356bc94..3abf0ba03b 100644 --- a/3rdparty/freetype-2.7/src/gzip/zconf.h +++ b/3rdparty/freetype-2.7/src/gzip/zconf.h @@ -217,7 +217,6 @@ #if !defined(MACOS) && !defined(TARGET_OS_MAC) typedef unsigned char Byte; /* 8 bits */ -eregrgrgregr #endif typedef unsigned int uInt; /* 16 bits or more */ typedef unsigned long uLong; /* 32 bits or more */ diff --git a/src/moai-assimp/MOAIAssimpAnimation.cpp b/src/moai-assimp/MOAIAssimpAnimation.cpp index 9654fa8fc2..fd08017257 100644 --- a/src/moai-assimp/MOAIAssimpAnimation.cpp +++ b/src/moai-assimp/MOAIAssimpAnimation.cpp @@ -168,7 +168,7 @@ MOAIAnimCurveBone* MOAIAssimpAnimation::GetAnimCurve ( u32 channel ) { ZLVec3D p1 = p0; const aiVectorKey& posKeyPrev = nodeAnim->mPositionKeys [ iPos > 0 ? iPos - 1 : 0 ]; p0 = ZLVec3D ( posKeyPrev.mValue.x, posKeyPrev.mValue.y, posKeyPrev.mValue.z ); - p0.Lerp ( p1, ( t - posKeyPrev.mTime ) / ( posKey->mTime - posKeyPrev.mTime )); + p0.Lerp ( p1, (float) (( t - posKeyPrev.mTime ) / ( posKey->mTime - posKeyPrev.mTime ))); } } @@ -183,7 +183,7 @@ MOAIAnimCurveBone* MOAIAssimpAnimation::GetAnimCurve ( u32 channel ) { ZLQuaternion q1 = q0; const aiQuatKey& rotKeyPrev = nodeAnim->mRotationKeys [ iRot > 0 ? iRot - 1 : 0 ]; q0 = ZLQuaternion ( rotKeyPrev.mValue.w, rotKeyPrev.mValue.x, rotKeyPrev.mValue.y, rotKeyPrev.mValue.z ); - q0.Slerp ( q0, q1, ( t - rotKeyPrev.mTime ) / ( rotKey->mTime - rotKeyPrev.mTime )); + q0.Slerp ( q0, q1, (float) (( t - rotKeyPrev.mTime ) / ( rotKey->mTime - rotKeyPrev.mTime ))); } } @@ -198,11 +198,11 @@ MOAIAnimCurveBone* MOAIAssimpAnimation::GetAnimCurve ( u32 channel ) { ZLVec3D s1 = s0; const aiVectorKey& sclKeyPrev = nodeAnim->mScalingKeys [ iScl > 0 ? iScl - 1 : 0 ]; s0 = ZLVec3D ( sclKeyPrev.mValue.x, sclKeyPrev.mValue.y, sclKeyPrev.mValue.z ); - s0.Lerp ( s1, ( t - sclKeyPrev.mTime ) / ( sclKey->mTime - sclKeyPrev.mTime )); + s0.Lerp ( s1, (float) (( t - sclKeyPrev.mTime ) / ( sclKey->mTime - sclKeyPrev.mTime ))); } } - curve->SetKey (( u32 )i, t / this->mAssimpAnimation->mTicksPerSecond, ZLInterpolate::kLinear ); + curve->SetKey (( u32 )i, (float) ( t / this->mAssimpAnimation->mTicksPerSecond ), ZLInterpolate::kLinear ); curve->SetSamplePosition (( u32 )i, p0.mX, p0.mY, p0.mZ ); curve->SetSampleRotation (( u32 )i, q0.mV.mX, q0.mV.mY, q0.mV.mZ, q0.mS ); curve->SetSampleScale (( u32 )i, s0.mX, s0.mY, s0.mZ ); diff --git a/src/moai-box2d/MOAIBox2DDebugDraw.cpp b/src/moai-box2d/MOAIBox2DDebugDraw.cpp index e8642e5a0c..7219c8746b 100644 --- a/src/moai-box2d/MOAIBox2DDebugDraw.cpp +++ b/src/moai-box2d/MOAIBox2DDebugDraw.cpp @@ -74,7 +74,7 @@ void MOAIBox2DDebugDraw::DrawCircle ( const b2Vec2& center, float32 radius, cons gfxMgr.mGfxState.SetPenColor ( color.r, color.g, color.b, 1.0f ); - const float32 k_segments = 16.0f; + const u32 k_segments = 16; const float32 k_increment = 2.0f * b2_pi / k_segments; gfxMgr.mVertexCache.BeginPrim ( ZGL_PRIM_LINE_LOOP, k_segments ); @@ -95,7 +95,7 @@ void MOAIBox2DDebugDraw::DrawSolidCircle ( const b2Vec2& center, float32 radius, gfxMgr.mGfxState.SetBlendMode ( ZGL_BLEND_FACTOR_SRC_ALPHA, ZGL_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA ); gfxMgr.mGfxState.SetPenColor ( 0.5f * color.r, 0.5f * color.g, 0.5f * color.b, 0.5f ); - const float32 k_segments = 16.0f; + const u32 k_segments = 16; const float32 k_increment = 2.0f * b2_pi / k_segments; gfxMgr.mVertexCache.BeginPrim ( ZGL_PRIM_TRIANGLE_FAN, k_segments ); diff --git a/src/moai-sim/MOAICamera.cpp b/src/moai-sim/MOAICamera.cpp index 825fb3265b..218a0a7312 100644 --- a/src/moai-sim/MOAICamera.cpp +++ b/src/moai-sim/MOAICamera.cpp @@ -498,7 +498,7 @@ void MOAICamera::RegisterLuaClass ( MOAILuaState& state ) { MOAIDebugLinesMgr::Get ().ReserveStyleSet < MOAICamera >( TOTAL_DEBUG_LINE_STYLES ); - state.SetField ( -1, "DEBUG_DRAW_CAMERA_MASTER", MOAIDebugLinesMgr::Pack < MOAICamera >( -1 )); + state.SetField ( -1, "DEBUG_DRAW_CAMERA_MASTER", MOAIDebugLinesMgr::Pack < MOAICamera >( (u32) -1 )); state.SetField ( -1, "DEBUG_DRAW_FRAME", MOAIDebugLinesMgr::Pack < MOAICamera >( DEBUG_DRAW_FRAME )); state.SetField ( -1, "DEBUG_DRAW_RETICLE", MOAIDebugLinesMgr::Pack < MOAICamera >( DEBUG_DRAW_RETICLE )); diff --git a/src/moai-sim/MOAICollisionPrim.cpp b/src/moai-sim/MOAICollisionPrim.cpp index 87ce38430b..538be41844 100644 --- a/src/moai-sim/MOAICollisionPrim.cpp +++ b/src/moai-sim/MOAICollisionPrim.cpp @@ -56,15 +56,15 @@ void MOAICollisionPrimVisitor::Process ( MOAICollisionProp& prop0, MOAICollision } else { - MOAIOverlapBox shape0; - shape0.mShape = prop0.GetModelBounds (); - shape0.mBounds = shape0.mShape; + MOAIOverlapBox oshape0; + oshape0.mShape = prop0.GetModelBounds (); + oshape0.mBounds = oshape0.mShape; - MOAIOverlapBox shape1; - shape1.mShape = prop1.GetModelBounds (); - shape1.mBounds = shape1.mShape; + MOAIOverlapBox oshape1; + oshape1.mShape = prop1.GetModelBounds (); + oshape1.mBounds = oshape1.mShape; - this->Process ( shape0, shape1, t0, t1 ); + this->Process ( oshape0, oshape1, t0, t1 ); } } diff --git a/src/moai-sim/MOAICollisionProp.cpp b/src/moai-sim/MOAICollisionProp.cpp index ead4073b2d..9925c7181c 100644 --- a/src/moai-sim/MOAICollisionProp.cpp +++ b/src/moai-sim/MOAICollisionProp.cpp @@ -272,9 +272,9 @@ void MOAICollisionProp::Move ( ZLVec3D move, u32 detach, u32 maxSteps ) { u32 nContacts = contactAccumulator.Top (); u32 nPushContacts = 0; - for ( u32 i = 0; i < nContacts; ++i ) { + for ( u32 j = 0; j < nContacts; ++j ) { - const MOAIMoveConstraint2D& contact = contacts [ i ]; + const MOAIMoveConstraint2D& contact = contacts [ j ]; // ignore corner contacts if they are behind the move if ( contact.mType == MOAIMoveConstraint2D::CORNER ) { @@ -411,7 +411,7 @@ void MOAICollisionProp::RegisterLuaClass ( MOAILuaState& state ) { MOAIDebugLinesMgr::Get ().ReserveStyleSet < MOAICollisionProp >( TOTAL_DEBUG_LINE_STYLES ); - state.SetField ( -1, "DEBUG_DRAW_COLLISION_PROP_MASTER", MOAIDebugLinesMgr::Pack < MOAICollisionProp >( -1 )); + state.SetField ( -1, "DEBUG_DRAW_COLLISION_PROP_MASTER", MOAIDebugLinesMgr::Pack < MOAICollisionProp >( (u32) -1 )); state.SetField ( -1, "DEBUG_DRAW_COLLISION_ACTIVE_PROP_BOUNDS", MOAIDebugLinesMgr::Pack < MOAICollisionProp >( DEBUG_DRAW_COLLISION_ACTIVE_PROP_BOUNDS )); state.SetField ( -1, "DEBUG_DRAW_COLLISION_ACTIVE_OVERLAP_PROP_BOUNDS", MOAIDebugLinesMgr::Pack < MOAICollisionProp >( DEBUG_DRAW_COLLISION_ACTIVE_OVERLAP_PROP_BOUNDS )); state.SetField ( -1, "DEBUG_DRAW_COLLISION_ACTIVE_TOUCHED_PROP_BOUNDS", MOAIDebugLinesMgr::Pack < MOAICollisionProp >( DEBUG_DRAW_COLLISION_ACTIVE_TOUCHED_PROP_BOUNDS )); @@ -529,7 +529,7 @@ void MOAICollisionProp::MOAIDrawable_DrawDebug ( int subPrimID ) { if ( visible ) { - MOAICollisionShape* shape = this->GetCollisionShape (); + shape = this->GetCollisionShape (); if ( shape ) { const ZLAffine3D& localToWorldMtx = this->GetLocalToWorldMtx (); diff --git a/src/moai-sim/MOAIDraw.cpp b/src/moai-sim/MOAIDraw.cpp index a8e4dc2e82..9fcc6580d3 100644 --- a/src/moai-sim/MOAIDraw.cpp +++ b/src/moai-sim/MOAIDraw.cpp @@ -1050,7 +1050,7 @@ int MOAIDraw::_setScissorRect ( lua_State* L ) { } else { ZLRect rect; - rect.Init ( 0, 0, gfxMgr.mGfxState.GetBufferWidth (), gfxMgr.mGfxState.GetBufferHeight ()); + rect.Init ( 0.0, 0.0, (float) gfxMgr.mGfxState.GetBufferWidth (), (float) gfxMgr.mGfxState.GetBufferHeight ()); rect = state.GetValue < ZLRect >( 1, rect ); gfxMgr.mGfxState.SetScissorRect ( rect ); } @@ -1085,7 +1085,7 @@ int MOAIDraw::_setViewRect ( lua_State* L ) { } else { ZLRect rect; - rect.Init ( 0, 0, gfxMgr.mGfxState.GetBufferWidth (), gfxMgr.mGfxState.GetBufferHeight ()); + rect.Init ( 0.0, 0.0, (float) gfxMgr.mGfxState.GetBufferWidth (), (float) gfxMgr.mGfxState.GetBufferHeight ()); rect = state.GetValue < ZLRect >( 1, rect ); gfxMgr.mGfxState.SetViewRect ( rect ); } @@ -1210,7 +1210,6 @@ void MOAIDraw::DrawAxisGrid ( ZLVec2D loc, ZLVec2D vec, float size ) { //----------------------------------------------------------------// void MOAIDraw::DrawBezierCurve ( const ZLCubicBezier2D& bezier ) { - MOAIGfxMgr& gfxMgr = MOAIGfxMgr::Get (); MOAIDrawVertexLineStripWriter2D writer; writer.Begin (); diff --git a/src/moai-sim/MOAIDrawDeck.cpp b/src/moai-sim/MOAIDrawDeck.cpp index f0441784bd..4c8ebe13d3 100644 --- a/src/moai-sim/MOAIDrawDeck.cpp +++ b/src/moai-sim/MOAIDrawDeck.cpp @@ -143,7 +143,7 @@ ZLBounds MOAIDrawDeck::MOAIDeck_GetBounds ( u32 idx ) { MOAIScopedLuaState state = MOAILuaRuntime::Get ().State (); - int top = state.GetTop (); + // int top = state.GetTop (); this->mOnBounds.PushRef ( state ); diff --git a/src/moai-sim/MOAIDrawShapeImmediate.cpp b/src/moai-sim/MOAIDrawShapeImmediate.cpp index ae74e40bbd..224cf10131 100644 --- a/src/moai-sim/MOAIDrawShapeImmediate.cpp +++ b/src/moai-sim/MOAIDrawShapeImmediate.cpp @@ -44,7 +44,7 @@ void MOAIDrawShapeImmediate::MOAIDrawShape_DrawLine ( float x0, float y0, float void MOAIDrawShapeImmediate::MOAIDrawShape_DrawPoint ( float x, float y, float z ) { MOAIGfxMgr& gfxMgr = MOAIGfxMgr::Get (); - + UNUSED(z); gfxMgr.mVertexCache.BeginPrim ( ZGL_PRIM_POINTS, 1 ); gfxMgr.mVertexCache.WriteVtx ( x, y, 0.0f ); gfxMgr.mVertexCache.WritePenColor4b (); diff --git a/src/moai-sim/MOAIGfxBuffer.cpp b/src/moai-sim/MOAIGfxBuffer.cpp index 7e7f1b9ead..cc0ae95673 100644 --- a/src/moai-sim/MOAIGfxBuffer.cpp +++ b/src/moai-sim/MOAIGfxBuffer.cpp @@ -125,7 +125,7 @@ void MOAIGfxBuffer::CopyFromStream ( ZLStream& stream, size_t size ) { //----------------------------------------------------------------// ZLSharedConstBuffer* MOAIGfxBuffer::GetBufferForBind ( ZLGfx& gfx ) { - + UNUSED(gfx); return this->mUseVBOs ? 0 : this->ZLCopyOnWrite::GetSharedConstBuffer (); // if ( this->mUseVBOs ) return 0; diff --git a/src/moai-sim/MOAIGfxGlobalsCache.cpp b/src/moai-sim/MOAIGfxGlobalsCache.cpp index e82f14fd14..37c9f37da7 100644 --- a/src/moai-sim/MOAIGfxGlobalsCache.cpp +++ b/src/moai-sim/MOAIGfxGlobalsCache.cpp @@ -95,7 +95,7 @@ const ZLMatrix4x4& MOAIGfxGlobalsCache::GetMtx ( u32 mtxID ) { //----------------------------------------------------------------// const ZLMatrix4x4& MOAIGfxGlobalsCache::GetPrimaryMtx ( u32 mtxID, u64 mtxFlag ) { - + UNUSED(mtxFlag); switch ( mtxID ) { case CLIP_TO_DISPLAY_MTX: diff --git a/src/moai-sim/MOAIGfxStateCache.cpp b/src/moai-sim/MOAIGfxStateCache.cpp index d161305e41..0de4693a8f 100644 --- a/src/moai-sim/MOAIGfxStateCache.cpp +++ b/src/moai-sim/MOAIGfxStateCache.cpp @@ -92,8 +92,8 @@ MOAIGfxState::~MOAIGfxState () { //----------------------------------------------------------------// void MOAIGfxStateCache::ApplyStateChange ( u32 stateID ) { - MOAIGfxState& active = this->mActiveState; - ZLGfx& gfx = MOAIGfxMgr::GetDrawingAPI (); +// MOAIGfxState& active = this->mActiveState; + //& gfx = MOAIGfxMgr::GetDrawingAPI (); switch ( stateID ) { @@ -241,7 +241,7 @@ void MOAIGfxStateCache::DrawPrims ( u32 primType, u32 base, u32 count ) { DEBUG_LOG ( "DRAW PRIMS: %d %d %d\n", primType, base, count ); - MOAIGfxMgr& gfxMgr = MOAIGfxMgr::Get (); +// MOAIGfxMgr& gfxMgr = MOAIGfxMgr::Get (); this->ApplyStateChanges (); MOAIShader* shader = this->mActiveState.mShader; diff --git a/src/moai-sim/MOAIGfxVertexCache.cpp b/src/moai-sim/MOAIGfxVertexCache.cpp index 0836a4e329..ebac1d0875 100644 --- a/src/moai-sim/MOAIGfxVertexCache.cpp +++ b/src/moai-sim/MOAIGfxVertexCache.cpp @@ -154,7 +154,7 @@ void MOAIGfxVertexCache::FlushBufferedPrims () { this->mIsDrawing = true; - ZLGfx& gfx = MOAIGfxMgr::GetDrawingAPI (); + //ZLGfx& gfx = MOAIGfxMgr::GetDrawingAPI (); u32 count = 0; u32 offset = 0; diff --git a/src/moai-sim/MOAIGfxVertexCache.h b/src/moai-sim/MOAIGfxVertexCache.h index 22876c9886..3e46131a3a 100644 --- a/src/moai-sim/MOAIGfxVertexCache.h +++ b/src/moai-sim/MOAIGfxVertexCache.h @@ -127,7 +127,7 @@ class MOAIGfxVertexCache : inline void WriteIndex ( u16 index ) { // TODO: put back an optimized write (i.e. WriteUnsafe or an equivalent) - this->mIdxBuffer->Write < u16 >( this->mVtxBase + index ); + this->mIdxBuffer->Write < u16 >( (u16) this->mVtxBase + index ); } //----------------------------------------------------------------// diff --git a/src/moai-sim/MOAIGraphicsProp.cpp b/src/moai-sim/MOAIGraphicsProp.cpp index a71f034929..58f640d4d2 100644 --- a/src/moai-sim/MOAIGraphicsProp.cpp +++ b/src/moai-sim/MOAIGraphicsProp.cpp @@ -125,7 +125,7 @@ bool MOAIGraphicsProp::MOAIPartitionHull_Inside ( ZLVec3D vec, float pad ) { if ( passTrivial && this->mDeck && ( this->mHitGranularity > HIT_TEST_COARSE )) { //return this->mDeck->Inside ( this->mIndex, this->mMaterialBatch, this->mHitGranularity, vec, pad ); - return this->mDeck->Overlap ( this->mIndex - 1, vec, this->mHitGranularity, 0 ); + return this->mDeck->Overlap ( this->mIndex - 1, vec.Vec2D(), this->mHitGranularity, 0 ); } return passTrivial; } diff --git a/src/moai-sim/MOAIGraphicsPropBase.cpp b/src/moai-sim/MOAIGraphicsPropBase.cpp index b1deb257db..dd5e3ca640 100644 --- a/src/moai-sim/MOAIGraphicsPropBase.cpp +++ b/src/moai-sim/MOAIGraphicsPropBase.cpp @@ -29,9 +29,9 @@ int MOAIGraphicsPropBase::_draw ( lua_State* L ) { MOAI_LUA_SETUP ( MOAIGraphicsPropBase, "U" ) - u32 subPrimID = state.GetValue < u32 >( 2, MOAIPartitionHull::NO_SUBPRIM_ID ); + u32 subPrimID = state.GetValue < u32 >( 2, (u32) MOAIPartitionHull::NO_SUBPRIM_ID ); - self->Draw ( subPrimID ); + self->Draw ( (int) subPrimID ); return 0; } @@ -194,7 +194,7 @@ int MOAIGraphicsPropBase::_setVisible ( lua_State* L ) { ZLMatrix4x4 MOAIGraphicsPropBase::GetWorldDrawingMtx () { MOAIGfxMgr& gfxMgr = MOAIGfxMgr::Get (); - MOAIRenderMgr& renderMgr = MOAIRenderMgr::Get (); + //MOAIRenderMgr& renderMgr = MOAIRenderMgr::Get (); ZLMatrix4x4 worldDrawingMtx; @@ -411,7 +411,7 @@ void MOAIGraphicsPropBase::RegisterLuaClass ( MOAILuaState& state ) { MOAIDebugLinesMgr::Get ().ReserveStyleSet < MOAIGraphicsPropBase >( TOTAL_DEBUG_LINE_STYLES ); - state.SetField ( -1, "DEBUG_DRAW_GFX_PROP_MASTER", MOAIDebugLinesMgr::Pack < MOAIGraphicsPropBase >( -1 )); + state.SetField ( -1, "DEBUG_DRAW_GFX_PROP_MASTER", MOAIDebugLinesMgr::Pack < MOAIGraphicsPropBase >( (u32) -1 )); state.SetField ( -1, "DEBUG_DRAW_PARTITION_CELLS", MOAIDebugLinesMgr::Pack < MOAIGraphicsPropBase >( DEBUG_DRAW_PARTITION_CELLS )); state.SetField ( -1, "DEBUG_DRAW_PARTITION_PADDED_CELLS", MOAIDebugLinesMgr::Pack < MOAIGraphicsPropBase >( DEBUG_DRAW_PARTITION_PADDED_CELLS )); state.SetField ( -1, "DEBUG_DRAW_AXIS", MOAIDebugLinesMgr::Pack < MOAIGraphicsPropBase >( DEBUG_DRAW_AXIS )); diff --git a/src/moai-sim/MOAIIndexedPropBase.cpp b/src/moai-sim/MOAIIndexedPropBase.cpp index 84a3d9a70a..d618f9abe8 100644 --- a/src/moai-sim/MOAIIndexedPropBase.cpp +++ b/src/moai-sim/MOAIIndexedPropBase.cpp @@ -105,7 +105,7 @@ bool MOAIIndexedPropBase::MOAINode_ApplyAttrOp ( u32 attrID, MOAIAttribute& attr switch ( UNPACK_ATTR ( attrID )) { case ATTR_INDEX: - this->mIndex = ZLFloat::ToIndex ( attr.Apply (( s32 )this->mIndex, op, MOAIAttribute::ATTR_READ_WRITE )); + this->mIndex = ZLFloat::ToIndex ((float) attr.Apply (( s32 )this->mIndex, op, MOAIAttribute::ATTR_READ_WRITE )); return true; } } diff --git a/src/moai-sim/MOAILight.cpp b/src/moai-sim/MOAILight.cpp index 413e86cf88..601015ba50 100644 --- a/src/moai-sim/MOAILight.cpp +++ b/src/moai-sim/MOAILight.cpp @@ -135,16 +135,15 @@ bool MOAILight::MOAINode_ApplyAttrOp ( u32 attrID, MOAIAttribute& attr, u32 op ) //----------------------------------------------------------------// MOAIShaderUniformFormatter* MOAILight::MOAIShaderUniformBuffer_GetUniform ( u32 uniformID, void*& buffer ) { - MOAIShaderUniform* uniform = 0; - if ( this->mFormat ) { - - MOAILightFormatUniform* uniform = this->mFormat->GetUniform ( uniformID ); + MOAILightFormatUniform * uniform = this->mFormat->GetUniform ( uniformID ); if ( uniform ) { - buffer = ( void* )(( size_t )this->mBuffer.Data () + uniform->mBase ); } + return uniform; + } else { + return (MOAIShaderUniform *) 0; } - return uniform; + } diff --git a/src/moai-sim/MOAILightFormat.cpp b/src/moai-sim/MOAILightFormat.cpp index cc82c4c6e7..c786860176 100644 --- a/src/moai-sim/MOAILightFormat.cpp +++ b/src/moai-sim/MOAILightFormat.cpp @@ -90,6 +90,7 @@ MOAILightFormat::~MOAILightFormat () { //----------------------------------------------------------------// void MOAILightFormat::RegisterLuaClass ( MOAILuaState& state ) { + UNUSED(state); } //----------------------------------------------------------------// diff --git a/src/moai-sim/MOAIPartitionHolder.cpp b/src/moai-sim/MOAIPartitionHolder.cpp index 28a17483d2..2c122e8d9a 100644 --- a/src/moai-sim/MOAIPartitionHolder.cpp +++ b/src/moai-sim/MOAIPartitionHolder.cpp @@ -87,6 +87,7 @@ MOAIPartitionHolder::~MOAIPartitionHolder () { //----------------------------------------------------------------// void MOAIPartitionHolder::RegisterLuaClass ( MOAILuaState& state ) { + UNUSED(state); } //----------------------------------------------------------------// diff --git a/src/moai-sim/MOAISpriteDeck2D.cpp b/src/moai-sim/MOAISpriteDeck2D.cpp index a5fc830fdf..02b540d46a 100644 --- a/src/moai-sim/MOAISpriteDeck2D.cpp +++ b/src/moai-sim/MOAISpriteDeck2D.cpp @@ -425,7 +425,7 @@ MOAIDeck* MOAISpriteDeck2D::AffirmDeck ( MOAILuaState& state, int idx ) { int hHeight = ( int )( texture->GetHeight () / 2 ); ZLRect rect; - rect.Init ( -hWidth, -hHeight, hWidth, hHeight ); + rect.Init ( (float) -hWidth, (float) -hHeight, (float) hWidth, (float) hHeight ); quadDeck->SetRect( 0, rect ); return quadDeck; @@ -807,7 +807,7 @@ ZLBounds MOAISpriteDeck2D::MOAIDeck_GetBounds ( u32 idx ) { //----------------------------------------------------------------// MOAICollisionShape* MOAISpriteDeck2D::MOAIDeck_GetCollisionShape ( u32 idx ) { - + UNUSED(idx); return 0; } @@ -817,7 +817,10 @@ bool MOAISpriteDeck2D::MOAIDeck_Overlap ( u32 idx, const ZLVec2D& vec, u32 granu // TODO: handle granularity //return this->GetMaterialBatch ()->TestHit ( this, idx, granularity, this->mQuad.mModelQuad, this->mQuad.mUVQuad, vec.mX, vec.mY ); - + UNUSED(result); + UNUSED(granularity); + UNUSED(vec); + UNUSED(idx); return true; } diff --git a/src/moai-sim/MOAITextLabel.cpp b/src/moai-sim/MOAITextLabel.cpp index fa1c95aab8..f38db50406 100644 --- a/src/moai-sim/MOAITextLabel.cpp +++ b/src/moai-sim/MOAITextLabel.cpp @@ -851,7 +851,7 @@ ZLMatrix4x4 MOAITextLabel::GetWorldDrawingMtx () { if ( this->mAutoFlip ) { - MOAIRenderMgr& renderMgr = MOAIRenderMgr::Get (); + //MOAIRenderMgr& renderMgr = MOAIRenderMgr::Get (); //MOAICamera* camera = renderMgr.GetCamera (); //if ( camera ) { @@ -990,7 +990,7 @@ void MOAITextLabel::RegisterLuaClass ( MOAILuaState& state ) { MOAIDebugLinesMgr::Get ().ReserveStyleSet < MOAITextLabel >( TOTAL_DEBUG_LINE_STYLES ); - state.SetField ( -1, "DEBUG_DRAW_TEXT_LABEL_MASTER", MOAIDebugLinesMgr::Pack < MOAITextLabel >( -1 )); + state.SetField ( -1, "DEBUG_DRAW_TEXT_LABEL_MASTER", MOAIDebugLinesMgr::Pack < MOAITextLabel >( (u32) -1 )); state.SetField ( -1, "DEBUG_DRAW_TEXT_LABEL", MOAIDebugLinesMgr::Pack < MOAITextLabel >( DEBUG_DRAW_TEXT_LABEL )); state.SetField ( -1, "DEBUG_DRAW_TEXT_LABEL_BASELINES", MOAIDebugLinesMgr::Pack < MOAITextLabel >( DEBUG_DRAW_TEXT_LABEL_BASELINES )); state.SetField ( -1, "DEBUG_DRAW_TEXT_LABEL_GLYPH_BOUNDS", MOAIDebugLinesMgr::Pack < MOAITextLabel >( DEBUG_DRAW_TEXT_LABEL_GLYPH_BOUNDS )); diff --git a/src/moai-sim/pch.h b/src/moai-sim/pch.h index 4c83378390..3ea5e12004 100644 --- a/src/moai-sim/pch.h +++ b/src/moai-sim/pch.h @@ -2,4 +2,5 @@ #include #include #include +#include #include diff --git a/src/zl-gfx/ZLGfxImmediate.cpp b/src/zl-gfx/ZLGfxImmediate.cpp index 1d137ad112..283a1f7821 100644 --- a/src/zl-gfx/ZLGfxImmediate.cpp +++ b/src/zl-gfx/ZLGfxImmediate.cpp @@ -718,7 +718,7 @@ void ZLGfxImmediate::UniformFloat ( u32 location, u32 index, u32 width, u32 coun //----------------------------------------------------------------// void ZLGfxImmediate::UniformInt ( u32 location, u32 index, u32 width, u32 count, const s32* value ) { - + UNUSED(index); switch ( width ) { case 1: diff --git a/src/zl-util/ZLBounds.cpp b/src/zl-util/ZLBounds.cpp index b1699f9cbb..31745a8c60 100644 --- a/src/zl-util/ZLBounds.cpp +++ b/src/zl-util/ZLBounds.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2010-2017 Zipline Games, Inc. All Rights Reserved. // http://getmoai.com - +#include "pch.h" #include //================================================================// diff --git a/src/zl-vfs/zl_vfscanf.cpp b/src/zl-vfs/zl_vfscanf.cpp index a1059690bd..a9f76b83c6 100644 --- a/src/zl-vfs/zl_vfscanf.cpp +++ b/src/zl-vfs/zl_vfscanf.cpp @@ -5,7 +5,9 @@ #include #include +#ifndef MOAI_COMPILER_MSVC #pragma GCC diagnostic ignored "-Wformat-security" +#endif using namespace std; diff --git a/vs2015/assimp/assimp.vcxproj b/vs2015/assimp/assimp.vcxproj index 87e9b861ec..c992485165 100644 --- a/vs2015/assimp/assimp.vcxproj +++ b/vs2015/assimp/assimp.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -487,27 +487,28 @@ {EEB0E2FC-4B26-49D4-98C6-0BF34C44AC2E} assimp Win32Proj + 10.0.15063.0 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 StaticLibrary Unicode - v140 + v141 StaticLibrary Unicode - v140 + v141 @@ -551,7 +552,7 @@ Disabled - ..\..\src;..\..\3rdparty\assimp-config;..\..\3rdparty\assimp;..\..\3rdparty\assimp\include;..\..\3rdparty\assimp\contrib\openddlparser\include;..\..\3rdparty\assimp\contrib\rapidjson\include;..\..\3rdparty\zlib-1.2.3;%(AdditionalIncludeDirectories) + ..\..\src;..\..\3rdparty\assimp-config;..\..\3rdparty\assimp;..\..\3rdparty\assimp\include;..\..\3rdparty\assimp\contrib\openddlparser\include;..\..\3rdparty\assimp\contrib\rapidjson\include;..\..\3rdparty\zlib-1.2.8;%(AdditionalIncludeDirectories) WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;OPENDDL_STATIC_LIBARY;ASSIMP_BUILD_NO_C4D_IMPORTER;ASSIMP_BUILD_NO_OPENGEX_EXPORTER;ASSIMP_BUILD_NO_OPENGEX_IMPORTER;ASSIMP_BUILD_NO_OWN_ZLIB;DEBUG;_DEBUG;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -577,7 +578,7 @@ Disabled - ..\..\src;..\..\3rdparty\assimp-config;..\..\3rdparty\assimp;..\..\3rdparty\assimp\include;..\..\3rdparty\assimp\contrib\openddlparser\include;..\..\3rdparty\assimp\contrib\rapidjson\include;..\..\3rdparty\zlib-1.2.3;%(AdditionalIncludeDirectories) + ..\..\src;..\..\3rdparty\assimp-config;..\..\3rdparty\assimp;..\..\3rdparty\assimp\include;..\..\3rdparty\assimp\contrib\openddlparser\include;..\..\3rdparty\assimp\contrib\rapidjson\include;..\..\3rdparty\zlib-1.2.8;%(AdditionalIncludeDirectories) WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;OPENDDL_STATIC_LIBARY;ASSIMP_BUILD_NO_C4D_IMPORTER;ASSIMP_BUILD_NO_OPENGEX_EXPORTER;ASSIMP_BUILD_NO_OPENGEX_IMPORTER;ASSIMP_BUILD_NO_OWN_ZLIB;DEBUG;_DEBUG;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -599,7 +600,7 @@ true Size true - ..\..\src;..\..\3rdparty\assimp-config;..\..\3rdparty\assimp;..\..\3rdparty\assimp\include;..\..\3rdparty\assimp\contrib\openddlparser\include;..\..\3rdparty\assimp\contrib\rapidjson\include;..\..\3rdparty\zlib-1.2.3;%(AdditionalIncludeDirectories) + ..\..\src;..\..\3rdparty\assimp-config;..\..\3rdparty\assimp;..\..\3rdparty\assimp\include;..\..\3rdparty\assimp\contrib\openddlparser\include;..\..\3rdparty\assimp\contrib\rapidjson\include;..\..\3rdparty\zlib-1.2.8;%(AdditionalIncludeDirectories) WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;OPENDDL_STATIC_LIBARY;ASSIMP_BUILD_NO_C4D_IMPORTER;ASSIMP_BUILD_NO_OPENGEX_EXPORTER;ASSIMP_BUILD_NO_OPENGEX_IMPORTER;ASSIMP_BUILD_NO_OWN_ZLIB;NDEBUG;%(PreprocessorDefinitions) MultiThreadedDLL $(OutDir)$(ProjectName).pdb @@ -628,7 +629,7 @@ true Size true - ..\..\src;..\..\3rdparty\assimp-config;..\..\3rdparty\assimp;..\..\3rdparty\assimp\include;..\..\3rdparty\assimp\contrib\openddlparser\include;..\..\3rdparty\assimp\contrib\rapidjson\include;..\..\3rdparty\zlib-1.2.3;%(AdditionalIncludeDirectories) + ..\..\src;..\..\3rdparty\assimp-config;..\..\3rdparty\assimp;..\..\3rdparty\assimp\include;..\..\3rdparty\assimp\contrib\openddlparser\include;..\..\3rdparty\assimp\contrib\rapidjson\include;..\..\3rdparty\zlib-1.2.8;%(AdditionalIncludeDirectories) WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;OPENDDL_STATIC_LIBARY;ASSIMP_BUILD_NO_C4D_IMPORTER;ASSIMP_BUILD_NO_OPENGEX_EXPORTER;ASSIMP_BUILD_NO_OPENGEX_IMPORTER;ASSIMP_BUILD_NO_OWN_ZLIB;NDEBUG;%(PreprocessorDefinitions) MultiThreadedDLL $(OutDir)$(ProjectName).pdb diff --git a/vs2015/box2d/box2d.vcxproj b/vs2015/box2d/box2d.vcxproj index 7eddd5daa6..f4bf705b02 100644 --- a/vs2015/box2d/box2d.vcxproj +++ b/vs2015/box2d/box2d.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -119,27 +119,28 @@ {AB0DD232-1AF9-4B16-A0F2-5EBF32250F6B} box2d Win32Proj + 10.0.15063.0 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 StaticLibrary Unicode - v140 + v141 StaticLibrary Unicode - v140 + v141 diff --git a/vs2015/buildvm/buildvm.vcxproj b/vs2015/buildvm/buildvm.vcxproj index 7e1633ed51..ca199894c2 100644 --- a/vs2015/buildvm/buildvm.vcxproj +++ b/vs2015/buildvm/buildvm.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,30 +22,31 @@ {157EB94D-71FA-4E48-A230-6196B1DF1B6C} buildvm Win32Proj + 10.0.15063.0 Application NotSet false - v140 + v141 Application NotSet false - v140 + v141 Application Unicode true - v140 + v141 Application Unicode - v140 + v141 diff --git a/vs2015/contrib/contrib.vcxproj b/vs2015/contrib/contrib.vcxproj index d85abd2b91..e798dbb192 100644 --- a/vs2015/contrib/contrib.vcxproj +++ b/vs2015/contrib/contrib.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -32,30 +32,31 @@ {562B9EEF-2A2E-46E1-8A28-550C86CDF9F6} contrib Win32Proj + 10.0.15063.0 StaticLibrary NotSet false - v140 + v141 StaticLibrary NotSet false - v140 + v141 StaticLibrary Unicode true - v140 + v141 StaticLibrary Unicode - v140 + v141 diff --git a/vs2015/expat/expat.vcxproj b/vs2015/expat/expat.vcxproj index 87de51f0ad..6bba37a09d 100644 --- a/vs2015/expat/expat.vcxproj +++ b/vs2015/expat/expat.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -46,30 +46,31 @@ {860D46BC-EC6B-43C3-B335-3479F096FB1B} expat Win32Proj + 10.0.15063.0 StaticLibrary NotSet false - v140 + v141 StaticLibrary NotSet false - v140 + v141 StaticLibrary Unicode true - v140 + v141 StaticLibrary Unicode - v140 + v141 diff --git a/vs2015/freetype/freetype.vcxproj b/vs2015/freetype/freetype.vcxproj index 5208a24116..1dc88795ff 100644 --- a/vs2015/freetype/freetype.vcxproj +++ b/vs2015/freetype/freetype.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -20,31 +20,32 @@ {97D147F3-4DBC-45CD-87EB-6C90EB6EFE21} + 10.0.15063.0 StaticLibrary false NotSet - v140 + v141 StaticLibrary false NotSet - v140 + v141 StaticLibrary false MultiByte - v140 + v141 StaticLibrary false MultiByte - v140 + v141 @@ -91,7 +92,7 @@ MaxSpeed OnlyExplicitInline - ..\..\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\freetype-2.4.4\include;%(AdditionalIncludeDirectories) + ..\..\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\freetype-2.7\include;%(AdditionalIncludeDirectories) WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;NDEBUG;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -124,7 +125,7 @@ MaxSpeed OnlyExplicitInline - ..\..\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\freetype-2.4.4\include;%(AdditionalIncludeDirectories) + ..\..\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\freetype-2.7\include;%(AdditionalIncludeDirectories) WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;NDEBUG;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -152,7 +153,7 @@ Disabled - ..\..\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\freetype-2.4.4\include;%(AdditionalIncludeDirectories) + ..\..\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\freetype-2.7\include;%(AdditionalIncludeDirectories) WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;DEBUG;_DEBUG;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -183,7 +184,7 @@ Disabled - ..\..\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\freetype-2.4.4\include;%(AdditionalIncludeDirectories) + ..\..\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\freetype-2.7\include;%(AdditionalIncludeDirectories) WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;DEBUG;_DEBUG;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -208,8 +209,9 @@ - - + + + Disabled %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -225,7 +227,7 @@ %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - + Disabled %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -241,7 +243,7 @@ %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - + Disabled %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -257,8 +259,8 @@ %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - - + + Disabled %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -274,10 +276,9 @@ %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - - - - + + + Disabled %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -293,7 +294,7 @@ %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - + Disabled %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -309,7 +310,7 @@ %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - + Disabled %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -325,7 +326,7 @@ %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - + Disabled %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -341,8 +342,8 @@ %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - - + + Disabled %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -358,7 +359,7 @@ %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - + Disabled %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -374,10 +375,10 @@ %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - - - - + + + + Disabled %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -393,14 +394,13 @@ %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - - - - - - - - + + + + + + + Disabled %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -416,7 +416,7 @@ %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - + Disabled %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -432,7 +432,7 @@ %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - + Disabled %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -448,7 +448,7 @@ %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - + Disabled %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -464,7 +464,7 @@ %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - + Disabled %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -480,7 +480,7 @@ %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - + Disabled %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -496,7 +496,7 @@ %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - + Disabled %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -512,7 +512,7 @@ %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - + Disabled %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -528,7 +528,7 @@ %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - + Disabled %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -544,7 +544,7 @@ %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - + Disabled %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -560,7 +560,7 @@ %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - + Disabled %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -576,7 +576,7 @@ %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - + Disabled %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -594,12 +594,12 @@ - - - - - - + + + + + + diff --git a/vs2015/freetype/freetype.vcxproj.filters b/vs2015/freetype/freetype.vcxproj.filters index 6db25f49d7..5c3f61ff9c 100644 --- a/vs2015/freetype/freetype.vcxproj.filters +++ b/vs2015/freetype/freetype.vcxproj.filters @@ -14,141 +14,138 @@ - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - - Source Files\FT_MODULES - - - Source Files\FT_MODULES + + Source Files - - Source Files\FT_MODULES + + Source Files - - Source Files\FT_MODULES + + Source Files - - Source Files\FT_MODULES + + Source Files - - Source Files\FT_MODULES + + Source Files - - Source Files\FT_MODULES + + Source Files - - Source Files\FT_MODULES + + Source Files - - Source Files\FT_MODULES + + Source Files - - Source Files\FT_MODULES + + Source Files - - Source Files\FT_MODULES + + Source Files - - Source Files\FT_MODULES + + Source Files - - Source Files\FT_MODULES + + Source Files - - Source Files\FT_MODULES + + Source Files - - Source Files\FT_MODULES + + Source Files - - Source Files\FT_MODULES + + Source Files - - Source Files\FT_MODULES + + Source Files - - Source Files\FT_MODULES + + Source Files - - Source Files\FT_MODULES + + Source Files - - Source Files\FT_MODULES + + Source Files - - Source Files\FT_MODULES + + Source Files - - Source Files\FT_MODULES + + Source Files - - Source Files\FT_MODULES + + Source Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files diff --git a/vs2015/glew/glew.vcxproj b/vs2015/glew/glew.vcxproj index 1c3a34043d..47bc7a01c8 100644 --- a/vs2015/glew/glew.vcxproj +++ b/vs2015/glew/glew.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,30 +22,31 @@ {48580411-0A48-46F9-87A6-CF5C9B81D146} glew Win32Proj + 10.0.15063.0 StaticLibrary NotSet false - v140 + v141 StaticLibrary NotSet false - v140 + v141 StaticLibrary Unicode true - v140 + v141 StaticLibrary Unicode - v140 + v141 diff --git a/vs2015/glewinfo/glewinfo.vcxproj b/vs2015/glewinfo/glewinfo.vcxproj index ab2add6948..4d584d2900 100644 --- a/vs2015/glewinfo/glewinfo.vcxproj +++ b/vs2015/glewinfo/glewinfo.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,30 +22,31 @@ {D898C9F0-C6D3-4A22-ADCE-763394B7F9E3} glewinfo Win32Proj + 10.0.15063.0 Application NotSet false - v140 + v141 Application NotSet false - v140 + v141 Application Unicode true - v140 + v141 Application Unicode - v140 + v141 @@ -92,7 +93,7 @@ Disabled ..\..\src;..\..\3rdparty\glew-1.5.6\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;GLEW_STATIC;%(PreprocessorDefinitions) + WIN32;_DEBUG;DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;GLEW_STATIC;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -107,7 +108,7 @@ false - zl-lib-vfs.lib;zlib.lib;glew.lib;opengl32.lib;%(AdditionalDependencies) + zl-lib-vfs.lib;zlib.lib;glew.lib;opengl32.lib;tlsf.lib;%(AdditionalDependencies) ..\bin\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) true Console @@ -128,7 +129,7 @@ Disabled ..\..\src;..\..\3rdparty\glew-1.5.6\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_DEBUG;DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -143,7 +144,7 @@ false - zl-lib-vfs.lib;zlib.lib;glew.lib;opengl32.lib;%(AdditionalDependencies) + zl-lib-vfs.lib;zlib.lib;glew.lib;opengl32.lib;tlsf.lib;%(AdditionalDependencies) ..\bin\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) true Console @@ -178,7 +179,7 @@ xcopy /yr "$(OutDir)$(TargetName).pdb" "..\..\bin\$(Platform)\$(Configuration)\" false - zl-lib-vfs.lib;zlib.lib;glew.lib;opengl32.lib;%(AdditionalDependencies) + zl-lib-vfs.lib;zlib.lib;glew.lib;opengl32.lib;tlsf.lib;%(AdditionalDependencies) ..\bin\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) true Console @@ -217,7 +218,7 @@ xcopy /yr "$(OutDir)$(TargetName).pdb" "..\..\bin\$(Platform)\$(Configuration)\" false - zl-lib-vfs.lib;zlib.lib;glew.lib;opengl32.lib;%(AdditionalDependencies) + zl-lib-vfs.lib;zlib.lib;glew.lib;opengl32.lib;tlsf.lib;%(AdditionalDependencies) ..\bin\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) true Console diff --git a/vs2015/hexdump/hexdump.vcxproj b/vs2015/hexdump/hexdump.vcxproj index d836cc95af..cc4efefb58 100644 --- a/vs2015/hexdump/hexdump.vcxproj +++ b/vs2015/hexdump/hexdump.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,30 +22,31 @@ {F83A5925-1AD8-4D5D-A134-85AFF1466766} hexdump Win32Proj + 10.0.15063.0 Application NotSet false - v140 + v141 Application NotSet false - v140 + v141 Application Unicode true - v140 + v141 Application Unicode - v140 + v141 @@ -91,8 +92,8 @@ Disabled - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\glut-3.7.6-bin;..\..\3rdparty\glew-1.5.6\include;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\lpng140;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\box2d-2.1.2\Box2D;..\..\3rdparty\chipmunk-5.3.4\include;%(AdditionalIncludeDirectories) - WIN32;_CONSOLE;_DEBUG;_BOOL;%(PreprocessorDefinitions) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\glut-3.7.6-bin;..\..\3rdparty\glew-1.5.6\include;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\lpng140;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\box2d-2.1.2\Box2D;..\..\3rdparty\chipmunk-5.3.4\include;%(AdditionalIncludeDirectories) + WIN32;_CONSOLE;_DEBUG;DEBUG;_BOOL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -110,7 +111,7 @@ false - zl-lib-util.lib;zl-lib-vfs.lib;zlib.lib;%(AdditionalDependencies) + zl-lib-core.lib;zl-lib-vfs.lib;zlib.lib;tlsf.lib;%(AdditionalDependencies) ..\bin\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) true Console @@ -132,8 +133,8 @@ Disabled - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\glut-3.7.6-bin;..\..\3rdparty\glew-1.5.6\include;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\lpng140;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\box2d-2.1.2\Box2D;..\..\3rdparty\chipmunk-5.3.4\include;%(AdditionalIncludeDirectories) - WIN32;_CONSOLE;_DEBUG;_BOOL;%(PreprocessorDefinitions) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\glut-3.7.6-bin;..\..\3rdparty\glew-1.5.6\include;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\lpng140;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\box2d-2.1.2\Box2D;..\..\3rdparty\chipmunk-5.3.4\include;%(AdditionalIncludeDirectories) + WIN32;_CONSOLE;_DEBUG;DEBUG;_BOOL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -151,7 +152,7 @@ false - zl-lib-util.lib;zl-lib-vfs.lib;zlib.lib;%(AdditionalDependencies) + zl-lib-core.lib;zl-lib-vfs.lib;zlib.lib;tlsf.lib;%(AdditionalDependencies) NotSet ..\bin\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) false @@ -172,8 +173,8 @@ xcopy /yr "$(OutDir)$(TargetName).pdb" "..\..\bin\$(Platform)\$(Configuration)\" - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\glut-3.7.6-bin;..\..\3rdparty\glew-1.5.6\include;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\lpng140;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\box2d-2.1.2\Box2D;..\..\3rdparty\chipmunk-5.3.4\include;%(AdditionalIncludeDirectories) - WIN32;_CONSOLE;_CRTDBG_MAP_ALLOC;_WINDOWS;_BOOL;TRUE_AND_FALSE_DEFINED;_USE_32BIT_TIME_T;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\glut-3.7.6-bin;..\..\3rdparty\glew-1.5.6\include;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\lpng140;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\box2d-2.1.2\Box2D;..\..\3rdparty\chipmunk-5.3.4\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;_CRTDBG_MAP_ALLOC;_WINDOWS;_BOOL;TRUE_AND_FALSE_DEFINED;_USE_32BIT_TIME_T;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDLL false false @@ -188,7 +189,7 @@ xcopy /yr "$(OutDir)$(TargetName).pdb" "..\..\bin\$(Platform)\$(Configuration)\" false - zl-lib-util.lib;zl-lib-vfs.lib;zlib.lib;%(AdditionalDependencies) + zl-lib-core.lib;zl-lib-vfs.lib;zlib.lib;tlsf.lib;%(AdditionalDependencies) ..\bin\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) true Console @@ -209,8 +210,8 @@ xcopy /yr "$(OutDir)$(TargetName).pdb" "..\..\bin\$(Platform)\$(Configuration)\" X64 - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\glut-3.7.6-bin;..\..\3rdparty\glew-1.5.6\include;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\lpng140;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\box2d-2.1.2\Box2D;..\..\3rdparty\chipmunk-5.3.4\include;%(AdditionalIncludeDirectories) - WIN32;_CONSOLE;_CRTDBG_MAP_ALLOC;_WINDOWS;_BOOL;TRUE_AND_FALSE_DEFINED;_USE_32BIT_TIME_T;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\glut-3.7.6-bin;..\..\3rdparty\glew-1.5.6\include;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\lpng140;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\box2d-2.1.2\Box2D;..\..\3rdparty\chipmunk-5.3.4\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;_CRTDBG_MAP_ALLOC;_WINDOWS;_BOOL;TRUE_AND_FALSE_DEFINED;_USE_32BIT_TIME_T;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDLL false false @@ -225,7 +226,7 @@ xcopy /yr "$(OutDir)$(TargetName).pdb" "..\..\bin\$(Platform)\$(Configuration)\" false - zl-lib-util.lib;zl-lib-vfs.lib;zlib.lib;%(AdditionalDependencies) + zl-lib-core.lib;zl-lib-vfs.lib;zlib.lib;tlsf.lib;%(AdditionalDependencies) ..\bin\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) false true diff --git a/vs2015/jansson/jansson.vcxproj b/vs2015/jansson/jansson.vcxproj index d1a4846884..56bd0b0041 100644 --- a/vs2015/jansson/jansson.vcxproj +++ b/vs2015/jansson/jansson.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -44,30 +44,30 @@ {52496C82-2EDB-4649-8509-451891F6A3DE} jansson Win32Proj - 8.1 + 10.0.15063.0 StaticLibrary false - v140 + v141 NotSet StaticLibrary false - v140 + v141 NotSet StaticLibrary true - v140 + v141 NotSet StaticLibrary - v140 + v141 NotSet diff --git a/vs2015/kissfft/kissfft.vcxproj b/vs2015/kissfft/kissfft.vcxproj index 560f4e4acc..fca02e7b27 100644 --- a/vs2015/kissfft/kissfft.vcxproj +++ b/vs2015/kissfft/kissfft.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -31,30 +31,31 @@ {23FA2A9C-429A-4BE6-A540-F80B061EE58A} kissfft Win32Proj + 10.0.15063.0 StaticLibrary NotSet false - v140 + v141 StaticLibrary NotSet false - v140 + v141 StaticLibrary Unicode true - v140 + v141 StaticLibrary Unicode - v140 + v141 diff --git a/vs2015/libcurl/libcurl.vcxproj b/vs2015/libcurl/libcurl.vcxproj index b079ad5cee..536c78b33f 100644 --- a/vs2015/libcurl/libcurl.vcxproj +++ b/vs2015/libcurl/libcurl.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -278,31 +278,32 @@ {41BEB1CB-88C0-4C0F-B24E-F5871CF9EE49} libcurl Win32Proj + 10.0.15063.0 StaticLibrary false NotSet - v140 + v141 StaticLibrary false NotSet - v140 + v141 StaticLibrary false Unicode - v140 + v141 StaticLibrary false Unicode - v140 + v141 diff --git a/vs2015/libjpg/libjpg.vcxproj b/vs2015/libjpg/libjpg.vcxproj index 5219c1fd6d..28d89d725b 100644 --- a/vs2015/libjpg/libjpg.vcxproj +++ b/vs2015/libjpg/libjpg.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,30 +22,31 @@ {1F65FE7F-80D7-4380-BDD3-2546D7C2DFF0} libjpg Win32Proj + 10.0.15063.0 StaticLibrary NotSet false - v140 + v141 StaticLibrary NotSet false - v140 + v141 StaticLibrary Unicode true - v140 + v141 StaticLibrary Unicode - v140 + v141 diff --git a/vs2015/libogg/libogg.vcxproj b/vs2015/libogg/libogg.vcxproj index 4f0c96e39f..1bf61a8db1 100644 --- a/vs2015/libogg/libogg.vcxproj +++ b/vs2015/libogg/libogg.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,30 +22,31 @@ {3986E679-6E11-4B7A-A00D-9669DEDBBC1E} libogg Win32Proj + 10.0.15063.0 StaticLibrary NotSet false - v140 + v141 StaticLibrary NotSet false - v140 + v141 StaticLibrary Unicode true - v140 + v141 StaticLibrary Unicode - v140 + v141 diff --git a/vs2015/libpng/libpng.vcxproj b/vs2015/libpng/libpng.vcxproj index ac2ec77745..a2baa15e87 100644 --- a/vs2015/libpng/libpng.vcxproj +++ b/vs2015/libpng/libpng.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,30 +22,31 @@ {E4BFD291-B8CF-4D71-9E86-658CD227428D} libpng Win32Proj + 10.0.15063.0 StaticLibrary NotSet false - v140 + v141 StaticLibrary NotSet false - v140 + v141 StaticLibrary Unicode true - v140 + v141 StaticLibrary Unicode - v140 + v141 @@ -89,7 +90,7 @@ Disabled - ..\..\src;..\..\3rdparty\zlib-1.2.3;%(AdditionalIncludeDirectories) + ..\..\src;..\..\3rdparty\zlib-1.2.8;%(AdditionalIncludeDirectories) WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;PNG_NO_STDIO;DEBUG;_DEBUG;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -115,7 +116,7 @@ Disabled - ..\..\src;..\..\3rdparty\zlib-1.2.3;%(AdditionalIncludeDirectories) + ..\..\src;..\..\3rdparty\zlib-1.2.8;%(AdditionalIncludeDirectories) WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;PNG_NO_STDIO;DEBUG;_DEBUG;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -142,7 +143,7 @@ Size true false - ..\..\src;..\..\3rdparty\zlib-1.2.3;%(AdditionalIncludeDirectories) + ..\..\src;..\..\3rdparty\zlib-1.2.8;%(AdditionalIncludeDirectories) WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;PNG_NO_STDIO;NDEBUG;%(PreprocessorDefinitions) MultiThreadedDLL @@ -171,7 +172,7 @@ true Size true - ..\..\src;..\..\3rdparty\zlib-1.2.3;%(AdditionalIncludeDirectories) + ..\..\src;..\..\3rdparty\zlib-1.2.8;%(AdditionalIncludeDirectories) WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;PNG_NO_STDIO;NDEBUG;%(PreprocessorDefinitions) MultiThreadedDLL diff --git a/vs2015/libpvr/libpvr.vcxproj b/vs2015/libpvr/libpvr.vcxproj index 668388bc83..8c7ad2be2d 100644 --- a/vs2015/libpvr/libpvr.vcxproj +++ b/vs2015/libpvr/libpvr.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -35,30 +35,31 @@ {EAD743FA-900E-4E4B-8F4A-7AD7F6B2F003} libpvr Win32Proj + 10.0.15063.0 StaticLibrary NotSet false - v140 + v141 StaticLibrary NotSet false - v140 + v141 StaticLibrary Unicode true - v140 + v141 StaticLibrary Unicode - v140 + v141 diff --git a/vs2015/libtess/libtess.vcxproj b/vs2015/libtess/libtess.vcxproj index aecdea55c3..2ee96991c4 100644 --- a/vs2015/libtess/libtess.vcxproj +++ b/vs2015/libtess/libtess.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -41,30 +41,31 @@ {6DE5E8C5-E477-4CEE-8824-73E3C3C483DE} libtess Win32Proj + 10.0.15063.0 StaticLibrary NotSet false - v140 + v141 StaticLibrary NotSet false - v140 + v141 StaticLibrary Unicode true - v140 + v141 StaticLibrary Unicode - v140 + v141 diff --git a/vs2015/libvorbis/libvorbis.vcxproj b/vs2015/libvorbis/libvorbis.vcxproj index 68b59fa811..07552365bf 100644 --- a/vs2015/libvorbis/libvorbis.vcxproj +++ b/vs2015/libvorbis/libvorbis.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,30 +22,31 @@ {CBD64DDC-70CE-470B-B5ED-E12B59196EE7} libvorbis Win32Proj + 10.0.15063.0 StaticLibrary NotSet false - v140 + v141 StaticLibrary NotSet false - v140 + v141 StaticLibrary Unicode true - v140 + v141 StaticLibrary Unicode - v140 + v141 diff --git a/vs2015/libwebp/libwebp.vcxproj b/vs2015/libwebp/libwebp.vcxproj index a4d52bc7ae..f7ea2e3ebc 100644 --- a/vs2015/libwebp/libwebp.vcxproj +++ b/vs2015/libwebp/libwebp.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -106,30 +106,31 @@ {02BD34AA-8475-47E4-BB24-749587616A40} libwebp Win32Proj + 10.0.15063.0 StaticLibrary NotSet false - v140 + v141 StaticLibrary NotSet false - v140 + v141 StaticLibrary Unicode true - v140 + v141 StaticLibrary Unicode - v140 + v141 diff --git a/vs2015/lua-5.1/lua-5.1.vcxproj b/vs2015/lua-5.1/lua-5.1.vcxproj index 9a1ed64b2c..0e13e3c2f2 100644 --- a/vs2015/lua-5.1/lua-5.1.vcxproj +++ b/vs2015/lua-5.1/lua-5.1.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,30 +22,31 @@ {CCE1639A-B6FD-4144-A309-741B55DC835D} lua-5.1 Win32Proj + 10.0.15063.0 Application NotSet false - v140 + v141 Application NotSet false - v140 + v141 Application Unicode true - v140 + v141 Application Unicode - v140 + v141 @@ -109,7 +110,7 @@ false - lua-lib-5.1.lib;zl-lib-vfs.lib;zlib.lib;%(AdditionalDependencies) + lua-lib-5.1.lib;zl-lib-vfs.lib;zlib.lib;tlsf.lib;%(AdditionalDependencies) ..\bin\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) true Console @@ -146,7 +147,7 @@ false - lua-lib-5.1.lib;zl-lib-vfs.lib;zlib.lib;%(AdditionalDependencies) + lua-lib-5.1.lib;zl-lib-vfs.lib;zlib.lib;tlsf.lib;%(AdditionalDependencies) $(OutDir)lua.exe ..\bin\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) true @@ -183,7 +184,7 @@ false - lua-lib-5.1.lib;zl-lib-vfs.lib;zlib.lib;%(AdditionalDependencies) + lua-lib-5.1.lib;zl-lib-vfs.lib;zlib.lib;tlsf.lib;%(AdditionalDependencies) ..\bin\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) true Console @@ -224,7 +225,7 @@ false - lua-lib-5.1.lib;zl-lib-vfs.lib;zlib.lib;%(AdditionalDependencies) + lua-lib-5.1.lib;zl-lib-vfs.lib;zlib.lib;tlsf.lib;%(AdditionalDependencies) $(OutDir)lua.exe ..\bin\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) true diff --git a/vs2015/lua-5.2/lua-5.2.vcxproj b/vs2015/lua-5.2/lua-5.2.vcxproj index 53e90858df..c05edffa32 100644 --- a/vs2015/lua-5.2/lua-5.2.vcxproj +++ b/vs2015/lua-5.2/lua-5.2.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,30 +22,31 @@ {1058A5FD-6F00-4D33-BBDC-274077672B1B} lua-5.2 Win32Proj + 10.0.15063.0 Application NotSet false - v140 + v141 Application NotSet false - v140 + v141 Application Unicode true - v140 + v141 Application Unicode - v140 + v141 @@ -109,7 +110,7 @@ false - lua-lib-5.2.lib;zl-lib-vfs.lib;zlib.lib;%(AdditionalDependencies) + lua-lib-5.2.lib;zl-lib-vfs.lib;zlib.lib;tlsf.lib;%(AdditionalDependencies) ..\bin\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) true Console @@ -146,7 +147,7 @@ false - lua-lib-5.2.lib;zl-lib-vfs.lib;zlib.lib;%(AdditionalDependencies) + lua-lib-5.2.lib;zl-lib-vfs.lib;zlib.lib;tlsf.lib;%(AdditionalDependencies) $(OutDir)lua.exe ..\bin\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) true @@ -183,7 +184,7 @@ false - lua-lib-5.2.lib;zl-lib-vfs.lib;zlib.lib;%(AdditionalDependencies) + lua-lib-5.2.lib;zl-lib-vfs.lib;zlib.lib;tlsf.lib;%(AdditionalDependencies) ..\bin\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) true Console @@ -224,7 +225,7 @@ false - lua-lib-5.2.lib;zl-lib-vfs.lib;zlib.lib;%(AdditionalDependencies) + lua-lib-5.2.lib;zl-lib-vfs.lib;zlib.lib;tlsf.lib;%(AdditionalDependencies) $(OutDir)lua.exe ..\bin\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) true diff --git a/vs2015/lua-lib-5.1/lua-lib-5.1.vcxproj b/vs2015/lua-lib-5.1/lua-lib-5.1.vcxproj index f3f5d1e18f..e4c2a5a81e 100644 --- a/vs2015/lua-lib-5.1/lua-lib-5.1.vcxproj +++ b/vs2015/lua-lib-5.1/lua-lib-5.1.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,30 +22,31 @@ {71F4FF55-2018-4950-9820-251D7C3CDD31} lua-lib-5.1 Win32Proj + 10.0.15063.0 StaticLibrary NotSet false - v140 + v141 StaticLibrary NotSet false - v140 + v141 StaticLibrary Unicode true - v140 + v141 StaticLibrary Unicode - v140 + v141 diff --git a/vs2015/lua-lib-5.2/lua-lib-5.2.vcxproj b/vs2015/lua-lib-5.2/lua-lib-5.2.vcxproj index 1500cea4a6..394dd3f1fa 100644 --- a/vs2015/lua-lib-5.2/lua-lib-5.2.vcxproj +++ b/vs2015/lua-lib-5.2/lua-lib-5.2.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,30 +22,31 @@ {7F4F2D90-99B8-45A2-A089-CBC3DF5F34B9} lua-lib-5.2 Win32Proj + 10.0.15063.0 StaticLibrary NotSet false - v140 + v141 StaticLibrary NotSet false - v140 + v141 StaticLibrary Unicode true - v140 + v141 StaticLibrary Unicode - v140 + v141 diff --git a/vs2015/luac-5.1/luac-5.1.vcxproj b/vs2015/luac-5.1/luac-5.1.vcxproj index cb3579db40..ac2c9c58c5 100644 --- a/vs2015/luac-5.1/luac-5.1.vcxproj +++ b/vs2015/luac-5.1/luac-5.1.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,30 +22,31 @@ {3AC1F428-E1A9-44D5-9A7C-F03BDCBCF92E} luac-5.1 Win32Proj + 10.0.15063.0 Application NotSet false - v140 + v141 Application NotSet false - v140 + v141 Application Unicode true - v140 + v141 Application Unicode - v140 + v141 @@ -109,7 +110,7 @@ false - lua-lib-5.1.lib;zl-lib-vfs.lib;zlib.lib;%(AdditionalDependencies) + lua-lib-5.1.lib;zl-lib-vfs.lib;zlib.lib;tlsf.lib;%(AdditionalDependencies) ..\bin\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) true Console @@ -146,7 +147,7 @@ false - lua-lib-5.1.lib;zl-lib-vfs.lib;zlib.lib;%(AdditionalDependencies) + lua-lib-5.1.lib;zl-lib-vfs.lib;zlib.lib;tlsf.lib;%(AdditionalDependencies) $(OutDir)luac.exe ..\bin\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) true @@ -183,7 +184,7 @@ false - lua-lib-5.1.lib;zl-lib-vfs.lib;zlib.lib;%(AdditionalDependencies) + lua-lib-5.1.lib;zl-lib-vfs.lib;zlib.lib;tlsf.lib;%(AdditionalDependencies) ..\bin\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) true Console @@ -224,7 +225,7 @@ false - lua-lib-5.1.lib;zl-lib-vfs.lib;zlib.lib;%(AdditionalDependencies) + lua-lib-5.1.lib;zl-lib-vfs.lib;zlib.lib;tlsf.lib;%(AdditionalDependencies) $(OutDir)luac.exe ..\bin\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) true diff --git a/vs2015/luac-5.2/luac-5.2.vcxproj b/vs2015/luac-5.2/luac-5.2.vcxproj index 6bb339ed37..1765b62502 100644 --- a/vs2015/luac-5.2/luac-5.2.vcxproj +++ b/vs2015/luac-5.2/luac-5.2.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,30 +22,31 @@ {01540EF6-65BB-486D-AE7F-02845FDCA479} luac-5.2 Win32Proj + 10.0.15063.0 Application NotSet false - v140 + v141 Application NotSet false - v140 + v141 Application Unicode true - v140 + v141 Application Unicode - v140 + v141 @@ -109,7 +110,7 @@ false - lua-lib-5.2.lib;zl-lib-vfs.lib;zlib.lib;%(AdditionalDependencies) + lua-lib-5.2.lib;zl-lib-vfs.lib;zlib.lib;tlsf.lib;%(AdditionalDependencies) ..\bin\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) true Console @@ -146,7 +147,7 @@ false - lua-lib-5.2.lib;zl-lib-vfs.lib;zlib.lib;%(AdditionalDependencies) + lua-lib-5.2.lib;zl-lib-vfs.lib;zlib.lib;tlsf.lib;%(AdditionalDependencies) $(OutDir)luac.exe ..\bin\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) true @@ -183,7 +184,7 @@ false - lua-lib-5.2.lib;zl-lib-vfs.lib;zlib.lib;%(AdditionalDependencies) + lua-lib-5.2.lib;zl-lib-vfs.lib;zlib.lib;tlsf.lib;%(AdditionalDependencies) ..\bin\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) true Console @@ -224,7 +225,7 @@ false - lua-lib-5.2.lib;zl-lib-vfs.lib;zlib.lib;%(AdditionalDependencies) + lua-lib-5.2.lib;zl-lib-vfs.lib;zlib.lib;tlsf.lib;%(AdditionalDependencies) $(OutDir)luac.exe ..\bin\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) true diff --git a/vs2015/luaext/luaext.vcxproj b/vs2015/luaext/luaext.vcxproj index 8f0177dd64..c7b87cd664 100644 --- a/vs2015/luaext/luaext.vcxproj +++ b/vs2015/luaext/luaext.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,31 +22,31 @@ {51007BE8-C720-4A9F-A1BF-C2AA31179E02} luaext Win32Proj - 8.1 + 10.0.15063.0 StaticLibrary NotSet false - v140 + v141 StaticLibrary NotSet false - v140 + v141 StaticLibrary NotSet true - v140 + v141 StaticLibrary NotSet - v140 + v141 diff --git a/vs2015/luajit-lib/luajit-lib.vcxproj b/vs2015/luajit-lib/luajit-lib.vcxproj index dcb744c9ff..87add8dbb5 100644 --- a/vs2015/luajit-lib/luajit-lib.vcxproj +++ b/vs2015/luajit-lib/luajit-lib.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,30 +22,31 @@ {2BBF2DB4-FDC4-478A-BE1B-9BA2C14CE237} luajit-lib Win32Proj + 10.0.15063.0 StaticLibrary NotSet false - v140 + v141 StaticLibrary NotSet false - v140 + v141 StaticLibrary Unicode true - v140 + v141 StaticLibrary Unicode - v140 + v141 diff --git a/vs2015/luajit/luajit.vcxproj b/vs2015/luajit/luajit.vcxproj index aed82ba5c0..47a71ef732 100644 --- a/vs2015/luajit/luajit.vcxproj +++ b/vs2015/luajit/luajit.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,30 +22,31 @@ {ECCF265E-EB98-45B6-BDB9-FF826302BF5E} luajit Win32Proj + 10.0.15063.0 Application NotSet false - v140 + v141 Application NotSet false - v140 + v141 Application Unicode true - v140 + v141 Application Unicode - v140 + v141 @@ -109,7 +110,7 @@ false - luajit-lib.lib;zl-lib-vfs.lib;zlib.lib;%(AdditionalDependencies) + luajit-lib.lib;zl-lib-vfs.lib;zlib.lib;tlsf.lib;%(AdditionalDependencies) ..\bin\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) true Console @@ -147,7 +148,7 @@ false - luajit-lib.lib;zl-lib-vfs.lib;zlib.lib;%(AdditionalDependencies) + luajit-lib.lib;zl-lib-vfs.lib;zlib.lib;tlsf.lib;%(AdditionalDependencies) $(OutDir)lua.exe ..\bin\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) true @@ -186,7 +187,7 @@ xcopy /yr "$(OutDir)$(TargetName).pdb" "..\..\bin\$(Platform)\$(Configuration)\" false - luajit-lib.lib;zl-lib-vfs.lib;zlib.lib;%(AdditionalDependencies) + luajit-lib.lib;zl-lib-vfs.lib;zlib.lib;tlsf.lib;%(AdditionalDependencies) ..\bin\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) true Console @@ -228,7 +229,7 @@ xcopy /yr "$(OutDir)$(TargetName).pdb" "..\..\bin\$(Platform)\$(Configuration)\" false - luajit-lib.lib;zl-lib-vfs.lib;zlib.lib;%(AdditionalDependencies) + luajit-lib.lib;zl-lib-vfs.lib;zlib.lib;tlsf.lib;%(AdditionalDependencies) $(OutDir)lua.exe ..\bin\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) true diff --git a/vs2015/mbedtls/mbedTLS.vcxproj b/vs2015/mbedtls/mbedTLS.vcxproj index 55ed8f46ce..89deadd658 100644 --- a/vs2015/mbedtls/mbedTLS.vcxproj +++ b/vs2015/mbedtls/mbedTLS.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -29,27 +29,27 @@ StaticLibrary true Unicode - v140 + v141 StaticLibrary true Unicode - v140 + v141 StaticLibrary false true Unicode - v140 + v141 StaticLibrary false false Unicode - v140 + v141 diff --git a/vs2015/minilua/minilua.vcxproj b/vs2015/minilua/minilua.vcxproj index a013759fb8..075c9531aa 100644 --- a/vs2015/minilua/minilua.vcxproj +++ b/vs2015/minilua/minilua.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -25,30 +25,31 @@ {0ADB3D95-A750-4A3F-B2EB-560A7E29C465} minilua Win32Proj + 10.0.15063.0 Application NotSet false - v140 + v141 Application NotSet false - v140 + v141 Application Unicode true - v140 + v141 Application Unicode - v140 + v141 diff --git a/vs2015/moai-exe-server/moai-server.vcxproj b/vs2015/moai-exe-server/moai-server.vcxproj index 8a954b8449..73065a7c88 100644 --- a/vs2015/moai-exe-server/moai-server.vcxproj +++ b/vs2015/moai-exe-server/moai-server.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,30 +22,31 @@ {4AAABD66-E60E-45BD-9F14-D0DD5F5F26E2} moai-server-lua-5.1 Win32Proj + 10.0.15063.0 Application NotSet false - v140 + v141 Application NotSet false - v140 + v141 Application Unicode true - v140 + v141 Application Unicode - v140 + v141 @@ -92,7 +93,7 @@ Disabled ..\..\src;..\..\src\config;..\..\src\config-default;%(AdditionalIncludeDirectories) - WIN32;_CONSOLE;_DEBUG;AKU_WITH_BOX2D=0;AKU_WITH_CHIPMUNK=0;AKU_WITH_FMOD_DESIGNER=0;AKU_WITH_FMOD_EX=0;AKU_WITH_HARNESS=0;AKU_WITH_HTTP_CLIENT=1;AKU_WITH_HTTP_SERVER=1;AKU_WITH_LUAEXT=1;AKU_WITH_SIM=0;AKU_WITH_TEST=0;AKU_WITH_UNTZ=0;AKU_WITH_UTIL=1;%(PreprocessorDefinitions) + WIN32;_CONSOLE;_DEBUG;DEBUG;AKU_WITH_BOX2D=0;AKU_WITH_CHIPMUNK=0;AKU_WITH_FMOD_DESIGNER=0;AKU_WITH_FMOD_EX=0;AKU_WITH_HARNESS=0;AKU_WITH_HTTP_CLIENT=1;AKU_WITH_HTTP_SERVER=1;AKU_WITH_LUAEXT=1;AKU_WITH_SIM=0;AKU_WITH_TEST=0;AKU_WITH_UNTZ=0;AKU_WITH_UTIL=1;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -135,7 +136,7 @@ Disabled ..\..\src;..\..\src\config;..\..\src\config-default;%(AdditionalIncludeDirectories) - WIN32;_CONSOLE;_DEBUG;AKU_WITH_BOX2D=0;AKU_WITH_CHIPMUNK=0;AKU_WITH_FMOD_DESIGNER=0;AKU_WITH_FMOD_EX=0;AKU_WITH_HARNESS=0;AKU_WITH_HTTP_CLIENT=1;AKU_WITH_HTTP_SERVER=1;AKU_WITH_LUAEXT=1;AKU_WITH_SIM=0;AKU_WITH_TEST=0;AKU_WITH_UNTZ=0;AKU_WITH_UTIL=1;%(PreprocessorDefinitions) + WIN32;_CONSOLE;_DEBUG;DEBUG;AKU_WITH_BOX2D=0;AKU_WITH_CHIPMUNK=0;AKU_WITH_FMOD_DESIGNER=0;AKU_WITH_FMOD_EX=0;AKU_WITH_HARNESS=0;AKU_WITH_HTTP_CLIENT=1;AKU_WITH_HTTP_SERVER=1;AKU_WITH_LUAEXT=1;AKU_WITH_SIM=0;AKU_WITH_TEST=0;AKU_WITH_UNTZ=0;AKU_WITH_UTIL=1;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -175,7 +176,7 @@ xcopy /yr "$(OutDir)$(TargetName).pdb" "..\..\bin\$(Platform)\$(Configuration)\" ..\..\src;..\..\src\config;..\..\src\config-default;%(AdditionalIncludeDirectories) - WIN32;_CONSOLE;AKU_WITH_BOX2D=0;AKU_WITH_CHIPMUNK=0;AKU_WITH_FMOD_DESIGNER=0;AKU_WITH_FMOD_EX=0;AKU_WITH_HARNESS=0;AKU_WITH_HTTP_CLIENT=1;AKU_WITH_HTTP_SERVER=1;AKU_WITH_LUAEXT=1;AKU_WITH_SIM=0;AKU_WITH_TEST=0;AKU_WITH_UNTZ=0;AKU_WITH_UTIL=1;%(PreprocessorDefinitions) + WIN32;_CONSOLE;NDEBUG;AKU_WITH_BOX2D=0;AKU_WITH_CHIPMUNK=0;AKU_WITH_FMOD_DESIGNER=0;AKU_WITH_FMOD_EX=0;AKU_WITH_HARNESS=0;AKU_WITH_HTTP_CLIENT=1;AKU_WITH_HTTP_SERVER=1;AKU_WITH_LUAEXT=1;AKU_WITH_SIM=0;AKU_WITH_TEST=0;AKU_WITH_UNTZ=0;AKU_WITH_UTIL=1;%(PreprocessorDefinitions) MultiThreadedDLL false false @@ -214,7 +215,7 @@ xcopy /yr "$(OutDir)$(TargetName).pdb" "..\..\bin\$(Platform)\$(Configuration)\" ..\..\src;..\..\src\config;..\..\src\config-default;%(AdditionalIncludeDirectories) - WIN32;_CONSOLE;AKU_WITH_BOX2D=0;AKU_WITH_CHIPMUNK=0;AKU_WITH_FMOD_DESIGNER=0;AKU_WITH_FMOD_EX=0;AKU_WITH_HARNESS=0;AKU_WITH_HTTP_CLIENT=1;AKU_WITH_HTTP_SERVER=1;AKU_WITH_LUAEXT=1;AKU_WITH_SIM=0;AKU_WITH_TEST=0;AKU_WITH_UNTZ=0;AKU_WITH_UTIL=1;%(PreprocessorDefinitions) + WIN32;_CONSOLE;NDEBUG;AKU_WITH_BOX2D=0;AKU_WITH_CHIPMUNK=0;AKU_WITH_FMOD_DESIGNER=0;AKU_WITH_FMOD_EX=0;AKU_WITH_HARNESS=0;AKU_WITH_HTTP_CLIENT=1;AKU_WITH_HTTP_SERVER=1;AKU_WITH_LUAEXT=1;AKU_WITH_SIM=0;AKU_WITH_TEST=0;AKU_WITH_UNTZ=0;AKU_WITH_UTIL=1;%(PreprocessorDefinitions) MultiThreadedDLL false false diff --git a/vs2015/moai-exe-test/moai-test.vcxproj b/vs2015/moai-exe-test/moai-test.vcxproj index 7a78a9cbd3..cbeca9881c 100644 --- a/vs2015/moai-exe-test/moai-test.vcxproj +++ b/vs2015/moai-exe-test/moai-test.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,30 +22,31 @@ {E2A74094-D98E-40F2-9123-6E12BD6BBB5D} moai-test-lua-5.1 Win32Proj + 10.0.15063.0 Application NotSet false - v140 + v141 Application NotSet false - v140 + v141 Application Unicode true - v140 + v141 Application Unicode - v140 + v141 @@ -91,8 +92,8 @@ Disabled - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty\sdl2-2.0.0\include;%(AdditionalIncludeDirectories) - WIN32;_CONSOLE;_DEBUG;AKU_WITH_TEST=1;DECLSPEC=;SDL_MAIN_HANDLED;%(PreprocessorDefinitions) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty\sdl2-2.0.4\include;%(AdditionalIncludeDirectories) + WIN32;_CONSOLE;_DEBUG;DEBUG;AKU_WITH_TEST=1;DECLSPEC=;SDL_MAIN_HANDLED;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -110,7 +111,7 @@ false - sdl.lib;moai-lib-box2d.lib;moai-lib-chipmunk.lib;moai-lib-core.lib;moai-lib-harness.lib;moai-lib-luaext.lib;moai-lib-http-client.lib;moai-lib-http-server.lib;moai-lib-sim.lib;moai-lib-test.lib;moai-lib-untz.lib;moai-lib-util.lib;dsound.lib;strmiids.lib;advapi32.lib;comctl32.lib;oleaut32.lib;rpcrt4.lib;winmm.lib;wldap32.lib;ws2_32.lib;wsock32.lib;iphlpapi.lib;psapi.lib;imm32.lib;version.lib;%(AdditionalDependencies) + sdl.lib;zl-lib-core.lib;moai-lib-box2d.lib;moai-lib-crypto.lib;moai-lib-core.lib;moai-lib-luaext.lib;moai-lib-http-client.lib;moai-lib-http-server.lib;moai-lib-sim.lib;moai-lib-untz.lib;moai-lib-util.lib;dsound.lib;strmiids.lib;advapi32.lib;comctl32.lib;oleaut32.lib;rpcrt4.lib;winmm.lib;wldap32.lib;ws2_32.lib;wsock32.lib;iphlpapi.lib;psapi.lib;imm32.lib;version.lib;%(AdditionalDependencies) NotSet ..\bin\$(Platform)\$(Configuration)\;..\..\3rdparty\freeglut-2.8.1\include;%(AdditionalLibraryDirectories) false @@ -134,8 +135,8 @@ Disabled - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty\sdl2-2.0.0\include;%(AdditionalIncludeDirectories) - WIN32;_CONSOLE;_DEBUG;AKU_WITH_TEST=1;DECLSPEC=;SDL_MAIN_HANDLED;%(PreprocessorDefinitions) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty\sdl2-2.0.4\include;%(AdditionalIncludeDirectories) + WIN32;_CONSOLE;_DEBUG;DEBUG;AKU_WITH_TEST=1;DECLSPEC=;SDL_MAIN_HANDLED;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -153,7 +154,7 @@ false - sdl.lib;moai-lib-box2d.lib;moai-lib-chipmunk.lib;moai-lib-core.lib;moai-lib-harness.lib;moai-lib-luaext.lib;moai-lib-http-client.lib;moai-lib-http-server.lib;moai-lib-sim.lib;moai-lib-test.lib;moai-lib-untz.lib;moai-lib-util.lib;dsound.lib;strmiids.lib;advapi32.lib;comctl32.lib;oleaut32.lib;rpcrt4.lib;winmm.lib;wldap32.lib;ws2_32.lib;wsock32.lib;iphlpapi.lib;psapi.lib;imm32.lib;version.lib;%(AdditionalDependencies) + sdl.lib;zl-lib-core.lib;moai-lib-box2d.lib;moai-lib-crypto.lib;moai-lib-core.lib;moai-lib-luaext.lib;moai-lib-http-client.lib;moai-lib-http-server.lib;moai-lib-sim.lib;moai-lib-untz.lib;moai-lib-util.lib;dsound.lib;strmiids.lib;advapi32.lib;comctl32.lib;oleaut32.lib;rpcrt4.lib;winmm.lib;wldap32.lib;ws2_32.lib;wsock32.lib;iphlpapi.lib;psapi.lib;imm32.lib;version.lib;%(AdditionalDependencies) NotSet ..\bin\$(Platform)\$(Configuration)\;..\..\3rdparty\freeglut-2.8.1\include;%(AdditionalLibraryDirectories) false @@ -173,8 +174,8 @@ - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty\sdl2-2.0.0\include;%(AdditionalIncludeDirectories) - WIN32;_CONSOLE;AKU_WITH_TEST=1;DECLSPEC=;SDL_MAIN_HANDLED;%(PreprocessorDefinitions) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty\sdl2-2.0.4\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;AKU_WITH_TEST=1;DECLSPEC=;SDL_MAIN_HANDLED;%(PreprocessorDefinitions) MultiThreadedDLL false false @@ -190,7 +191,7 @@ false - sdl.lib;moai-lib-box2d.lib;moai-lib-chipmunk.lib;moai-lib-core.lib;moai-lib-harness.lib;moai-lib-luaext.lib;moai-lib-http-client.lib;moai-lib-http-server.lib;moai-lib-sim.lib;moai-lib-test.lib;moai-lib-untz.lib;moai-lib-util.lib;dsound.lib;strmiids.lib;advapi32.lib;comctl32.lib;oleaut32.lib;rpcrt4.lib;winmm.lib;wldap32.lib;ws2_32.lib;wsock32.lib;iphlpapi.lib;psapi.lib;imm32.lib;version.lib;%(AdditionalDependencies) + sdl.lib;zl-lib-core.lib;moai-lib-box2d.lib;moai-lib-crypto.lib;moai-lib-core.lib;moai-lib-luaext.lib;moai-lib-http-client.lib;moai-lib-http-server.lib;moai-lib-sim.lib;moai-lib-untz.lib;moai-lib-util.lib;dsound.lib;strmiids.lib;advapi32.lib;comctl32.lib;oleaut32.lib;rpcrt4.lib;winmm.lib;wldap32.lib;ws2_32.lib;wsock32.lib;iphlpapi.lib;psapi.lib;imm32.lib;version.lib;%(AdditionalDependencies) ..\bin\$(Platform)\$(Configuration)\;..\..\3rdparty\freeglut-2.8.1\include;%(AdditionalLibraryDirectories) false true @@ -212,8 +213,8 @@ X64 - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty\sdl2-2.0.0\include;%(AdditionalIncludeDirectories) - WIN32;_CONSOLE;AKU_WITH_TEST=1;DECLSPEC=;SDL_MAIN_HANDLED;%(PreprocessorDefinitions) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty\sdl2-2.0.4\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;AKU_WITH_TEST=1;DECLSPEC=;SDL_MAIN_HANDLED;%(PreprocessorDefinitions) MultiThreadedDLL false false @@ -228,7 +229,7 @@ false - sdl.lib;moai-lib-box2d.lib;moai-lib-chipmunk.lib;moai-lib-core.lib;moai-lib-harness.lib;moai-lib-luaext.lib;moai-lib-http-client.lib;moai-lib-http-server.lib;moai-lib-sim.lib;moai-lib-test.lib;moai-lib-untz.lib;moai-lib-util.lib;dsound.lib;strmiids.lib;advapi32.lib;comctl32.lib;oleaut32.lib;rpcrt4.lib;winmm.lib;wldap32.lib;ws2_32.lib;wsock32.lib;iphlpapi.lib;psapi.lib;imm32.lib;version.lib;%(AdditionalDependencies) + sdl.lib;zl-lib-core.lib;moai-lib-box2d.lib;moai-lib-crypto.lib;moai-lib-core.lib;moai-lib-luaext.lib;moai-lib-http-client.lib;moai-lib-http-server.lib;moai-lib-sim.lib;moai-lib-untz.lib;moai-lib-util.lib;dsound.lib;strmiids.lib;advapi32.lib;comctl32.lib;oleaut32.lib;rpcrt4.lib;winmm.lib;wldap32.lib;ws2_32.lib;wsock32.lib;iphlpapi.lib;psapi.lib;imm32.lib;version.lib;%(AdditionalDependencies) ..\bin\$(Platform)\$(Configuration)\;..\..\3rdparty\freeglut-2.8.1\include;%(AdditionalLibraryDirectories) false true @@ -274,9 +275,6 @@ {fa856173-3823-4fff-8207-32db9c1711fa} - - {6b898b13-e6f1-473c-a020-328da0d50fb9} - {c699bb79-8f3f-48a3-a06a-2d4e0ea73360} diff --git a/vs2015/moai-exe/moai.vcxproj b/vs2015/moai-exe/moai.vcxproj index 4abee32be2..0c9d9f300b 100644 --- a/vs2015/moai-exe/moai.vcxproj +++ b/vs2015/moai-exe/moai.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,27 +22,27 @@ {83DE7C0A-667A-4B75-8D00-B575501BC289} moai-lua-5.1 Win32Proj - 8.1 + 10.0.15063.0 Application false - v140 + v141 Application false - v140 + v141 Application true - v140 + v141 Application - v140 + v141 @@ -108,7 +108,7 @@ false - zlib.lib;zl-lib-vfs.lib;assimp.lib;box2d.lib;contrib.lib;expat.lib;freetype.lib;glew.lib;jansson.lib;kissfft.lib;tinyxml.lib;libcrypto.lib;libssl.lib;libcurl.lib;libjpg.lib;libpng.lib;libpvr.lib;libwebp.lib;libogg.lib;libvorbis.lib;libtess.lib;sdl.lib;zl-lib-core.lib;zl-lib-crypto.lib;zl-lib-gfx.lib;moai-lib-assimp.lib;moai-lib-core.lib;moai-lib-crypto.lib;moai-lib-http-client.lib;moai-lib-http-server.lib;moai-lib-sim.lib;moai-lib-image-jpg.lib;moai-lib-image-png.lib;moai-lib-image-pvr.lib;moai-lib-image-tga.lib;moai-lib-image-webp.lib;moai-lib-untz.lib;moai-lib-util.lib;dsound.lib;strmiids.lib;advapi32.lib;comctl32.lib;oleaut32.lib;opengl32.lib;rpcrt4.lib;winmm.lib;wldap32.lib;ws2_32.lib;wsock32.lib;iphlpapi.lib;psapi.lib;imm32.lib;version.lib;%(AdditionalDependencies) + zlib.lib;zl-lib-vfs.lib;assimp.lib;box2d.lib;contrib.lib;expat.lib;mbedtls.lib;freetype.lib;glew.lib;jansson.lib;kissfft.lib;tinyxml.lib;libcurl.lib;libjpg.lib;libpng.lib;libpvr.lib;libwebp.lib;libogg.lib;libvorbis.lib;libtess.lib;sdl.lib;zl-lib-core.lib;zl-lib-crypto.lib;zl-lib-gfx.lib;moai-lib-assimp.lib;moai-lib-core.lib;moai-lib-crypto.lib;moai-lib-http-client.lib;moai-lib-http-server.lib;moai-lib-sim.lib;moai-lib-image-jpg.lib;moai-lib-image-png.lib;moai-lib-image-pvr.lib;moai-lib-image-tga.lib;moai-lib-image-webp.lib;moai-lib-untz.lib;moai-lib-util.lib;dsound.lib;strmiids.lib;advapi32.lib;comctl32.lib;oleaut32.lib;opengl32.lib;rpcrt4.lib;winmm.lib;wldap32.lib;ws2_32.lib;wsock32.lib;iphlpapi.lib;psapi.lib;imm32.lib;version.lib;%(AdditionalDependencies) ..\bin\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) false true @@ -154,7 +154,7 @@ true - zlib.lib;zl-lib-vfs.lib;assimp.lib;box2d.lib;contrib.lib;expat.lib;freetype.lib;glew.lib;jansson.lib;kissfft.lib;tinyxml.lib;libcrypto.lib;libssl.lib;libcurl.lib;libjpg.lib;libpng.lib;libpvr.lib;libwebp.lib;libogg.lib;libvorbis.lib;libtess.lib;sdl.lib;zl-lib-core.lib;zl-lib-crypto.lib;zl-lib-gfx.lib;moai-lib-assimp.lib;moai-lib-core.lib;moai-lib-crypto.lib;moai-lib-http-client.lib;moai-lib-http-server.lib;moai-lib-sim.lib;moai-lib-image-jpg.lib;moai-lib-image-png.lib;moai-lib-image-pvr.lib;moai-lib-image-tga.lib;moai-lib-image-webp.lib;moai-lib-untz.lib;moai-lib-util.lib;dsound.lib;strmiids.lib;advapi32.lib;comctl32.lib;oleaut32.lib;opengl32.lib;rpcrt4.lib;winmm.lib;wldap32.lib;ws2_32.lib;wsock32.lib;iphlpapi.lib;psapi.lib;imm32.lib;version.lib;%(AdditionalDependencies) + zlib.lib;zl-lib-vfs.lib;assimp.lib;box2d.lib;contrib.lib;expat.lib;mbedtls.lib;freetype.lib;glew.lib;jansson.lib;kissfft.lib;tinyxml.lib;libcurl.lib;libjpg.lib;libpng.lib;libpvr.lib;libwebp.lib;libogg.lib;libvorbis.lib;libtess.lib;sdl.lib;zl-lib-core.lib;zl-lib-crypto.lib;zl-lib-gfx.lib;moai-lib-assimp.lib;moai-lib-core.lib;moai-lib-crypto.lib;moai-lib-http-client.lib;moai-lib-http-server.lib;moai-lib-sim.lib;moai-lib-image-jpg.lib;moai-lib-image-png.lib;moai-lib-image-pvr.lib;moai-lib-image-tga.lib;moai-lib-image-webp.lib;moai-lib-untz.lib;moai-lib-util.lib;dsound.lib;strmiids.lib;advapi32.lib;comctl32.lib;oleaut32.lib;opengl32.lib;rpcrt4.lib;winmm.lib;wldap32.lib;ws2_32.lib;wsock32.lib;iphlpapi.lib;psapi.lib;imm32.lib;version.lib;%(AdditionalDependencies) NotSet ..\bin\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) false @@ -197,7 +197,7 @@ true - zlib.lib;zl-lib-vfs.lib;assimp.lib;box2d.lib;contrib.lib;expat.lib;freetype.lib;glew.lib;jansson.lib;kissfft.lib;tinyxml.lib;libcrypto.lib;libssl.lib;libcurl.lib;libjpg.lib;libpng.lib;libpvr.lib;libwebp.lib;libogg.lib;libvorbis.lib;libtess.lib;sdl.lib;zl-lib-core.lib;zl-lib-crypto.lib;zl-lib-gfx.lib;moai-lib-assimp.lib;moai-lib-core.lib;moai-lib-crypto.lib;moai-lib-http-client.lib;moai-lib-http-server.lib;moai-lib-sim.lib;moai-lib-image-jpg.lib;moai-lib-image-png.lib;moai-lib-image-pvr.lib;moai-lib-image-tga.lib;moai-lib-image-webp.lib;moai-lib-untz.lib;moai-lib-util.lib;dsound.lib;strmiids.lib;advapi32.lib;comctl32.lib;oleaut32.lib;opengl32.lib;rpcrt4.lib;winmm.lib;wldap32.lib;ws2_32.lib;wsock32.lib;iphlpapi.lib;psapi.lib;imm32.lib;version.lib;%(AdditionalDependencies) + zlib.lib;zl-lib-vfs.lib;assimp.lib;box2d.lib;contrib.lib;expat.lib;mbedtls.lib;freetype.lib;glew.lib;jansson.lib;kissfft.lib;tinyxml.lib;libcurl.lib;libjpg.lib;libpng.lib;libpvr.lib;libwebp.lib;libogg.lib;libvorbis.lib;libtess.lib;sdl.lib;zl-lib-core.lib;zl-lib-crypto.lib;zl-lib-gfx.lib;moai-lib-assimp.lib;moai-lib-core.lib;moai-lib-crypto.lib;moai-lib-http-client.lib;moai-lib-http-server.lib;moai-lib-sim.lib;moai-lib-image-jpg.lib;moai-lib-image-png.lib;moai-lib-image-pvr.lib;moai-lib-image-tga.lib;moai-lib-image-webp.lib;moai-lib-untz.lib;moai-lib-util.lib;dsound.lib;strmiids.lib;advapi32.lib;comctl32.lib;oleaut32.lib;opengl32.lib;rpcrt4.lib;winmm.lib;wldap32.lib;ws2_32.lib;wsock32.lib;iphlpapi.lib;psapi.lib;imm32.lib;version.lib;%(AdditionalDependencies) ..\bin\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) false true @@ -241,7 +241,7 @@ true - zlib.lib;zl-lib-vfs.lib;assimp.lib;box2d.lib;contrib.lib;expat.lib;freetype.lib;glew.lib;jansson.lib;kissfft.lib;tinyxml.lib;libcrypto.lib;libssl.lib;libcurl.lib;libjpg.lib;libpng.lib;libpvr.lib;libwebp.lib;libogg.lib;libvorbis.lib;libtess.lib;sdl.lib;zl-lib-core.lib;zl-lib-crypto.lib;zl-lib-gfx.lib;moai-lib-assimp.lib;moai-lib-core.lib;moai-lib-crypto.lib;moai-lib-http-client.lib;moai-lib-http-server.lib;moai-lib-sim.lib;moai-lib-image-jpg.lib;moai-lib-image-png.lib;moai-lib-image-pvr.lib;moai-lib-image-tga.lib;moai-lib-image-webp.lib;moai-lib-untz.lib;moai-lib-util.lib;dsound.lib;strmiids.lib;advapi32.lib;comctl32.lib;oleaut32.lib;opengl32.lib;rpcrt4.lib;winmm.lib;wldap32.lib;ws2_32.lib;wsock32.lib;iphlpapi.lib;psapi.lib;imm32.lib;version.lib;%(AdditionalDependencies) + zlib.lib;zl-lib-vfs.lib;assimp.lib;box2d.lib;contrib.lib;expat.lib;mbedtls.lib;freetype.lib;glew.lib;jansson.lib;kissfft.lib;tinyxml.lib;libcurl.lib;libjpg.lib;libpng.lib;libpvr.lib;libwebp.lib;libogg.lib;libvorbis.lib;libtess.lib;sdl.lib;zl-lib-core.lib;zl-lib-crypto.lib;zl-lib-gfx.lib;moai-lib-assimp.lib;moai-lib-core.lib;moai-lib-crypto.lib;moai-lib-http-client.lib;moai-lib-http-server.lib;moai-lib-sim.lib;moai-lib-image-jpg.lib;moai-lib-image-png.lib;moai-lib-image-pvr.lib;moai-lib-image-tga.lib;moai-lib-image-webp.lib;moai-lib-untz.lib;moai-lib-util.lib;dsound.lib;strmiids.lib;advapi32.lib;comctl32.lib;oleaut32.lib;opengl32.lib;rpcrt4.lib;winmm.lib;wldap32.lib;ws2_32.lib;wsock32.lib;iphlpapi.lib;psapi.lib;imm32.lib;version.lib;%(AdditionalDependencies) ..\bin\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) false true @@ -287,9 +287,6 @@ {23fa2a9c-429a-4be6-a540-f80b061ee58a} - - {956ffe71-66f4-457c-8c88-9f075e4fde27} - {41beb1cb-88c0-4c0f-b24e-f5871cf9ee49} @@ -305,9 +302,6 @@ {ead743fa-900e-4e4b-8f4a-7ad7f6b2f003} - - {d0f1c892-57f4-4758-a2ee-bfb58db20987} - {6de5e8c5-e477-4cee-8824-73e3c3c483de} diff --git a/vs2015/moai-lib-assimp/moai-lib-assimp.vcxproj b/vs2015/moai-lib-assimp/moai-lib-assimp.vcxproj index 237ad52b66..5208fe684e 100644 --- a/vs2015/moai-lib-assimp/moai-lib-assimp.vcxproj +++ b/vs2015/moai-lib-assimp/moai-lib-assimp.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,6 +21,7 @@ + @@ -30,6 +31,7 @@ + @@ -46,27 +48,28 @@ {A90989F3-8C14-487B-9127-C89A9D53630C} moai-lib-assimp Win32Proj + 10.0.15063.0 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 @@ -110,7 +113,7 @@ Disabled - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\box2d-2.3.0;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\tinyxml;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\assimp\include;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\box2d-2.3.0;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\tinyxml;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\assimp\include;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;_DEBUG;%(PreprocessorDefinitions) true Sync @@ -144,7 +147,7 @@ Disabled - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\box2d-2.3.0;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\tinyxml;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\assimp\include;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\box2d-2.3.0;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\tinyxml;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\assimp\include;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;_DEBUG;%(PreprocessorDefinitions) true Sync @@ -179,7 +182,7 @@ false Speed false - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\box2d-2.3.0;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\tinyxml;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\assimp\include;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\box2d-2.3.0;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\tinyxml;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\assimp\include;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions) true Sync @@ -219,7 +222,7 @@ Size true true - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\box2d-2.3.0;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\tinyxml;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\assimp\include;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\box2d-2.3.0;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\tinyxml;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\assimp\include;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions) true Sync diff --git a/vs2015/moai-lib-box2d/moai-lib-box2d.vcxproj b/vs2015/moai-lib-box2d/moai-lib-box2d.vcxproj index 8eaa67309d..ac11a91879 100644 --- a/vs2015/moai-lib-box2d/moai-lib-box2d.vcxproj +++ b/vs2015/moai-lib-box2d/moai-lib-box2d.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,27 +22,28 @@ {BAAF0611-4BA9-4BDD-9D83-822F3B23ABA3} moai-lib-box2d Win32Proj + 10.0.15063.0 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 @@ -86,7 +87,7 @@ Disabled - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\box2d-2.3.0;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\tinyxml;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\freetype-2.4.4\include;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\box2d-2.3.0;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\tinyxml;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\freetype-2.4.4\include;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;_DEBUG;%(PreprocessorDefinitions) true Sync @@ -120,7 +121,7 @@ Disabled - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\box2d-2.3.0;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\tinyxml;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\freetype-2.4.4\include;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\box2d-2.3.0;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\tinyxml;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\freetype-2.4.4\include;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;_DEBUG;%(PreprocessorDefinitions) true Sync @@ -155,7 +156,7 @@ false Speed false - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\box2d-2.3.0;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\tinyxml;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\freetype-2.4.4\include;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\box2d-2.3.0;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\tinyxml;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\freetype-2.4.4\include;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions) true Sync @@ -195,7 +196,7 @@ Size true true - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\box2d-2.3.0;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\tinyxml;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\freetype-2.4.4\include;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\box2d-2.3.0;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\tinyxml;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\freetype-2.4.4\include;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions) true Sync diff --git a/vs2015/moai-lib-core/moai-lib-core.vcxproj b/vs2015/moai-lib-core/moai-lib-core.vcxproj index b81e204b07..d751e65c26 100644 --- a/vs2015/moai-lib-core/moai-lib-core.vcxproj +++ b/vs2015/moai-lib-core/moai-lib-core.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,27 +22,28 @@ {AA2BD0BE-D174-4F8F-A7F7-B924128FED00} moai-lib-core Win32Proj + 10.0.15063.0 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 @@ -86,7 +87,7 @@ Disabled - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\jansson-2.7\src-win32;..\..\3rdparty\jansson-2.7\src;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\jansson-2.7\src-win32;..\..\3rdparty\jansson-2.7\src;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;_DEBUG;%(PreprocessorDefinitions) true Sync @@ -117,7 +118,7 @@ Disabled - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\jansson-2.7\src-win32;..\..\3rdparty\jansson-2.7\src;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\jansson-2.7\src-win32;..\..\3rdparty\jansson-2.7\src;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;_DEBUG;%(PreprocessorDefinitions) true Sync @@ -152,7 +153,7 @@ false Speed false - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\jansson-2.7\src-win32;..\..\3rdparty\jansson-2.7\src;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\jansson-2.7\src-win32;..\..\3rdparty\jansson-2.7\src;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions) true Sync @@ -192,7 +193,7 @@ Size true true - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\jansson-2.7\src-win32;..\..\3rdparty\jansson-2.7\src;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\jansson-2.7\src-win32;..\..\3rdparty\jansson-2.7\src;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions) true Sync @@ -220,13 +221,11 @@ - - @@ -239,27 +238,24 @@ - - + - - @@ -267,7 +263,6 @@ - diff --git a/vs2015/moai-lib-crypto/moai-lib-crypto.vcxproj b/vs2015/moai-lib-crypto/moai-lib-crypto.vcxproj index c983d459b3..06f9d4caf9 100644 --- a/vs2015/moai-lib-crypto/moai-lib-crypto.vcxproj +++ b/vs2015/moai-lib-crypto/moai-lib-crypto.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,27 +22,28 @@ {A5F1DFA8-7FDB-4D71-B926-350A011C98F9} moai-lib-crypto Win32Proj + 10.0.15063.0 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 @@ -86,7 +87,7 @@ Disabled - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\expat-2.1.0\lib;..\..\3rdparty\ooid-0.99;..\..\3rdparty\openssl-1.0.0m\include-win32;..\..\3rdparty\openssl-1.0.0m\include;..\..\3rdparty\openssl-1.0.0m\crypto;..\..\3rdparty\openssl-1.0.0m\crypto\asn1;..\..\3rdparty\openssl-1.0.0m\crypto\evp;..\..\3rdparty\openssl-1.0.0m;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\expat-2.1.0\lib;..\..\3rdparty\ooid-0.99;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;_DEBUG;%(PreprocessorDefinitions) true Sync @@ -115,7 +116,7 @@ Disabled - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\expat-2.1.0\lib;..\..\3rdparty\ooid-0.99;..\..\3rdparty\openssl-1.0.0m\include-win32;..\..\3rdparty\openssl-1.0.0m\include;..\..\3rdparty\openssl-1.0.0m\crypto;..\..\3rdparty\openssl-1.0.0m\crypto\asn1;..\..\3rdparty\openssl-1.0.0m\crypto\evp;..\..\3rdparty\openssl-1.0.0m;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\expat-2.1.0\lib;..\..\3rdparty\ooid-0.99;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;_DEBUG;%(PreprocessorDefinitions) true Sync @@ -148,7 +149,7 @@ false Speed false - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\expat-2.1.0\lib;..\..\3rdparty\ooid-0.99;..\..\3rdparty\openssl-1.0.0m\include-win32;..\..\3rdparty\openssl-1.0.0m\include;..\..\3rdparty\openssl-1.0.0m\crypto;..\..\3rdparty\openssl-1.0.0m\crypto\asn1;..\..\3rdparty\openssl-1.0.0m\crypto\evp;..\..\3rdparty\openssl-1.0.0m;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\expat-2.1.0\lib;..\..\3rdparty\ooid-0.99;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions) true Sync @@ -186,7 +187,7 @@ Size true true - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\expat-2.1.0\lib;..\..\3rdparty\ooid-0.99;..\..\3rdparty\openssl-1.0.0m\include-win32;..\..\3rdparty\openssl-1.0.0m\include;..\..\3rdparty\openssl-1.0.0m\crypto;..\..\3rdparty\openssl-1.0.0m\crypto\asn1;..\..\3rdparty\openssl-1.0.0m\crypto\evp;..\..\3rdparty\openssl-1.0.0m;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\expat-2.1.0\lib;..\..\3rdparty\ooid-0.99;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions) true Sync diff --git a/vs2015/moai-lib-http-client/moai-lib-http-client.vcxproj b/vs2015/moai-lib-http-client/moai-lib-http-client.vcxproj index 5fef129695..f33790c276 100644 --- a/vs2015/moai-lib-http-client/moai-lib-http-client.vcxproj +++ b/vs2015/moai-lib-http-client/moai-lib-http-client.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,27 +22,28 @@ {CAF76E4C-0B1B-424D-B36E-BA0D974A7A0C} moai-lib-http-client Win32Proj + 10.0.15063.0 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 @@ -86,7 +87,7 @@ Disabled - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\c-ares-1.7.5;..\..\3rdparty\curl\lib;..\..\3rdparty\curl\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\tinyxml;..\..\src\custom-include\curl\windows;..\..\src\custom-include\curl\windows\curl;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\c-ares-1.7.5;..\..\3rdparty\curl\lib;..\..\3rdparty\curl\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\tinyxml;..\..\src\custom-include\curl\windows;..\..\src\custom-include\curl\windows\curl;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;CURL_STATICLIB;HAVE_BOOL_T;DEBUG;_DEBUG;%(PreprocessorDefinitions) true Sync @@ -117,7 +118,7 @@ Disabled - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\c-ares-1.7.5;..\..\3rdparty\curl\lib;..\..\3rdparty\curl\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\tinyxml;..\..\src\custom-include\curl\windows;..\..\src\custom-include\curl\windows\curl;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\c-ares-1.7.5;..\..\3rdparty\curl\lib;..\..\3rdparty\curl\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\tinyxml;..\..\src\custom-include\curl\windows;..\..\src\custom-include\curl\windows\curl;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;CURL_STATICLIB;HAVE_BOOL_T;DEBUG;_DEBUG;%(PreprocessorDefinitions) true Sync @@ -152,7 +153,7 @@ false Speed false - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\c-ares-1.7.5;..\..\3rdparty\curl\lib;..\..\3rdparty\curl\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\tinyxml;..\..\src\custom-include\curl\windows;..\..\src\custom-include\curl\windows\curl;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\c-ares-1.7.5;..\..\3rdparty\curl\lib;..\..\3rdparty\curl\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\tinyxml;..\..\src\custom-include\curl\windows;..\..\src\custom-include\curl\windows\curl;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;CURL_STATICLIB;HAVE_BOOL_T;NDEBUG;%(PreprocessorDefinitions) true Sync @@ -192,7 +193,7 @@ Size true true - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\c-ares-1.7.5;..\..\3rdparty\curl\lib;..\..\3rdparty\curl\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\tinyxml;..\..\src\custom-include\curl\windows;..\..\src\custom-include\curl\windows\curl;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\c-ares-1.7.5;..\..\3rdparty\curl\lib;..\..\3rdparty\curl\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\tinyxml;..\..\src\custom-include\curl\windows;..\..\src\custom-include\curl\windows\curl;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;CURL_STATICLIB;HAVE_BOOL_T;NDEBUG;%(PreprocessorDefinitions) true Sync diff --git a/vs2015/moai-lib-http-server/moai-lib-http-server.vcxproj b/vs2015/moai-lib-http-server/moai-lib-http-server.vcxproj index c465d23aad..c19fb4ed9a 100644 --- a/vs2015/moai-lib-http-server/moai-lib-http-server.vcxproj +++ b/vs2015/moai-lib-http-server/moai-lib-http-server.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,27 +22,28 @@ {327AAD13-D2A2-4BBF-A68D-88E7DBF4E5FC} moai-lib-http-server Win32Proj + 10.0.15063.0 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 @@ -86,7 +87,7 @@ Disabled - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\tinyxml;..\..\3rdparty\mongoose;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\tinyxml;..\..\3rdparty\mongoose;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;_DEBUG;%(PreprocessorDefinitions) true Sync @@ -117,7 +118,7 @@ Disabled - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\tinyxml;..\..\3rdparty\mongoose;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\tinyxml;..\..\3rdparty\mongoose;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;_DEBUG;%(PreprocessorDefinitions) true Sync @@ -152,7 +153,7 @@ false Speed false - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\tinyxml;..\..\3rdparty\mongoose;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\tinyxml;..\..\3rdparty\mongoose;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions) true Sync @@ -192,7 +193,7 @@ Size true true - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\tinyxml;..\..\3rdparty\mongoose;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\tinyxml;..\..\3rdparty\mongoose;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions) true Sync diff --git a/vs2015/moai-lib-image-jpg/moai-lib-image-jpg.vcxproj b/vs2015/moai-lib-image-jpg/moai-lib-image-jpg.vcxproj index a2f0956b36..da7b1c4456 100644 --- a/vs2015/moai-lib-image-jpg/moai-lib-image-jpg.vcxproj +++ b/vs2015/moai-lib-image-jpg/moai-lib-image-jpg.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,27 +22,28 @@ {7294031C-51D0-4FED-8468-A03766274951} moai-lib-image-jpg Win32Proj + 10.0.15063.0 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 @@ -86,7 +87,7 @@ Disabled - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\jpeg-8c;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\jpeg-8c;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;_DEBUG;%(PreprocessorDefinitions) true Sync @@ -115,7 +116,7 @@ Disabled - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\jpeg-8c;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\jpeg-8c;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;_DEBUG;%(PreprocessorDefinitions) true Sync @@ -148,7 +149,7 @@ false Speed false - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\jpeg-8c;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\jpeg-8c;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions) true Sync @@ -186,7 +187,7 @@ Size true true - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\jpeg-8c;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\jpeg-8c;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions) true Sync diff --git a/vs2015/moai-lib-image-png/moai-lib-image-png.vcxproj b/vs2015/moai-lib-image-png/moai-lib-image-png.vcxproj index 44c234bb49..6f3846a41f 100644 --- a/vs2015/moai-lib-image-png/moai-lib-image-png.vcxproj +++ b/vs2015/moai-lib-image-png/moai-lib-image-png.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,27 +22,28 @@ {DCF29CD5-AFDE-4C7A-9BED-0679D09EAA9D} moai-lib-image-png Win32Proj + 10.0.15063.0 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 @@ -86,7 +87,7 @@ Disabled - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\lpng140;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\lpng140;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;_DEBUG;%(PreprocessorDefinitions) true Sync @@ -115,7 +116,7 @@ Disabled - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\lpng140;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\lpng140;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;_DEBUG;%(PreprocessorDefinitions) true Sync @@ -148,7 +149,7 @@ false Speed false - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\lpng140;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\lpng140;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions) true Sync @@ -186,7 +187,7 @@ Size true true - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\lpng140;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\lpng140;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions) true Sync diff --git a/vs2015/moai-lib-image-pvr/moai-lib-image-pvr.vcxproj b/vs2015/moai-lib-image-pvr/moai-lib-image-pvr.vcxproj index 3215a55bdc..ffb1fd1453 100644 --- a/vs2015/moai-lib-image-pvr/moai-lib-image-pvr.vcxproj +++ b/vs2015/moai-lib-image-pvr/moai-lib-image-pvr.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,27 +22,28 @@ {985CE67A-B78B-4A50-A033-5A50A04F645E} moai-lib-image-pvr Win32Proj + 10.0.15063.0 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 @@ -86,7 +87,7 @@ Disabled - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\libpvr-3.4;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\libpvr-3.4;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;_DEBUG;%(PreprocessorDefinitions) true Sync @@ -115,7 +116,7 @@ Disabled - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\libpvr-3.4;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\libpvr-3.4;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;_DEBUG;%(PreprocessorDefinitions) true Sync @@ -148,7 +149,7 @@ false Speed false - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\libpvr-3.4;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\libpvr-3.4;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions) true Sync @@ -186,7 +187,7 @@ Size true true - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\libpvr-3.4;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\libpvr-3.4;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions) true Sync diff --git a/vs2015/moai-lib-image-tga/moai-lib-image-tga.vcxproj b/vs2015/moai-lib-image-tga/moai-lib-image-tga.vcxproj index f1c79ab48d..34d6bdc055 100644 --- a/vs2015/moai-lib-image-tga/moai-lib-image-tga.vcxproj +++ b/vs2015/moai-lib-image-tga/moai-lib-image-tga.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -32,27 +32,28 @@ {18093173-A50D-42A3-9066-1301BF1F5D14} moai-lib-image-tga Win32Proj + 10.0.15063.0 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 @@ -96,7 +97,7 @@ Disabled - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\lpng140;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;..\..\3rdparty\tgareader-config;..\..\3rdparty\tgareader\src\c;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\lpng140;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;..\..\3rdparty\tgareader-config;..\..\3rdparty\tgareader\src\c WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;_DEBUG;%(PreprocessorDefinitions) true Sync @@ -125,7 +126,7 @@ Disabled - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\lpng140;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;..\..\3rdparty\tgareader-config;..\..\3rdparty\tgareader\src\c;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\lpng140;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;..\..\3rdparty\tgareader-config;..\..\3rdparty\tgareader\src\c WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;_DEBUG;%(PreprocessorDefinitions) true Sync @@ -158,7 +159,7 @@ false Speed false - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\lpng140;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;..\..\3rdparty\tgareader-config;..\..\3rdparty\tgareader\src\c;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\lpng140;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;..\..\3rdparty\tgareader-config;..\..\3rdparty\tgareader\src\c WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions) true Sync @@ -196,7 +197,7 @@ Size true true - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\lpng140;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;..\..\3rdparty\tgareader-config;..\..\3rdparty\tgareader\src\c;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\lpng140;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;..\..\3rdparty\tgareader-config;..\..\3rdparty\tgareader\src\c WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions) true Sync diff --git a/vs2015/moai-lib-image-webp/moai-lib-image-webp.vcxproj b/vs2015/moai-lib-image-webp/moai-lib-image-webp.vcxproj index 75b4c12634..42f9cc6beb 100644 --- a/vs2015/moai-lib-image-webp/moai-lib-image-webp.vcxproj +++ b/vs2015/moai-lib-image-webp/moai-lib-image-webp.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,27 +22,28 @@ {99E440CC-F4D1-427E-9AB0-0BA2F2D1F89D} moai-lib-image-jpg Win32Proj + 10.0.15063.0 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 @@ -86,7 +87,7 @@ Disabled - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;_DEBUG;%(PreprocessorDefinitions) true Sync @@ -115,7 +116,7 @@ Disabled - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;_DEBUG;%(PreprocessorDefinitions) true Sync @@ -148,7 +149,7 @@ false Speed false - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions) true Sync @@ -186,7 +187,7 @@ Size true true - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions) true Sync diff --git a/vs2015/moai-lib-luaext/moai-lib-luaext.vcxproj b/vs2015/moai-lib-luaext/moai-lib-luaext.vcxproj index 00d28586d1..e5ca37d028 100644 --- a/vs2015/moai-lib-luaext/moai-lib-luaext.vcxproj +++ b/vs2015/moai-lib-luaext/moai-lib-luaext.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,31 +22,32 @@ {30D318C3-18A8-40B4-ADAC-3360CDCB4DD4} moai-lib-luaext Win32Proj + 10.0.15063.0 StaticLibrary NotSet false - v140 + v141 StaticLibrary NotSet false - v140 + v141 StaticLibrary NotSet false - v140 + v141 StaticLibrary NotSet false - v140 + v141 @@ -90,7 +91,7 @@ Disabled - ..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\glew-1.5.6\include;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\lpng140;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\chipmunk-5.3.4\include;..\..\3rdparty\luacrypto-0.2.0\src;..\..\3rdparty\luasocket-2.0.2\src;..\..\3rdparty\luasocket-2.0.2-embed;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\glew-1.5.6\include;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\lpng140;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\chipmunk-5.3.4\include;..\..\3rdparty\luasocket-2.0.2\src;..\..\3rdparty\luasocket-2.0.2-embed;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;_DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -118,7 +119,7 @@ Disabled - ..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\glew-1.5.6\include;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\lpng140;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\chipmunk-5.3.4\include;..\..\3rdparty\luacrypto-0.2.0\src;..\..\3rdparty\luasocket-2.0.2\src;..\..\3rdparty\luasocket-2.0.2-embed;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\glew-1.5.6\include;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\lpng140;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\chipmunk-5.3.4\include;..\..\3rdparty\luasocket-2.0.2\src;..\..\3rdparty\luasocket-2.0.2-embed;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;_DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -145,7 +146,7 @@ MinSpace Size - ..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\glew-1.5.6\include;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\lpng140;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\chipmunk-5.3.4\include;..\..\3rdparty\luacrypto-0.2.0\src;..\..\3rdparty\luasocket-2.0.2\src;..\..\3rdparty\luasocket-2.0.2-embed;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\glew-1.5.6\include;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\lpng140;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\chipmunk-5.3.4\include;..\..\3rdparty\luasocket-2.0.2\src;..\..\3rdparty\luasocket-2.0.2-embed;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +174,7 @@ X64 - ..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\glew-1.5.6\include;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\lpng140;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\chipmunk-5.3.4\include;..\..\3rdparty\luacrypto-0.2.0\src;..\..\3rdparty\luasocket-2.0.2\src;..\..\3rdparty\luasocket-2.0.2-embed;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\glew-1.5.6\include;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\lpng140;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\chipmunk-5.3.4\include;..\..\3rdparty\luasocket-2.0.2\src;..\..\3rdparty\luasocket-2.0.2-embed;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/vs2015/moai-lib-sdl/moai-lib-sdl.vcxproj b/vs2015/moai-lib-sdl/moai-lib-sdl.vcxproj index cef1e0dc66..29b0c1dc19 100644 --- a/vs2015/moai-lib-sdl/moai-lib-sdl.vcxproj +++ b/vs2015/moai-lib-sdl/moai-lib-sdl.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -31,27 +31,28 @@ {1AA4543C-F443-4529-AFBE-C335F295A27A} moai-lib-sdl Win32Proj + 10.0.15063.0 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 @@ -95,7 +96,7 @@ Disabled - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sdl2-2.0.4\include;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sdl2-2.0.4\include;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;_DEBUG;%(PreprocessorDefinitions) true Sync @@ -124,7 +125,7 @@ Disabled - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sdl2-2.0.4\include;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sdl2-2.0.4\include;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;_DEBUG;%(PreprocessorDefinitions) true Sync @@ -157,7 +158,7 @@ false Speed false - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sdl2-2.0.4\include;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sdl2-2.0.4\include;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions) true Sync @@ -195,7 +196,7 @@ Size true true - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sdl2-2.0.4\include;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sdl2-2.0.4\include;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions) true Sync diff --git a/vs2015/moai-lib-sim/moai-engine.vcxproj b/vs2015/moai-lib-sim/moai-engine.vcxproj index d3a30f36d6..281377cdc0 100644 --- a/vs2015/moai-lib-sim/moai-engine.vcxproj +++ b/vs2015/moai-lib-sim/moai-engine.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,18 +27,20 @@ + - + - - + + + @@ -47,13 +49,20 @@ + + + + + + + @@ -64,9 +73,6 @@ - - - @@ -74,19 +80,21 @@ + - + - - + + + @@ -94,19 +102,28 @@ - + + + + + + + + - + + + @@ -120,9 +137,12 @@ + + + @@ -130,13 +150,19 @@ - + + + + + + + + + - - @@ -144,14 +170,17 @@ + + - - + + + @@ -169,7 +198,6 @@ - @@ -185,7 +213,9 @@ + + @@ -206,6 +236,7 @@ + @@ -215,17 +246,18 @@ + - - + + @@ -234,13 +266,20 @@ + + + + + + + @@ -252,9 +291,6 @@ - - - @@ -262,37 +298,50 @@ + - + - - + + + - + + + + + + + + - + + + + + @@ -305,9 +354,12 @@ + + + @@ -315,13 +367,19 @@ - + + + + + + + + + - - @@ -329,13 +387,16 @@ + + - - + + + @@ -347,12 +408,12 @@ + - @@ -368,7 +429,9 @@ + + Create @@ -382,27 +445,28 @@ {FA856173-3823-4FFF-8207-32DB9C1711FA} moai-lib-sim Win32Proj + 10.0.15063.0 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 @@ -446,7 +510,7 @@ Disabled - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\kissfft;..\..\3rdparty\libtess2\include;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\glew-1.5.6\include;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\jpeg-8c;..\..\3rdparty\lpng140;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\chipmunk-5.3.4\include;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\kissfft;..\..\3rdparty\libtess2\include;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\glew-1.5.6\include;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\jpeg-8c;..\..\3rdparty\lpng140;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;..\..\3rdparty\freetype-2.7\include;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\chipmunk-5.3.4\include;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;_DEBUG;%(PreprocessorDefinitions) true Sync @@ -477,7 +541,7 @@ Disabled - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\kissfft;..\..\3rdparty\libtess2\include;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\glew-1.5.6\include;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\jpeg-8c;..\..\3rdparty\lpng140;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\chipmunk-5.3.4\include;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\kissfft;..\..\3rdparty\libtess2\include;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\glew-1.5.6\include;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\jpeg-8c;..\..\3rdparty\lpng140;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;..\..\3rdparty\freetype-2.7\include;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\chipmunk-5.3.4\include;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;_DEBUG;%(PreprocessorDefinitions) true Sync @@ -512,7 +576,7 @@ false Speed false - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\kissfft;..\..\3rdparty\libtess2\include;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\glew-1.5.6\include;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\jpeg-8c;..\..\3rdparty\lpng140;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\chipmunk-5.3.4\include;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\kissfft;..\..\3rdparty\libtess2\include;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\glew-1.5.6\include;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\jpeg-8c;..\..\3rdparty\lpng140;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;..\..\3rdparty\freetype-2.7\include;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\chipmunk-5.3.4\include;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions) true Sync @@ -552,7 +616,7 @@ Size true true - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\kissfft;..\..\3rdparty\libtess2\include;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\glew-1.5.6\include;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\jpeg-8c;..\..\3rdparty\lpng140;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\chipmunk-5.3.4\include;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\kissfft;..\..\3rdparty\libtess2\include;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\glew-1.5.6\include;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\jpeg-8c;..\..\3rdparty\lpng140;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;..\..\3rdparty\freetype-2.7\include;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\chipmunk-5.3.4\include;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions) true Sync diff --git a/vs2015/moai-lib-sim/moai-engine.vcxproj.filters b/vs2015/moai-lib-sim/moai-engine.vcxproj.filters index 9903a795e3..bd52298bf9 100644 --- a/vs2015/moai-lib-sim/moai-engine.vcxproj.filters +++ b/vs2015/moai-lib-sim/moai-engine.vcxproj.filters @@ -159,9 +159,6 @@ camera - - camera - camera @@ -291,24 +288,6 @@ deck - - deck - - - deck - - - deck - - - deck - - - deck - - - deck - deck @@ -318,9 +297,6 @@ deck - - deck - input @@ -336,9 +312,6 @@ grid - - grid - grid @@ -360,9 +333,6 @@ image - - gfx - gfx @@ -432,9 +402,6 @@ partition - - node - node @@ -471,9 +438,6 @@ input - - layer - layer @@ -516,12 +480,6 @@ mesh - - texture - - - texture - texture @@ -534,9 +492,6 @@ transform - - transform - transform @@ -552,9 +507,6 @@ gfx - - gfx - vector @@ -615,9 +567,6 @@ vector - - partition - mesh @@ -633,6 +582,56 @@ mesh + + deck + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -661,9 +660,6 @@ camera - - camera - camera @@ -793,24 +789,6 @@ deck - - deck - - - deck - - - deck - - - deck - - - deck - - - deck - deck @@ -820,9 +798,6 @@ deck - - deck - input @@ -838,9 +813,6 @@ grid - - grid - grid @@ -886,9 +858,6 @@ gfx - - gfx - text @@ -967,9 +936,6 @@ input - - layer - layer @@ -1012,12 +978,6 @@ mesh - - texture - - - texture - texture @@ -1030,9 +990,6 @@ transform - - transform - transform @@ -1048,9 +1005,6 @@ gfx - - gfx - vector @@ -1105,9 +1059,6 @@ vector - - partition - mesh @@ -1120,5 +1071,55 @@ mesh + + deck + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/vs2015/moai-lib-test/moai-lib-test.vcxproj b/vs2015/moai-lib-test/moai-lib-test.vcxproj index afa3534a9e..1be29e32b8 100644 --- a/vs2015/moai-lib-test/moai-lib-test.vcxproj +++ b/vs2015/moai-lib-test/moai-lib-test.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,31 +22,32 @@ {6B898B13-E6F1-473C-A020-328DA0D50FB9} moai-lib-test Win32Proj + 10.0.15063.0 StaticLibrary NotSet false - v140 + v141 StaticLibrary NotSet false - v140 + v141 StaticLibrary NotSet false - v140 + v141 StaticLibrary NotSet false - v140 + v141 @@ -90,7 +91,7 @@ Disabled - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\glew-1.5.6\include;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\lpng140;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\chipmunk-5.3.4\include;..\..\3rdparty\luacrypto-0.2.0\src;..\..\3rdparty\luasocket-2.0.2\src;..\..\3rdparty\luasocket-2.0.2-embed;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\glew-1.5.6\include;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\lpng140;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\chipmunk-5.3.4\include;..\..\3rdparty\luasocket-2.0.2\src;..\..\3rdparty\luasocket-2.0.2-embed;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;_DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -118,7 +119,7 @@ Disabled - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\glew-1.5.6\include;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\lpng140;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\chipmunk-5.3.4\include;..\..\3rdparty\luacrypto-0.2.0\src;..\..\3rdparty\luasocket-2.0.2\src;..\..\3rdparty\luasocket-2.0.2-embed;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\glew-1.5.6\include;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\lpng140;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\chipmunk-5.3.4\include;..\..\3rdparty\luasocket-2.0.2\src;..\..\3rdparty\luasocket-2.0.2-embed;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;_DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -145,7 +146,7 @@ MinSpace Size - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\glew-1.5.6\include;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\lpng140;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\chipmunk-5.3.4\include;..\..\3rdparty\luacrypto-0.2.0\src;..\..\3rdparty\luasocket-2.0.2\src;..\..\3rdparty\luasocket-2.0.2-embed;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\glew-1.5.6\include;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\lpng140;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\chipmunk-5.3.4\include;..\..\3rdparty\luasocket-2.0.2\src;..\..\3rdparty\luasocket-2.0.2-embed;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +174,7 @@ X64 - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\glew-1.5.6\include;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\lpng140;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\chipmunk-5.3.4\include;..\..\3rdparty\luacrypto-0.2.0\src;..\..\3rdparty\luasocket-2.0.2\src;..\..\3rdparty\luasocket-2.0.2-embed;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\glew-1.5.6\include;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\lpng140;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\chipmunk-5.3.4\include;..\..\3rdparty\luasocket-2.0.2\src;..\..\3rdparty\luasocket-2.0.2-embed;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/vs2015/moai-lib-untz/moai-lib-untz.vcxproj b/vs2015/moai-lib-untz/moai-lib-untz.vcxproj index ffe0fef4f8..31d9c90674 100644 --- a/vs2015/moai-lib-untz/moai-lib-untz.vcxproj +++ b/vs2015/moai-lib-untz/moai-lib-untz.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,31 +22,32 @@ {C699BB79-8F3F-48A3-A06A-2D4E0EA73360} moai-lib-untz Win32Proj + 10.0.15063.0 StaticLibrary NotSet false - v140 + v141 StaticLibrary NotSet false - v140 + v141 StaticLibrary NotSet false - v140 + v141 StaticLibrary NotSet false - v140 + v141 @@ -90,7 +91,7 @@ Disabled - ..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\glew-1.5.6\include;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\lpng140;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\chipmunk-5.3.4\include;..\..\3rdparty\untz\include;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\glew-1.5.6\include;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\lpng140;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\chipmunk-5.3.4\include;..\..\3rdparty\untz\include;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;_DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -118,7 +119,7 @@ Disabled - ..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\glew-1.5.6\include;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\lpng140;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\chipmunk-5.3.4\include;..\..\3rdparty\untz\include;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\glew-1.5.6\include;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\lpng140;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\chipmunk-5.3.4\include;..\..\3rdparty\untz\include;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;_DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -145,7 +146,7 @@ MinSpace Size - ..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\glew-1.5.6\include;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\lpng140;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\chipmunk-5.3.4\include;..\..\3rdparty\untz\include;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\glew-1.5.6\include;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\lpng140;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\chipmunk-5.3.4\include;..\..\3rdparty\untz\include;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +174,7 @@ X64 - ..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\glew-1.5.6\include;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\lpng140;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\chipmunk-5.3.4\include;..\..\3rdparty\untz\include;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\glew-1.5.6\include;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\lpng140;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\chipmunk-5.3.4\include;..\..\3rdparty\untz\include;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/vs2015/moai-lib-util/moai-lib-util.vcxproj b/vs2015/moai-lib-util/moai-lib-util.vcxproj index 28cbd7099a..6e5ae06c8b 100644 --- a/vs2015/moai-lib-util/moai-lib-util.vcxproj +++ b/vs2015/moai-lib-util/moai-lib-util.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -98,27 +98,28 @@ {9CF1DC0D-A3C1-45C2-98EC-F4F30B6BB49D} moai-lib-util Win32Proj + 10.0.15063.0 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 @@ -162,7 +163,7 @@ Disabled - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\jansson-2.7\src-win32;..\..\3rdparty\jansson-2.7\src;..\..\3rdparty\kissfft;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\jansson-2.7\src-win32;..\..\3rdparty\jansson-2.7\src;..\..\3rdparty\kissfft;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;_DEBUG;%(PreprocessorDefinitions) true Sync @@ -193,7 +194,7 @@ Disabled - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\jansson-2.7\src-win32;..\..\3rdparty\jansson-2.7\src;..\..\3rdparty\kissfft;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\jansson-2.7\src-win32;..\..\3rdparty\jansson-2.7\src;..\..\3rdparty\kissfft;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;_DEBUG;%(PreprocessorDefinitions) true Sync @@ -228,7 +229,7 @@ false Speed false - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\jansson-2.7\src-win32;..\..\3rdparty\jansson-2.7\src;..\..\3rdparty\kissfft;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\jansson-2.7\src-win32;..\..\3rdparty\jansson-2.7\src;..\..\3rdparty\kissfft;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions) true Sync @@ -268,7 +269,7 @@ Size true true - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\jansson-2.7\src-win32;..\..\3rdparty\jansson-2.7\src;..\..\3rdparty\kissfft;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\jansson-2.7\src-win32;..\..\3rdparty\jansson-2.7\src;..\..\3rdparty\kissfft;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\sqlite-3.6.16;..\..\3rdparty\tinyxml;..\..\3rdparty\openssl-1.0.0d\include-win32;..\..\3rdparty\curl-7.19.7\include;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions) true Sync diff --git a/vs2015/moai.sln b/vs2015/moai.sln index ed7c55f515..809bef25bf 100644 --- a/vs2015/moai.sln +++ b/vs2015/moai.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.24720.0 +# Visual Studio 15 +VisualStudioVersion = 15.0.26430.16 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3rd Party", "3rd Party", "{3C05055B-3444-43CB-8793-D469F0D40706}" EndProject @@ -27,8 +27,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glew", "glew\glew.vcxproj", EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jansson", "jansson\jansson.vcxproj", "{52496C82-2EDB-4649-8509-451891F6A3DE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcrypto", "libcrypto\libcrypto.vcxproj", "{956FFE71-66F4-457C-8C88-9F075E4FDE27}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcurl", "libcurl\libcurl.vcxproj", "{41BEB1CB-88C0-4C0F-B24E-F5871CF9EE49}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpg", "libjpg\libjpg.vcxproj", "{1F65FE7F-80D7-4380-BDD3-2546D7C2DFF0}" @@ -37,8 +35,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libogg", "libogg\libogg.vcx EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "libpng\libpng.vcxproj", "{E4BFD291-B8CF-4D71-9E86-658CD227428D}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libssl", "libssl\libssl.vcxproj", "{D0F1C892-57F4-4758-A2EE-BFB58DB20987}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvorbis", "libvorbis\libvorbis.vcxproj", "{CBD64DDC-70CE-470B-B5ED-E12B59196EE7}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "luaext", "luaext\luaext.vcxproj", "{51007BE8-C720-4A9F-A1BF-C2AA31179E02}" @@ -73,8 +69,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "moai-lib-http-server", "moa EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "moai-lib-sim", "moai-lib-sim\moai-engine.vcxproj", "{FA856173-3823-4FFF-8207-32DB9C1711FA}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "moai-lib-test", "moai-lib-test\moai-lib-test.vcxproj", "{6B898B13-E6F1-473C-A020-328DA0D50FB9}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "moai-lib-untz", "moai-lib-untz\moai-lib-untz.vcxproj", "{C699BB79-8F3F-48A3-A06A-2D4E0EA73360}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "moai-lib-util", "moai-lib-util\moai-lib-util.vcxproj", "{9CF1DC0D-A3C1-45C2-98EC-F4F30B6BB49D}" @@ -115,16 +109,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hexdump", "hexdump\hexdump. EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "visualinfo", "visualinfo\visualinfo.vcxproj", "{CC196C96-AE3D-4E3A-A405-620F83104EB7}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "work", "work\work.vcxproj", "{A130115C-B50F-436E-8C90-4243E310DC9C}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sdl", "sdl\sdl.vcxproj", "{AD871809-7119-436F-A8AA-2EAF63B35A3C}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "moai", "moai-exe\moai.vcxproj", "{83DE7C0A-667A-4B75-8D00-B575501BC289}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "moai-server", "moai-exe-server\moai-server.vcxproj", "{4AAABD66-E60E-45BD-9F14-D0DD5F5F26E2}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "moai-test", "moai-exe-test\moai-test.vcxproj", "{E2A74094-D98E-40F2-9123-6E12BD6BBB5D}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpvr", "libpvr\libpvr.vcxproj", "{EAD743FA-900E-4E4B-8F4A-7AD7F6B2F003}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp", "libwebp\libwebp.vcxproj", "{02BD34AA-8475-47E4-BB24-749587616A40}" @@ -155,6 +143,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "moai-lib-assimp", "moai-lib EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "moai-lib-image-tga", "moai-lib-image-tga\moai-lib-image-tga.vcxproj", "{18093173-A50D-42A3-9066-1301BF1F5D14}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mbedTLS", "mbedtls\mbedTLS.vcxproj", "{46CF2D25-6A36-4189-B59C-E4815388E554}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -211,14 +201,6 @@ Global {52496C82-2EDB-4649-8509-451891F6A3DE}.Release|Win32.Build.0 = Release|Win32 {52496C82-2EDB-4649-8509-451891F6A3DE}.Release|x64.ActiveCfg = Release|x64 {52496C82-2EDB-4649-8509-451891F6A3DE}.Release|x64.Build.0 = Release|x64 - {956FFE71-66F4-457C-8C88-9F075E4FDE27}.Debug|Win32.ActiveCfg = Debug|Win32 - {956FFE71-66F4-457C-8C88-9F075E4FDE27}.Debug|Win32.Build.0 = Debug|Win32 - {956FFE71-66F4-457C-8C88-9F075E4FDE27}.Debug|x64.ActiveCfg = Debug|x64 - {956FFE71-66F4-457C-8C88-9F075E4FDE27}.Debug|x64.Build.0 = Debug|x64 - {956FFE71-66F4-457C-8C88-9F075E4FDE27}.Release|Win32.ActiveCfg = Release|Win32 - {956FFE71-66F4-457C-8C88-9F075E4FDE27}.Release|Win32.Build.0 = Release|Win32 - {956FFE71-66F4-457C-8C88-9F075E4FDE27}.Release|x64.ActiveCfg = Release|x64 - {956FFE71-66F4-457C-8C88-9F075E4FDE27}.Release|x64.Build.0 = Release|x64 {41BEB1CB-88C0-4C0F-B24E-F5871CF9EE49}.Debug|Win32.ActiveCfg = Debug|Win32 {41BEB1CB-88C0-4C0F-B24E-F5871CF9EE49}.Debug|Win32.Build.0 = Debug|Win32 {41BEB1CB-88C0-4C0F-B24E-F5871CF9EE49}.Debug|x64.ActiveCfg = Debug|x64 @@ -251,14 +233,6 @@ Global {E4BFD291-B8CF-4D71-9E86-658CD227428D}.Release|Win32.Build.0 = Release|Win32 {E4BFD291-B8CF-4D71-9E86-658CD227428D}.Release|x64.ActiveCfg = Release|x64 {E4BFD291-B8CF-4D71-9E86-658CD227428D}.Release|x64.Build.0 = Release|x64 - {D0F1C892-57F4-4758-A2EE-BFB58DB20987}.Debug|Win32.ActiveCfg = Debug|Win32 - {D0F1C892-57F4-4758-A2EE-BFB58DB20987}.Debug|Win32.Build.0 = Debug|Win32 - {D0F1C892-57F4-4758-A2EE-BFB58DB20987}.Debug|x64.ActiveCfg = Debug|x64 - {D0F1C892-57F4-4758-A2EE-BFB58DB20987}.Debug|x64.Build.0 = Debug|x64 - {D0F1C892-57F4-4758-A2EE-BFB58DB20987}.Release|Win32.ActiveCfg = Release|Win32 - {D0F1C892-57F4-4758-A2EE-BFB58DB20987}.Release|Win32.Build.0 = Release|Win32 - {D0F1C892-57F4-4758-A2EE-BFB58DB20987}.Release|x64.ActiveCfg = Release|x64 - {D0F1C892-57F4-4758-A2EE-BFB58DB20987}.Release|x64.Build.0 = Release|x64 {CBD64DDC-70CE-470B-B5ED-E12B59196EE7}.Debug|Win32.ActiveCfg = Debug|Win32 {CBD64DDC-70CE-470B-B5ED-E12B59196EE7}.Debug|Win32.Build.0 = Debug|Win32 {CBD64DDC-70CE-470B-B5ED-E12B59196EE7}.Debug|x64.ActiveCfg = Debug|x64 @@ -395,14 +369,6 @@ Global {FA856173-3823-4FFF-8207-32DB9C1711FA}.Release|Win32.Build.0 = Release|Win32 {FA856173-3823-4FFF-8207-32DB9C1711FA}.Release|x64.ActiveCfg = Release|x64 {FA856173-3823-4FFF-8207-32DB9C1711FA}.Release|x64.Build.0 = Release|x64 - {6B898B13-E6F1-473C-A020-328DA0D50FB9}.Debug|Win32.ActiveCfg = Debug|Win32 - {6B898B13-E6F1-473C-A020-328DA0D50FB9}.Debug|Win32.Build.0 = Debug|Win32 - {6B898B13-E6F1-473C-A020-328DA0D50FB9}.Debug|x64.ActiveCfg = Debug|x64 - {6B898B13-E6F1-473C-A020-328DA0D50FB9}.Debug|x64.Build.0 = Debug|x64 - {6B898B13-E6F1-473C-A020-328DA0D50FB9}.Release|Win32.ActiveCfg = Release|Win32 - {6B898B13-E6F1-473C-A020-328DA0D50FB9}.Release|Win32.Build.0 = Release|Win32 - {6B898B13-E6F1-473C-A020-328DA0D50FB9}.Release|x64.ActiveCfg = Release|x64 - {6B898B13-E6F1-473C-A020-328DA0D50FB9}.Release|x64.Build.0 = Release|x64 {C699BB79-8F3F-48A3-A06A-2D4E0EA73360}.Debug|Win32.ActiveCfg = Debug|Win32 {C699BB79-8F3F-48A3-A06A-2D4E0EA73360}.Debug|Win32.Build.0 = Debug|Win32 {C699BB79-8F3F-48A3-A06A-2D4E0EA73360}.Debug|x64.ActiveCfg = Debug|x64 @@ -523,14 +489,6 @@ Global {CC196C96-AE3D-4E3A-A405-620F83104EB7}.Release|Win32.Build.0 = Release|Win32 {CC196C96-AE3D-4E3A-A405-620F83104EB7}.Release|x64.ActiveCfg = Release|x64 {CC196C96-AE3D-4E3A-A405-620F83104EB7}.Release|x64.Build.0 = Release|x64 - {A130115C-B50F-436E-8C90-4243E310DC9C}.Debug|Win32.ActiveCfg = Debug|Win32 - {A130115C-B50F-436E-8C90-4243E310DC9C}.Debug|Win32.Build.0 = Debug|Win32 - {A130115C-B50F-436E-8C90-4243E310DC9C}.Debug|x64.ActiveCfg = Debug|x64 - {A130115C-B50F-436E-8C90-4243E310DC9C}.Debug|x64.Build.0 = Debug|x64 - {A130115C-B50F-436E-8C90-4243E310DC9C}.Release|Win32.ActiveCfg = Release|Win32 - {A130115C-B50F-436E-8C90-4243E310DC9C}.Release|Win32.Build.0 = Release|Win32 - {A130115C-B50F-436E-8C90-4243E310DC9C}.Release|x64.ActiveCfg = Release|x64 - {A130115C-B50F-436E-8C90-4243E310DC9C}.Release|x64.Build.0 = Release|x64 {AD871809-7119-436F-A8AA-2EAF63B35A3C}.Debug|Win32.ActiveCfg = Debug|Win32 {AD871809-7119-436F-A8AA-2EAF63B35A3C}.Debug|Win32.Build.0 = Debug|Win32 {AD871809-7119-436F-A8AA-2EAF63B35A3C}.Debug|x64.ActiveCfg = Debug|x64 @@ -547,22 +505,6 @@ Global {83DE7C0A-667A-4B75-8D00-B575501BC289}.Release|Win32.Build.0 = Release|Win32 {83DE7C0A-667A-4B75-8D00-B575501BC289}.Release|x64.ActiveCfg = Release|x64 {83DE7C0A-667A-4B75-8D00-B575501BC289}.Release|x64.Build.0 = Release|x64 - {4AAABD66-E60E-45BD-9F14-D0DD5F5F26E2}.Debug|Win32.ActiveCfg = Debug|Win32 - {4AAABD66-E60E-45BD-9F14-D0DD5F5F26E2}.Debug|Win32.Build.0 = Debug|Win32 - {4AAABD66-E60E-45BD-9F14-D0DD5F5F26E2}.Debug|x64.ActiveCfg = Debug|x64 - {4AAABD66-E60E-45BD-9F14-D0DD5F5F26E2}.Debug|x64.Build.0 = Debug|x64 - {4AAABD66-E60E-45BD-9F14-D0DD5F5F26E2}.Release|Win32.ActiveCfg = Release|Win32 - {4AAABD66-E60E-45BD-9F14-D0DD5F5F26E2}.Release|Win32.Build.0 = Release|Win32 - {4AAABD66-E60E-45BD-9F14-D0DD5F5F26E2}.Release|x64.ActiveCfg = Release|x64 - {4AAABD66-E60E-45BD-9F14-D0DD5F5F26E2}.Release|x64.Build.0 = Release|x64 - {E2A74094-D98E-40F2-9123-6E12BD6BBB5D}.Debug|Win32.ActiveCfg = Debug|Win32 - {E2A74094-D98E-40F2-9123-6E12BD6BBB5D}.Debug|Win32.Build.0 = Debug|Win32 - {E2A74094-D98E-40F2-9123-6E12BD6BBB5D}.Debug|x64.ActiveCfg = Debug|x64 - {E2A74094-D98E-40F2-9123-6E12BD6BBB5D}.Debug|x64.Build.0 = Debug|x64 - {E2A74094-D98E-40F2-9123-6E12BD6BBB5D}.Release|Win32.ActiveCfg = Release|Win32 - {E2A74094-D98E-40F2-9123-6E12BD6BBB5D}.Release|Win32.Build.0 = Release|Win32 - {E2A74094-D98E-40F2-9123-6E12BD6BBB5D}.Release|x64.ActiveCfg = Release|x64 - {E2A74094-D98E-40F2-9123-6E12BD6BBB5D}.Release|x64.Build.0 = Release|x64 {EAD743FA-900E-4E4B-8F4A-7AD7F6B2F003}.Debug|Win32.ActiveCfg = Debug|Win32 {EAD743FA-900E-4E4B-8F4A-7AD7F6B2F003}.Debug|Win32.Build.0 = Debug|Win32 {EAD743FA-900E-4E4B-8F4A-7AD7F6B2F003}.Debug|x64.ActiveCfg = Debug|x64 @@ -683,6 +625,14 @@ Global {18093173-A50D-42A3-9066-1301BF1F5D14}.Release|Win32.Build.0 = Release|Win32 {18093173-A50D-42A3-9066-1301BF1F5D14}.Release|x64.ActiveCfg = Release|x64 {18093173-A50D-42A3-9066-1301BF1F5D14}.Release|x64.Build.0 = Release|x64 + {46CF2D25-6A36-4189-B59C-E4815388E554}.Debug|Win32.ActiveCfg = Debug|Win32 + {46CF2D25-6A36-4189-B59C-E4815388E554}.Debug|Win32.Build.0 = Debug|Win32 + {46CF2D25-6A36-4189-B59C-E4815388E554}.Debug|x64.ActiveCfg = Debug|x64 + {46CF2D25-6A36-4189-B59C-E4815388E554}.Debug|x64.Build.0 = Debug|x64 + {46CF2D25-6A36-4189-B59C-E4815388E554}.Release|Win32.ActiveCfg = Release|Win32 + {46CF2D25-6A36-4189-B59C-E4815388E554}.Release|Win32.Build.0 = Release|Win32 + {46CF2D25-6A36-4189-B59C-E4815388E554}.Release|x64.ActiveCfg = Release|x64 + {46CF2D25-6A36-4189-B59C-E4815388E554}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -694,12 +644,10 @@ Global {97D147F3-4DBC-45CD-87EB-6C90EB6EFE21} = {3C05055B-3444-43CB-8793-D469F0D40706} {48580411-0A48-46F9-87A6-CF5C9B81D146} = {3C05055B-3444-43CB-8793-D469F0D40706} {52496C82-2EDB-4649-8509-451891F6A3DE} = {3C05055B-3444-43CB-8793-D469F0D40706} - {956FFE71-66F4-457C-8C88-9F075E4FDE27} = {3C05055B-3444-43CB-8793-D469F0D40706} {41BEB1CB-88C0-4C0F-B24E-F5871CF9EE49} = {3C05055B-3444-43CB-8793-D469F0D40706} {1F65FE7F-80D7-4380-BDD3-2546D7C2DFF0} = {3C05055B-3444-43CB-8793-D469F0D40706} {3986E679-6E11-4B7A-A00D-9669DEDBBC1E} = {3C05055B-3444-43CB-8793-D469F0D40706} {E4BFD291-B8CF-4D71-9E86-658CD227428D} = {3C05055B-3444-43CB-8793-D469F0D40706} - {D0F1C892-57F4-4758-A2EE-BFB58DB20987} = {3C05055B-3444-43CB-8793-D469F0D40706} {CBD64DDC-70CE-470B-B5ED-E12B59196EE7} = {3C05055B-3444-43CB-8793-D469F0D40706} {51007BE8-C720-4A9F-A1BF-C2AA31179E02} = {3C05055B-3444-43CB-8793-D469F0D40706} {71F4FF55-2018-4950-9820-251D7C3CDD31} = {3C05055B-3444-43CB-8793-D469F0D40706} @@ -717,7 +665,6 @@ Global {CAF76E4C-0B1B-424D-B36E-BA0D974A7A0C} = {E2D67AF9-792C-4F3B-B969-4914EFF4B03F} {327AAD13-D2A2-4BBF-A68D-88E7DBF4E5FC} = {E2D67AF9-792C-4F3B-B969-4914EFF4B03F} {FA856173-3823-4FFF-8207-32DB9C1711FA} = {E2D67AF9-792C-4F3B-B969-4914EFF4B03F} - {6B898B13-E6F1-473C-A020-328DA0D50FB9} = {E2D67AF9-792C-4F3B-B969-4914EFF4B03F} {C699BB79-8F3F-48A3-A06A-2D4E0EA73360} = {E2D67AF9-792C-4F3B-B969-4914EFF4B03F} {9CF1DC0D-A3C1-45C2-98EC-F4F30B6BB49D} = {E2D67AF9-792C-4F3B-B969-4914EFF4B03F} {15EA6761-E3C5-4035-97EE-4F74A5ACEE96} = {E2D67AF9-792C-4F3B-B969-4914EFF4B03F} @@ -733,11 +680,8 @@ Global {D898C9F0-C6D3-4A22-ADCE-763394B7F9E3} = {0A0F956C-BC16-4A42-939E-6EA89A1F142E} {F83A5925-1AD8-4D5D-A134-85AFF1466766} = {0A0F956C-BC16-4A42-939E-6EA89A1F142E} {CC196C96-AE3D-4E3A-A405-620F83104EB7} = {0A0F956C-BC16-4A42-939E-6EA89A1F142E} - {A130115C-B50F-436E-8C90-4243E310DC9C} = {0A0F956C-BC16-4A42-939E-6EA89A1F142E} {AD871809-7119-436F-A8AA-2EAF63B35A3C} = {3C05055B-3444-43CB-8793-D469F0D40706} {83DE7C0A-667A-4B75-8D00-B575501BC289} = {EE001E46-5A97-4A19-BC07-0F4E176C023A} - {4AAABD66-E60E-45BD-9F14-D0DD5F5F26E2} = {EE001E46-5A97-4A19-BC07-0F4E176C023A} - {E2A74094-D98E-40F2-9123-6E12BD6BBB5D} = {EE001E46-5A97-4A19-BC07-0F4E176C023A} {EAD743FA-900E-4E4B-8F4A-7AD7F6B2F003} = {3C05055B-3444-43CB-8793-D469F0D40706} {02BD34AA-8475-47E4-BB24-749587616A40} = {3C05055B-3444-43CB-8793-D469F0D40706} {23FA2A9C-429A-4BE6-A540-F80B061EE58A} = {3C05055B-3444-43CB-8793-D469F0D40706} @@ -753,10 +697,11 @@ Global {EEB0E2FC-4B26-49D4-98C6-0BF34C44AC2E} = {3C05055B-3444-43CB-8793-D469F0D40706} {A90989F3-8C14-487B-9127-C89A9D53630C} = {E2D67AF9-792C-4F3B-B969-4914EFF4B03F} {18093173-A50D-42A3-9066-1301BF1F5D14} = {E2D67AF9-792C-4F3B-B969-4914EFF4B03F} + {46CF2D25-6A36-4189-B59C-E4815388E554} = {3C05055B-3444-43CB-8793-D469F0D40706} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - AMDCaProjectFile = C:\Documents and Settings\Patrick\My Documents\git\moai\vs2008\CodeAnalyst\moai.caw - AMDCaPersistentStartup = moai (Utilities\moai) AMDCaPersistentConfig = Debug|Win32 + AMDCaPersistentStartup = moai (Utilities\moai) + AMDCaProjectFile = C:\Documents and Settings\Patrick\My Documents\git\moai\vs2008\CodeAnalyst\moai.caw EndGlobalSection EndGlobal diff --git a/vs2015/mongoose/mongoose.vcxproj b/vs2015/mongoose/mongoose.vcxproj index 3ed54b23f2..c8bff1e081 100644 --- a/vs2015/mongoose/mongoose.vcxproj +++ b/vs2015/mongoose/mongoose.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,30 +22,31 @@ {D7555F5D-ECFB-4A80-BAB6-7A549F19F9A7} mongoose Win32Proj + 10.0.15063.0 StaticLibrary NotSet false - v140 + v141 StaticLibrary NotSet false - v140 + v141 StaticLibrary Unicode true - v140 + v141 StaticLibrary Unicode - v140 + v141 diff --git a/vs2015/sdl/sdl.vcxproj b/vs2015/sdl/sdl.vcxproj index 046ef0b0da..468e707e49 100644 --- a/vs2015/sdl/sdl.vcxproj +++ b/vs2015/sdl/sdl.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -317,30 +317,31 @@ {AD871809-7119-436F-A8AA-2EAF63B35A3C} sdl Win32Proj + 10.0.15063.0 StaticLibrary NotSet false - v140 + v141 StaticLibrary NotSet false - v140 + v141 StaticLibrary Unicode true - v140 + v141 StaticLibrary Unicode - v140 + v141 diff --git a/vs2015/sfmt/sfmt.vcxproj b/vs2015/sfmt/sfmt.vcxproj index 82eb5665f6..d357e0d5eb 100644 --- a/vs2015/sfmt/sfmt.vcxproj +++ b/vs2015/sfmt/sfmt.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,30 +22,31 @@ {1DC6BD91-B45F-442A-AE6C-88AB5DCF0CE2} sfmt Win32Proj + 10.0.15063.0 StaticLibrary NotSet false - v140 + v141 StaticLibrary NotSet false - v140 + v141 StaticLibrary Unicode true - v140 + v141 StaticLibrary Unicode - v140 + v141 diff --git a/vs2015/sqlite/sqlite.vcxproj b/vs2015/sqlite/sqlite.vcxproj index 4e379676e4..2801dce2b8 100644 --- a/vs2015/sqlite/sqlite.vcxproj +++ b/vs2015/sqlite/sqlite.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,30 +22,31 @@ {A9935050-2E54-4674-80F8-CFC45A2C106A} sqlite Win32Proj + 10.0.15063.0 StaticLibrary NotSet false - v140 + v141 StaticLibrary NotSet false - v140 + v141 StaticLibrary Unicode true - v140 + v141 StaticLibrary Unicode - v140 + v141 diff --git a/vs2015/tinyxml/tinyxml.vcxproj b/vs2015/tinyxml/tinyxml.vcxproj index 710af1ccc1..8ccd88ea3d 100644 --- a/vs2015/tinyxml/tinyxml.vcxproj +++ b/vs2015/tinyxml/tinyxml.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,30 +22,31 @@ {991EBC54-28FF-44A1-863E-E70617782825} tinyxml Win32Proj + 10.0.15063.0 StaticLibrary NotSet false - v140 + v141 StaticLibrary NotSet false - v140 + v141 StaticLibrary Unicode true - v140 + v141 StaticLibrary Unicode - v140 + v141 diff --git a/vs2015/tlsf/tlsf.vcxproj b/vs2015/tlsf/tlsf.vcxproj index 935717619e..9b64102494 100644 --- a/vs2015/tlsf/tlsf.vcxproj +++ b/vs2015/tlsf/tlsf.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,30 +22,31 @@ {1E78302D-CF63-4922-8113-DCCD24F94087} tlsf Win32Proj + 10.0.15063.0 StaticLibrary NotSet false - v140 + v141 StaticLibrary NotSet false - v140 + v141 StaticLibrary Unicode true - v140 + v141 StaticLibrary Unicode - v140 + v141 diff --git a/vs2015/untz/untz.vcxproj b/vs2015/untz/untz.vcxproj index 5df4d921e8..5f715a4a6f 100644 --- a/vs2015/untz/untz.vcxproj +++ b/vs2015/untz/untz.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,31 +22,31 @@ {76508AAD-7030-4FD2-9D05-99184AF2BAF5} untz Win32Proj - 8.1 + 10.0.15063.0 StaticLibrary NotSet false - v140 + v141 StaticLibrary NotSet false - v140 + v141 StaticLibrary NotSet true - v140 + v141 StaticLibrary NotSet - v140 + v141 diff --git a/vs2015/visualinfo/visualinfo.vcxproj b/vs2015/visualinfo/visualinfo.vcxproj index 6ac1679d87..1abf0eb885 100644 --- a/vs2015/visualinfo/visualinfo.vcxproj +++ b/vs2015/visualinfo/visualinfo.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,30 +22,31 @@ {CC196C96-AE3D-4E3A-A405-620F83104EB7} visualinfo Win32Proj + 10.0.15063.0 Application NotSet false - v140 + v141 Application NotSet false - v140 + v141 Application Unicode true - v140 + v141 Application Unicode - v140 + v141 @@ -92,7 +93,7 @@ Disabled ..\..\src;..\..\3rdparty\glew-1.5.6\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;GLEW_STATIC;%(PreprocessorDefinitions) + WIN32;_DEBUG;DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;GLEW_STATIC;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -107,7 +108,7 @@ false - zl-lib-vfs.lib;zlib.lib;glu32.lib;glew.lib;opengl32.lib;%(AdditionalDependencies) + zl-lib-vfs.lib;zlib.lib;glu32.lib;glew.lib;opengl32.lib;tlsf.lib;%(AdditionalDependencies) ..\bin\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) true Console @@ -128,7 +129,7 @@ Disabled ..\..\src;..\..\3rdparty\glew-1.5.6\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_DEBUG;DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -143,7 +144,7 @@ false - zl-lib-vfs.lib;zlib.lib;glu32.lib;glew.lib;opengl32.lib;%(AdditionalDependencies) + zl-lib-vfs.lib;zlib.lib;glu32.lib;glew.lib;opengl32.lib;tlsf.lib;%(AdditionalDependencies) ..\bin\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) true Console @@ -178,7 +179,7 @@ xcopy /yr "$(OutDir)$(TargetName).pdb" "..\..\bin\$(Platform)\$(Configuration)\" false - zl-lib-vfs.lib;zlib.lib;glu32.lib;glew.lib;opengl32.lib;%(AdditionalDependencies) + zl-lib-vfs.lib;zlib.lib;glu32.lib;glew.lib;opengl32.lib;tlsf.lib;%(AdditionalDependencies) ..\bin\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) true Console @@ -217,7 +218,7 @@ xcopy /yr "$(OutDir)$(TargetName).pdb" "..\..\bin\$(Platform)\$(Configuration)\" false - zl-lib-vfs.lib;zlib.lib;glu32.lib;glew.lib;opengl32.lib;%(AdditionalDependencies) + zl-lib-vfs.lib;zlib.lib;glu32.lib;glew.lib;opengl32.lib;tlsf.lib;%(AdditionalDependencies) ..\bin\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) true Console diff --git a/vs2015/work/work.vcxproj b/vs2015/work/work.vcxproj index 9db5bd328c..4bda8c3e02 100644 --- a/vs2015/work/work.vcxproj +++ b/vs2015/work/work.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,30 +22,31 @@ {A130115C-B50F-436E-8C90-4243E310DC9C} work Win32Proj + 10.0.15063.0 Application NotSet false - v140 + v141 Application NotSet false - v140 + v141 Application Unicode true - v140 + v141 Application Unicode - v140 + v141 @@ -287,10 +288,6 @@ {fa856173-3823-4fff-8207-32db9c1711fa} false - - {6b898b13-e6f1-473c-a020-328da0d50fb9} - false - {c699bb79-8f3f-48a3-a06a-2d4e0ea73360} false diff --git a/vs2015/zl-lib-core/zl-lib-core.vcxproj b/vs2015/zl-lib-core/zl-lib-core.vcxproj index 8c345e1737..c7cf897071 100644 --- a/vs2015/zl-lib-core/zl-lib-core.vcxproj +++ b/vs2015/zl-lib-core/zl-lib-core.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,27 +22,28 @@ {E97A3E3D-01D5-4210-BCA0-A6D816624F1A} zl-lib-core Win32Proj + 10.0.15063.0 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 @@ -86,7 +87,7 @@ Disabled - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\tinyxml;..\..\3rdparty\expat-2.1.0\lib;..\..\3rdparty\ooid-0.99;..\..\3rdparty\openssl-1.0.0d\include-win32;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\tinyxml;..\..\3rdparty\expat-2.1.0\lib;..\..\3rdparty\ooid-0.99;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;_DEBUG;%(PreprocessorDefinitions) true Sync @@ -120,7 +121,7 @@ Disabled - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\tinyxml;..\..\3rdparty\expat-2.1.0\lib;..\..\3rdparty\ooid-0.99;..\..\3rdparty\openssl-1.0.0d\include-win32;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\tinyxml;..\..\3rdparty\expat-2.1.0\lib;..\..\3rdparty\ooid-0.99;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;_DEBUG;%(PreprocessorDefinitions) true Sync @@ -155,7 +156,7 @@ false Speed false - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\tinyxml;..\..\3rdparty\expat-2.1.0\lib;..\..\3rdparty\ooid-0.99;..\..\3rdparty\openssl-1.0.0d\include-win32;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\tinyxml;..\..\3rdparty\expat-2.1.0\lib;..\..\3rdparty\ooid-0.99;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions) true Sync @@ -196,7 +197,7 @@ Size true true - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\tinyxml;..\..\3rdparty\expat-2.1.0\lib;..\..\3rdparty\ooid-0.99;..\..\3rdparty\openssl-1.0.0d\include-win32;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\tinyxml;..\..\3rdparty\expat-2.1.0\lib;..\..\3rdparty\ooid-0.99;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions) true Sync @@ -224,10 +225,15 @@ + + + + + @@ -239,14 +245,20 @@ + + + + + + @@ -304,6 +316,7 @@ + @@ -324,9 +337,11 @@ + + @@ -337,6 +352,7 @@ + diff --git a/vs2015/zl-lib-core/zl-lib-core.vcxproj.filters b/vs2015/zl-lib-core/zl-lib-core.vcxproj.filters index 85fe275cd9..f1825e2d54 100644 --- a/vs2015/zl-lib-core/zl-lib-core.vcxproj.filters +++ b/vs2015/zl-lib-core/zl-lib-core.vcxproj.filters @@ -322,6 +322,18 @@ + + + + + + + + + + + + @@ -513,5 +525,8 @@ math + + + \ No newline at end of file diff --git a/vs2015/zl-lib-crypto/zl-lib-crypto.vcxproj b/vs2015/zl-lib-crypto/zl-lib-crypto.vcxproj index 67d7785dc6..f6642171e1 100644 --- a/vs2015/zl-lib-crypto/zl-lib-crypto.vcxproj +++ b/vs2015/zl-lib-crypto/zl-lib-crypto.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,27 +22,28 @@ {5234F482-E45E-48E1-83F1-C56EEC64C0EE} zl-lib-crypto Win32Proj + 10.0.15063.0 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 @@ -86,7 +87,7 @@ Disabled - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\tinyxml;..\..\3rdparty\expat-2.1.0\lib;..\..\3rdparty\ooid-0.99;..\..\3rdparty\mbedtls\include;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\tinyxml;..\..\3rdparty\expat-2.1.0\lib;..\..\3rdparty\ooid-0.99;..\..\3rdparty\mbedtls\include;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;_DEBUG;%(PreprocessorDefinitions) true Sync @@ -120,7 +121,7 @@ Disabled - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\tinyxml;..\..\3rdparty\expat-2.1.0\lib;..\..\3rdparty\ooid-0.99;..\..\3rdparty\mbedtls\include;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\tinyxml;..\..\3rdparty\expat-2.1.0\lib;..\..\3rdparty\ooid-0.99;..\..\3rdparty\mbedtls\include;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;_DEBUG;%(PreprocessorDefinitions) true Sync @@ -155,7 +156,7 @@ false Speed false - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\tinyxml;..\..\3rdparty\expat-2.1.0\lib;..\..\3rdparty\ooid-0.99;..\..\3rdparty\mbedtls\include;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\tinyxml;..\..\3rdparty\expat-2.1.0\lib;..\..\3rdparty\ooid-0.99;..\..\3rdparty\mbedtls\include;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions) true Sync @@ -196,7 +197,7 @@ Size true true - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\tinyxml;..\..\3rdparty\expat-2.1.0\lib;..\..\3rdparty\ooid-0.99;..\..\3rdparty\mbedtls\include;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\tinyxml;..\..\3rdparty\expat-2.1.0\lib;..\..\3rdparty\ooid-0.99;..\..\3rdparty\mbedtls\include;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions) true Sync @@ -225,12 +226,6 @@ - - - - - - @@ -240,12 +235,6 @@ Create - - - - - - diff --git a/vs2015/zl-lib-gfx/zl-lib-gfx.vcxproj b/vs2015/zl-lib-gfx/zl-lib-gfx.vcxproj index b68b706874..6bba1ad707 100644 --- a/vs2015/zl-lib-gfx/zl-lib-gfx.vcxproj +++ b/vs2015/zl-lib-gfx/zl-lib-gfx.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -48,27 +48,28 @@ {15EA6761-E3C5-4035-97EE-4F74A5ACEE96} zl-lib-gfx Win32Proj + 10.0.15063.0 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 diff --git a/vs2015/zl-lib-vfs/zl-lib-vfs.vcxproj b/vs2015/zl-lib-vfs/zl-lib-vfs.vcxproj index ad01787ef5..29221a7c05 100644 --- a/vs2015/zl-lib-vfs/zl-lib-vfs.vcxproj +++ b/vs2015/zl-lib-vfs/zl-lib-vfs.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,27 +22,28 @@ {1E2D4A61-74EA-46FB-896D-6926DBCA43D0} zl-lib-vfs Win32Proj + 10.0.15063.0 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 StaticLibrary NotSet - v140 + v141 @@ -86,7 +87,7 @@ Disabled - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty\tlsf-2.0;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\glew-1.5.6\include;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty\tlsf-2.0;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\glew-1.5.6\include;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;_DEBUG;%(PreprocessorDefinitions) true Sync @@ -120,7 +121,7 @@ Disabled - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty\tlsf-2.0;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\glew-1.5.6\include;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty\tlsf-2.0;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\glew-1.5.6\include;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;_DEBUG;%(PreprocessorDefinitions) true Sync @@ -155,7 +156,7 @@ false Speed false - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty\tlsf-2.0;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\glew-1.5.6\include;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty\tlsf-2.0;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\glew-1.5.6\include;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions) true Sync @@ -196,7 +197,7 @@ Size true true - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty\tlsf-2.0;..\..\3rdparty\zlib-1.2.3;..\..\3rdparty\glew-1.5.6\include;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty\tlsf-2.0;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\glew-1.5.6\include;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions) true Sync diff --git a/vs2015/zlib/zlib.vcxproj b/vs2015/zlib/zlib.vcxproj index b75eeeb072..376f0eb64e 100644 --- a/vs2015/zlib/zlib.vcxproj +++ b/vs2015/zlib/zlib.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,30 +22,31 @@ {E6C55A0C-B5B7-4963-8F77-19F1624B9F47} zlib Win32Proj + 10.0.15063.0 StaticLibrary NotSet false - v140 + v141 StaticLibrary NotSet false - v140 + v141 StaticLibrary Unicode true - v140 + v141 StaticLibrary Unicode - v140 + v141 @@ -89,7 +90,7 @@ Disabled - ..\..\src;..\..\3rdparty\zlib-1.2.3;%(AdditionalIncludeDirectories) + ..\..\src;..\..\3rdparty\zlib-1.2.8;%(AdditionalIncludeDirectories) WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;DEBUG;_DEBUG;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -112,7 +113,7 @@ Disabled - ..\..\src;..\..\3rdparty\zlib-1.2.3;%(AdditionalIncludeDirectories) + ..\..\src;..\..\3rdparty\zlib-1.2.8;%(AdditionalIncludeDirectories) WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;DEBUG;_DEBUG;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -136,7 +137,7 @@ Size true false - ..\..\src;..\..\3rdparty\zlib-1.2.3;%(AdditionalIncludeDirectories) + ..\..\src;..\..\3rdparty\zlib-1.2.8;%(AdditionalIncludeDirectories) WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions) MultiThreadedDLL $(OutDir)$(ProjectName).pdb @@ -162,7 +163,7 @@ true Size true - ..\..\src;..\..\3rdparty\zlib-1.2.3;%(AdditionalIncludeDirectories) + ..\..\src;..\..\3rdparty\zlib-1.2.8;%(AdditionalIncludeDirectories) WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions) MultiThreadedDLL $(OutDir)$(ProjectName).pdb @@ -179,31 +180,35 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + From 7bc764dec6a33aea1ef2164f25024a93aa6b76de Mon Sep 17 00:00:00 2001 From: David Pershouse Date: Thu, 28 Sep 2017 22:49:00 +1000 Subject: [PATCH 2/9] Changes I am not 100% sure about. MOAIDeck and DrawShape I removed calls that tripped up the warnings in VS2017 that look to me like they just call themselves forever recursively (vs thinks the same) GFXDevice and STLString are trying to work around fact that tolower takes an int and returns an int but we are using char, so it trips up the loss of precision warning in vs2017 ZLBox looked like it was calling itself recursively,and creating a ZLBox that it didn't use, I changed it to what I thought made sense, but will need to be checked. zl_replace_stdlib.h system is already declared in one of win10's headers as dllimport, so this guards it. You might have a better fix in mind. --- src/moai-sim/MOAIDeck.cpp | 17 ++++++++--------- src/moai-sim/MOAIDeck.h | 1 - src/moai-sim/MOAIDrawShape.cpp | 5 ++++- src/zl-gfx/ZLGfxDevice.cpp | 6 +++++- src/zl-util/STLString.cpp | 4 ++-- src/zl-util/ZLBox.cpp | 2 +- src/zl-vfs/zl_replace_stdlib.h | 2 ++ 7 files changed, 22 insertions(+), 15 deletions(-) diff --git a/src/moai-sim/MOAIDeck.cpp b/src/moai-sim/MOAIDeck.cpp index 8e441fbba9..4e7c8da30e 100644 --- a/src/moai-sim/MOAIDeck.cpp +++ b/src/moai-sim/MOAIDeck.cpp @@ -90,7 +90,7 @@ void MOAIDeck::Draw ( u32 idx ) { ZLBounds MOAIDeck::GetBounds () { return this->GetBounds ( 0 ); - + /* if ( this->mBoundsDirty ) { this->mMaxBounds = this->MOAIDeck_ComputeMaxBounds (); @@ -103,7 +103,7 @@ ZLBounds MOAIDeck::GetBounds () { //this->mMaxBounds.Grow ( bounds ); this->mBoundsDirty = false; } - return this->mMaxBounds; + return this->mMaxBounds;*/ } //----------------------------------------------------------------// @@ -133,15 +133,14 @@ MOAIDeck::~MOAIDeck () { //----------------------------------------------------------------// bool MOAIDeck::Overlap ( u32 idx, const ZLVec2D& vec, u32 granularity, ZLBounds* result ) { - - return this->Overlap ( idx, vec, granularity, result ); + UNUSED(idx); + UNUSED(vec); + UNUSED(granularity); + UNUSED(result); + return false; + //return this->Overlap ( idx, vec, granularity, result ); } -//----------------------------------------------------------------// -bool MOAIDeck::Overlap ( u32 idx, const ZLVec3D& vec, u32 granularity, ZLBounds* result ) { - - return this->Overlap ( idx, vec, granularity, result ); -} //----------------------------------------------------------------// void MOAIDeck::RegisterLuaClass ( MOAILuaState& state ) { diff --git a/src/moai-sim/MOAIDeck.h b/src/moai-sim/MOAIDeck.h index 24dd8e69b9..5824ff85d2 100644 --- a/src/moai-sim/MOAIDeck.h +++ b/src/moai-sim/MOAIDeck.h @@ -64,7 +64,6 @@ class MOAIDeck : MOAIDeck (); ~MOAIDeck (); bool Overlap ( u32 idx, const ZLVec2D& vec, u32 granularity, ZLBounds* result = 0 ); - bool Overlap ( u32 idx, const ZLVec3D& vec, u32 granularity, ZLBounds* result = 0 ); void RegisterLuaClass ( MOAILuaState& state ); void RegisterLuaFuncs ( MOAILuaState& state ); }; diff --git a/src/moai-sim/MOAIDrawShape.cpp b/src/moai-sim/MOAIDrawShape.cpp index 01d2adef56..9e04555061 100644 --- a/src/moai-sim/MOAIDrawShape.cpp +++ b/src/moai-sim/MOAIDrawShape.cpp @@ -170,7 +170,10 @@ void MOAIDrawShape::DrawPoint ( const ZLVec2D& loc ) { //----------------------------------------------------------------// void MOAIDrawShape::DrawPoint ( float x, float y, float z ) { - this->DrawPoint ( x, y, z ); + //this->DrawPoint ( x, y, z ); + UNUSED(x); + UNUSED(y); + UNUSED(z); } //----------------------------------------------------------------// diff --git a/src/zl-gfx/ZLGfxDevice.cpp b/src/zl-gfx/ZLGfxDevice.cpp index 9fe426d385..3246da861b 100644 --- a/src/zl-gfx/ZLGfxDevice.cpp +++ b/src/zl-gfx/ZLGfxDevice.cpp @@ -69,6 +69,10 @@ cc8* ZLGfxDevice::GetString ( u32 stringID ) { return ( cc8* )glGetString ( ZLGfxEnum::MapZLToNative ( stringID )); } +char Lower(char c) { + return (char) ::tolower((int)c); +} + //----------------------------------------------------------------// void ZLGfxDevice::Initialize () { @@ -86,7 +90,7 @@ void ZLGfxDevice::Initialize () { #endif STLString version = ZLGfxDevice::GetString ( ZGL_STRING_VERSION ); - std::transform ( version.begin (), version.end(), version.begin(), ::tolower ); + std::transform ( version.begin (), version.end(), version.begin(), Lower ); STLString gles = "opengl es"; diff --git a/src/zl-util/STLString.cpp b/src/zl-util/STLString.cpp index 5f9af9b717..d9dc454e6d 100644 --- a/src/zl-util/STLString.cpp +++ b/src/zl-util/STLString.cpp @@ -180,13 +180,13 @@ int STLString::to_int () { //----------------------------------------------------------------// void STLString::to_lower () { - transform ( this->begin (), this->end (),this->begin (), ( int( * )( int ))tolower ); + transform ( this->begin (), this->end (),this->begin (), ( char( * )( char ))tolower ); } //----------------------------------------------------------------// void STLString::to_upper () { - transform ( this->begin (), this->end (),this->begin (), ( int( * )( int ))toupper ); + transform ( this->begin (), this->end (),this->begin (), ( char( * )( char ))toupper ); } //----------------------------------------------------------------// diff --git a/src/zl-util/ZLBox.cpp b/src/zl-util/ZLBox.cpp index c1d49dd251..87511b677e 100644 --- a/src/zl-util/ZLBox.cpp +++ b/src/zl-util/ZLBox.cpp @@ -225,7 +225,7 @@ void ZLBox::Grow ( const ZLRect& rect, bool first, u32 plane ) { ZLBox grow; grow.Init ( rect, plane ); - this->Grow ( rect, first ); + this->Grow ( grow, first ); } //----------------------------------------------------------------// diff --git a/src/zl-vfs/zl_replace_stdlib.h b/src/zl-vfs/zl_replace_stdlib.h index ea71c618e8..6c3fa936e8 100644 --- a/src/zl-vfs/zl_replace_stdlib.h +++ b/src/zl-vfs/zl_replace_stdlib.h @@ -28,8 +28,10 @@ #undef realloc #define realloc zl_realloc +#ifndef MOAI_COMPILER_MSVC #undef system #define system zl_system +#endif #ifdef __cplusplus } From 080511323fddb86b943d11cff64a9c33028b753d Mon Sep 17 00:00:00 2001 From: Patrick Meehan Date: Mon, 9 Oct 2017 21:43:44 -0700 Subject: [PATCH 3/9] fixed xcode ios crash on simulator launch; updated assimp to 4.0.1 --- 3rdparty/assimp | 2 +- 3rdparty/assimp-config/assimp/config.h | 946 ++++++ 3rdparty/assimp-config/revision.h | 2 +- src/moai-assimp/MOAIAssimpUtil.cpp | 4 +- src/zl-vfs/zl_replace_stdlib.h | 4 +- xcode/ios/Info.plist | 17 +- xcode/ios/moai-ios.xcodeproj/project.pbxproj | 16 +- .../xcshareddata/xcschemes/moai-ios.xcscheme | 2 +- .../libmoai/libmoai.xcodeproj/project.pbxproj | 2950 +++++++---------- 9 files changed, 2229 insertions(+), 1714 deletions(-) create mode 100644 3rdparty/assimp-config/assimp/config.h diff --git a/3rdparty/assimp b/3rdparty/assimp index 9b6de15b74..eb8639d7c8 160000 --- a/3rdparty/assimp +++ b/3rdparty/assimp @@ -1 +1 @@ -Subproject commit 9b6de15b74f4d44220f0514766d6344f6238cf2f +Subproject commit eb8639d7c8a056d1c1b1cd42598c84ba3974c41b diff --git a/3rdparty/assimp-config/assimp/config.h b/3rdparty/assimp-config/assimp/config.h new file mode 100644 index 0000000000..59d301f788 --- /dev/null +++ b/3rdparty/assimp-config/assimp/config.h @@ -0,0 +1,946 @@ +/* +--------------------------------------------------------------------------- +Open Asset Import Library (assimp) +--------------------------------------------------------------------------- + +Copyright (c) 2006-2017, assimp team + +All rights reserved. + +Redistribution and use of this software in source and binary forms, +with or without modification, are permitted provided that the following +conditions are met: + +* Redistributions of source code must retain the above + copyright notice, this list of conditions and the + following disclaimer. + +* Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the + following disclaimer in the documentation and/or other + materials provided with the distribution. + +* Neither the name of the assimp team, nor the names of its + contributors may be used to endorse or promote products + derived from this software without specific prior + written permission of the assimp team. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +--------------------------------------------------------------------------- +*/ + +/** @file config.h + * @brief Defines constants for configurable properties for the library + * + * Typically these properties are set via + * #Assimp::Importer::SetPropertyFloat, + * #Assimp::Importer::SetPropertyInteger or + * #Assimp::Importer::SetPropertyString, + * depending on the data type of a property. All properties have a + * default value. See the doc for the mentioned methods for more details. + * + *

+ * The corresponding functions for use with the plain-c API are: + * #aiSetImportPropertyInteger, + * #aiSetImportPropertyFloat, + * #aiSetImportPropertyString + */ +#pragma once +#ifndef AI_CONFIG_H_INC +#define AI_CONFIG_H_INC + + +// ########################################################################### +// LIBRARY SETTINGS +// General, global settings +// ########################################################################### + +// --------------------------------------------------------------------------- +/** @brief Enables time measurements. + * + * If enabled, measures the time needed for each part of the loading + * process (i.e. IO time, importing, postprocessing, ..) and dumps + * these timings to the DefaultLogger. See the @link perf Performance + * Page@endlink for more information on this topic. + * + * Property type: bool. Default value: false. + */ +#define AI_CONFIG_GLOB_MEASURE_TIME \ + "GLOB_MEASURE_TIME" + + +// --------------------------------------------------------------------------- +/** @brief Global setting to disable generation of skeleton dummy meshes + * + * Skeleton dummy meshes are generated as a visualization aid in cases which + * the input data contains no geometry, but only animation data. + * Property data type: bool. Default value: false + */ +// --------------------------------------------------------------------------- +#define AI_CONFIG_IMPORT_NO_SKELETON_MESHES \ + "IMPORT_NO_SKELETON_MESHES" + + + +# if 0 // not implemented yet +// --------------------------------------------------------------------------- +/** @brief Set Assimp's multithreading policy. + * + * This setting is ignored if Assimp was built without boost.thread + * support (ASSIMP_BUILD_NO_THREADING, which is implied by ASSIMP_BUILD_BOOST_WORKAROUND). + * Possible values are: -1 to let Assimp decide what to do, 0 to disable + * multithreading entirely and any number larger than 0 to force a specific + * number of threads. Assimp is always free to ignore this settings, which is + * merely a hint. Usually, the default value (-1) will be fine. However, if + * Assimp is used concurrently from multiple user threads, it might be useful + * to limit each Importer instance to a specific number of cores. + * + * For more information, see the @link threading Threading page@endlink. + * Property type: int, default value: -1. + */ +#define AI_CONFIG_GLOB_MULTITHREADING \ + "GLOB_MULTITHREADING" +#endif + +// ########################################################################### +// POST PROCESSING SETTINGS +// Various stuff to fine-tune the behavior of a specific post processing step. +// ########################################################################### + + +// --------------------------------------------------------------------------- +/** @brief Maximum bone count per mesh for the SplitbyBoneCount step. + * + * Meshes are split until the maximum number of bones is reached. The default + * value is AI_SBBC_DEFAULT_MAX_BONES, which may be altered at + * compile-time. + * Property data type: integer. + */ +// --------------------------------------------------------------------------- +#define AI_CONFIG_PP_SBBC_MAX_BONES \ + "PP_SBBC_MAX_BONES" + + +// default limit for bone count +#if (!defined AI_SBBC_DEFAULT_MAX_BONES) +# define AI_SBBC_DEFAULT_MAX_BONES 60 +#endif + + +// --------------------------------------------------------------------------- +/** @brief Specifies the maximum angle that may be between two vertex tangents + * that their tangents and bi-tangents are smoothed. + * + * This applies to the CalcTangentSpace-Step. The angle is specified + * in degrees. The maximum value is 175. + * Property type: float. Default value: 45 degrees + */ +#define AI_CONFIG_PP_CT_MAX_SMOOTHING_ANGLE \ + "PP_CT_MAX_SMOOTHING_ANGLE" + +// --------------------------------------------------------------------------- +/** @brief Source UV channel for tangent space computation. + * + * The specified channel must exist or an error will be raised. + * Property type: integer. Default value: 0 + */ +// --------------------------------------------------------------------------- +#define AI_CONFIG_PP_CT_TEXTURE_CHANNEL_INDEX \ + "PP_CT_TEXTURE_CHANNEL_INDEX" + +// --------------------------------------------------------------------------- +/** @brief Specifies the maximum angle that may be between two face normals + * at the same vertex position that their are smoothed together. + * + * Sometimes referred to as 'crease angle'. + * This applies to the GenSmoothNormals-Step. The angle is specified + * in degrees, so 180 is PI. The default value is 175 degrees (all vertex + * normals are smoothed). The maximum value is 175, too. Property type: float. + * Warning: setting this option may cause a severe loss of performance. The + * performance is unaffected if the #AI_CONFIG_FAVOUR_SPEED flag is set but + * the output quality may be reduced. + */ +#define AI_CONFIG_PP_GSN_MAX_SMOOTHING_ANGLE \ + "PP_GSN_MAX_SMOOTHING_ANGLE" + + +// --------------------------------------------------------------------------- +/** @brief Sets the colormap (= palette) to be used to decode embedded + * textures in MDL (Quake or 3DGS) files. + * + * This must be a valid path to a file. The file is 768 (256*3) bytes + * large and contains RGB triplets for each of the 256 palette entries. + * The default value is colormap.lmp. If the file is not found, + * a default palette (from Quake 1) is used. + * Property type: string. + */ +#define AI_CONFIG_IMPORT_MDL_COLORMAP \ + "IMPORT_MDL_COLORMAP" + +// --------------------------------------------------------------------------- +/** @brief Configures the #aiProcess_RemoveRedundantMaterials step to + * keep materials matching a name in a given list. + * + * This is a list of 1 to n strings, ' ' serves as delimiter character. + * Identifiers containing whitespaces must be enclosed in *single* + * quotation marks. For example: + * "keep-me and_me_to anotherMaterialToBeKept \'name with whitespace\'". + * If a material matches on of these names, it will not be modified or + * removed by the postprocessing step nor will other materials be replaced + * by a reference to it.
+ * This option might be useful if you are using some magic material names + * to pass additional semantics through the content pipeline. This ensures + * they won't be optimized away, but a general optimization is still + * performed for materials not contained in the list. + * Property type: String. Default value: n/a + * @note Linefeeds, tabs or carriage returns are treated as whitespace. + * Material names are case sensitive. + */ +#define AI_CONFIG_PP_RRM_EXCLUDE_LIST \ + "PP_RRM_EXCLUDE_LIST" + +// --------------------------------------------------------------------------- +/** @brief Configures the #aiProcess_PreTransformVertices step to + * keep the scene hierarchy. Meshes are moved to worldspace, but + * no optimization is performed (read: meshes with equal materials are not + * joined. The total number of meshes won't change). + * + * This option could be of use for you if the scene hierarchy contains + * important additional information which you intend to parse. + * For rendering, you can still render all meshes in the scene without + * any transformations. + * Property type: bool. Default value: false. + */ +#define AI_CONFIG_PP_PTV_KEEP_HIERARCHY \ + "PP_PTV_KEEP_HIERARCHY" + +// --------------------------------------------------------------------------- +/** @brief Configures the #aiProcess_PreTransformVertices step to normalize + * all vertex components into the [-1,1] range. That is, a bounding box + * for the whole scene is computed, the maximum component is taken and all + * meshes are scaled appropriately (uniformly of course!). + * This might be useful if you don't know the spatial dimension of the input + * data*/ +#define AI_CONFIG_PP_PTV_NORMALIZE \ + "PP_PTV_NORMALIZE" + +// --------------------------------------------------------------------------- +/** @brief Configures the #aiProcess_PreTransformVertices step to use + * a users defined matrix as the scene root node transformation before + * transforming vertices. + * Property type: bool. Default value: false. + */ +#define AI_CONFIG_PP_PTV_ADD_ROOT_TRANSFORMATION \ + "PP_PTV_ADD_ROOT_TRANSFORMATION" + +// --------------------------------------------------------------------------- +/** @brief Configures the #aiProcess_PreTransformVertices step to use + * a users defined matrix as the scene root node transformation before + * transforming vertices. This property correspond to the 'a1' component + * of the transformation matrix. + * Property type: aiMatrix4x4. + */ +#define AI_CONFIG_PP_PTV_ROOT_TRANSFORMATION \ + "PP_PTV_ROOT_TRANSFORMATION" + +// --------------------------------------------------------------------------- +/** @brief Configures the #aiProcess_FindDegenerates step to + * remove degenerated primitives from the import - immediately. + * + * The default behaviour converts degenerated triangles to lines and + * degenerated lines to points. See the documentation to the + * #aiProcess_FindDegenerates step for a detailed example of the various ways + * to get rid of these lines and points if you don't want them. + * Property type: bool. Default value: false. + */ +#define AI_CONFIG_PP_FD_REMOVE \ + "PP_FD_REMOVE" + +// --------------------------------------------------------------------------- +/** @brief Configures the #aiProcess_OptimizeGraph step to preserve nodes + * matching a name in a given list. + * + * This is a list of 1 to n strings, ' ' serves as delimiter character. + * Identifiers containing whitespaces must be enclosed in *single* + * quotation marks. For example: + * "keep-me and_me_to anotherNodeToBeKept \'name with whitespace\'". + * If a node matches on of these names, it will not be modified or + * removed by the postprocessing step.
+ * This option might be useful if you are using some magic node names + * to pass additional semantics through the content pipeline. This ensures + * they won't be optimized away, but a general optimization is still + * performed for nodes not contained in the list. + * Property type: String. Default value: n/a + * @note Linefeeds, tabs or carriage returns are treated as whitespace. + * Node names are case sensitive. + */ +#define AI_CONFIG_PP_OG_EXCLUDE_LIST \ + "PP_OG_EXCLUDE_LIST" + +// --------------------------------------------------------------------------- +/** @brief Set the maximum number of triangles in a mesh. + * + * This is used by the "SplitLargeMeshes" PostProcess-Step to determine + * whether a mesh must be split or not. + * @note The default value is AI_SLM_DEFAULT_MAX_TRIANGLES + * Property type: integer. + */ +#define AI_CONFIG_PP_SLM_TRIANGLE_LIMIT \ + "PP_SLM_TRIANGLE_LIMIT" + +// default value for AI_CONFIG_PP_SLM_TRIANGLE_LIMIT +#if (!defined AI_SLM_DEFAULT_MAX_TRIANGLES) +# define AI_SLM_DEFAULT_MAX_TRIANGLES 1000000 +#endif + +// --------------------------------------------------------------------------- +/** @brief Set the maximum number of vertices in a mesh. + * + * This is used by the "SplitLargeMeshes" PostProcess-Step to determine + * whether a mesh must be split or not. + * @note The default value is AI_SLM_DEFAULT_MAX_VERTICES + * Property type: integer. + */ +#define AI_CONFIG_PP_SLM_VERTEX_LIMIT \ + "PP_SLM_VERTEX_LIMIT" + +// default value for AI_CONFIG_PP_SLM_VERTEX_LIMIT +#if (!defined AI_SLM_DEFAULT_MAX_VERTICES) +# define AI_SLM_DEFAULT_MAX_VERTICES 1000000 +#endif + +// --------------------------------------------------------------------------- +/** @brief Set the maximum number of bones affecting a single vertex + * + * This is used by the #aiProcess_LimitBoneWeights PostProcess-Step. + * @note The default value is AI_LMW_MAX_WEIGHTS + * Property type: integer.*/ +#define AI_CONFIG_PP_LBW_MAX_WEIGHTS \ + "PP_LBW_MAX_WEIGHTS" + +// default value for AI_CONFIG_PP_LBW_MAX_WEIGHTS +#if (!defined AI_LMW_MAX_WEIGHTS) +# define AI_LMW_MAX_WEIGHTS 0x4 +#endif // !! AI_LMW_MAX_WEIGHTS + +// --------------------------------------------------------------------------- +/** @brief Lower the deboning threshold in order to remove more bones. + * + * This is used by the #aiProcess_Debone PostProcess-Step. + * @note The default value is AI_DEBONE_THRESHOLD + * Property type: float.*/ +#define AI_CONFIG_PP_DB_THRESHOLD \ + "PP_DB_THRESHOLD" + +// default value for AI_CONFIG_PP_LBW_MAX_WEIGHTS +#if (!defined AI_DEBONE_THRESHOLD) +# define AI_DEBONE_THRESHOLD 1.0f +#endif // !! AI_DEBONE_THRESHOLD + +// --------------------------------------------------------------------------- +/** @brief Require all bones qualify for deboning before removing any + * + * This is used by the #aiProcess_Debone PostProcess-Step. + * @note The default value is 0 + * Property type: bool.*/ +#define AI_CONFIG_PP_DB_ALL_OR_NONE \ + "PP_DB_ALL_OR_NONE" + +/** @brief Default value for the #AI_CONFIG_PP_ICL_PTCACHE_SIZE property + */ +#ifndef PP_ICL_PTCACHE_SIZE +# define PP_ICL_PTCACHE_SIZE 12 +#endif + +// --------------------------------------------------------------------------- +/** @brief Set the size of the post-transform vertex cache to optimize the + * vertices for. This configures the #aiProcess_ImproveCacheLocality step. + * + * The size is given in vertices. Of course you can't know how the vertex + * format will exactly look like after the import returns, but you can still + * guess what your meshes will probably have. + * @note The default value is #PP_ICL_PTCACHE_SIZE. That results in slight + * performance improvements for most nVidia/AMD cards since 2002. + * Property type: integer. + */ +#define AI_CONFIG_PP_ICL_PTCACHE_SIZE "PP_ICL_PTCACHE_SIZE" + +// --------------------------------------------------------------------------- +/** @brief Enumerates components of the aiScene and aiMesh data structures + * that can be excluded from the import using the #aiProcess_RemoveComponent step. + * + * See the documentation to #aiProcess_RemoveComponent for more details. + */ +enum aiComponent +{ + /** Normal vectors */ +#ifdef SWIG + aiComponent_NORMALS = 0x2, +#else + aiComponent_NORMALS = 0x2u, +#endif + + /** Tangents and bitangents go always together ... */ +#ifdef SWIG + aiComponent_TANGENTS_AND_BITANGENTS = 0x4, +#else + aiComponent_TANGENTS_AND_BITANGENTS = 0x4u, +#endif + + /** ALL color sets + * Use aiComponent_COLORn(N) to specify the N'th set */ + aiComponent_COLORS = 0x8, + + /** ALL texture UV sets + * aiComponent_TEXCOORDn(N) to specify the N'th set */ + aiComponent_TEXCOORDS = 0x10, + + /** Removes all bone weights from all meshes. + * The scenegraph nodes corresponding to the bones are NOT removed. + * use the #aiProcess_OptimizeGraph step to do this */ + aiComponent_BONEWEIGHTS = 0x20, + + /** Removes all node animations (aiScene::mAnimations). + * The corresponding scenegraph nodes are NOT removed. + * use the #aiProcess_OptimizeGraph step to do this */ + aiComponent_ANIMATIONS = 0x40, + + /** Removes all embedded textures (aiScene::mTextures) */ + aiComponent_TEXTURES = 0x80, + + /** Removes all light sources (aiScene::mLights). + * The corresponding scenegraph nodes are NOT removed. + * use the #aiProcess_OptimizeGraph step to do this */ + aiComponent_LIGHTS = 0x100, + + /** Removes all cameras (aiScene::mCameras). + * The corresponding scenegraph nodes are NOT removed. + * use the #aiProcess_OptimizeGraph step to do this */ + aiComponent_CAMERAS = 0x200, + + /** Removes all meshes (aiScene::mMeshes). */ + aiComponent_MESHES = 0x400, + + /** Removes all materials. One default material will + * be generated, so aiScene::mNumMaterials will be 1. */ + aiComponent_MATERIALS = 0x800, + + + /** This value is not used. It is just there to force the + * compiler to map this enum to a 32 Bit integer. */ +#ifndef SWIG + _aiComponent_Force32Bit = 0x9fffffff +#endif +}; + +// Remove a specific color channel 'n' +#define aiComponent_COLORSn(n) (1u << (n+20u)) + +// Remove a specific UV channel 'n' +#define aiComponent_TEXCOORDSn(n) (1u << (n+25u)) + +// --------------------------------------------------------------------------- +/** @brief Input parameter to the #aiProcess_RemoveComponent step: + * Specifies the parts of the data structure to be removed. + * + * See the documentation to this step for further details. The property + * is expected to be an integer, a bitwise combination of the + * #aiComponent flags defined above in this header. The default + * value is 0. Important: if no valid mesh is remaining after the + * step has been executed (e.g you thought it was funny to specify ALL + * of the flags defined above) the import FAILS. Mainly because there is + * no data to work on anymore ... + */ +#define AI_CONFIG_PP_RVC_FLAGS \ + "PP_RVC_FLAGS" + +// --------------------------------------------------------------------------- +/** @brief Input parameter to the #aiProcess_SortByPType step: + * Specifies which primitive types are removed by the step. + * + * This is a bitwise combination of the aiPrimitiveType flags. + * Specifying all of them is illegal, of course. A typical use would + * be to exclude all line and point meshes from the import. This + * is an integer property, its default value is 0. + */ +#define AI_CONFIG_PP_SBP_REMOVE \ + "PP_SBP_REMOVE" + +// --------------------------------------------------------------------------- +/** @brief Input parameter to the #aiProcess_FindInvalidData step: + * Specifies the floating-point accuracy for animation values. The step + * checks for animation tracks where all frame values are absolutely equal + * and removes them. This tweakable controls the epsilon for floating-point + * comparisons - two keys are considered equal if the invariant + * abs(n0-n1)>epsilon holds true for all vector respectively quaternion + * components. The default value is 0.f - comparisons are exact then. + */ +#define AI_CONFIG_PP_FID_ANIM_ACCURACY \ + "PP_FID_ANIM_ACCURACY" + + +// TransformUVCoords evaluates UV scalings +#define AI_UVTRAFO_SCALING 0x1 + +// TransformUVCoords evaluates UV rotations +#define AI_UVTRAFO_ROTATION 0x2 + +// TransformUVCoords evaluates UV translation +#define AI_UVTRAFO_TRANSLATION 0x4 + +// Everything baked together -> default value +#define AI_UVTRAFO_ALL (AI_UVTRAFO_SCALING | AI_UVTRAFO_ROTATION | AI_UVTRAFO_TRANSLATION) + +// --------------------------------------------------------------------------- +/** @brief Input parameter to the #aiProcess_TransformUVCoords step: + * Specifies which UV transformations are evaluated. + * + * This is a bitwise combination of the AI_UVTRAFO_XXX flags (integer + * property, of course). By default all transformations are enabled + * (AI_UVTRAFO_ALL). + */ +#define AI_CONFIG_PP_TUV_EVALUATE \ + "PP_TUV_EVALUATE" + +// --------------------------------------------------------------------------- +/** @brief A hint to assimp to favour speed against import quality. + * + * Enabling this option may result in faster loading, but it needn't. + * It represents just a hint to loaders and post-processing steps to use + * faster code paths, if possible. + * This property is expected to be an integer, != 0 stands for true. + * The default value is 0. + */ +#define AI_CONFIG_FAVOUR_SPEED \ + "FAVOUR_SPEED" + + +// ########################################################################### +// IMPORTER SETTINGS +// Various stuff to fine-tune the behaviour of specific importer plugins. +// ########################################################################### + + +// --------------------------------------------------------------------------- +/** @brief Set whether the fbx importer will merge all geometry layers present + * in the source file or take only the first. + * + * The default value is true (1) + * Property type: bool + */ +#define AI_CONFIG_IMPORT_FBX_READ_ALL_GEOMETRY_LAYERS \ + "IMPORT_FBX_READ_ALL_GEOMETRY_LAYERS" + +// --------------------------------------------------------------------------- +/** @brief Set whether the fbx importer will read all materials present in the + * source file or take only the referenced materials. + * + * This is void unless IMPORT_FBX_READ_MATERIALS=1. + * + * The default value is false (0) + * Property type: bool + */ +#define AI_CONFIG_IMPORT_FBX_READ_ALL_MATERIALS \ + "IMPORT_FBX_READ_ALL_MATERIALS" + +// --------------------------------------------------------------------------- +/** @brief Set whether the fbx importer will read materials. + * + * The default value is true (1) + * Property type: bool + */ +#define AI_CONFIG_IMPORT_FBX_READ_MATERIALS \ + "IMPORT_FBX_READ_MATERIALS" + +// --------------------------------------------------------------------------- +/** @brief Set whether the fbx importer will read embedded textures. + * + * The default value is true (1) + * Property type: bool + */ +#define AI_CONFIG_IMPORT_FBX_READ_TEXTURES \ + "IMPORT_FBX_READ_TEXTURES" + +// --------------------------------------------------------------------------- +/** @brief Set whether the fbx importer will read cameras. + * + * The default value is true (1) + * Property type: bool + */ +#define AI_CONFIG_IMPORT_FBX_READ_CAMERAS \ + "IMPORT_FBX_READ_CAMERAS" + +// --------------------------------------------------------------------------- +/** @brief Set whether the fbx importer will read light sources. + * + * The default value is true (1) + * Property type: bool + */ +#define AI_CONFIG_IMPORT_FBX_READ_LIGHTS \ + "IMPORT_FBX_READ_LIGHTS" + +// --------------------------------------------------------------------------- +/** @brief Set whether the fbx importer will read animations. + * + * The default value is true (1) + * Property type: bool + */ +#define AI_CONFIG_IMPORT_FBX_READ_ANIMATIONS \ + "IMPORT_FBX_READ_ANIMATIONS" + +// --------------------------------------------------------------------------- +/** @brief Set whether the fbx importer will act in strict mode in which only + * FBX 2013 is supported and any other sub formats are rejected. FBX 2013 + * is the primary target for the importer, so this format is best + * supported and well-tested. + * + * The default value is false (0) + * Property type: bool + */ +#define AI_CONFIG_IMPORT_FBX_STRICT_MODE \ + "IMPORT_FBX_STRICT_MODE" + +// --------------------------------------------------------------------------- +/** @brief Set whether the fbx importer will preserve pivot points for + * transformations (as extra nodes). If set to false, pivots and offsets + * will be evaluated whenever possible. + * + * The default value is true (1) + * Property type: bool + */ +#define AI_CONFIG_IMPORT_FBX_PRESERVE_PIVOTS \ + "IMPORT_FBX_PRESERVE_PIVOTS" + +// --------------------------------------------------------------------------- +/** @brief Specifies whether the importer will drop empty animation curves or + * animation curves which match the bind pose transformation over their + * entire defined range. + * + * The default value is true (1) + * Property type: bool + */ +#define AI_CONFIG_IMPORT_FBX_OPTIMIZE_EMPTY_ANIMATION_CURVES \ + "IMPORT_FBX_OPTIMIZE_EMPTY_ANIMATION_CURVES" + +// --------------------------------------------------------------------------- +/** @brief Set whether the fbx importer will search for embedded loaded textures, where no embedded texture data is provided. +* +* The default value is false (0) +* Property type: bool +*/ +#define AI_CONFIG_IMPORT_FBX_SEARCH_EMBEDDED_TEXTURES \ + "IMPORT_FBX_SEARCH_EMBEDDED_TEXTURES" + +// --------------------------------------------------------------------------- +/** @brief Set the vertex animation keyframe to be imported + * + * ASSIMP does not support vertex keyframes (only bone animation is supported). + * The library reads only one frame of models with vertex animations. + * By default this is the first frame. + * \note The default value is 0. This option applies to all importers. + * However, it is also possible to override the global setting + * for a specific loader. You can use the AI_CONFIG_IMPORT_XXX_KEYFRAME + * options (where XXX is a placeholder for the file format for which you + * want to override the global setting). + * Property type: integer. + */ +#define AI_CONFIG_IMPORT_GLOBAL_KEYFRAME "IMPORT_GLOBAL_KEYFRAME" + +#define AI_CONFIG_IMPORT_MD3_KEYFRAME "IMPORT_MD3_KEYFRAME" +#define AI_CONFIG_IMPORT_MD2_KEYFRAME "IMPORT_MD2_KEYFRAME" +#define AI_CONFIG_IMPORT_MDL_KEYFRAME "IMPORT_MDL_KEYFRAME" +#define AI_CONFIG_IMPORT_MDC_KEYFRAME "IMPORT_MDC_KEYFRAME" +#define AI_CONFIG_IMPORT_SMD_KEYFRAME "IMPORT_SMD_KEYFRAME" +#define AI_CONFIG_IMPORT_UNREAL_KEYFRAME "IMPORT_UNREAL_KEYFRAME" + + +// --------------------------------------------------------------------------- +/** @brief Configures the AC loader to collect all surfaces which have the + * "Backface cull" flag set in separate meshes. + * + * Property type: bool. Default value: true. + */ +#define AI_CONFIG_IMPORT_AC_SEPARATE_BFCULL \ + "IMPORT_AC_SEPARATE_BFCULL" + +// --------------------------------------------------------------------------- +/** @brief Configures whether the AC loader evaluates subdivision surfaces ( + * indicated by the presence of the 'subdiv' attribute in the file). By + * default, Assimp performs the subdivision using the standard + * Catmull-Clark algorithm + * + * * Property type: bool. Default value: true. + */ +#define AI_CONFIG_IMPORT_AC_EVAL_SUBDIVISION \ + "IMPORT_AC_EVAL_SUBDIVISION" + +// --------------------------------------------------------------------------- +/** @brief Configures the UNREAL 3D loader to separate faces with different + * surface flags (e.g. two-sided vs. single-sided). + * + * * Property type: bool. Default value: true. + */ +#define AI_CONFIG_IMPORT_UNREAL_HANDLE_FLAGS \ + "UNREAL_HANDLE_FLAGS" + +// --------------------------------------------------------------------------- +/** @brief Configures the terragen import plugin to compute uv's for + * terrains, if not given. Furthermore a default texture is assigned. + * + * UV coordinates for terrains are so simple to compute that you'll usually + * want to compute them on your own, if you need them. This option is intended + * for model viewers which want to offer an easy way to apply textures to + * terrains. + * * Property type: bool. Default value: false. + */ +#define AI_CONFIG_IMPORT_TER_MAKE_UVS \ + "IMPORT_TER_MAKE_UVS" + +// --------------------------------------------------------------------------- +/** @brief Configures the ASE loader to always reconstruct normal vectors + * basing on the smoothing groups loaded from the file. + * + * Some ASE files have carry invalid normals, other don't. + * * Property type: bool. Default value: true. + */ +#define AI_CONFIG_IMPORT_ASE_RECONSTRUCT_NORMALS \ + "IMPORT_ASE_RECONSTRUCT_NORMALS" + +// --------------------------------------------------------------------------- +/** @brief Configures the M3D loader to detect and process multi-part + * Quake player models. + * + * These models usually consist of 3 files, lower.md3, upper.md3 and + * head.md3. If this property is set to true, Assimp will try to load and + * combine all three files if one of them is loaded. + * Property type: bool. Default value: true. + */ +#define AI_CONFIG_IMPORT_MD3_HANDLE_MULTIPART \ + "IMPORT_MD3_HANDLE_MULTIPART" + +// --------------------------------------------------------------------------- +/** @brief Tells the MD3 loader which skin files to load. + * + * When loading MD3 files, Assimp checks whether a file + * [md3_file_name]_[skin_name].skin is existing. These files are used by + * Quake III to be able to assign different skins (e.g. red and blue team) + * to models. 'default', 'red', 'blue' are typical skin names. + * Property type: String. Default value: "default". + */ +#define AI_CONFIG_IMPORT_MD3_SKIN_NAME \ + "IMPORT_MD3_SKIN_NAME" + +// --------------------------------------------------------------------------- +/** @brief Specify the Quake 3 shader file to be used for a particular + * MD3 file. This can also be a search path. + * + * By default Assimp's behaviour is as follows: If a MD3 file + * any_path/models/any_q3_subdir/model_name/file_name.md3 is + * loaded, the library tries to locate the corresponding shader file in + * any_path/scripts/model_name.shader. This property overrides this + * behaviour. It can either specify a full path to the shader to be loaded + * or alternatively the path (relative or absolute) to the directory where + * the shaders for all MD3s to be loaded reside. Assimp attempts to open + * IMPORT_MD3_SHADER_SRC/model_name.shader first, IMPORT_MD3_SHADER_SRC/file_name.shader + * is the fallback file. Note that IMPORT_MD3_SHADER_SRC should have a terminal (back)slash. + * Property type: String. Default value: n/a. + */ +#define AI_CONFIG_IMPORT_MD3_SHADER_SRC \ + "IMPORT_MD3_SHADER_SRC" + +// --------------------------------------------------------------------------- +/** @brief Configures the LWO loader to load just one layer from the model. + * + * LWO files consist of layers and in some cases it could be useful to load + * only one of them. This property can be either a string - which specifies + * the name of the layer - or an integer - the index of the layer. If the + * property is not set the whole LWO model is loaded. Loading fails if the + * requested layer is not available. The layer index is zero-based and the + * layer name may not be empty.
+ * Property type: Integer. Default value: all layers are loaded. + */ +#define AI_CONFIG_IMPORT_LWO_ONE_LAYER_ONLY \ + "IMPORT_LWO_ONE_LAYER_ONLY" + +// --------------------------------------------------------------------------- +/** @brief Configures the MD5 loader to not load the MD5ANIM file for + * a MD5MESH file automatically. + * + * The default strategy is to look for a file with the same name but the + * MD5ANIM extension in the same directory. If it is found, it is loaded + * and combined with the MD5MESH file. This configuration option can be + * used to disable this behaviour. + * + * * Property type: bool. Default value: false. + */ +#define AI_CONFIG_IMPORT_MD5_NO_ANIM_AUTOLOAD \ + "IMPORT_MD5_NO_ANIM_AUTOLOAD" + +// --------------------------------------------------------------------------- +/** @brief Defines the begin of the time range for which the LWS loader + * evaluates animations and computes aiNodeAnim's. + * + * Assimp provides full conversion of LightWave's envelope system, including + * pre and post conditions. The loader computes linearly subsampled animation + * chanels with the frame rate given in the LWS file. This property defines + * the start time. Note: animation channels are only generated if a node + * has at least one envelope with more tan one key assigned. This property. + * is given in frames, '0' is the first frame. By default, if this property + * is not set, the importer takes the animation start from the input LWS + * file ('FirstFrame' line)
+ * Property type: Integer. Default value: taken from file. + * + * @see AI_CONFIG_IMPORT_LWS_ANIM_END - end of the imported time range + */ +#define AI_CONFIG_IMPORT_LWS_ANIM_START \ + "IMPORT_LWS_ANIM_START" +#define AI_CONFIG_IMPORT_LWS_ANIM_END \ + "IMPORT_LWS_ANIM_END" + +// --------------------------------------------------------------------------- +/** @brief Defines the output frame rate of the IRR loader. + * + * IRR animations are difficult to convert for Assimp and there will + * always be a loss of quality. This setting defines how many keys per second + * are returned by the converter.
+ * Property type: integer. Default value: 100 + */ +#define AI_CONFIG_IMPORT_IRR_ANIM_FPS \ + "IMPORT_IRR_ANIM_FPS" + +// --------------------------------------------------------------------------- +/** @brief Ogre Importer will try to find referenced materials from this file. + * + * Ogre meshes reference with material names, this does not tell Assimp the file + * where it is located in. Assimp will try to find the source file in the following + * order: .material, .material and + * lastly the material name defined by this config property. + *
+ * Property type: String. Default value: Scene.material. + */ +#define AI_CONFIG_IMPORT_OGRE_MATERIAL_FILE \ + "IMPORT_OGRE_MATERIAL_FILE" + +// --------------------------------------------------------------------------- +/** @brief Ogre Importer detect the texture usage from its filename. + * + * Ogre material texture units do not define texture type, the textures usage + * depends on the used shader or Ogre's fixed pipeline. If this config property + * is true Assimp will try to detect the type from the textures filename postfix: + * _n, _nrm, _nrml, _normal, _normals and _normalmap for normal map, _s, _spec, + * _specular and _specularmap for specular map, _l, _light, _lightmap, _occ + * and _occlusion for light map, _disp and _displacement for displacement map. + * The matching is case insensitive. Post fix is taken between the last + * underscore and the last period. + * Default behavior is to detect type from lower cased texture unit name by + * matching against: normalmap, specularmap, lightmap and displacementmap. + * For both cases if no match is found aiTextureType_DIFFUSE is used. + *
+ * Property type: Bool. Default value: false. + */ +#define AI_CONFIG_IMPORT_OGRE_TEXTURETYPE_FROM_FILENAME \ + "IMPORT_OGRE_TEXTURETYPE_FROM_FILENAME" + + /** @brief Specifies whether the Android JNI asset extraction is supported. + * + * Turn on this option if you want to manage assets in native + * Android application without having to keep the internal directory and asset + * manager pointer. + */ + #define AI_CONFIG_ANDROID_JNI_ASSIMP_MANAGER_SUPPORT "AI_CONFIG_ANDROID_JNI_ASSIMP_MANAGER_SUPPORT" + +// --------------------------------------------------------------------------- +/** @brief Specifies whether the IFC loader skips over IfcSpace elements. + * + * IfcSpace elements (and their geometric representations) are used to + * represent, well, free space in a building storey.
+ * Property type: Bool. Default value: true. + */ +#define AI_CONFIG_IMPORT_IFC_SKIP_SPACE_REPRESENTATIONS "IMPORT_IFC_SKIP_SPACE_REPRESENTATIONS" + +// --------------------------------------------------------------------------- +/** @brief Specifies whether the IFC loader will use its own, custom triangulation + * algorithm to triangulate wall and floor meshes. + * + * If this property is set to false, walls will be either triangulated by + * #aiProcess_Triangulate or will be passed through as huge polygons with + * faked holes (i.e. holes that are connected with the outer boundary using + * a dummy edge). It is highly recommended to set this property to true + * if you want triangulated data because #aiProcess_Triangulate is known to + * have problems with the kind of polygons that the IFC loader spits out for + * complicated meshes. + * Property type: Bool. Default value: true. + */ +#define AI_CONFIG_IMPORT_IFC_CUSTOM_TRIANGULATION "IMPORT_IFC_CUSTOM_TRIANGULATION" + +// --------------------------------------------------------------------------- +/** @brief Set the tessellation conic angle for IFC smoothing curves. + * + * This is used by the IFC importer to determine the tessellation parameter + * for smoothing curves. + * @note The default value is AI_IMPORT_IFC_DEFAULT_SMOOTHING_ANGLE and the + * accepted values are in range [5.0, 120.0]. + * Property type: Float. + */ +#define AI_CONFIG_IMPORT_IFC_SMOOTHING_ANGLE "IMPORT_IFC_SMOOTHING_ANGLE" + +// default value for AI_CONFIG_IMPORT_IFC_SMOOTHING_ANGLE +#if (!defined AI_IMPORT_IFC_DEFAULT_SMOOTHING_ANGLE) +# define AI_IMPORT_IFC_DEFAULT_SMOOTHING_ANGLE 10.0f +#endif + +// --------------------------------------------------------------------------- +/** @brief Set the tessellation for IFC cylindrical shapes. + * + * This is used by the IFC importer to determine the tessellation parameter + * for cylindrical shapes, i.e. the number of segments used to aproximate a circle. + * @note The default value is AI_IMPORT_IFC_DEFAULT_CYLINDRICAL_TESSELLATION and the + * accepted values are in range [3, 180]. + * Property type: Integer. + */ +#define AI_CONFIG_IMPORT_IFC_CYLINDRICAL_TESSELLATION "IMPORT_IFC_CYLINDRICAL_TESSELLATION" + +// default value for AI_CONFIG_IMPORT_IFC_CYLINDRICAL_TESSELLATION +#if (!defined AI_IMPORT_IFC_DEFAULT_CYLINDRICAL_TESSELLATION) +# define AI_IMPORT_IFC_DEFAULT_CYLINDRICAL_TESSELLATION 32 +#endif + +// --------------------------------------------------------------------------- +/** @brief Specifies whether the Collada loader will ignore the provided up direction. + * + * If this property is set to true, the up direction provided in the file header will + * be ignored and the file will be loaded as is. + * Property type: Bool. Default value: false. + */ +#define AI_CONFIG_IMPORT_COLLADA_IGNORE_UP_DIRECTION "IMPORT_COLLADA_IGNORE_UP_DIRECTION" + +// ---------- All the Export defines ------------ + +/** @brief Specifies the xfile use double for real values of float + * + * Property type: Bool. Default value: false. + */ + +#define AI_CONFIG_EXPORT_XFILE_64BIT "EXPORT_XFILE_64BIT" + + +// ---------- All the Build/Compile-time defines ------------ + +/** @brief Specifies if double precision is supported inside assimp + * + * Property type: Bool. Default value: undefined. + */ + +#define ASSIMP_DOUBLE_PRECISION 1 + +#endif // !! AI_CONFIG_H_INC diff --git a/3rdparty/assimp-config/revision.h b/3rdparty/assimp-config/revision.h index 1102dc1512..109170ede3 100644 --- a/3rdparty/assimp-config/revision.h +++ b/3rdparty/assimp-config/revision.h @@ -1,7 +1,7 @@ #ifndef ASSIMP_REVISION_H_INC #define ASSIMP_REVISION_H_INC -#define GitVersion 0x9b6de15 +#define GitVersion 0xeb8639d #define GitBranch "master" #endif // ASSIMP_REVISION_H_INC diff --git a/src/moai-assimp/MOAIAssimpUtil.cpp b/src/moai-assimp/MOAIAssimpUtil.cpp index b7dea2da5f..3d055f69f3 100644 --- a/src/moai-assimp/MOAIAssimpUtil.cpp +++ b/src/moai-assimp/MOAIAssimpUtil.cpp @@ -232,7 +232,7 @@ void MOAIAssimpUtil::PushNode ( lua_State* L, const aiNode* node ) { state.Push ( *( bool* )value.mData ); break; - case AI_INT: + case AI_INT32: state.Push ( *( int* )value.mData ); break; @@ -296,7 +296,7 @@ void MOAIAssimpUtil::PushTexture ( lua_State* L, aiMaterial* material, aiTexture aiString path; aiTextureMapping mapping; uint uvindex; - float blend; + double blend; aiTextureOp op; aiTextureMapMode mapmode [ 3 ]; diff --git a/src/zl-vfs/zl_replace_stdlib.h b/src/zl-vfs/zl_replace_stdlib.h index 6c3fa936e8..47a7993680 100644 --- a/src/zl-vfs/zl_replace_stdlib.h +++ b/src/zl-vfs/zl_replace_stdlib.h @@ -29,8 +29,8 @@ #define realloc zl_realloc #ifndef MOAI_COMPILER_MSVC -#undef system -#define system zl_system + #undef system + #define system zl_system #endif #ifdef __cplusplus diff --git a/xcode/ios/Info.plist b/xcode/ios/Info.plist index 5b5ba34820..c65100a0a1 100644 --- a/xcode/ios/Info.plist +++ b/xcode/ios/Info.plist @@ -8,8 +8,17 @@ ${PRODUCT_NAME} CFBundleExecutable ${EXECUTABLE_NAME} + CFBundleIconFiles + + Icon.png + Icon@2x.png + Icon-72.png + Icon-Small-50.png + Icon-Small.png + Icon-Small@2x.png + CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) + com.moaisdk.samples CFBundleInfoDictionaryVersion 6.0 CFBundleName @@ -24,14 +33,8 @@ 1 LSRequiresIPhoneOS - UILaunchStoryboardName - LaunchScreen UIPrerenderedIcon - UIRequiresFullScreen - - UIStatusBarHidden - UISupportedInterfaceOrientations UIInterfaceOrientationPortrait diff --git a/xcode/ios/moai-ios.xcodeproj/project.pbxproj b/xcode/ios/moai-ios.xcodeproj/project.pbxproj index e96950cd00..86ed17126a 100755 --- a/xcode/ios/moai-ios.xcodeproj/project.pbxproj +++ b/xcode/ios/moai-ios.xcodeproj/project.pbxproj @@ -1229,15 +1229,6 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 080E96DDFE201D6D7F000001 /* Classes */ = { - isa = PBXGroup; - children = ( - CDC963C91A12C68F00F9CA22 /* moai */, - CDFD7DFA1A08B15200A94E6B /* modules */, - ); - path = Classes; - sourceTree = SOURCE_ROOT; - }; 19C28FACFE9D520D11CA2CBB /* Products */ = { isa = PBXGroup; children = ( @@ -1251,7 +1242,8 @@ isa = PBXGroup; children = ( 03CC90AE13B3C39D00B2724C /* libmoai.xcodeproj */, - 080E96DDFE201D6D7F000001 /* Classes */, + CDC963C91A12C68F00F9CA22 /* moai */, + CDFD7DFA1A08B15200A94E6B /* modules */, 29B97317FDCFA39411CA2CEA /* Resources */, 29B97323FDCFA39411CA2CEA /* Frameworks */, 19C28FACFE9D520D11CA2CBB /* Products */, @@ -2497,7 +2489,7 @@ INFOPLIST_FILE = Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LIBRARY_SEARCH_PATHS = ( - "\"../../3rdparty/artoolkit5/lib/ios7\"", + "\"../../3rdparty/artoolkit-ios-sdk/lib\"", "\"../../3rdparty/gvr-ios-sdk/lib\"", ); ONLY_ACTIVE_ARCH = YES; @@ -2564,7 +2556,7 @@ INFOPLIST_FILE = Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LIBRARY_SEARCH_PATHS = ( - "\"../../3rdparty/artoolkit5/lib/ios7\"", + "\"../../3rdparty/artoolkit-ios-sdk/lib\"", "\"../../3rdparty/gvr-ios-sdk/lib\"", ); OTHER_CFLAGS = ( diff --git a/xcode/ios/moai-ios.xcodeproj/xcshareddata/xcschemes/moai-ios.xcscheme b/xcode/ios/moai-ios.xcodeproj/xcshareddata/xcschemes/moai-ios.xcscheme index bbe92c60b3..22e1d35543 100644 --- a/xcode/ios/moai-ios.xcodeproj/xcshareddata/xcschemes/moai-ios.xcscheme +++ b/xcode/ios/moai-ios.xcodeproj/xcshareddata/xcschemes/moai-ios.xcscheme @@ -1,6 +1,6 @@ Date: Mon, 9 Oct 2017 22:09:31 -0700 Subject: [PATCH 4/9] fixed some places where renaming to new virtual method convention wasn't completed --- src/moai-sim/MOAIDeck.cpp | 8 ++------ src/moai-sim/MOAIDrawShape.cpp | 7 ++----- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/moai-sim/MOAIDeck.cpp b/src/moai-sim/MOAIDeck.cpp index 4e7c8da30e..5dee60c635 100644 --- a/src/moai-sim/MOAIDeck.cpp +++ b/src/moai-sim/MOAIDeck.cpp @@ -133,12 +133,8 @@ MOAIDeck::~MOAIDeck () { //----------------------------------------------------------------// bool MOAIDeck::Overlap ( u32 idx, const ZLVec2D& vec, u32 granularity, ZLBounds* result ) { - UNUSED(idx); - UNUSED(vec); - UNUSED(granularity); - UNUSED(result); - return false; - //return this->Overlap ( idx, vec, granularity, result ); + + return this->MOAIDeck_Overlap ( idx, vec, granularity, result ); } diff --git a/src/moai-sim/MOAIDrawShape.cpp b/src/moai-sim/MOAIDrawShape.cpp index 9e04555061..1a521f883c 100644 --- a/src/moai-sim/MOAIDrawShape.cpp +++ b/src/moai-sim/MOAIDrawShape.cpp @@ -164,16 +164,13 @@ void MOAIDrawShape::DrawLine ( float x0, float y0, float z0, float x1, float y1, //----------------------------------------------------------------// void MOAIDrawShape::DrawPoint ( const ZLVec2D& loc ) { - this->DrawPoint ( loc.mX, loc.mY ); + this->MOAIDrawShape_DrawPoint ( loc.mX, loc.mY ); } //----------------------------------------------------------------// void MOAIDrawShape::DrawPoint ( float x, float y, float z ) { - //this->DrawPoint ( x, y, z ); - UNUSED(x); - UNUSED(y); - UNUSED(z); + this->MOAIDrawShape_DrawPoint ( x, y, z ); } //----------------------------------------------------------------// From 3800757b364538d40fab591a8548f4677a75c1f7 Mon Sep 17 00:00:00 2001 From: David Pershouse Date: Thu, 12 Oct 2017 22:10:28 +1000 Subject: [PATCH 5/9] give strings.h to MOAIFont_bmfont remove obsolete files. --- src/moai-sim/MOAIFont_bmfont.cpp | 4 +- src/moai-sim/MOAILightSet copy.cpp | 17 - src/moai-sim/MOAILightSet copy.h | 18 - src/moai-sim/MOAISingleTexture.cpp | 547 ----------------------------- 4 files changed, 3 insertions(+), 583 deletions(-) delete mode 100644 src/moai-sim/MOAILightSet copy.cpp delete mode 100644 src/moai-sim/MOAILightSet copy.h delete mode 100644 src/moai-sim/MOAISingleTexture.cpp diff --git a/src/moai-sim/MOAIFont_bmfont.cpp b/src/moai-sim/MOAIFont_bmfont.cpp index b93334914a..d07d6644b3 100644 --- a/src/moai-sim/MOAIFont_bmfont.cpp +++ b/src/moai-sim/MOAIFont_bmfont.cpp @@ -9,10 +9,12 @@ #include #include -#if defined( _WIN32 ) +#if defined( _WIN32 ) #define strcasecmp(str1, str2) ( stricmp ( str1,str2 )) #endif +#include + #define WIDE_ID_BIT 0x80000000 #define WIDE_ID_MASK 0x7fffffff #define INVALID_ID 0xffffffff diff --git a/src/moai-sim/MOAILightSet copy.cpp b/src/moai-sim/MOAILightSet copy.cpp deleted file mode 100644 index a40cd35c25..0000000000 --- a/src/moai-sim/MOAILightSet copy.cpp +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright (c) 2010-2017 Zipline Games, Inc. All Rights Reserved. -// http://getmoai.com - -#include "pch.h" -#include - -//================================================================// -// MOAILightSet -//================================================================// - -//----------------------------------------------------------------// -MOAILightSet::MOAILightSet () { -} - -//----------------------------------------------------------------// -MOAILightSet::~MOAILightSet () { -} diff --git a/src/moai-sim/MOAILightSet copy.h b/src/moai-sim/MOAILightSet copy.h deleted file mode 100644 index 6c08da36df..0000000000 --- a/src/moai-sim/MOAILightSet copy.h +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright (c) 2010-2017 Zipline Games, Inc. All Rights Reserved. -// http://getmoai.com - -#ifndef MOAILIGHTSET_H -#define MOAILIGHTSET_H - -//================================================================// -// MOAILightSet -//================================================================// -class MOAILightSet { -public: - - //----------------------------------------------------------------// - MOAILightSet (); - ~MOAILightSet (); -}; - -#endif diff --git a/src/moai-sim/MOAISingleTexture.cpp b/src/moai-sim/MOAISingleTexture.cpp deleted file mode 100644 index d4deb61c7d..0000000000 --- a/src/moai-sim/MOAISingleTexture.cpp +++ /dev/null @@ -1,547 +0,0 @@ -// Copyright (c) 2010-2011 Zipline Games, Inc. All Rights Reserved. -// http://getmoai.com - -#include "pch.h" -#include -#include -#include -#include - -//================================================================// -// local -//================================================================// - -//----------------------------------------------------------------// -/** @lua getSize - @text Returns the width and height of the texture's source image. - Avoid using the texture width and height to compute UV - coordinates from pixels, as this will prevent texture - resolution swapping. - - @in MOAISingleTexture self - @out number width - @out number height -*/ -int MOAISingleTexture::_getSize ( lua_State* L ) { - MOAI_LUA_SETUP ( MOAISingleTexture, "U" ) - - self->DoCPUCreate (); - - lua_pushnumber ( state, self->mWidth ); - lua_pushnumber ( state, self->mHeight ); - - return 2; -} - -//----------------------------------------------------------------// -/** @lua release - @text Releases any memory associated with the texture. - - @in MOAISingleTexture self - @out nil -*/ -int MOAISingleTexture::_release ( lua_State* L ) { - MOAI_LUA_SETUP ( MOAISingleTexture, "U" ) - - self->Destroy (); - - return 0; -} - -//----------------------------------------------------------------// -/** @lua setDebugName - @text Set a name for the texture to use during memory logging. - - @in MOAISingleTexture self - @in string debugName - @out nil -*/ -int MOAISingleTexture::_setDebugName ( lua_State* L ) { - MOAI_LUA_SETUP ( MOAISingleTexture, "U" ) - - self->mDebugName = state.GetValue < cc8* >( 2, "" ); - return 0; -} - -//----------------------------------------------------------------// -/** @lua setFilter - @text Set default filtering mode for texture. - - @in MOAISingleTexture self - @in number min One of MOAISingleTexture.GL_LINEAR, MOAISingleTexture.GL_LINEAR_MIPMAP_LINEAR, MOAISingleTexture.GL_LINEAR_MIPMAP_NEAREST, - MOAISingleTexture.GL_NEAREST, MOAISingleTexture.GL_NEAREST_MIPMAP_LINEAR, MOAISingleTexture.GL_NEAREST_MIPMAP_NEAREST - @opt number mag Defaults to value passed to 'min'. - @out nil -*/ -int MOAISingleTexture::_setFilter ( lua_State* L ) { - MOAI_LUA_SETUP ( MOAISingleTexture, "UN" ) - - int min = state.GetValue < int >( 2, ZGL_SAMPLE_LINEAR ); - int mag = state.GetValue < int >( 3, min ); - - MOAISingleTexture::CheckFilterModes ( min, mag ); - - self->SetFilter ( min, mag ); - - return 0; -} - -//----------------------------------------------------------------// -/** @lua setWrap - @text Set wrapping mode for texture. - - @in MOAISingleTexture self - @in boolean wrap Texture will wrap if true, clamp if not. - @out nil -*/ -int MOAISingleTexture::_setWrap ( lua_State* L ) { - MOAI_LUA_SETUP ( MOAISingleTexture, "UB" ) - - bool wrap = state.GetValue < bool >( 2, false ); - - self->mWrap = wrap ? ZGL_WRAP_MODE_REPEAT : ZGL_WRAP_MODE_CLAMP; - - return 0; -} - -//================================================================// -// MOAISingleTexture -//================================================================// - -//----------------------------------------------------------------// -void MOAISingleTexture::CheckFilterModes ( int min, int mag ) { - UNUSED ( min ); - UNUSED ( mag ); - - #ifdef _DEBUG - switch ( min ) { - case ZGL_SAMPLE_LINEAR_MIPMAP_LINEAR: - case ZGL_SAMPLE_LINEAR_MIPMAP_NEAREST: - case ZGL_SAMPLE_NEAREST_MIPMAP_LINEAR: - case ZGL_SAMPLE_NEAREST_MIPMAP_NEAREST: - - if ( !(( mag == ZGL_SAMPLE_LINEAR ) || ( mag == ZGL_SAMPLE_NEAREST ))) { - - ZLLog_Warning ( "WARNING: possibly incompatible filter modes; MIPMAP not supported for mag filter\n" ); - } - break; - - default: - break; - } - #endif -} - -//----------------------------------------------------------------// -void MOAISingleTexture::CleanupOnError () { - - this->mTextureSize = 0; - MOAIGfxMgr::GetDrawingAPI ().Delete ( this->mGLTexID ); - this->mGLTexID = 0; - this->mWidth = 0; - this->mHeight = 0; - this->mTextureSize = 0; -} - -//----------------------------------------------------------------// -u32 MOAISingleTexture::CountActiveUnits () { - - return 1; -} - -//----------------------------------------------------------------// -bool MOAISingleTexture::CreateTextureFromImage ( MOAIImage& srcImage ) { - - if ( !MOAIGfxMgr::Get ().GetHasContext ()) return false; - - ZLGfx& gfx = MOAIGfxMgr::GetDrawingAPI (); - - MOAIImage altImage; - - ZLColor::ColorFormat colorFormat = srcImage.GetColorFormat (); - if ( colorFormat == ZLColor::CLR_FMT_UNKNOWN ) return false; - - if (( colorFormat == ZLColor::A_1 ) || ( colorFormat == ZLColor::A_4 )) { - colorFormat = ZLColor::A_8; - } - - if (( colorFormat != srcImage.GetColorFormat ()) || ( srcImage.GetPixelFormat () != MOAIImage::TRUECOLOR )) { - //if ( !altImage.Convert ( srcImage, colorFormat, MOAIImage::TRUECOLOR )); // TODO: what was this? add error handling? - altImage.Convert ( srcImage, colorFormat, MOAIImage::TRUECOLOR ); - } - - MOAIImage& image = altImage.IsOK () ? altImage : srcImage; - if ( !image.IsOK ()) return false; - - //MOAIGfxMgr::Get ().ClearErrors (); - this->mGLTexID = gfx.CreateTexture (); - if ( !this->mGLTexID ) return false; - - // get the dimensions before trying to get the OpenGL texture ID - this->mWidth = image.GetWidth (); - this->mHeight = image.GetHeight (); - - // warn if not a power of two (if we're supposed to generate mipmaps) - if ( this->ShouldGenerateMipmaps () && !image.IsPow2 ()) { - MOAILogF ( 0, ZLLog::LOG_WARNING, MOAILogMessages::MOAITexture_NonPowerOfTwo_SDD, ( cc8* )this->mDebugName, this->mWidth, this->mHeight ); - } - - // GL_ALPHA - // GL_RGB - // GL_RGBA - // GL_LUMINANCE - // GL_LUMINANCE_ALPHA - - // GL_UNSIGNED_BYTE - // GL_UNSIGNED_SHORT_5_6_5 - // GL_UNSIGNED_SHORT_4_4_4_4 - // GL_UNSIGNED_SHORT_5_5_5_1 - - switch ( colorFormat ) { - - case ZLColor::A_8: - this->mGLInternalFormat = ZGL_PIXEL_FORMAT_ALPHA; - this->mGLPixelType = ZGL_PIXEL_TYPE_UNSIGNED_BYTE; - break; - - case ZLColor::LA_8: - this->mGLInternalFormat = ZGL_PIXEL_FORMAT_LUMINANCE_ALPHA; - this->mGLPixelType = ZGL_PIXEL_TYPE_UNSIGNED_BYTE; - break; - - case ZLColor::RGB_888: - this->mGLInternalFormat = ZGL_PIXEL_FORMAT_RGB; - this->mGLPixelType = ZGL_PIXEL_TYPE_UNSIGNED_BYTE; - break; - - case ZLColor::RGB_565: - this->mGLInternalFormat = ZGL_PIXEL_FORMAT_RGB; - this->mGLPixelType = ZGL_PIXEL_TYPE_UNSIGNED_SHORT_5_6_5; - break; - - case ZLColor::RGBA_5551: - this->mGLInternalFormat = ZGL_PIXEL_FORMAT_RGBA; - this->mGLPixelType = ZGL_PIXEL_TYPE_UNSIGNED_SHORT_5_5_5_1; - break; - - case ZLColor::RGBA_4444: - this->mGLInternalFormat = ZGL_PIXEL_FORMAT_RGBA; - this->mGLPixelType = ZGL_PIXEL_TYPE_UNSIGNED_SHORT_4_4_4_4; - break; - - case ZLColor::RGBA_8888: - this->mGLInternalFormat = ZGL_PIXEL_FORMAT_RGBA; - this->mGLPixelType = ZGL_PIXEL_TYPE_UNSIGNED_BYTE; - break; - - default: - this->CleanupOnError (); - return false; - } - - gfx.BindTexture ( this->mGLTexID ); - - gfx.TexImage2D ( - 0, - this->mGLInternalFormat, - this->mWidth, - this->mHeight, - this->mGLInternalFormat, - this->mGLPixelType, - image.GetBitmapBuffer () - ); - - this->mTextureSize = image.GetBitmapSize (); - - // TODO: error handling -// if ( MOAIGfxMgr::Get ().LogErrors ()) { -// this->CleanupOnError (); -// return false; -// } -// else if ( this->ShouldGenerateMipmaps ()) { - - if ( this->ShouldGenerateMipmaps ()) { - - u32 mipLevel = 1; - - MOAIImage mipmap; - mipmap.Copy ( image ); - - while ( mipmap.MipReduce ()) { - - gfx.TexImage2D ( - mipLevel++, - this->mGLInternalFormat, - mipmap.GetWidth (), - mipmap.GetHeight (), - this->mGLInternalFormat, - this->mGLPixelType, - mipmap.GetBitmapBuffer () - ); - - if ( MOAIGfxMgr::Get ().LogErrors ()) { - this->CleanupOnError (); - return false; - } - this->mTextureSize += mipmap.GetBitmapSize (); - } - } - - MOAIGfxMgr::Get ().ReportTextureAlloc ( this->mDebugName, this->mTextureSize ); - - return true; -} - -//----------------------------------------------------------------// -u32 MOAISingleTexture::GetHeight () { - return this->mHeight; -} - -//----------------------------------------------------------------// -MOAISingleTexture* MOAISingleTexture::GetTextureForUnit ( u32 unit ) { - UNUSED ( unit ); - - assert ( unit == 0 ); - - return this; -} - -//----------------------------------------------------------------// -u32 MOAISingleTexture::GetWidth () { - return this->mWidth; -} - -//----------------------------------------------------------------// -MOAISingleTexture::MOAISingleTexture () : - mGLTexID ( 0 ), - mWidth ( 0 ), - mHeight ( 0 ), - mMinFilter ( ZGL_SAMPLE_LINEAR ), - mMagFilter ( ZGL_SAMPLE_NEAREST ), - mWrap ( ZGL_WRAP_MODE_CLAMP ), - mTextureSize ( 0 ) { - - RTTI_BEGIN - RTTI_EXTEND ( MOAILuaObject ) - RTTI_EXTEND ( MOAIGfxResource ) - RTTI_END -} - -//----------------------------------------------------------------// -MOAISingleTexture::~MOAISingleTexture () { - - this->OnGPUDeleteOrDiscard ( true ); -} - -//----------------------------------------------------------------// -bool MOAISingleTexture::OnCPUCreate () { - - return true; -} - -//----------------------------------------------------------------// -void MOAISingleTexture::OnCPUDestroy () { -} - -//----------------------------------------------------------------// -void MOAISingleTexture::OnGfxEvent ( u32 event, void* userdata ) { - - MOAIGfxMgr::Get ().ReportTextureAlloc ( this->mDebugName, this->mTextureSize ); - MOAIGfxResource::OnGfxEvent ( event, userdata ); -} - -//----------------------------------------------------------------// -void MOAISingleTexture::OnGPUBind () { - - MOAIGfxMgr::GetDrawingAPI ().BindTexture ( this->mGLTexID ); -} - -//----------------------------------------------------------------// -void MOAISingleTexture::OnGPUDeleteOrDiscard ( bool shouldDelete ) { - - if ( this->mGLTexID && MOAIGfxMgr::IsValid ()) { - MOAIGfxMgr::Get ().ReportTextureFree ( this->mDebugName, this->mTextureSize ); - } - MOAIGfxResourceClerk::DeleteOrDiscardHandle ( this->mGLTexID, shouldDelete ); -} - -//----------------------------------------------------------------// -void MOAISingleTexture::OnGPUUnbind () { - - MOAIGfxMgr::GetDrawingAPI ().BindTexture ( 0 ); -} - -//----------------------------------------------------------------// -bool MOAISingleTexture::OnGPUUpdate () { - - ZLGfx& gfx = MOAIGfxMgr::GetDrawingAPI (); - - gfx.TexParameteri ( ZGL_TEXTURE_WRAP_S, this->mWrap ); - gfx.TexParameteri ( ZGL_TEXTURE_WRAP_T, this->mWrap ); - - gfx.TexParameteri ( ZGL_TEXTURE_MIN_FILTER, this->mMinFilter ); - gfx.TexParameteri ( ZGL_TEXTURE_MAG_FILTER, this->mMagFilter ); - - return true; -} - -//----------------------------------------------------------------// -void MOAISingleTexture::RegisterLuaClass ( MOAILuaState& state ) { - - MOAIGfxResource::RegisterLuaClass ( state ); - - state.SetField ( -1, "GL_LINEAR", ( u32 )ZGL_SAMPLE_LINEAR ); - state.SetField ( -1, "GL_LINEAR_MIPMAP_LINEAR", ( u32 )ZGL_SAMPLE_LINEAR_MIPMAP_LINEAR ); - state.SetField ( -1, "GL_LINEAR_MIPMAP_NEAREST", ( u32 )ZGL_SAMPLE_LINEAR_MIPMAP_NEAREST ); - - state.SetField ( -1, "GL_NEAREST", ( u32 )ZGL_SAMPLE_NEAREST ); - state.SetField ( -1, "GL_NEAREST_MIPMAP_LINEAR", ( u32 )ZGL_SAMPLE_NEAREST_MIPMAP_LINEAR ); - state.SetField ( -1, "GL_NEAREST_MIPMAP_NEAREST", ( u32 )ZGL_SAMPLE_NEAREST_MIPMAP_NEAREST ); - - state.SetField ( -1, "GL_RGBA4", ( u32 )ZGL_PIXEL_FORMAT_RGBA4 ); - state.SetField ( -1, "GL_RGB5_A1", ( u32 )ZGL_PIXEL_FORMAT_RGB5_A1 ); - state.SetField ( -1, "GL_DEPTH_COMPONENT16", ( u32 )ZGL_PIXEL_FORMAT_DEPTH_COMPONENT16 ); - //***state.SetField ( -1, "GL_DEPTH_COMPONENT24", ( u32 )GL_DEPTH_COMPONENT24 ); - //***state.SetField ( -1, "GL_STENCIL_INDEX1", ( u32 )GL_STENCIL_INDEX1 ); - //***state.SetField ( -1, "GL_STENCIL_INDEX4", ( u32 )GL_STENCIL_INDEX4 ); - state.SetField ( -1, "GL_STENCIL_INDEX8", ( u32 )ZGL_PIXEL_FORMAT_STENCIL_INDEX8 ); - //***state.SetField ( -1, "GL_STENCIL_INDEX16", ( u32 )GL_STENCIL_INDEX16 ); - - // TODO: - #ifdef MOAI_OS_ANDROID - state.SetField ( -1, "GL_RGB565", ( u32 )ZGL_PIXEL_FORMAT_RGB565 ); - #else - state.SetField ( -1, "GL_RGBA8", ( u32 )ZGL_PIXEL_FORMAT_RGBA8 ); - #endif -} - -//----------------------------------------------------------------// -void MOAISingleTexture::RegisterLuaFuncs ( MOAILuaState& state ) { - - MOAIGfxResource::RegisterLuaFuncs ( state ); - - luaL_Reg regTable [] = { - { "getSize", _getSize }, - { "release", _release }, - { "setDebugName", _setDebugName }, - { "setFilter", _setFilter }, - { "setWrap", _setWrap }, - { NULL, NULL } - }; - - luaL_register ( state, 0, regTable ); -} - -//----------------------------------------------------------------// -void MOAISingleTexture::SerializeIn ( MOAILuaState& state, MOAIDeserializer& serializer ) { - UNUSED ( state ); - UNUSED ( serializer ); -} - -//----------------------------------------------------------------// -void MOAISingleTexture::SerializeOut ( MOAILuaState& state, MOAISerializer& serializer ) { - UNUSED ( state ); - UNUSED ( serializer ); -} - -//----------------------------------------------------------------// -void MOAISingleTexture::SetFilter ( int filter ) { - - this->SetFilter ( filter, filter ); -} - -//----------------------------------------------------------------// -void MOAISingleTexture::SetFilter ( int min, int mag ) { - - this->mMinFilter = min; - this->mMagFilter = mag; - - this->ScheduleForGPUUpdate (); -} - -//----------------------------------------------------------------// -void MOAISingleTexture::SetTextureID ( ZLGfxHandle* glTexID, int internalFormat, int pixelType, size_t textureSize ) { - - this->mGLTexID = glTexID; - this->mGLInternalFormat = internalFormat; - this->mGLPixelType = pixelType; - this->mTextureSize = textureSize; - - this->ScheduleForGPUUpdate (); -} - -//----------------------------------------------------------------// -void MOAISingleTexture::SetWrap ( int wrap ) { - - this->mWrap = wrap; - - this->ScheduleForGPUUpdate (); -} - -//----------------------------------------------------------------// -bool MOAISingleTexture::ShouldGenerateMipmaps () { - - return ( - ( this->mMinFilter == ZGL_SAMPLE_LINEAR_MIPMAP_LINEAR ) || - ( this->mMinFilter == ZGL_SAMPLE_LINEAR_MIPMAP_NEAREST ) || - ( this->mMinFilter == ZGL_SAMPLE_NEAREST_MIPMAP_LINEAR ) || - ( this->mMinFilter == ZGL_SAMPLE_NEAREST_MIPMAP_NEAREST ) - ); -} - -//----------------------------------------------------------------// -bool MOAISingleTexture::UpdateTextureFromImage ( MOAIImage& image, ZLIntRect rect ) { - - // TODO: what happens when image is an unsupported format? - - // if we need to generate mipmaps or the dimensions have changed, clear out the old texture - if ( this->ShouldGenerateMipmaps () || ( this->mWidth != image.GetWidth ()) || ( this->mHeight != image.GetHeight ())) { - - MOAIGfxMgr::Get ().ReportTextureFree ( this->mDebugName, this->mTextureSize ); - MOAIGfxResourceClerk::DeleteOrDiscardHandle ( this->mGLTexID, false ); - - if ( this->CreateTextureFromImage ( image )) { - MOAIGfxMgr::Get ().ReportTextureAlloc ( this->mDebugName, this->mTextureSize ); - return true; - } - return false; - } - - ZLGfx& gfx = MOAIGfxMgr::GetDrawingAPI (); - - // if the texture exists just update the sub-region - // otherwise create a new texture from the image - if ( this->mGLTexID ) { - - gfx.BindTexture ( this->mGLTexID ); - - rect.Bless (); - ZLIntRect imageRect = image.GetRect (); - imageRect.Clip ( rect ); - - ZLSharedConstBuffer* bitmapBuffer = image.GetBitmapBuffer (); - - MOAIImage subImage; - if (( this->mWidth != ( u32 )rect.Width ()) || ( this->mHeight != ( u32 )rect.Height ())) { - subImage.GetSubImage ( image, rect ); // TODO: need to convert to correct format for texture - bitmapBuffer = subImage.GetBitmapBuffer (); - } - - gfx.TexSubImage2D ( - 0, - rect.mXMin, - rect.mYMin, - rect.Width (), - rect.Height (), - this->mGLInternalFormat, - this->mGLPixelType, - bitmapBuffer - ); - - MOAIGfxMgr::Get ().LogErrors (); - - return true; - } - - return false; -} From 0c551751ba9279475659fb1c850685eea4358412 Mon Sep 17 00:00:00 2001 From: David Pershouse Date: Sat, 14 Oct 2017 00:03:02 +1000 Subject: [PATCH 6/9] Support non luajit compiles --- src/moai-core/host.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/moai-core/host.cpp b/src/moai-core/host.cpp index c9d9086d33..419d9f3dde 100644 --- a/src/moai-core/host.cpp +++ b/src/moai-core/host.cpp @@ -97,6 +97,7 @@ int _loadFuncFromBuffer ( MOAIDataBuffer& buffer, cc8* chunkname, int compressed MOAIDataBufferScopedLock lock ( buffer, ( void** )&data, &size ); + #ifndef MOAI_WITH_LUAJIT MOAILuaHeader header; header.Read ( data, size ); @@ -114,6 +115,10 @@ int _loadFuncFromBuffer ( MOAIDataBuffer& buffer, cc8* chunkname, int compressed // trim trailing nulls from non-bytecode while (( size > 1 ) && ( data [ size - 1 ] == 0 )) --size; } + #else + // trim trailing nulls from non-bytecode + while (( size > 1 ) && ( data [ size - 1 ] == 0 )) --size; + #endif MOAIScopedLuaState state = MOAILuaRuntime::Get ().State (); From 0086e03a303a5c353ee4bf036f36f0311a4dfc1b Mon Sep 17 00:00:00 2001 From: David Pershouse Date: Sun, 15 Oct 2017 00:25:15 +1000 Subject: [PATCH 7/9] silence warnings in vs2017 --- src/moai-assimp/MOAIAssimpAnimation.cpp | 12 ++++++------ src/moai-assimp/MOAIAssimpCamera.cpp | 18 +++++++++--------- src/moai-assimp/MOAIAssimpMesh.cpp | 6 +++--- src/moai-assimp/MOAIAssimpUtil.cpp | 1 + src/moai-sim/MOAIGfxStateCache.cpp | 2 ++ 5 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/moai-assimp/MOAIAssimpAnimation.cpp b/src/moai-assimp/MOAIAssimpAnimation.cpp index fd08017257..b27242f9c7 100644 --- a/src/moai-assimp/MOAIAssimpAnimation.cpp +++ b/src/moai-assimp/MOAIAssimpAnimation.cpp @@ -159,7 +159,7 @@ MOAIAnimCurveBone* MOAIAssimpAnimation::GetAnimCurve ( u32 channel ) { if ( posKey ) { - p0 = ZLVec3D ( posKey->mValue.x, posKey->mValue.y, posKey->mValue.z ); + p0 = ZLVec3D ( (float) posKey->mValue.x, (float) posKey->mValue.y, (float) posKey->mValue.z ); if ( t == posKey->mTime ) { iPos++; @@ -167,14 +167,14 @@ MOAIAnimCurveBone* MOAIAssimpAnimation::GetAnimCurve ( u32 channel ) { else { ZLVec3D p1 = p0; const aiVectorKey& posKeyPrev = nodeAnim->mPositionKeys [ iPos > 0 ? iPos - 1 : 0 ]; - p0 = ZLVec3D ( posKeyPrev.mValue.x, posKeyPrev.mValue.y, posKeyPrev.mValue.z ); + p0 = ZLVec3D ((float) posKeyPrev.mValue.x, (float) posKeyPrev.mValue.y, (float) posKeyPrev.mValue.z ); p0.Lerp ( p1, (float) (( t - posKeyPrev.mTime ) / ( posKey->mTime - posKeyPrev.mTime ))); } } if ( rotKey ) { - q0 = ZLQuaternion ( rotKey->mValue.w, rotKey->mValue.x, rotKey->mValue.y, rotKey->mValue.z ); + q0 = ZLQuaternion ((float) rotKey->mValue.w, (float) rotKey->mValue.x, (float)rotKey->mValue.y, (float) rotKey->mValue.z ); if ( t == posKey->mTime ) { iRot++; @@ -182,14 +182,14 @@ MOAIAnimCurveBone* MOAIAssimpAnimation::GetAnimCurve ( u32 channel ) { else { ZLQuaternion q1 = q0; const aiQuatKey& rotKeyPrev = nodeAnim->mRotationKeys [ iRot > 0 ? iRot - 1 : 0 ]; - q0 = ZLQuaternion ( rotKeyPrev.mValue.w, rotKeyPrev.mValue.x, rotKeyPrev.mValue.y, rotKeyPrev.mValue.z ); + q0 = ZLQuaternion ((float) rotKeyPrev.mValue.w, (float) rotKeyPrev.mValue.x, (float) rotKeyPrev.mValue.y, (float) rotKeyPrev.mValue.z ); q0.Slerp ( q0, q1, (float) (( t - rotKeyPrev.mTime ) / ( rotKey->mTime - rotKeyPrev.mTime ))); } } if ( sclKey ) { - s0 = ZLVec3D ( sclKey->mValue.x, sclKey->mValue.y, sclKey->mValue.z ); + s0 = ZLVec3D ((float) sclKey->mValue.x, (float) sclKey->mValue.y, (float) sclKey->mValue.z ); if ( t == posKey->mTime ) { iScl++; @@ -197,7 +197,7 @@ MOAIAnimCurveBone* MOAIAssimpAnimation::GetAnimCurve ( u32 channel ) { else { ZLVec3D s1 = s0; const aiVectorKey& sclKeyPrev = nodeAnim->mScalingKeys [ iScl > 0 ? iScl - 1 : 0 ]; - s0 = ZLVec3D ( sclKeyPrev.mValue.x, sclKeyPrev.mValue.y, sclKeyPrev.mValue.z ); + s0 = ZLVec3D ((float) sclKeyPrev.mValue.x, (float) sclKeyPrev.mValue.y, (float) sclKeyPrev.mValue.z ); s0.Lerp ( s1, (float) (( t - sclKeyPrev.mTime ) / ( sclKey->mTime - sclKeyPrev.mTime ))); } } diff --git a/src/moai-assimp/MOAIAssimpCamera.cpp b/src/moai-assimp/MOAIAssimpCamera.cpp index ccac0bf6f6..373d46783c 100644 --- a/src/moai-assimp/MOAIAssimpCamera.cpp +++ b/src/moai-assimp/MOAIAssimpCamera.cpp @@ -158,21 +158,21 @@ int MOAIAssimpCamera::_getYawAngle ( lua_State *L ) { //----------------------------------------------------------------// float MOAIAssimpCamera::CalculatePitch(aiQuaternion quaternion) { - return asin ( 2.0f * quaternion.z * quaternion.y + 2.0f * quaternion.x * quaternion. w ); + return (float) asin ( 2.0f * quaternion.z * quaternion.y + 2.0f * quaternion.x * quaternion. w ); } //----------------------------------------------------------------// float MOAIAssimpCamera::CalculateRoll ( aiQuaternion quaternion ) { - float x2 = quaternion.x * quaternion.x; - float z2 = quaternion.z * quaternion.z; - return atan2 ( 2.0f * quaternion.z * quaternion.w - 2.0f * quaternion.y * quaternion.x, 1.0f- 2.0f * z2 - 2.0f * x2 ); + float x2 = (float) quaternion.x * (float) quaternion.x; + float z2 = (float) quaternion.z * (float) quaternion.z; + return (float) atan2 ( 2.0f * quaternion.z * quaternion.w - 2.0f * quaternion.y * quaternion.x, 1.0f- 2.0f * z2 - 2.0f * x2 ); } //----------------------------------------------------------------// float MOAIAssimpCamera::CalculateYaw ( aiQuaternion quaternion ) { - float x2 = quaternion.x * quaternion.x; - float y2 = quaternion.y * quaternion.y; - return atan2 ( 2.0f * quaternion.y * quaternion.w - 2.0f * quaternion.z * quaternion.x , 1.0f - 2.0f * x2 - 2.0f * y2 ); + float x2 = (float) quaternion.x * (float) quaternion.x; + float y2 = (float) quaternion.y * (float) quaternion.y; + return (float) atan2 ( 2.0f * quaternion.y * quaternion.w - 2.0f * quaternion.z * quaternion.x , 1.0f - 2.0f * x2 - 2.0f * y2 ); } //----------------------------------------------------------------// @@ -228,8 +228,8 @@ void MOAIAssimpCamera::SetCamera ( aiCamera *assimpCamera ) { transform.Decompose ( this->mScaling, this->mRotation, this->mPosition ); this->mMoaiCamera = new MOAICamera (); - this->mMoaiCamera->SetLoc ( this->mPosition.x , this->mPosition.y , this->mPosition.z ); - this->mMoaiCamera->SetScl ( this->mScaling.x , this->mScaling.y , this->mScaling.z ); + this->mMoaiCamera->SetLoc ((float) this->mPosition.x , (float) this->mPosition.y , (float) this->mPosition.z ); + this->mMoaiCamera->SetScl ((float) this->mScaling.x , (float) this->mScaling.y , (float) this->mScaling.z ); this->mMoaiCamera->SetRot ( ( float )( this->CalculatePitch ( this->mRotation) * R2D ), ( float )( this->CalculateYaw ( this->mRotation) * R2D ), diff --git a/src/moai-assimp/MOAIAssimpMesh.cpp b/src/moai-assimp/MOAIAssimpMesh.cpp index 4ffd514e01..d537ef407f 100644 --- a/src/moai-assimp/MOAIAssimpMesh.cpp +++ b/src/moai-assimp/MOAIAssimpMesh.cpp @@ -490,11 +490,11 @@ u32 MOAIAssimpMesh::ReadVertices ( const MOAIVertexFormat& format, ZLStream& str format.SeekVertex ( stream, base, i ); aiVector3D vertex = mesh->mVertices [ i ]; - format.WriteCoord ( stream, 0, vertex.x, vertex.y, vertex.z, 1.0f ); + format.WriteCoord ( stream, 0, (float) vertex.x, (float) vertex.y, (float) vertex.z, 1.0f ); if ( mesh->HasVertexColors ( 0 )) { aiColor4D color = mesh->mColors [ 0 ][ i ]; - format.WriteColor ( stream, 0, color.r, color.g, color.b, color.a ); + format.WriteColor ( stream, 0, (float) color.r, (float) color.g, (float) color.b, (float) color.a ); } else { format.WriteColor ( stream, 0, 0xffffffff ); @@ -502,7 +502,7 @@ u32 MOAIAssimpMesh::ReadVertices ( const MOAIVertexFormat& format, ZLStream& str if ( mesh->HasTextureCoords ( 0 )) { aiVector3D uvw = mesh->mTextureCoords [ 0 ][ i ]; - format.WriteUV ( stream, 0, uvw.x, uvw.y, uvw.z ); + format.WriteUV ( stream, 0, (float) uvw.x, (float) uvw.y, (float) uvw.z ); } if ( boneBuffer ) { diff --git a/src/moai-assimp/MOAIAssimpUtil.cpp b/src/moai-assimp/MOAIAssimpUtil.cpp index 3d055f69f3..a36dc2e624 100644 --- a/src/moai-assimp/MOAIAssimpUtil.cpp +++ b/src/moai-assimp/MOAIAssimpUtil.cpp @@ -174,6 +174,7 @@ void MOAIAssimpUtil::PushNode ( lua_State* L, const aiNode* node ) { int stackOK = lua_checkstack ( L, 4 ); assert ( stackOK ); + UNUSED(stackOK); if ( !node ) return; diff --git a/src/moai-sim/MOAIGfxStateCache.cpp b/src/moai-sim/MOAIGfxStateCache.cpp index 0de4693a8f..5be5d777d0 100644 --- a/src/moai-sim/MOAIGfxStateCache.cpp +++ b/src/moai-sim/MOAIGfxStateCache.cpp @@ -211,6 +211,8 @@ void MOAIGfxStateCache::ApplyStateChanges () { //----------------------------------------------------------------// void MOAIGfxStateCache::BindVertexBufferWithFormat ( MOAIVertexBufferWithFormat& bufferWithFormat, bool useVAOs ) { + UNUSED(useVAOs); + MOAIVertexBuffer* buffer = bufferWithFormat.mBuffer; MOAIVertexFormat* format = bufferWithFormat.mFormat; From cff73eba80346f67cbf96c30afff165a89be8a3d Mon Sep 17 00:00:00 2001 From: David Pershouse Date: Sun, 15 Oct 2017 00:26:33 +1000 Subject: [PATCH 8/9] get vs2017 building again --- src/moai-sim/MOAIFont_bmfont.cpp | 4 +- vs2015/assimp/assimp.vcxproj | 75 +++++++++++++++---- vs2015/assimp/assimp.vcxproj.filters | 63 +++++++++++++--- .../moai-lib-assimp/moai-lib-assimp.vcxproj | 8 +- vs2015/moai.sln | 10 ++- 5 files changed, 124 insertions(+), 36 deletions(-) diff --git a/src/moai-sim/MOAIFont_bmfont.cpp b/src/moai-sim/MOAIFont_bmfont.cpp index d07d6644b3..2b42faf5c8 100644 --- a/src/moai-sim/MOAIFont_bmfont.cpp +++ b/src/moai-sim/MOAIFont_bmfont.cpp @@ -11,9 +11,11 @@ #if defined( _WIN32 ) #define strcasecmp(str1, str2) ( stricmp ( str1,str2 )) +#else + #include #endif -#include + #define WIDE_ID_BIT 0x80000000 #define WIDE_ID_MASK 0x7fffffff diff --git a/vs2015/assimp/assimp.vcxproj b/vs2015/assimp/assimp.vcxproj index c992485165..7a1b48719e 100644 --- a/vs2015/assimp/assimp.vcxproj +++ b/vs2015/assimp/assimp.vcxproj @@ -23,6 +23,9 @@ + + + @@ -44,6 +47,7 @@ + @@ -54,6 +58,7 @@ + @@ -82,6 +87,7 @@ + @@ -100,6 +106,7 @@ + @@ -131,6 +138,11 @@ + + + + + @@ -146,6 +158,9 @@ + + + @@ -201,6 +216,10 @@ + + + + @@ -208,7 +227,6 @@ - @@ -301,6 +319,7 @@ + @@ -315,6 +334,10 @@ + + + + @@ -333,13 +356,16 @@ + + + @@ -367,6 +393,7 @@ + @@ -380,12 +407,8 @@ - - /bigobj %(AdditionalOptions) - /bigobj %(AdditionalOptions) - /bigobj %(AdditionalOptions) - /bigobj %(AdditionalOptions) - + + @@ -409,6 +432,8 @@ + + @@ -422,6 +447,8 @@ + + @@ -438,6 +465,7 @@ + @@ -463,12 +491,24 @@ + + + + + + + + + + + + + - @@ -483,6 +523,9 @@ + + + {EEB0E2FC-4B26-49D4-98C6-0BF34C44AC2E} assimp @@ -552,8 +595,8 @@ Disabled - ..\..\src;..\..\3rdparty\assimp-config;..\..\3rdparty\assimp;..\..\3rdparty\assimp\include;..\..\3rdparty\assimp\contrib\openddlparser\include;..\..\3rdparty\assimp\contrib\rapidjson\include;..\..\3rdparty\zlib-1.2.8;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;OPENDDL_STATIC_LIBARY;ASSIMP_BUILD_NO_C4D_IMPORTER;ASSIMP_BUILD_NO_OPENGEX_EXPORTER;ASSIMP_BUILD_NO_OPENGEX_IMPORTER;ASSIMP_BUILD_NO_OWN_ZLIB;DEBUG;_DEBUG;%(PreprocessorDefinitions) + ..\..\src;..\..\3rdparty\assimp-config;..\..\3rdparty\assimp;..\..\3rdparty\assimp\include;..\..\3rdparty\assimp\contrib\openddlparser\include;..\..\3rdparty\assimp\contrib\irrXML;..\..\3rdparty\assimp\contrib\rapidjson\include;..\..\3rdparty\zlib-1.2.8;%(AdditionalIncludeDirectories) + WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;OPENDDL_STATIC_LIBARY;ASSIMP_BUILD_NO_AMF_IMPORTER;ASSIMP_BUILD_NO_C4D_IMPORTER;ASSIMP_BUILD_NO_X3D_IMPORTER;ASSIMP_BUILD_NO_X3D_EXPORTER;ASSIMP_BUILD_NO_OPENGEX_EXPORTER;ASSIMP_BUILD_NO_OPENGEX_IMPORTER;ASSIMP_BUILD_NO_OWN_ZLIB;DEBUG;_DEBUG;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL $(OutDir)$(ProjectName).pdb @@ -578,8 +621,8 @@ Disabled - ..\..\src;..\..\3rdparty\assimp-config;..\..\3rdparty\assimp;..\..\3rdparty\assimp\include;..\..\3rdparty\assimp\contrib\openddlparser\include;..\..\3rdparty\assimp\contrib\rapidjson\include;..\..\3rdparty\zlib-1.2.8;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;OPENDDL_STATIC_LIBARY;ASSIMP_BUILD_NO_C4D_IMPORTER;ASSIMP_BUILD_NO_OPENGEX_EXPORTER;ASSIMP_BUILD_NO_OPENGEX_IMPORTER;ASSIMP_BUILD_NO_OWN_ZLIB;DEBUG;_DEBUG;%(PreprocessorDefinitions) + ..\..\src;..\..\3rdparty\assimp-config;..\..\3rdparty\assimp;..\..\3rdparty\assimp\include;..\..\3rdparty\assimp\contrib\openddlparser\include;..\..\3rdparty\assimp\contrib\irrXML;..\..\3rdparty\assimp\contrib\rapidjson\include;..\..\3rdparty\zlib-1.2.8;%(AdditionalIncludeDirectories) + WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;OPENDDL_STATIC_LIBARY;ASSIMP_BUILD_NO_AMF_IMPORTER;ASSIMP_BUILD_NO_C4D_IMPORTER;ASSIMP_BUILD_NO_X3D_IMPORTER;ASSIMP_BUILD_NO_X3D_EXPORTER;ASSIMP_BUILD_NO_OPENGEX_EXPORTER;ASSIMP_BUILD_NO_OPENGEX_IMPORTER;ASSIMP_BUILD_NO_OWN_ZLIB;DEBUG;_DEBUG;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL $(OutDir)$(ProjectName).pdb @@ -600,8 +643,8 @@ true Size true - ..\..\src;..\..\3rdparty\assimp-config;..\..\3rdparty\assimp;..\..\3rdparty\assimp\include;..\..\3rdparty\assimp\contrib\openddlparser\include;..\..\3rdparty\assimp\contrib\rapidjson\include;..\..\3rdparty\zlib-1.2.8;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;OPENDDL_STATIC_LIBARY;ASSIMP_BUILD_NO_C4D_IMPORTER;ASSIMP_BUILD_NO_OPENGEX_EXPORTER;ASSIMP_BUILD_NO_OPENGEX_IMPORTER;ASSIMP_BUILD_NO_OWN_ZLIB;NDEBUG;%(PreprocessorDefinitions) + ..\..\src;..\..\3rdparty\assimp-config;..\..\3rdparty\assimp;..\..\3rdparty\assimp\include;..\..\3rdparty\assimp\contrib\openddlparser\include;..\..\3rdparty\assimp\contrib\irrXML;..\..\3rdparty\assimp\contrib\rapidjson\include;..\..\3rdparty\zlib-1.2.8;%(AdditionalIncludeDirectories) + WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;OPENDDL_STATIC_LIBARY;ASSIMP_BUILD_NO_AMF_IMPORTER;ASSIMP_BUILD_NO_C4D_IMPORTER;ASSIMP_BUILD_NO_X3D_IMPORTER;ASSIMP_BUILD_NO_X3D_EXPORTER;ASSIMP_BUILD_NO_OPENGEX_EXPORTER;ASSIMP_BUILD_NO_OPENGEX_IMPORTER;ASSIMP_BUILD_NO_OWN_ZLIB;NDEBUG;%(PreprocessorDefinitions) MultiThreadedDLL $(OutDir)$(ProjectName).pdb TurnOffAllWarnings @@ -629,8 +672,8 @@ true Size true - ..\..\src;..\..\3rdparty\assimp-config;..\..\3rdparty\assimp;..\..\3rdparty\assimp\include;..\..\3rdparty\assimp\contrib\openddlparser\include;..\..\3rdparty\assimp\contrib\rapidjson\include;..\..\3rdparty\zlib-1.2.8;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;OPENDDL_STATIC_LIBARY;ASSIMP_BUILD_NO_C4D_IMPORTER;ASSIMP_BUILD_NO_OPENGEX_EXPORTER;ASSIMP_BUILD_NO_OPENGEX_IMPORTER;ASSIMP_BUILD_NO_OWN_ZLIB;NDEBUG;%(PreprocessorDefinitions) + ..\..\src;..\..\3rdparty\assimp-config;..\..\3rdparty\assimp;..\..\3rdparty\assimp\include;..\..\3rdparty\assimp\contrib\openddlparser\include;..\..\3rdparty\assimp\contrib\irrXML;..\..\3rdparty\assimp\contrib\rapidjson\include;..\..\3rdparty\zlib-1.2.8;%(AdditionalIncludeDirectories) + WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;OPENDDL_STATIC_LIBARY;ASSIMP_BUILD_NO_AMF_IMPORTER;ASSIMP_BUILD_NO_C4D_IMPORTER;ASSIMP_BUILD_NO_X3D_IMPORTER;ASSIMP_BUILD_NO_X3D_EXPORTER;ASSIMP_BUILD_NO_OPENGEX_EXPORTER;ASSIMP_BUILD_NO_OPENGEX_IMPORTER;ASSIMP_BUILD_NO_OWN_ZLIB;NDEBUG;%(PreprocessorDefinitions) MultiThreadedDLL $(OutDir)$(ProjectName).pdb $(IntDir) diff --git a/vs2015/assimp/assimp.vcxproj.filters b/vs2015/assimp/assimp.vcxproj.filters index 7afbc01f20..fda9aa2a4d 100644 --- a/vs2015/assimp/assimp.vcxproj.filters +++ b/vs2015/assimp/assimp.vcxproj.filters @@ -16,9 +16,6 @@ {e093da70-bb64-4dc6-af51-c8fc53cb0395} - - {dc380576-aa06-47e0-9e54-c8217125e121} - {ae6e8fe4-8e5d-4e44-9c90-0f7b36048943} @@ -732,9 +729,6 @@ contrib\clipper - - contrib\ConvertUTF - contrib\irrXML @@ -888,6 +882,25 @@ contrib\unzip + + + + + + + + + + + + + + + + + + + @@ -923,6 +936,7 @@ code + @@ -1132,9 +1146,6 @@ code - - code - code @@ -1381,9 +1392,6 @@ contrib\clipper - - contrib\ConvertUTF - contrib\irrXML @@ -1423,5 +1431,36 @@ contrib\unzip + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/vs2015/moai-lib-assimp/moai-lib-assimp.vcxproj b/vs2015/moai-lib-assimp/moai-lib-assimp.vcxproj index 5208fe684e..ce18ca81ae 100644 --- a/vs2015/moai-lib-assimp/moai-lib-assimp.vcxproj +++ b/vs2015/moai-lib-assimp/moai-lib-assimp.vcxproj @@ -113,7 +113,7 @@ Disabled - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\box2d-2.3.0;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\tinyxml;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\assimp\include;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\box2d-2.3.0;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\tinyxml;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\assimp-config;..\..\3rdparty\assimp\include;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;_DEBUG;%(PreprocessorDefinitions) true Sync @@ -147,7 +147,7 @@ Disabled - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\box2d-2.3.0;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\tinyxml;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\assimp\include;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\box2d-2.3.0;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\tinyxml;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\assimp-config;..\..\3rdparty\assimp\include;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;_DEBUG;%(PreprocessorDefinitions) true Sync @@ -182,7 +182,7 @@ false Speed false - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\box2d-2.3.0;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\tinyxml;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\assimp\include;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\box2d-2.3.0;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\tinyxml;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\assimp-config;..\..\3rdparty\assimp\include;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions) true Sync @@ -222,7 +222,7 @@ Size true true - ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\box2d-2.3.0;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\tinyxml;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\assimp\include;%(AdditionalIncludeDirectories) + ..\..\src;..\..\src\config;..\..\src\config-default;..\..\3rdparty;..\..\3rdparty\sfmt-1.4;..\..\3rdparty\box2d-2.3.0;..\..\3rdparty\lua-5.1.3\src;..\..\3rdparty\zlib-1.2.8;..\..\3rdparty\tinyxml;..\..\3rdparty\expat-2.0.1\lib;..\..\3rdparty\jansson-2.1\src;..\..\3rdparty\box2d-2.2.1;..\..\3rdparty\freetype-2.4.4\include;..\..\3rdparty\assimp-config;..\..\3rdparty\assimp\include;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions) true Sync diff --git a/vs2015/moai.sln b/vs2015/moai.sln index 809bef25bf..6ead5eb69a 100644 --- a/vs2015/moai.sln +++ b/vs2015/moai.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26430.16 +VisualStudioVersion = 15.0.27004.2002 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3rd Party", "3rd Party", "{3C05055B-3444-43CB-8793-D469F0D40706}" EndProject @@ -140,6 +140,9 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "assimp", "assimp\assimp.vcxproj", "{EEB0E2FC-4B26-49D4-98C6-0BF34C44AC2E}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "moai-lib-assimp", "moai-lib-assimp\moai-lib-assimp.vcxproj", "{A90989F3-8C14-487B-9127-C89A9D53630C}" + ProjectSection(ProjectDependencies) = postProject + {EEB0E2FC-4B26-49D4-98C6-0BF34C44AC2E} = {EEB0E2FC-4B26-49D4-98C6-0BF34C44AC2E} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "moai-lib-image-tga", "moai-lib-image-tga\moai-lib-image-tga.vcxproj", "{18093173-A50D-42A3-9066-1301BF1F5D14}" EndProject @@ -700,8 +703,9 @@ Global {46CF2D25-6A36-4189-B59C-E4815388E554} = {3C05055B-3444-43CB-8793-D469F0D40706} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - AMDCaPersistentConfig = Debug|Win32 - AMDCaPersistentStartup = moai (Utilities\moai) AMDCaProjectFile = C:\Documents and Settings\Patrick\My Documents\git\moai\vs2008\CodeAnalyst\moai.caw + AMDCaPersistentStartup = moai (Utilities\moai) + AMDCaPersistentConfig = Debug|Win32 + SolutionGuid = {2A8C43A2-FD0E-4965-85FF-8890DF1A5E33} EndGlobalSection EndGlobal From d58747c280862d505fd476dc787045bec7794d22 Mon Sep 17 00:00:00 2001 From: David Pershouse Date: Sun, 15 Oct 2017 00:27:01 +1000 Subject: [PATCH 9/9] this will be moai 2.0 --- src/moai-core/moai_version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/moai-core/moai_version.h b/src/moai-core/moai_version.h index b1fa116e57..c44852a72f 100644 --- a/src/moai-core/moai_version.h +++ b/src/moai-core/moai_version.h @@ -4,8 +4,8 @@ // DO NOT EVER MODIFY THIS FILE // this file should *only* be touched by the build server - #define MOAI_SDK_VERSION_MAJOR 1 // int - #define MOAI_SDK_VERSION_MINOR 8 // int + #define MOAI_SDK_VERSION_MAJOR 2 // int + #define MOAI_SDK_VERSION_MINOR 0 // int #define MOAI_SDK_VERSION_REVISION 0 // int #endif