From cc0d6eeb63528111534ec2c671ee6e0dda19059b Mon Sep 17 00:00:00 2001 From: Birunthan Mohanathas Date: Sun, 5 Jan 2014 13:00:50 +0200 Subject: [PATCH] Library: Simplify PCH use --- Library/ConfigParser_Test.cpp | 1 + Library/Library.vcxproj | 211 +++++++--------------------- Library/SkinRegistry_Test.cpp | 1 + Library/lua/LuaManager.cpp | 2 +- Library/lua/LuaScript.cpp | 2 +- Library/lua/glue/LuaGlobal.cpp | 2 +- Library/lua/glue/LuaMeasure.cpp | 2 +- Library/lua/glue/LuaMeter.cpp | 2 +- Library/lua/glue/LuaMeterWindow.cpp | 2 +- 9 files changed, 60 insertions(+), 165 deletions(-) diff --git a/Library/ConfigParser_Test.cpp b/Library/ConfigParser_Test.cpp index 96dd2b4f..ac3053d3 100644 --- a/Library/ConfigParser_Test.cpp +++ b/Library/ConfigParser_Test.cpp @@ -16,6 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include "StdAfx.h" #include "ConfigParser.h" #include "../Common/UnitTest.h" diff --git a/Library/Library.vcxproj b/Library/Library.vcxproj index f670a60b..f3a3d0f5 100644 --- a/Library/Library.vcxproj +++ b/Library/Library.vcxproj @@ -19,6 +19,7 @@ lua/include;lua/lua;%(AdditionalIncludeDirectories) _USRDLL;LIBRARY_EXPORTS;%(PreprocessorDefinitions) + Use comctl32.lib;Wininet.lib;UxTheme.lib;Winmm.lib;gdiplus.lib;Iphlpapi.lib;shlwapi.lib;d2d1.lib;dwrite.lib;windowscodecs.lib;Version.lib;%(AdditionalDependencies) @@ -27,175 +28,67 @@ - - Use - - - Use - + + $(ExcludeTests) - - Use - - - Use - - - Use - - - Use - - - Use - - - Use - - - Use - - - Use - - - Use - - - Use - - - Use - - - Use - - - Use - - - Use - - - Use - - - Use - - - Use - - - Use - - - Use - - - Use - + + + + + + + + + + + + + + + + + + + + - - Use - - - Use - - - Use - - - Use - - - Use - - - Use - - - Use - - - Use - - - Use - - - Use - - - Use - - - Use - - - Use - - - Use - - - Use - - - Use - - - Use - - - Use - - - Use - + + + + + + + + + + + + + + + + + + + $(ExcludeTests) Create - - Use - - - Use - - - Use - - - Use - - - Use - ../StdAfx.h - - - Use - ../StdAfx.h - - - Use - ../../StdAfx.h - - - Use - ../../StdAfx.h - - - Use - ../../StdAfx.h - - - Use - ../../StdAfx.h - + + + + + + + + + + diff --git a/Library/SkinRegistry_Test.cpp b/Library/SkinRegistry_Test.cpp index 3458640e..86649798 100644 --- a/Library/SkinRegistry_Test.cpp +++ b/Library/SkinRegistry_Test.cpp @@ -16,6 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include "StdAfx.h" #include "SkinRegistry.h" #include "../Common/UnitTest.h" diff --git a/Library/lua/LuaManager.cpp b/Library/lua/LuaManager.cpp index e82ff37a..4f9c071a 100644 --- a/Library/lua/LuaManager.cpp +++ b/Library/lua/LuaManager.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "../StdAfx.h" +#include "StdAfx.h" #include "../../Common/StringUtil.h" #include "LuaManager.h" #include "../Logger.h" diff --git a/Library/lua/LuaScript.cpp b/Library/lua/LuaScript.cpp index fe3b06d2..590a35ce 100644 --- a/Library/lua/LuaScript.cpp +++ b/Library/lua/LuaScript.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "../StdAfx.h" +#include "StdAfx.h" #include "../../Common/StringUtil.h" #include "LuaScript.h" #include "LuaManager.h" diff --git a/Library/lua/glue/LuaGlobal.cpp b/Library/lua/glue/LuaGlobal.cpp index d6a61f1c..ccfa3e64 100644 --- a/Library/lua/glue/LuaGlobal.cpp +++ b/Library/lua/glue/LuaGlobal.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "../../StdAfx.h" +#include "StdAfx.h" #include "../LuaManager.h" #include "../../Logger.h" #include "../../../Common/StringUtil.h" diff --git a/Library/lua/glue/LuaMeasure.cpp b/Library/lua/glue/LuaMeasure.cpp index c52af7b1..dc6557e6 100644 --- a/Library/lua/glue/LuaMeasure.cpp +++ b/Library/lua/glue/LuaMeasure.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "../../StdAfx.h" +#include "StdAfx.h" #include "../LuaManager.h" #include "../../Measure.h" #include "../../MeterWindow.h" diff --git a/Library/lua/glue/LuaMeter.cpp b/Library/lua/glue/LuaMeter.cpp index b2ade4f2..3d5bf3ef 100644 --- a/Library/lua/glue/LuaMeter.cpp +++ b/Library/lua/glue/LuaMeter.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "../../StdAfx.h" +#include "StdAfx.h" #include "../LuaManager.h" #include "../../Meter.h" #include "../../MeterString.h" diff --git a/Library/lua/glue/LuaMeterWindow.cpp b/Library/lua/glue/LuaMeterWindow.cpp index 8a52873b..ab8bc204 100644 --- a/Library/lua/glue/LuaMeterWindow.cpp +++ b/Library/lua/glue/LuaMeterWindow.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "../../StdAfx.h" +#include "StdAfx.h" #include "../LuaManager.h" #include "../../Rainmeter.h" #include "../../MeterWindow.h"