From 48a2435bdee693ec9a063322916271c768d3d7a4 Mon Sep 17 00:00:00 2001 From: Doug Johnson Date: Thu, 12 May 2016 01:40:30 -0600 Subject: [PATCH] Add header dependencies that prevented linux build There were several files with dependancies on vector and cmath that caused compiler errors under linux. In addition, there was a printf formatting error that threw a compiler error as well --- src/xenia/cpu/compiler/passes/data_flow_analysis_pass.cc | 1 + src/xenia/cpu/compiler/passes/value_reduction_pass.cc | 1 + src/xenia/gpu/command_processor.h | 1 + src/xenia/gpu/gl4/gl4_shader_cache.cc | 2 +- src/xenia/gpu/gl4/gl4_shader_cache.h | 4 +++- 5 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/xenia/cpu/compiler/passes/data_flow_analysis_pass.cc b/src/xenia/cpu/compiler/passes/data_flow_analysis_pass.cc index a858e4329..5f403c738 100644 --- a/src/xenia/cpu/compiler/passes/data_flow_analysis_pass.cc +++ b/src/xenia/cpu/compiler/passes/data_flow_analysis_pass.cc @@ -23,6 +23,7 @@ #include #pragma warning(pop) #else +#include #include #endif // XE_COMPILER_MSVC diff --git a/src/xenia/cpu/compiler/passes/value_reduction_pass.cc b/src/xenia/cpu/compiler/passes/value_reduction_pass.cc index 94a218219..635290d67 100644 --- a/src/xenia/cpu/compiler/passes/value_reduction_pass.cc +++ b/src/xenia/cpu/compiler/passes/value_reduction_pass.cc @@ -22,6 +22,7 @@ #include #pragma warning(pop) #else +#include #include #endif // XE_COMPILER_MSVC diff --git a/src/xenia/gpu/command_processor.h b/src/xenia/gpu/command_processor.h index a418dd683..e8f7fffec 100644 --- a/src/xenia/gpu/command_processor.h +++ b/src/xenia/gpu/command_processor.h @@ -240,3 +240,4 @@ class CommandProcessor { } // namespace xe #endif // XENIA_GPU_COMMAND_PROCESSOR_H_ + diff --git a/src/xenia/gpu/gl4/gl4_shader_cache.cc b/src/xenia/gpu/gl4/gl4_shader_cache.cc index 033ed1b5e..714de3e1d 100644 --- a/src/xenia/gpu/gl4/gl4_shader_cache.cc +++ b/src/xenia/gpu/gl4/gl4_shader_cache.cc @@ -184,4 +184,4 @@ GL4Shader* GL4ShaderCache::FindCachedShader(ShaderType shader_type, } // namespace gl4 } // namespace gpu -} // namespace xe \ No newline at end of file +} // namespace xe diff --git a/src/xenia/gpu/gl4/gl4_shader_cache.h b/src/xenia/gpu/gl4/gl4_shader_cache.h index 7bac4c084..59eaf665e 100644 --- a/src/xenia/gpu/gl4/gl4_shader_cache.h +++ b/src/xenia/gpu/gl4/gl4_shader_cache.h @@ -11,6 +11,8 @@ #define XENIA_GPU_GL4_SHADER_CACHE_H_ #include +#include +#include #include #include @@ -57,4 +59,4 @@ class GL4ShaderCache { } // namespace gpu } // namespace xe -#endif // XENIA_GPU_GL4_SHADER_CACHE_H_ \ No newline at end of file +#endif // XENIA_GPU_GL4_SHADER_CACHE_H_