From b3c17b215f76c7807749c5342eb1da9c9c324ea8 Mon Sep 17 00:00:00 2001 From: Ted John Date: Wed, 30 May 2018 19:45:43 +0100 Subject: [PATCH] Use single output folder for msbuild obj files This requires unique named source files within a project. --- src/openrct2-cli/openrct2-cli.vcxproj | 1 - src/openrct2-dll/openrct2-dll.vcxproj | 1 - src/openrct2-ui/libopenrct2ui.vcxproj | 1 - src/openrct2-win/openrct2-win.vcxproj | 1 - src/openrct2/drawing/{Sprite.cpp => Drawing.Sprite.cpp} | 0 src/openrct2/drawing/{String.cpp => Drawing.String.cpp} | 0 src/openrct2/interface/{Console.cpp => InteractiveConsole.cpp} | 0 src/openrct2/libopenrct2.vcxproj | 1 - src/openrct2/localisation/{Date.cpp => Localisation.Date.cpp} | 0 src/openrct2/paint/sprite/{Peep.cpp => Paint.Peep.cpp} | 0 src/openrct2/paint/sprite/{Sprite.cpp => Paint.Sprite.cpp} | 0 src/openrct2/paint/tile_element/{Banner.cpp => Paint.Banner.cpp} | 0 .../paint/tile_element/{Entrance.cpp => Paint.Entrance.cpp} | 0 .../tile_element/{LargeScenery.cpp => Paint.LargeScenery.cpp} | 0 src/openrct2/paint/tile_element/{Path.cpp => Paint.Path.cpp} | 0 .../tile_element/{SmallScenery.cpp => Paint.SmallScenery.cpp} | 0 .../paint/tile_element/{Surface.cpp => Paint.Surface.cpp} | 0 .../tile_element/{TileElement.cpp => Paint.TileElement.cpp} | 0 src/openrct2/paint/tile_element/{Fence.cpp => Paint.Wall.cpp} | 0 19 files changed, 5 deletions(-) rename src/openrct2/drawing/{Sprite.cpp => Drawing.Sprite.cpp} (100%) rename src/openrct2/drawing/{String.cpp => Drawing.String.cpp} (100%) rename src/openrct2/interface/{Console.cpp => InteractiveConsole.cpp} (100%) rename src/openrct2/localisation/{Date.cpp => Localisation.Date.cpp} (100%) rename src/openrct2/paint/sprite/{Peep.cpp => Paint.Peep.cpp} (100%) rename src/openrct2/paint/sprite/{Sprite.cpp => Paint.Sprite.cpp} (100%) rename src/openrct2/paint/tile_element/{Banner.cpp => Paint.Banner.cpp} (100%) rename src/openrct2/paint/tile_element/{Entrance.cpp => Paint.Entrance.cpp} (100%) rename src/openrct2/paint/tile_element/{LargeScenery.cpp => Paint.LargeScenery.cpp} (100%) rename src/openrct2/paint/tile_element/{Path.cpp => Paint.Path.cpp} (100%) rename src/openrct2/paint/tile_element/{SmallScenery.cpp => Paint.SmallScenery.cpp} (100%) rename src/openrct2/paint/tile_element/{Surface.cpp => Paint.Surface.cpp} (100%) rename src/openrct2/paint/tile_element/{TileElement.cpp => Paint.TileElement.cpp} (100%) rename src/openrct2/paint/tile_element/{Fence.cpp => Paint.Wall.cpp} (100%) diff --git a/src/openrct2-cli/openrct2-cli.vcxproj b/src/openrct2-cli/openrct2-cli.vcxproj index 5f153bce6e..9a76591370 100644 --- a/src/openrct2-cli/openrct2-cli.vcxproj +++ b/src/openrct2-cli/openrct2-cli.vcxproj @@ -36,7 +36,6 @@ - $(IntDir)\%(RelativeDir) $(OPENRCT2_CL_ADDITIONALOPTIONS) %(AdditionalOptions) diff --git a/src/openrct2-dll/openrct2-dll.vcxproj b/src/openrct2-dll/openrct2-dll.vcxproj index 9ba350c54f..5b00e1e85f 100644 --- a/src/openrct2-dll/openrct2-dll.vcxproj +++ b/src/openrct2-dll/openrct2-dll.vcxproj @@ -41,7 +41,6 @@ - $(IntDir)\%(RelativeDir) $(OPENRCT2_CL_ADDITIONALOPTIONS) %(AdditionalOptions) diff --git a/src/openrct2-ui/libopenrct2ui.vcxproj b/src/openrct2-ui/libopenrct2ui.vcxproj index 0d9b5d811a..ab79111952 100644 --- a/src/openrct2-ui/libopenrct2ui.vcxproj +++ b/src/openrct2-ui/libopenrct2ui.vcxproj @@ -45,7 +45,6 @@ - $(IntDir)\%(RelativeDir) $(OPENRCT2_CL_ADDITIONALOPTIONS) %(AdditionalOptions) diff --git a/src/openrct2-win/openrct2-win.vcxproj b/src/openrct2-win/openrct2-win.vcxproj index dcc0fade85..74b6e852ba 100644 --- a/src/openrct2-win/openrct2-win.vcxproj +++ b/src/openrct2-win/openrct2-win.vcxproj @@ -41,7 +41,6 @@ - $(IntDir)\%(RelativeDir) $(OPENRCT2_CL_ADDITIONALOPTIONS) %(AdditionalOptions) diff --git a/src/openrct2/drawing/Sprite.cpp b/src/openrct2/drawing/Drawing.Sprite.cpp similarity index 100% rename from src/openrct2/drawing/Sprite.cpp rename to src/openrct2/drawing/Drawing.Sprite.cpp diff --git a/src/openrct2/drawing/String.cpp b/src/openrct2/drawing/Drawing.String.cpp similarity index 100% rename from src/openrct2/drawing/String.cpp rename to src/openrct2/drawing/Drawing.String.cpp diff --git a/src/openrct2/interface/Console.cpp b/src/openrct2/interface/InteractiveConsole.cpp similarity index 100% rename from src/openrct2/interface/Console.cpp rename to src/openrct2/interface/InteractiveConsole.cpp diff --git a/src/openrct2/libopenrct2.vcxproj b/src/openrct2/libopenrct2.vcxproj index e53bc9f93c..3cc7869f28 100644 --- a/src/openrct2/libopenrct2.vcxproj +++ b/src/openrct2/libopenrct2.vcxproj @@ -38,7 +38,6 @@ - $(IntDir)\%(RelativeDir) $(OPENRCT2_CL_ADDITIONALOPTIONS) %(AdditionalOptions) diff --git a/src/openrct2/localisation/Date.cpp b/src/openrct2/localisation/Localisation.Date.cpp similarity index 100% rename from src/openrct2/localisation/Date.cpp rename to src/openrct2/localisation/Localisation.Date.cpp diff --git a/src/openrct2/paint/sprite/Peep.cpp b/src/openrct2/paint/sprite/Paint.Peep.cpp similarity index 100% rename from src/openrct2/paint/sprite/Peep.cpp rename to src/openrct2/paint/sprite/Paint.Peep.cpp diff --git a/src/openrct2/paint/sprite/Sprite.cpp b/src/openrct2/paint/sprite/Paint.Sprite.cpp similarity index 100% rename from src/openrct2/paint/sprite/Sprite.cpp rename to src/openrct2/paint/sprite/Paint.Sprite.cpp diff --git a/src/openrct2/paint/tile_element/Banner.cpp b/src/openrct2/paint/tile_element/Paint.Banner.cpp similarity index 100% rename from src/openrct2/paint/tile_element/Banner.cpp rename to src/openrct2/paint/tile_element/Paint.Banner.cpp diff --git a/src/openrct2/paint/tile_element/Entrance.cpp b/src/openrct2/paint/tile_element/Paint.Entrance.cpp similarity index 100% rename from src/openrct2/paint/tile_element/Entrance.cpp rename to src/openrct2/paint/tile_element/Paint.Entrance.cpp diff --git a/src/openrct2/paint/tile_element/LargeScenery.cpp b/src/openrct2/paint/tile_element/Paint.LargeScenery.cpp similarity index 100% rename from src/openrct2/paint/tile_element/LargeScenery.cpp rename to src/openrct2/paint/tile_element/Paint.LargeScenery.cpp diff --git a/src/openrct2/paint/tile_element/Path.cpp b/src/openrct2/paint/tile_element/Paint.Path.cpp similarity index 100% rename from src/openrct2/paint/tile_element/Path.cpp rename to src/openrct2/paint/tile_element/Paint.Path.cpp diff --git a/src/openrct2/paint/tile_element/SmallScenery.cpp b/src/openrct2/paint/tile_element/Paint.SmallScenery.cpp similarity index 100% rename from src/openrct2/paint/tile_element/SmallScenery.cpp rename to src/openrct2/paint/tile_element/Paint.SmallScenery.cpp diff --git a/src/openrct2/paint/tile_element/Surface.cpp b/src/openrct2/paint/tile_element/Paint.Surface.cpp similarity index 100% rename from src/openrct2/paint/tile_element/Surface.cpp rename to src/openrct2/paint/tile_element/Paint.Surface.cpp diff --git a/src/openrct2/paint/tile_element/TileElement.cpp b/src/openrct2/paint/tile_element/Paint.TileElement.cpp similarity index 100% rename from src/openrct2/paint/tile_element/TileElement.cpp rename to src/openrct2/paint/tile_element/Paint.TileElement.cpp diff --git a/src/openrct2/paint/tile_element/Fence.cpp b/src/openrct2/paint/tile_element/Paint.Wall.cpp similarity index 100% rename from src/openrct2/paint/tile_element/Fence.cpp rename to src/openrct2/paint/tile_element/Paint.Wall.cpp