From 683dbc09ac7403975ec727066426c11a9e956ca2 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sun, 19 Jan 2014 11:06:53 -0600 Subject: [PATCH] Stop building GLExtensions.cpp twice(One in GL, one in software). We don't need to build it twice, this'll save a bit of time in the build process. Also a bit of spacing cleanup. --- Source/Core/VideoBackends/OGL/CMakeLists.txt | 30 ++++++------ .../VideoBackends/Software/CMakeLists.txt | 47 +++++++++---------- 2 files changed, 38 insertions(+), 39 deletions(-) diff --git a/Source/Core/VideoBackends/OGL/CMakeLists.txt b/Source/Core/VideoBackends/OGL/CMakeLists.txt index 4d920ebf32..431feb9d54 100644 --- a/Source/Core/VideoBackends/OGL/CMakeLists.txt +++ b/Source/Core/VideoBackends/OGL/CMakeLists.txt @@ -1,18 +1,18 @@ -set(SRCS GLExtensions/GLExtensions.cpp - FramebufferManager.cpp - GLUtil.cpp - main.cpp - NativeVertexFormat.cpp - PerfQuery.cpp - PostProcessing.cpp - ProgramShaderCache.cpp - RasterFont.cpp - Render.cpp - SamplerCache.cpp - StreamBuffer.cpp - TextureCache.cpp - TextureConverter.cpp - VertexManager.cpp) +set(SRCS GLExtensions/GLExtensions.cpp + FramebufferManager.cpp + GLUtil.cpp + main.cpp + NativeVertexFormat.cpp + PerfQuery.cpp + PostProcessing.cpp + ProgramShaderCache.cpp + RasterFont.cpp + Render.cpp + SamplerCache.cpp + StreamBuffer.cpp + TextureCache.cpp + TextureConverter.cpp + VertexManager.cpp) set(LIBS videocommon SOIL diff --git a/Source/Core/VideoBackends/Software/CMakeLists.txt b/Source/Core/VideoBackends/Software/CMakeLists.txt index 60d69db42b..4ae5340026 100644 --- a/Source/Core/VideoBackends/Software/CMakeLists.txt +++ b/Source/Core/VideoBackends/Software/CMakeLists.txt @@ -1,27 +1,26 @@ -set(SRCS ../OGL/GLExtensions/GLExtensions.cpp - BPMemLoader.cpp - Clipper.cpp - SWCommandProcessor.cpp - CPMemLoader.cpp - DebugUtil.cpp - EfbCopy.cpp - EfbInterface.cpp - HwRasterizer.cpp - SWmain.cpp - OpcodeDecoder.cpp - SWPixelEngine.cpp - RasterFont.cpp - Rasterizer.cpp - SWRenderer.cpp - SetupUnit.cpp - SWStatistics.cpp - Tev.cpp - TextureEncoder.cpp - TextureSampler.cpp - TransformUnit.cpp - SWVertexLoader.cpp - SWVideoConfig.cpp - XFMemLoader.cpp) +set(SRCS BPMemLoader.cpp + Clipper.cpp + SWCommandProcessor.cpp + CPMemLoader.cpp + DebugUtil.cpp + EfbCopy.cpp + EfbInterface.cpp + HwRasterizer.cpp + SWmain.cpp + OpcodeDecoder.cpp + SWPixelEngine.cpp + RasterFont.cpp + Rasterizer.cpp + SWRenderer.cpp + SetupUnit.cpp + SWStatistics.cpp + Tev.cpp + TextureEncoder.cpp + TextureSampler.cpp + TransformUnit.cpp + SWVertexLoader.cpp + SWVideoConfig.cpp + XFMemLoader.cpp) if(wxWidgets_FOUND) set(SRCS ${SRCS} VideoConfigDialog.cpp)