1 files changed, 42 insertions, 12 deletions
diff --git a/plugins/MirandaG15/MirandaG15_11.vcxproj b/plugins/MirandaG15/MirandaG15_11.vcxproj
index 8bd9c2f823..db6ea88cd7 100644
--- a/plugins/MirandaG15/MirandaG15_11.vcxproj
+++ b/plugins/MirandaG15/MirandaG15_11.vcxproj
@@ -81,7 +81,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>LCDFramework\src;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>src\LCDFramework;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -100,6 +100,7 @@
       <TargetMachine>MachineX86</TargetMachine>
       <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin11\lib</AdditionalLibraryDirectories>
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
     <ResourceCompile>
@@ -110,7 +111,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>LCDFramework\src;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>src\LCDFramework;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -127,7 +128,7 @@
       </DataExecutionPrevention>
       <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin11\lib</AdditionalLibraryDirectories>
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -136,7 +137,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>LCDFramework\src;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>src\LCDFramework;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
@@ -158,7 +159,7 @@
       <TargetMachine>MachineX86</TargetMachine>
       <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin11\lib</AdditionalLibraryDirectories>
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -167,7 +168,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>LCDFramework\src;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>src\LCDFramework;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
@@ -188,7 +189,7 @@
       </DataExecutionPrevention>
       <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin11\lib</AdditionalLibraryDirectories>
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -220,6 +221,21 @@
   <ItemGroup>
     <ClCompile Include="src\CAppletManager.cpp" />
     <ClCompile Include="src\CConfig.cpp" />
+    <ClCompile Include="src\LCDFramework\CLCDBar.cpp" />
+    <ClCompile Include="src\LCDFramework\CLCDBitmap.cpp" />
+    <ClCompile Include="src\LCDFramework\CLCDConnection.cpp" />
+    <ClCompile Include="src\LCDFramework\CLCDConnectionLogitech.cpp" />
+    <ClCompile Include="src\LCDFramework\CLCDGfx.cpp" />
+    <ClCompile Include="src\LCDFramework\CLCDInput.cpp" />
+    <ClCompile Include="src\LCDFramework\CLCDLabel.cpp" />
+    <ClCompile Include="src\LCDFramework\CLCDOutputManager.cpp" />
+    <ClCompile Include="src\LCDFramework\CLCDScreen.cpp" />
+    <ClCompile Include="src\LCDFramework\CLCDTextLog.cpp" />
+    <ClCompile Include="src\LCDFramework\CLCDTextObject.cpp" />
+    <ClCompile Include="src\LCDFramework\ConStream.cpp" />
+    <ClCompile Include="src\LCDFramework\debug.cpp" />
+    <ClCompile Include="src\LCDFramework\LCDObject.cpp" />
+    <ClCompile Include="src\LCDFramework\misc.cpp" />
     <ClCompile Include="src\Miranda.cpp" />
     <ClCompile Include="src\CChatScreen.cpp" />
     <ClCompile Include="src\CContactlistScreen.cpp" />
@@ -241,6 +257,25 @@
     <ClInclude Include="src\CIRCConnection.h" />
     <ClInclude Include="src\CIRCHistory.h" />
     <ClInclude Include="src\CProtocolData.h" />
+    <ClInclude Include="src\LCDFramework\CLCDBar.h" />
+    <ClInclude Include="src\LCDFramework\CLCDBitmap.h" />
+    <ClInclude Include="src\LCDFramework\CLCDConnection.h" />
+    <ClInclude Include="src\LCDFramework\CLCDConnectionLogitech.h" />
+    <ClInclude Include="src\LCDFramework\CLCDDevice.h" />
+    <ClInclude Include="src\LCDFramework\CLCDGfx.h" />
+    <ClInclude Include="src\LCDFramework\CLCDInput.h" />
+    <ClInclude Include="src\LCDFramework\CLCDLabel.h" />
+    <ClInclude Include="src\LCDFramework\CLCDList.h" />
+    <ClInclude Include="src\LCDFramework\CLCDObject.h" />
+    <ClInclude Include="src\LCDFramework\CLCDOutputManager.h" />
+    <ClInclude Include="src\LCDFramework\CLCDScreen.h" />
+    <ClInclude Include="src\LCDFramework\CLCDTextLog.h" />
+    <ClInclude Include="src\LCDFramework\CLCDTextObject.h" />
+    <ClInclude Include="src\LCDFramework\ConStream.h" />
+    <ClInclude Include="src\LCDFramework\debug.h" />
+    <ClInclude Include="src\LCDFramework\LCDFramework.h" />
+    <ClInclude Include="src\LCDFramework\misc.h" />
+    <ClInclude Include="src\LCDFramework\stdafx.h" />
     <ClInclude Include="src\Miranda.h" />
     <ClInclude Include="src\resource.h" />
     <ClInclude Include="src\StdAfx.h" />
@@ -293,11 +328,6 @@
     <ResourceCompile Include="res\MirandaG15.rc" />
     <ResourceCompile Include="res\Version.rc" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="LCDFramework\LCDFramework_11.vcxproj">
-      <Project>{3bba4976-826e-44e5-b65f-8a2e1d912be7}</Project>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>