Windows build fixes

This commit is contained in:
Jack Andersen 2016-08-22 17:12:50 -10:00
parent 5a521ed9c6
commit 27b2f2aedb
16 changed files with 20 additions and 4 deletions

View File

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

View File

@ -1,4 +1,5 @@
#include "CFirstPersonCamera.hpp"
#include "Character/CCharLayoutInfo.hpp"
namespace urde
{

View File

@ -101,6 +101,8 @@ SAdvancementDeltas CAnimData::AdvanceAdditiveAnims(float dt)
{
}
}
return {};
}
SAdvancementDeltas CAnimData::UpdateAdditiveAnims(float dt)

View File

@ -8,6 +8,7 @@
#include "CPoseAsTransforms.hpp"
#include "CHierarchyPoseBuilder.hpp"
#include "CAdditiveAnimPlayback.hpp"
#include "CCharLayoutInfo.hpp"
#include <set>
enum class EUserEventType

View File

@ -3,6 +3,7 @@
#include "CCharacterFactory.hpp"
#include "GameGlobalObjects.hpp"
#include "CModelData.hpp"
#include "Character/CCharLayoutInfo.hpp"
namespace urde
{

View File

@ -12,6 +12,7 @@
#include "GameGlobalObjects.hpp"
#include "CParticleGenInfo.hpp"
#include "Graphics/CSkinnedModel.hpp"
#include "Character/CCharLayoutInfo.hpp"
namespace urde
{

View File

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

View File

@ -1,4 +1,5 @@
#include "CSkinnedModel.hpp"
#include "Character/CSkinRules.hpp"
namespace urde
{

View File

@ -1,5 +1,6 @@
#include "CBeetle.hpp"
#include "World/CDamageInfo.hpp"
#include "Character/CCharLayoutInfo.hpp"
namespace urde
{

View File

@ -3,6 +3,7 @@
#include "GameGlobalObjects.hpp"
#include "CGameState.hpp"
#include "MP1.hpp"
#include "Character/CCharLayoutInfo.hpp"
namespace urde
{

View File

@ -6,6 +6,7 @@
#include "CResFactory.hpp"
#include "CFrontEndUI.hpp"
#include "GameGlobalObjects.hpp"
#include "Character/CCharLayoutInfo.hpp"
namespace urde
{

View File

@ -1,4 +1,5 @@
#include "CNewIntroBoss.hpp"
#include "Character/CCharLayoutInfo.hpp"
namespace urde
{

View File

@ -1,4 +1,5 @@
#include "CSpacePirate.hpp"
#include "Character/CCharLayoutInfo.hpp"
namespace urde
{

View File

@ -1,4 +1,5 @@
#include "CWarWasp.hpp"
#include "Character/CCharLayoutInfo.hpp"
namespace urde
{

View File

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

View File

@ -1,4 +1,5 @@
#include "CGunController.hpp"
#include "Character/CCharLayoutInfo.hpp"
namespace urde
{