From 27b2f2aedbaa2c7cb145b49dc365750ba18fd92d Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Mon, 22 Aug 2016 17:12:50 -1000 Subject: [PATCH] Windows build fixes --- CMakeLists.txt | 7 ++++--- Runtime/Camera/CFirstPersonCamera.cpp | 1 + Runtime/Character/CAnimData.cpp | 2 ++ Runtime/Character/CAnimData.hpp | 1 + Runtime/Character/CAssetFactory.cpp | 1 + Runtime/Character/CCharacterFactory.cpp | 1 + Runtime/Character/CModelData.cpp | 2 +- Runtime/Graphics/CSkinnedModel.cpp | 1 + Runtime/MP1/CBeetle.cpp | 1 + Runtime/MP1/CMFGame.cpp | 1 + Runtime/MP1/CMainFlow.cpp | 1 + Runtime/MP1/CNewIntroBoss.cpp | 1 + Runtime/MP1/CSpacePirate.cpp | 1 + Runtime/MP1/CWarWasp.cpp | 1 + Runtime/MP1/MP1.cpp | 1 + Runtime/World/CGunController.cpp | 1 + 16 files changed, 20 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ffe625e8f..4b9ecfdfb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,8 @@ if(MSVC) endif() # Shaddup MSVC - add_definitions(-DUNICODE=1 -D_UNICODE=1 -D__SSE__=1 -D_CRT_SECURE_NO_WARNINGS=1 -DD_SCL_SECURE_NO_WARNINGS=1 /IGNORE:4221 /wd4800 /wd4005 /wd4311 /wd4267 /wd4244 /wd4305 ${VS_DEFINES}) + add_definitions(-DUNICODE=1 -D_UNICODE=1 -D__SSE__=1 -D_CRT_SECURE_NO_WARNINGS=1 -DD_SCL_SECURE_NO_WARNINGS=1 + /IGNORE:4221 /wd4800 /wd4005 /wd4311 /wd4267 /wd4244 /wd4200 /wd4305 ${VS_DEFINES}) # Link-time Code Generation for Release builds set(CMAKE_C_FLAGS_RELEASE "/DNDEBUG /O2 /Oy /GL /Gy /MD") @@ -48,8 +49,8 @@ if(USE_LD_GOLD AND ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto") message(STATUS "GNU gold linker enabled.") else() - message(WARNING "GNU gold linker isn't available, using the default system linker.") - set(USE_LD_GOLD OFF) + message(WARNING "GNU gold linker isn't available, using the default system linker.") + set(USE_LD_GOLD OFF) endif() endif() diff --git a/Runtime/Camera/CFirstPersonCamera.cpp b/Runtime/Camera/CFirstPersonCamera.cpp index 528839444..c8c340f97 100644 --- a/Runtime/Camera/CFirstPersonCamera.cpp +++ b/Runtime/Camera/CFirstPersonCamera.cpp @@ -1,4 +1,5 @@ #include "CFirstPersonCamera.hpp" +#include "Character/CCharLayoutInfo.hpp" namespace urde { diff --git a/Runtime/Character/CAnimData.cpp b/Runtime/Character/CAnimData.cpp index 075250b00..5cff954a0 100644 --- a/Runtime/Character/CAnimData.cpp +++ b/Runtime/Character/CAnimData.cpp @@ -101,6 +101,8 @@ SAdvancementDeltas CAnimData::AdvanceAdditiveAnims(float dt) { } } + + return {}; } SAdvancementDeltas CAnimData::UpdateAdditiveAnims(float dt) diff --git a/Runtime/Character/CAnimData.hpp b/Runtime/Character/CAnimData.hpp index 8a56f0aa8..d0553073e 100644 --- a/Runtime/Character/CAnimData.hpp +++ b/Runtime/Character/CAnimData.hpp @@ -8,6 +8,7 @@ #include "CPoseAsTransforms.hpp" #include "CHierarchyPoseBuilder.hpp" #include "CAdditiveAnimPlayback.hpp" +#include "CCharLayoutInfo.hpp" #include enum class EUserEventType diff --git a/Runtime/Character/CAssetFactory.cpp b/Runtime/Character/CAssetFactory.cpp index abaed162d..be15e0a0d 100644 --- a/Runtime/Character/CAssetFactory.cpp +++ b/Runtime/Character/CAssetFactory.cpp @@ -3,6 +3,7 @@ #include "CCharacterFactory.hpp" #include "GameGlobalObjects.hpp" #include "CModelData.hpp" +#include "Character/CCharLayoutInfo.hpp" namespace urde { diff --git a/Runtime/Character/CCharacterFactory.cpp b/Runtime/Character/CCharacterFactory.cpp index 77d63c654..fcb67416c 100644 --- a/Runtime/Character/CCharacterFactory.cpp +++ b/Runtime/Character/CCharacterFactory.cpp @@ -12,6 +12,7 @@ #include "GameGlobalObjects.hpp" #include "CParticleGenInfo.hpp" #include "Graphics/CSkinnedModel.hpp" +#include "Character/CCharLayoutInfo.hpp" namespace urde { diff --git a/Runtime/Character/CModelData.cpp b/Runtime/Character/CModelData.cpp index 8881936e3..268d37aed 100644 --- a/Runtime/Character/CModelData.cpp +++ b/Runtime/Character/CModelData.cpp @@ -329,7 +329,7 @@ void CModelData::RenderUnsortedParts(EWhichModel which, const zeus::CTransform& void CModelData::Render(EWhichModel which, const zeus::CTransform& xf, const CActorLights* lights, const CModelFlags& drawFlags) -{ +{ if (x14_25_sortThermal && which == EWhichModel::Thermal) { zeus::CColor mul(drawFlags.color.a, drawFlags.color.a, drawFlags.color.a, drawFlags.color.a); diff --git a/Runtime/Graphics/CSkinnedModel.cpp b/Runtime/Graphics/CSkinnedModel.cpp index 2594dc759..bb82b967a 100644 --- a/Runtime/Graphics/CSkinnedModel.cpp +++ b/Runtime/Graphics/CSkinnedModel.cpp @@ -1,4 +1,5 @@ #include "CSkinnedModel.hpp" +#include "Character/CSkinRules.hpp" namespace urde { diff --git a/Runtime/MP1/CBeetle.cpp b/Runtime/MP1/CBeetle.cpp index da4d6243a..c07a4a38e 100644 --- a/Runtime/MP1/CBeetle.cpp +++ b/Runtime/MP1/CBeetle.cpp @@ -1,5 +1,6 @@ #include "CBeetle.hpp" #include "World/CDamageInfo.hpp" +#include "Character/CCharLayoutInfo.hpp" namespace urde { diff --git a/Runtime/MP1/CMFGame.cpp b/Runtime/MP1/CMFGame.cpp index 740463ebc..f12cedaa1 100644 --- a/Runtime/MP1/CMFGame.cpp +++ b/Runtime/MP1/CMFGame.cpp @@ -3,6 +3,7 @@ #include "GameGlobalObjects.hpp" #include "CGameState.hpp" #include "MP1.hpp" +#include "Character/CCharLayoutInfo.hpp" namespace urde { diff --git a/Runtime/MP1/CMainFlow.cpp b/Runtime/MP1/CMainFlow.cpp index 67356cd0a..047793ff8 100644 --- a/Runtime/MP1/CMainFlow.cpp +++ b/Runtime/MP1/CMainFlow.cpp @@ -6,6 +6,7 @@ #include "CResFactory.hpp" #include "CFrontEndUI.hpp" #include "GameGlobalObjects.hpp" +#include "Character/CCharLayoutInfo.hpp" namespace urde { diff --git a/Runtime/MP1/CNewIntroBoss.cpp b/Runtime/MP1/CNewIntroBoss.cpp index d720075c6..0788e4304 100644 --- a/Runtime/MP1/CNewIntroBoss.cpp +++ b/Runtime/MP1/CNewIntroBoss.cpp @@ -1,4 +1,5 @@ #include "CNewIntroBoss.hpp" +#include "Character/CCharLayoutInfo.hpp" namespace urde { diff --git a/Runtime/MP1/CSpacePirate.cpp b/Runtime/MP1/CSpacePirate.cpp index 64684f471..26dd8d541 100644 --- a/Runtime/MP1/CSpacePirate.cpp +++ b/Runtime/MP1/CSpacePirate.cpp @@ -1,4 +1,5 @@ #include "CSpacePirate.hpp" +#include "Character/CCharLayoutInfo.hpp" namespace urde { diff --git a/Runtime/MP1/CWarWasp.cpp b/Runtime/MP1/CWarWasp.cpp index e5cdc85c3..b8df93c5e 100644 --- a/Runtime/MP1/CWarWasp.cpp +++ b/Runtime/MP1/CWarWasp.cpp @@ -1,4 +1,5 @@ #include "CWarWasp.hpp" +#include "Character/CCharLayoutInfo.hpp" namespace urde { diff --git a/Runtime/MP1/MP1.cpp b/Runtime/MP1/MP1.cpp index 0e55ea27b..7b587f575 100644 --- a/Runtime/MP1/MP1.cpp +++ b/Runtime/MP1/MP1.cpp @@ -7,6 +7,7 @@ #include "Graphics/Shaders/CTexturedQuadFilter.hpp" #include "Graphics/Shaders/CCameraBlurFilter.hpp" #include "Graphics/Shaders/CXRayBlurFilter.hpp" +#include "Character/CCharLayoutInfo.hpp" namespace urde { diff --git a/Runtime/World/CGunController.cpp b/Runtime/World/CGunController.cpp index dd69a9506..54b40c3c0 100644 --- a/Runtime/World/CGunController.cpp +++ b/Runtime/World/CGunController.cpp @@ -1,4 +1,5 @@ #include "CGunController.hpp" +#include "Character/CCharLayoutInfo.hpp" namespace urde {