From 71c6124c109e26f7e1d557fe828657b4a63cd00b Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Wed, 30 Oct 2013 20:49:04 +1300 Subject: [PATCH] Tidy renderer dependencies. --- Makefile | 16 +++++----------- OpenRA.Renderer.Cg/OpenRA.Renderer.Cg.csproj | 6 ------ OpenRA.Renderer.Gl/OpenRA.Renderer.Gl.csproj | 6 ------ OpenRA.Renderer.Null/OpenRA.Renderer.Null.csproj | 12 ------------ .../OpenRA.Renderer.SdlCommon.csproj | 1 - 5 files changed, 5 insertions(+), 36 deletions(-) diff --git a/Makefile b/Makefile index cc5a312360..ab8fd35e27 100644 --- a/Makefile +++ b/Makefile @@ -110,32 +110,26 @@ rsdl_SRCS := $(shell find OpenRA.Renderer.SdlCommon/ -iname '*.cs') rsdl_TARGET = OpenRA.Renderer.SdlCommon.dll rsdl_KIND = library rsdl_DEPS = $(fileformats_TARGET) $(game_TARGET) -rsdl_LIBS = $(COMMON_LIBS) System.Windows.Forms.dll \ - thirdparty/Tao/Tao.OpenGl.dll thirdparty/Tao/Tao.Sdl.dll \ +rsdl_LIBS = $(COMMON_LIBS) thirdparty/Tao/Tao.OpenGl.dll thirdparty/Tao/Tao.Sdl.dll \ $(rsdl_DEPS) rcg_SRCS := $(shell find OpenRA.Renderer.Cg/ -iname '*.cs') rcg_TARGET = OpenRA.Renderer.Cg.dll rcg_KIND = library rcg_DEPS = $(fileformats_TARGET) $(game_TARGET) $(rsdl_TARGET) -rcg_LIBS = $(COMMON_LIBS) System.Windows.Forms.dll \ - thirdparty/Tao/Tao.Cg.dll thirdparty/Tao/Tao.OpenGl.dll thirdparty/Tao/Tao.Sdl.dll \ - $(rcg_DEPS) +rcg_LIBS = $(COMMON_LIBS) thirdparty/Tao/Tao.Cg.dll thirdparty/Tao/Tao.OpenGl.dll $(rcg_DEPS) rgl_SRCS := $(shell find OpenRA.Renderer.Gl/ -iname '*.cs') rgl_TARGET = OpenRA.Renderer.Gl.dll rgl_KIND = library rgl_DEPS = $(fileformats_TARGET) $(game_TARGET) $(rsdl_TARGET) -rgl_LIBS = $(COMMON_LIBS) System.Windows.Forms.dll \ - thirdparty/Tao/Tao.Cg.dll thirdparty/Tao/Tao.OpenGl.dll thirdparty/Tao/Tao.Sdl.dll \ - $(rgl_DEPS) +rgl_LIBS = $(COMMON_LIBS) thirdparty/Tao/Tao.OpenGl.dll $(rgl_DEPS) rnull_SRCS := $(shell find OpenRA.Renderer.Null/ -iname '*.cs') -rnull_TARGET = OpenRA.Renderer.Null.dll +rnull_TARGET = OpenRA.Renderer.Null.dll rnull_KIND = library rnull_DEPS = $(fileformats_TARGET) $(game_TARGET) -rnull_LIBS = $(COMMON_LIBS) System.Windows.Forms.dll \ - $(rnull_DEPS) +rnull_LIBS = $(COMMON_LIBS) $(rnull_DEPS) PROGRAMS += rcg rgl rnull rsdl renderers: $(rcg_TARGET) $(rgl_TARGET) $(rnull_TARGET) $(rsdl_TARGET) diff --git a/OpenRA.Renderer.Cg/OpenRA.Renderer.Cg.csproj b/OpenRA.Renderer.Cg/OpenRA.Renderer.Cg.csproj index 7186e7810f..fd95732782 100644 --- a/OpenRA.Renderer.Cg/OpenRA.Renderer.Cg.csproj +++ b/OpenRA.Renderer.Cg/OpenRA.Renderer.Cg.csproj @@ -55,13 +55,7 @@ - - 3.5 - - - - False ..\thirdparty\Tao\Tao.Cg.dll diff --git a/OpenRA.Renderer.Gl/OpenRA.Renderer.Gl.csproj b/OpenRA.Renderer.Gl/OpenRA.Renderer.Gl.csproj index eeb08b83f7..5c2079d64c 100644 --- a/OpenRA.Renderer.Gl/OpenRA.Renderer.Gl.csproj +++ b/OpenRA.Renderer.Gl/OpenRA.Renderer.Gl.csproj @@ -62,13 +62,7 @@ False ..\thirdparty\Tao\Tao.Sdl.dll - - 3.5 - - - - False ..\thirdparty\Tao\Tao.Cg.dll diff --git a/OpenRA.Renderer.Null/OpenRA.Renderer.Null.csproj b/OpenRA.Renderer.Null/OpenRA.Renderer.Null.csproj index e6cf42a74f..7383d4c86e 100644 --- a/OpenRA.Renderer.Null/OpenRA.Renderer.Null.csproj +++ b/OpenRA.Renderer.Null/OpenRA.Renderer.Null.csproj @@ -53,19 +53,7 @@ - - 3.5 - - - - 3.5 - - - 3.5 - - - diff --git a/OpenRA.Renderer.SdlCommon/OpenRA.Renderer.SdlCommon.csproj b/OpenRA.Renderer.SdlCommon/OpenRA.Renderer.SdlCommon.csproj index a489aae220..659ddfe69a 100644 --- a/OpenRA.Renderer.SdlCommon/OpenRA.Renderer.SdlCommon.csproj +++ b/OpenRA.Renderer.SdlCommon/OpenRA.Renderer.SdlCommon.csproj @@ -54,7 +54,6 @@ - False ..\thirdparty\Tao\Tao.OpenGl.dll