From 5c371b8999214f77b367ca525494e6236aca9271 Mon Sep 17 00:00:00 2001 From: Birunthan Mohanathas Date: Sun, 5 Jan 2014 12:28:12 +0200 Subject: [PATCH] Move Lua into separate Library_Lua project --- Library/Library.vcxproj | 58 +----------- Library/Library.vcxproj.filters | 159 -------------------------------- Library/Library_Lua.vcxproj | 87 +++++++++++++++++ Rainmeter.sln | 19 +++- 4 files changed, 108 insertions(+), 215 deletions(-) create mode 100644 Library/Library_Lua.vcxproj diff --git a/Library/Library.vcxproj b/Library/Library.vcxproj index fa408595..bc3254ac 100644 --- a/Library/Library.vcxproj +++ b/Library/Library.vcxproj @@ -234,36 +234,6 @@ Use ../../StdAfx.h - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -340,29 +310,6 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -372,6 +319,11 @@ {19312085-aa51-4bd6-be92-4b6098cca539} + + + {BC25C5DC-AEFB-49F9-8188-3C1B8C8929E6} + + diff --git a/Library/Library.vcxproj.filters b/Library/Library.vcxproj.filters index 05dbb45e..56b08115 100644 --- a/Library/Library.vcxproj.filters +++ b/Library/Library.vcxproj.filters @@ -165,96 +165,6 @@ Lua\glue - - Lua\Lua - - - Lua\Lua - - - Lua\Lua - - - Lua\Lua - - - Lua\Lua - - - Lua\Lua - - - Lua\Lua - - - Lua\Lua - - - Lua\Lua - - - Lua\Lua - - - Lua\Lua - - - Lua\Lua - - - Lua\Lua - - - Lua\Lua - - - Lua\Lua - - - Lua\Lua - - - Lua\Lua - - - Lua\Lua - - - Lua\Lua - - - Lua\Lua - - - Lua\Lua - - - Lua\Lua - - - Lua\Lua - - - Lua\Lua - - - Lua\Lua - - - Lua\Lua - - - Lua\Lua - - - Lua\Lua - - - Lua\Lua - - - Lua\Lua - pcre @@ -524,72 +434,6 @@ Lua - - Lua\Lua - - - Lua\Lua - - - Lua\Lua - - - Lua\Lua - - - Lua\Lua - - - Lua\Lua - - - Lua\Lua - - - Lua\Lua - - - Lua\Lua - - - Lua\Lua - - - Lua\Lua - - - Lua\Lua - - - Lua\Lua - - - Lua\Lua - - - Lua\Lua - - - Lua\Lua - - - Lua\Lua - - - Lua\Lua - - - Lua\Lua - - - Lua\Lua - - - Lua\Lua - - - Lua\Lua - pcre @@ -611,9 +455,6 @@ Header Files - - Lua\Lua - Header Files diff --git a/Library/Library_Lua.vcxproj b/Library/Library_Lua.vcxproj new file mode 100644 index 00000000..ed68009d --- /dev/null +++ b/Library/Library_Lua.vcxproj @@ -0,0 +1,87 @@ + + + + + {BC25C5DC-AEFB-49F9-8188-3C1B8C8929E6} + StaticLibrary + + + + + + + + + + + + + _LIB;%(PreprocessorDefinitions) + 4334;%(DisableSpecificWarnings) + lua/include;lua/lua;%(AdditionalIncludeDirectories) + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Rainmeter.sln b/Rainmeter.sln index 4e561b0d..dd2b9c78 100644 --- a/Rainmeter.sln +++ b/Rainmeter.sln @@ -1,10 +1,14 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 +# Visual Studio 2013 +VisualStudioVersion = 12.0.21005.1 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Application", "Application\Application.vcxproj", "{D2A0903C-E760-4134-AE61-3D55BF8F760C}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Common\Common.vcxproj", "{19312085-AA51-4BD6-BE92-4B6098CCA539}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common_Test", "Common\Common_Test.vcxproj", "{442084A6-2069-4927-B0C9-51525A720CB2}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Installer", "Installer\Installer.vcxproj", "{2FCFBFD2-2720-4BDD-B620-4BDD3DBB8D3D}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Language", "Language\Language.vcxproj", "{6BE6F228-B741-4DA9-9FBC-E9F2A7BD483A}" @@ -13,8 +17,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Library", "Library\Library. ProjectSection(ProjectDependencies) = postProject {6BE6F228-B741-4DA9-9FBC-E9F2A7BD483A} = {6BE6F228-B741-4DA9-9FBC-E9F2A7BD483A} {19312085-AA51-4BD6-BE92-4B6098CCA539} = {19312085-AA51-4BD6-BE92-4B6098CCA539} + {BC25C5DC-AEFB-49F9-8188-3C1B8C8929E6} = {BC25C5DC-AEFB-49F9-8188-3C1B8C8929E6} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Library_Lua", "Library\Library_Lua.vcxproj", "{BC25C5DC-AEFB-49F9-8188-3C1B8C8929E6}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SkinInstaller", "SkinInstaller\SkinInstaller.vcxproj", "{6F5D4C4A-C8C3-41DA-BF44-6D42B76464DA}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SkinInstallerLauncher", "SkinInstaller\SkinInstallerLauncher.vcxproj", "{2D8F1DDB-6470-45A1-B95A-3E2960641314}" @@ -68,8 +75,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PluginWin7Audio", "Plugins\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PluginWindowMessage", "Plugins\PluginWindowMessage\PluginWindowMessage.vcxproj", "{B9184DBA-C6B7-44FE-8BBD-0852DB22D2E4}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common_Test", "Common\Common_Test.vcxproj", "{442084A6-2069-4927-B0C9-51525A720CB2}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -114,6 +119,14 @@ Global {BE9D2400-7F1C-49D6-8498-5CE495491AD6}.Release|Win32.Build.0 = Release|Win32 {BE9D2400-7F1C-49D6-8498-5CE495491AD6}.Release|x64.ActiveCfg = Release|x64 {BE9D2400-7F1C-49D6-8498-5CE495491AD6}.Release|x64.Build.0 = Release|x64 + {BC25C5DC-AEFB-49F9-8188-3C1B8C8929E6}.Debug|Win32.ActiveCfg = Debug|Win32 + {BC25C5DC-AEFB-49F9-8188-3C1B8C8929E6}.Debug|Win32.Build.0 = Debug|Win32 + {BC25C5DC-AEFB-49F9-8188-3C1B8C8929E6}.Debug|x64.ActiveCfg = Debug|x64 + {BC25C5DC-AEFB-49F9-8188-3C1B8C8929E6}.Debug|x64.Build.0 = Debug|x64 + {BC25C5DC-AEFB-49F9-8188-3C1B8C8929E6}.Release|Win32.ActiveCfg = Release|Win32 + {BC25C5DC-AEFB-49F9-8188-3C1B8C8929E6}.Release|Win32.Build.0 = Release|Win32 + {BC25C5DC-AEFB-49F9-8188-3C1B8C8929E6}.Release|x64.ActiveCfg = Release|x64 + {BC25C5DC-AEFB-49F9-8188-3C1B8C8929E6}.Release|x64.Build.0 = Release|x64 {6F5D4C4A-C8C3-41DA-BF44-6D42B76464DA}.Debug|Win32.ActiveCfg = Debug|Win32 {6F5D4C4A-C8C3-41DA-BF44-6D42B76464DA}.Debug|Win32.Build.0 = Debug|Win32 {6F5D4C4A-C8C3-41DA-BF44-6D42B76464DA}.Debug|x64.ActiveCfg = Debug|x64