diff options
| author | Vadim Dashevskiy <watcherhd@gmail.com> | 2013-11-04 08:59:15 +0000 |
|---|---|---|
| committer | Vadim Dashevskiy <watcherhd@gmail.com> | 2013-11-04 08:59:15 +0000 |
| commit | c77821d0b4b3ae09e47ce6d6ca9d6b21dbb56d30 (patch) | |
| tree | 4063ea096104679033e757b724b22da17534da21 /plugins/MirandaG15 | |
| parent | 9d51dbf389539696b5d5e3417683c1709d957b6b (diff) | |
LCDFramework project removed, integrated to MirandaG15 project
git-svn-id: http://svn.miranda-ng.org/main/trunk@6767 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/MirandaG15')
| -rw-r--r-- | plugins/MirandaG15/LCDFramework/LCDFramework_10.vcxproj | 177 | ||||
| -rw-r--r-- | plugins/MirandaG15/LCDFramework/LCDFramework_10.vcxproj.filters | 141 | ||||
| -rw-r--r-- | plugins/MirandaG15/LCDFramework/LCDFramework_11.vcxproj | 185 | ||||
| -rw-r--r-- | plugins/MirandaG15/LCDFramework/LCDFramework_11.vcxproj.filters | 141 | ||||
| -rw-r--r-- | plugins/MirandaG15/LCDFramework/docs/todo.txt | 8 | ||||
| -rw-r--r-- | plugins/MirandaG15/MirandaG15_10.vcxproj | 51 | ||||
| -rw-r--r-- | plugins/MirandaG15/MirandaG15_10.vcxproj.filters | 108 | ||||
| -rw-r--r-- | plugins/MirandaG15/MirandaG15_11.vcxproj | 54 | ||||
| -rw-r--r-- | plugins/MirandaG15/MirandaG15_11.vcxproj.filters | 108 | ||||
| -rw-r--r-- | plugins/MirandaG15/src/LCDFramework/CLCDBar.cpp (renamed from plugins/MirandaG15/LCDFramework/src/CLCDBar.cpp) | 0 | ||||
| -rw-r--r-- | plugins/MirandaG15/src/LCDFramework/CLCDBar.h (renamed from plugins/MirandaG15/LCDFramework/src/CLCDBar.h) | 0 | ||||
| -rw-r--r-- | plugins/MirandaG15/src/LCDFramework/CLCDBitmap.cpp (renamed from plugins/MirandaG15/LCDFramework/src/CLCDBitmap.cpp) | 0 | ||||
| -rw-r--r-- | plugins/MirandaG15/src/LCDFramework/CLCDBitmap.h (renamed from plugins/MirandaG15/LCDFramework/src/CLCDBitmap.h) | 0 | ||||
| -rw-r--r-- | plugins/MirandaG15/src/LCDFramework/CLCDConnection.cpp (renamed from plugins/MirandaG15/LCDFramework/src/CLCDConnection.cpp) | 0 | ||||
| -rw-r--r-- | plugins/MirandaG15/src/LCDFramework/CLCDConnection.h (renamed from plugins/MirandaG15/LCDFramework/src/CLCDConnection.h) | 0 | ||||
| -rw-r--r-- | plugins/MirandaG15/src/LCDFramework/CLCDConnectionLogitech.cpp (renamed from plugins/MirandaG15/LCDFramework/src/CLCDConnectionLogitech.cpp) | 0 | ||||
| -rw-r--r-- | plugins/MirandaG15/src/LCDFramework/CLCDConnectionLogitech.h (renamed from plugins/MirandaG15/LCDFramework/src/CLCDConnectionLogitech.h) | 2 | ||||
| -rw-r--r-- | plugins/MirandaG15/src/LCDFramework/CLCDDevice.h (renamed from plugins/MirandaG15/LCDFramework/src/CLCDDevice.h) | 2 | ||||
| -rw-r--r-- | plugins/MirandaG15/src/LCDFramework/CLCDGfx.cpp (renamed from plugins/MirandaG15/LCDFramework/src/CLCDGfx.cpp) | 0 | ||||
| -rw-r--r-- | plugins/MirandaG15/src/LCDFramework/CLCDGfx.h (renamed from plugins/MirandaG15/LCDFramework/src/CLCDGfx.h) | 0 | ||||
| -rw-r--r-- | plugins/MirandaG15/src/LCDFramework/CLCDInput.cpp (renamed from plugins/MirandaG15/LCDFramework/src/CLCDInput.cpp) | 0 | ||||
| -rw-r--r-- | plugins/MirandaG15/src/LCDFramework/CLCDInput.h (renamed from plugins/MirandaG15/LCDFramework/src/CLCDInput.h) | 0 | ||||
| -rw-r--r-- | plugins/MirandaG15/src/LCDFramework/CLCDLabel.cpp (renamed from plugins/MirandaG15/LCDFramework/src/CLCDLabel.cpp) | 0 | ||||
| -rw-r--r-- | plugins/MirandaG15/src/LCDFramework/CLCDLabel.h (renamed from plugins/MirandaG15/LCDFramework/src/CLCDLabel.h) | 0 | ||||
| -rw-r--r-- | plugins/MirandaG15/src/LCDFramework/CLCDList.h (renamed from plugins/MirandaG15/LCDFramework/src/CLCDList.h) | 0 | ||||
| -rw-r--r-- | plugins/MirandaG15/src/LCDFramework/CLCDObject.h (renamed from plugins/MirandaG15/LCDFramework/src/CLCDObject.h) | 0 | ||||
| -rw-r--r-- | plugins/MirandaG15/src/LCDFramework/CLCDOutputManager.cpp (renamed from plugins/MirandaG15/LCDFramework/src/CLCDOutputManager.cpp) | 0 | ||||
| -rw-r--r-- | plugins/MirandaG15/src/LCDFramework/CLCDOutputManager.h (renamed from plugins/MirandaG15/LCDFramework/src/CLCDOutputManager.h) | 0 | ||||
| -rw-r--r-- | plugins/MirandaG15/src/LCDFramework/CLCDScreen.cpp (renamed from plugins/MirandaG15/LCDFramework/src/CLCDScreen.cpp) | 0 | ||||
| -rw-r--r-- | plugins/MirandaG15/src/LCDFramework/CLCDScreen.h (renamed from plugins/MirandaG15/LCDFramework/src/CLCDScreen.h) | 0 | ||||
| -rw-r--r-- | plugins/MirandaG15/src/LCDFramework/CLCDTextLog.cpp (renamed from plugins/MirandaG15/LCDFramework/src/CLCDTextLog.cpp) | 0 | ||||
| -rw-r--r-- | plugins/MirandaG15/src/LCDFramework/CLCDTextLog.h (renamed from plugins/MirandaG15/LCDFramework/src/CLCDTextLog.h) | 0 | ||||
| -rw-r--r-- | plugins/MirandaG15/src/LCDFramework/CLCDTextObject.cpp (renamed from plugins/MirandaG15/LCDFramework/src/CLCDTextObject.cpp) | 0 | ||||
| -rw-r--r-- | plugins/MirandaG15/src/LCDFramework/CLCDTextObject.h (renamed from plugins/MirandaG15/LCDFramework/src/CLCDTextObject.h) | 0 | ||||
| -rw-r--r-- | plugins/MirandaG15/src/LCDFramework/ConStream.cpp (renamed from plugins/MirandaG15/LCDFramework/src/ConStream.cpp) | bin | 3624 -> 3624 bytes | |||
| -rw-r--r-- | plugins/MirandaG15/src/LCDFramework/ConStream.h (renamed from plugins/MirandaG15/LCDFramework/src/ConStream.h) | bin | 2488 -> 2488 bytes | |||
| -rw-r--r-- | plugins/MirandaG15/src/LCDFramework/LCDFramework.h (renamed from plugins/MirandaG15/LCDFramework/src/LCDFramework.h) | 2 | ||||
| -rw-r--r-- | plugins/MirandaG15/src/LCDFramework/LCDObject.cpp (renamed from plugins/MirandaG15/LCDFramework/src/LCDObject.cpp) | 0 | ||||
| -rw-r--r-- | plugins/MirandaG15/src/LCDFramework/debug.cpp (renamed from plugins/MirandaG15/LCDFramework/src/debug.cpp) | 0 | ||||
| -rw-r--r-- | plugins/MirandaG15/src/LCDFramework/debug.h (renamed from plugins/MirandaG15/LCDFramework/src/debug.h) | 0 | ||||
| -rw-r--r-- | plugins/MirandaG15/src/LCDFramework/g15sdk/lglcd.h (renamed from plugins/MirandaG15/LCDFramework/g15sdk/lglcd.h) | 0 | ||||
| -rw-r--r-- | plugins/MirandaG15/src/LCDFramework/g15sdk/lib/x64/lgLcd.lib (renamed from plugins/MirandaG15/LCDFramework/g15sdk/lib/x64/lgLcd.lib) | bin | 11950 -> 11950 bytes | |||
| -rw-r--r-- | plugins/MirandaG15/src/LCDFramework/g15sdk/lib/x86/lgLcd.lib (renamed from plugins/MirandaG15/LCDFramework/g15sdk/lib/x86/lgLcd.lib) | bin | 7994 -> 7994 bytes | |||
| -rw-r--r-- | plugins/MirandaG15/src/LCDFramework/hid/hid.lib (renamed from plugins/MirandaG15/LCDFramework/hid/hid.lib) | bin | 28352 -> 28352 bytes | |||
| -rw-r--r-- | plugins/MirandaG15/src/LCDFramework/hid/hidpi.h (renamed from plugins/MirandaG15/LCDFramework/hid/hidpi.h) | 0 | ||||
| -rw-r--r-- | plugins/MirandaG15/src/LCDFramework/hid/hidsdi.h (renamed from plugins/MirandaG15/LCDFramework/hid/hidsdi.h) | 0 | ||||
| -rw-r--r-- | plugins/MirandaG15/src/LCDFramework/hid/hidusage.h (renamed from plugins/MirandaG15/LCDFramework/hid/hidusage.h) | 0 | ||||
| -rw-r--r-- | plugins/MirandaG15/src/LCDFramework/hid/x64/hid.lib (renamed from plugins/MirandaG15/LCDFramework/hid/x64/hid.lib) | bin | 11336 -> 11336 bytes | |||
| -rw-r--r-- | plugins/MirandaG15/src/LCDFramework/misc.cpp (renamed from plugins/MirandaG15/LCDFramework/src/misc.cpp) | 0 | ||||
| -rw-r--r-- | plugins/MirandaG15/src/LCDFramework/misc.h (renamed from plugins/MirandaG15/LCDFramework/src/misc.h) | 0 | ||||
| -rw-r--r-- | plugins/MirandaG15/src/LCDFramework/stdafx.h (renamed from plugins/MirandaG15/LCDFramework/src/stdafx.h) | 0 | ||||
| -rw-r--r-- | plugins/MirandaG15/src/Miranda.cpp | 8 |
52 files changed, 307 insertions, 680 deletions
diff --git a/plugins/MirandaG15/LCDFramework/LCDFramework_10.vcxproj b/plugins/MirandaG15/LCDFramework/LCDFramework_10.vcxproj deleted file mode 100644 index 292460da7a..0000000000 --- a/plugins/MirandaG15/LCDFramework/LCDFramework_10.vcxproj +++ /dev/null @@ -1,177 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{3BBA4976-826E-44E5-B65F-8A2E1D912BE7}</ProjectGuid>
- <RootNamespace>LCDFramework</RootNamespace>
- <Keyword>Win32Proj</Keyword>
- <ProjectName>LCDFramework</ProjectName>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(ProjectDir)\g15sdk\;$(ProjectDir)\hid;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <Lib>
- <AdditionalDependencies>setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
- </Lib>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(ProjectDir)\g15sdk\;$(ProjectDir)\hid;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Lib>
- <AdditionalDependencies>setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
- </Lib>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <AdditionalIncludeDirectories>$(ProjectDir)\g15sdk\;$(ProjectDir)\hid\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <Optimization>Full</Optimization>
- <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
- </ClCompile>
- <Lib>
- <AdditionalDependencies>setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
- </Lib>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <ClCompile>
- <AdditionalIncludeDirectories>$(ProjectDir)\g15sdk\;$(ProjectDir)\hid\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <Optimization>Full</Optimization>
- <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
- </ClCompile>
- <Lib>
- <AdditionalDependencies>setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
- </Lib>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="src\CLCDGfx.cpp" />
- <ClCompile Include="src\CLCDOutputManager.cpp" />
- <ClCompile Include="src\CLCDScreen.cpp" />
- <ClCompile Include="src\misc.cpp" />
- <ClCompile Include="src\CLCDConnection.cpp" />
- <ClCompile Include="src\CLCDConnectionLogitech.cpp" />
- <ClCompile Include="src\ConStream.cpp" />
- <ClCompile Include="src\debug.cpp" />
- <ClCompile Include="src\CLCDBar.cpp" />
- <ClCompile Include="src\CLCDBitmap.cpp" />
- <ClCompile Include="src\CLCDInput.cpp" />
- <ClCompile Include="src\CLCDLabel.cpp" />
- <ClCompile Include="src\CLCDTextLog.cpp" />
- <ClCompile Include="src\CLCDTextObject.cpp" />
- <ClCompile Include="src\LCDObject.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="src\CLCDGfx.h" />
- <ClInclude Include="src\CLCDOutputManager.h" />
- <ClInclude Include="src\CLCDScreen.h" />
- <ClInclude Include="src\LCDFramework.h" />
- <ClInclude Include="src\misc.h" />
- <ClInclude Include="src\stdafx.h" />
- <ClInclude Include="src\CLCDConnection.h" />
- <ClInclude Include="src\CLCDConnectionLogitech.h" />
- <ClInclude Include="src\CLCDDevice.h" />
- <ClInclude Include="src\ConStream.h" />
- <ClInclude Include="src\debug.h" />
- <ClInclude Include="src\CLCDBar.h" />
- <ClInclude Include="src\CLCDBitmap.h" />
- <ClInclude Include="src\CLCDInput.h" />
- <ClInclude Include="src\CLCDLabel.h" />
- <ClInclude Include="src\CLCDList.h" />
- <ClInclude Include="src\CLCDObject.h" />
- <ClInclude Include="src\CLCDTextLog.h" />
- <ClInclude Include="src\CLCDTextObject.h" />
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file diff --git a/plugins/MirandaG15/LCDFramework/LCDFramework_10.vcxproj.filters b/plugins/MirandaG15/LCDFramework/LCDFramework_10.vcxproj.filters deleted file mode 100644 index 64d294b0ec..0000000000 --- a/plugins/MirandaG15/LCDFramework/LCDFramework_10.vcxproj.filters +++ /dev/null @@ -1,141 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
- <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
- </Filter>
- <Filter Include="Source Files\LCDConnections">
- <UniqueIdentifier>{b5136e30-be62-43f3-b14b-feb34b84fc74}</UniqueIdentifier>
- </Filter>
- <Filter Include="Source Files\debug">
- <UniqueIdentifier>{67510d21-eb00-49ae-a049-8dedd1561324}</UniqueIdentifier>
- </Filter>
- <Filter Include="Source Files\LCDObjects">
- <UniqueIdentifier>{510e0b20-a701-4058-b1e2-2e3949eeb56a}</UniqueIdentifier>
- </Filter>
- <Filter Include="Resource Files">
- <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
- <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
- </Filter>
- <Filter Include="Header Files">
- <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
- <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
- </Filter>
- <Filter Include="Header Files\LCDConnections">
- <UniqueIdentifier>{fad292fa-e001-4c46-931d-d2cdcd274c21}</UniqueIdentifier>
- </Filter>
- <Filter Include="Header Files\debug">
- <UniqueIdentifier>{65812f3e-00a5-4a8b-a420-f1db867ba16c}</UniqueIdentifier>
- </Filter>
- <Filter Include="Header Files\LCDObjects">
- <UniqueIdentifier>{438192d8-3f4c-42d7-9351-dbdbb6305977}</UniqueIdentifier>
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="src\CLCDGfx.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\CLCDOutputManager.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\CLCDScreen.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\misc.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\CLCDConnection.cpp">
- <Filter>Source Files\LCDConnections</Filter>
- </ClCompile>
- <ClCompile Include="src\CLCDConnectionLogitech.cpp">
- <Filter>Source Files\LCDConnections</Filter>
- </ClCompile>
- <ClCompile Include="src\ConStream.cpp">
- <Filter>Source Files\debug</Filter>
- </ClCompile>
- <ClCompile Include="src\debug.cpp">
- <Filter>Source Files\debug</Filter>
- </ClCompile>
- <ClCompile Include="src\CLCDBar.cpp">
- <Filter>Source Files\LCDObjects</Filter>
- </ClCompile>
- <ClCompile Include="src\CLCDBitmap.cpp">
- <Filter>Source Files\LCDObjects</Filter>
- </ClCompile>
- <ClCompile Include="src\CLCDInput.cpp">
- <Filter>Source Files\LCDObjects</Filter>
- </ClCompile>
- <ClCompile Include="src\CLCDLabel.cpp">
- <Filter>Source Files\LCDObjects</Filter>
- </ClCompile>
- <ClCompile Include="src\CLCDTextLog.cpp">
- <Filter>Source Files\LCDObjects</Filter>
- </ClCompile>
- <ClCompile Include="src\CLCDTextObject.cpp">
- <Filter>Source Files\LCDObjects</Filter>
- </ClCompile>
- <ClCompile Include="src\LCDObject.cpp">
- <Filter>Source Files\LCDObjects</Filter>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="src\CLCDGfx.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\CLCDOutputManager.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\CLCDScreen.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\LCDFramework.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\misc.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\stdafx.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\CLCDConnection.h">
- <Filter>Header Files\LCDConnections</Filter>
- </ClInclude>
- <ClInclude Include="src\CLCDConnectionLogitech.h">
- <Filter>Header Files\LCDConnections</Filter>
- </ClInclude>
- <ClInclude Include="src\CLCDDevice.h">
- <Filter>Header Files\LCDConnections</Filter>
- </ClInclude>
- <ClInclude Include="src\ConStream.h">
- <Filter>Header Files\debug</Filter>
- </ClInclude>
- <ClInclude Include="src\debug.h">
- <Filter>Header Files\debug</Filter>
- </ClInclude>
- <ClInclude Include="src\CLCDBar.h">
- <Filter>Header Files\LCDObjects</Filter>
- </ClInclude>
- <ClInclude Include="src\CLCDBitmap.h">
- <Filter>Header Files\LCDObjects</Filter>
- </ClInclude>
- <ClInclude Include="src\CLCDInput.h">
- <Filter>Header Files\LCDObjects</Filter>
- </ClInclude>
- <ClInclude Include="src\CLCDLabel.h">
- <Filter>Header Files\LCDObjects</Filter>
- </ClInclude>
- <ClInclude Include="src\CLCDList.h">
- <Filter>Header Files\LCDObjects</Filter>
- </ClInclude>
- <ClInclude Include="src\CLCDObject.h">
- <Filter>Header Files\LCDObjects</Filter>
- </ClInclude>
- <ClInclude Include="src\CLCDTextLog.h">
- <Filter>Header Files\LCDObjects</Filter>
- </ClInclude>
- <ClInclude Include="src\CLCDTextObject.h">
- <Filter>Header Files\LCDObjects</Filter>
- </ClInclude>
- </ItemGroup>
-</Project>
\ No newline at end of file diff --git a/plugins/MirandaG15/LCDFramework/LCDFramework_11.vcxproj b/plugins/MirandaG15/LCDFramework/LCDFramework_11.vcxproj deleted file mode 100644 index 6ffe115689..0000000000 --- a/plugins/MirandaG15/LCDFramework/LCDFramework_11.vcxproj +++ /dev/null @@ -1,185 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{3BBA4976-826E-44E5-B65F-8A2E1D912BE7}</ProjectGuid>
- <RootNamespace>LCDFramework</RootNamespace>
- <Keyword>Win32Proj</Keyword>
- <ProjectName>LCDFramework</ProjectName>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110_xp</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110_xp</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110_xp</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110_xp</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(ProjectDir)\g15sdk\;$(ProjectDir)\hid;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <Lib>
- <AdditionalDependencies>setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(ProjectDir)\g15sdk\Lib\x86;$(ProjectDir)\hid;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- </Lib>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(ProjectDir)\g15sdk\;$(ProjectDir)\hid;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Lib>
- <AdditionalDependencies>setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(ProjectDir)\g15sdk\Lib\x64;$(ProjectDir)\hid;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- </Lib>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <AdditionalIncludeDirectories>$(ProjectDir)\g15sdk\;$(ProjectDir)\hid\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <Optimization>Full</Optimization>
- <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
- </ClCompile>
- <Lib>
- <AdditionalDependencies>setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(ProjectDir)\g15sdk\Lib\x86;$(ProjectDir)\hid;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- </Lib>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <ClCompile>
- <AdditionalIncludeDirectories>$(ProjectDir)\g15sdk\;$(ProjectDir)\hid\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <Optimization>Full</Optimization>
- <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
- </ClCompile>
- <Lib>
- <AdditionalDependencies>setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(ProjectDir)\g15sdk\Lib\x86;$(ProjectDir)\hid;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- </Lib>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="src\CLCDGfx.cpp" />
- <ClCompile Include="src\CLCDOutputManager.cpp" />
- <ClCompile Include="src\CLCDScreen.cpp" />
- <ClCompile Include="src\misc.cpp" />
- <ClCompile Include="src\CLCDConnection.cpp" />
- <ClCompile Include="src\CLCDConnectionLogitech.cpp" />
- <ClCompile Include="src\ConStream.cpp" />
- <ClCompile Include="src\debug.cpp" />
- <ClCompile Include="src\CLCDBar.cpp" />
- <ClCompile Include="src\CLCDBitmap.cpp" />
- <ClCompile Include="src\CLCDInput.cpp" />
- <ClCompile Include="src\CLCDLabel.cpp" />
- <ClCompile Include="src\CLCDTextLog.cpp" />
- <ClCompile Include="src\CLCDTextObject.cpp" />
- <ClCompile Include="src\LCDObject.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="src\CLCDGfx.h" />
- <ClInclude Include="src\CLCDOutputManager.h" />
- <ClInclude Include="src\CLCDScreen.h" />
- <ClInclude Include="src\LCDFramework.h" />
- <ClInclude Include="src\misc.h" />
- <ClInclude Include="src\stdafx.h" />
- <ClInclude Include="src\CLCDConnection.h" />
- <ClInclude Include="src\CLCDConnectionLogitech.h" />
- <ClInclude Include="src\CLCDDevice.h" />
- <ClInclude Include="src\ConStream.h" />
- <ClInclude Include="src\debug.h" />
- <ClInclude Include="src\CLCDBar.h" />
- <ClInclude Include="src\CLCDBitmap.h" />
- <ClInclude Include="src\CLCDInput.h" />
- <ClInclude Include="src\CLCDLabel.h" />
- <ClInclude Include="src\CLCDList.h" />
- <ClInclude Include="src\CLCDObject.h" />
- <ClInclude Include="src\CLCDTextLog.h" />
- <ClInclude Include="src\CLCDTextObject.h" />
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file diff --git a/plugins/MirandaG15/LCDFramework/LCDFramework_11.vcxproj.filters b/plugins/MirandaG15/LCDFramework/LCDFramework_11.vcxproj.filters deleted file mode 100644 index 64d294b0ec..0000000000 --- a/plugins/MirandaG15/LCDFramework/LCDFramework_11.vcxproj.filters +++ /dev/null @@ -1,141 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
- <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
- </Filter>
- <Filter Include="Source Files\LCDConnections">
- <UniqueIdentifier>{b5136e30-be62-43f3-b14b-feb34b84fc74}</UniqueIdentifier>
- </Filter>
- <Filter Include="Source Files\debug">
- <UniqueIdentifier>{67510d21-eb00-49ae-a049-8dedd1561324}</UniqueIdentifier>
- </Filter>
- <Filter Include="Source Files\LCDObjects">
- <UniqueIdentifier>{510e0b20-a701-4058-b1e2-2e3949eeb56a}</UniqueIdentifier>
- </Filter>
- <Filter Include="Resource Files">
- <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
- <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
- </Filter>
- <Filter Include="Header Files">
- <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
- <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
- </Filter>
- <Filter Include="Header Files\LCDConnections">
- <UniqueIdentifier>{fad292fa-e001-4c46-931d-d2cdcd274c21}</UniqueIdentifier>
- </Filter>
- <Filter Include="Header Files\debug">
- <UniqueIdentifier>{65812f3e-00a5-4a8b-a420-f1db867ba16c}</UniqueIdentifier>
- </Filter>
- <Filter Include="Header Files\LCDObjects">
- <UniqueIdentifier>{438192d8-3f4c-42d7-9351-dbdbb6305977}</UniqueIdentifier>
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="src\CLCDGfx.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\CLCDOutputManager.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\CLCDScreen.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\misc.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\CLCDConnection.cpp">
- <Filter>Source Files\LCDConnections</Filter>
- </ClCompile>
- <ClCompile Include="src\CLCDConnectionLogitech.cpp">
- <Filter>Source Files\LCDConnections</Filter>
- </ClCompile>
- <ClCompile Include="src\ConStream.cpp">
- <Filter>Source Files\debug</Filter>
- </ClCompile>
- <ClCompile Include="src\debug.cpp">
- <Filter>Source Files\debug</Filter>
- </ClCompile>
- <ClCompile Include="src\CLCDBar.cpp">
- <Filter>Source Files\LCDObjects</Filter>
- </ClCompile>
- <ClCompile Include="src\CLCDBitmap.cpp">
- <Filter>Source Files\LCDObjects</Filter>
- </ClCompile>
- <ClCompile Include="src\CLCDInput.cpp">
- <Filter>Source Files\LCDObjects</Filter>
- </ClCompile>
- <ClCompile Include="src\CLCDLabel.cpp">
- <Filter>Source Files\LCDObjects</Filter>
- </ClCompile>
- <ClCompile Include="src\CLCDTextLog.cpp">
- <Filter>Source Files\LCDObjects</Filter>
- </ClCompile>
- <ClCompile Include="src\CLCDTextObject.cpp">
- <Filter>Source Files\LCDObjects</Filter>
- </ClCompile>
- <ClCompile Include="src\LCDObject.cpp">
- <Filter>Source Files\LCDObjects</Filter>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="src\CLCDGfx.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\CLCDOutputManager.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\CLCDScreen.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\LCDFramework.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\misc.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\stdafx.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\CLCDConnection.h">
- <Filter>Header Files\LCDConnections</Filter>
- </ClInclude>
- <ClInclude Include="src\CLCDConnectionLogitech.h">
- <Filter>Header Files\LCDConnections</Filter>
- </ClInclude>
- <ClInclude Include="src\CLCDDevice.h">
- <Filter>Header Files\LCDConnections</Filter>
- </ClInclude>
- <ClInclude Include="src\ConStream.h">
- <Filter>Header Files\debug</Filter>
- </ClInclude>
- <ClInclude Include="src\debug.h">
- <Filter>Header Files\debug</Filter>
- </ClInclude>
- <ClInclude Include="src\CLCDBar.h">
- <Filter>Header Files\LCDObjects</Filter>
- </ClInclude>
- <ClInclude Include="src\CLCDBitmap.h">
- <Filter>Header Files\LCDObjects</Filter>
- </ClInclude>
- <ClInclude Include="src\CLCDInput.h">
- <Filter>Header Files\LCDObjects</Filter>
- </ClInclude>
- <ClInclude Include="src\CLCDLabel.h">
- <Filter>Header Files\LCDObjects</Filter>
- </ClInclude>
- <ClInclude Include="src\CLCDList.h">
- <Filter>Header Files\LCDObjects</Filter>
- </ClInclude>
- <ClInclude Include="src\CLCDObject.h">
- <Filter>Header Files\LCDObjects</Filter>
- </ClInclude>
- <ClInclude Include="src\CLCDTextLog.h">
- <Filter>Header Files\LCDObjects</Filter>
- </ClInclude>
- <ClInclude Include="src\CLCDTextObject.h">
- <Filter>Header Files\LCDObjects</Filter>
- </ClInclude>
- </ItemGroup>
-</Project>
\ No newline at end of file diff --git a/plugins/MirandaG15/LCDFramework/docs/todo.txt b/plugins/MirandaG15/LCDFramework/docs/todo.txt deleted file mode 100644 index 868788c685..0000000000 --- a/plugins/MirandaG15/LCDFramework/docs/todo.txt +++ /dev/null @@ -1,8 +0,0 @@ -wordwrapping rewrite mit gettextextentextpoint
-
-Icon
-
-Kommentare für CLCDInput und CLCDOutputManager
-
-kommentarsystem ändern
-Outputmanager ggf umbenennen?
diff --git a/plugins/MirandaG15/MirandaG15_10.vcxproj b/plugins/MirandaG15/MirandaG15_10.vcxproj index 1670673154..1fb11780e0 100644 --- a/plugins/MirandaG15/MirandaG15_10.vcxproj +++ b/plugins/MirandaG15/MirandaG15_10.vcxproj @@ -77,7 +77,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>
@@ -96,6 +96,7 @@ <TargetMachine>MachineX86</TargetMachine>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\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>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -105,7 +106,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>
@@ -122,6 +123,7 @@ </DataExecutionPrevention>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\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>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -130,7 +132,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>
@@ -152,6 +154,7 @@ <TargetMachine>MachineX86</TargetMachine>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\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>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -160,7 +163,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>
@@ -181,6 +184,7 @@ </DataExecutionPrevention>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\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>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -212,6 +216,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" />
@@ -233,6 +252,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" />
@@ -285,11 +323,6 @@ <ResourceCompile Include="res\MirandaG15.rc" />
<ResourceCompile Include="res\Version.rc" />
</ItemGroup>
- <ItemGroup>
- <ProjectReference Include="LCDFramework\LCDFramework_10.vcxproj">
- <Project>{3bba4976-826e-44e5-b65f-8a2e1d912be7}</Project>
- </ProjectReference>
- </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
diff --git a/plugins/MirandaG15/MirandaG15_10.vcxproj.filters b/plugins/MirandaG15/MirandaG15_10.vcxproj.filters index a50d8fb337..d7b19a3fcb 100644 --- a/plugins/MirandaG15/MirandaG15_10.vcxproj.filters +++ b/plugins/MirandaG15/MirandaG15_10.vcxproj.filters @@ -25,6 +25,12 @@ <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
</Filter>
+ <Filter Include="Source Files\LCDframework">
+ <UniqueIdentifier>{00d79f18-bb9f-4b49-a3ac-0e053d0c958d}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Header Files\LCDframework">
+ <UniqueIdentifier>{e90eb6ae-328d-4e9f-9b67-7c3237f9789b}</UniqueIdentifier>
+ </Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\CAppletManager.cpp">
@@ -66,6 +72,51 @@ <ClCompile Include="src\stdafx.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="src\LCDFramework\CLCDBar.cpp">
+ <Filter>Source Files\LCDframework</Filter>
+ </ClCompile>
+ <ClCompile Include="src\LCDFramework\CLCDBitmap.cpp">
+ <Filter>Source Files\LCDframework</Filter>
+ </ClCompile>
+ <ClCompile Include="src\LCDFramework\CLCDConnection.cpp">
+ <Filter>Source Files\LCDframework</Filter>
+ </ClCompile>
+ <ClCompile Include="src\LCDFramework\CLCDConnectionLogitech.cpp">
+ <Filter>Source Files\LCDframework</Filter>
+ </ClCompile>
+ <ClCompile Include="src\LCDFramework\CLCDGfx.cpp">
+ <Filter>Source Files\LCDframework</Filter>
+ </ClCompile>
+ <ClCompile Include="src\LCDFramework\CLCDInput.cpp">
+ <Filter>Source Files\LCDframework</Filter>
+ </ClCompile>
+ <ClCompile Include="src\LCDFramework\CLCDLabel.cpp">
+ <Filter>Source Files\LCDframework</Filter>
+ </ClCompile>
+ <ClCompile Include="src\LCDFramework\CLCDOutputManager.cpp">
+ <Filter>Source Files\LCDframework</Filter>
+ </ClCompile>
+ <ClCompile Include="src\LCDFramework\CLCDScreen.cpp">
+ <Filter>Source Files\LCDframework</Filter>
+ </ClCompile>
+ <ClCompile Include="src\LCDFramework\CLCDTextLog.cpp">
+ <Filter>Source Files\LCDframework</Filter>
+ </ClCompile>
+ <ClCompile Include="src\LCDFramework\CLCDTextObject.cpp">
+ <Filter>Source Files\LCDframework</Filter>
+ </ClCompile>
+ <ClCompile Include="src\LCDFramework\ConStream.cpp">
+ <Filter>Source Files\LCDframework</Filter>
+ </ClCompile>
+ <ClCompile Include="src\LCDFramework\debug.cpp">
+ <Filter>Source Files\LCDframework</Filter>
+ </ClCompile>
+ <ClCompile Include="src\LCDFramework\LCDObject.cpp">
+ <Filter>Source Files\LCDframework</Filter>
+ </ClCompile>
+ <ClCompile Include="src\LCDFramework\misc.cpp">
+ <Filter>Source Files\LCDframework</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\CAppletManager.h">
@@ -125,6 +176,63 @@ <ClInclude Include="src\Version.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="src\LCDFramework\CLCDBar.h">
+ <Filter>Header Files\LCDframework</Filter>
+ </ClInclude>
+ <ClInclude Include="src\LCDFramework\CLCDBitmap.h">
+ <Filter>Header Files\LCDframework</Filter>
+ </ClInclude>
+ <ClInclude Include="src\LCDFramework\CLCDConnection.h">
+ <Filter>Header Files\LCDframework</Filter>
+ </ClInclude>
+ <ClInclude Include="src\LCDFramework\CLCDConnectionLogitech.h">
+ <Filter>Header Files\LCDframework</Filter>
+ </ClInclude>
+ <ClInclude Include="src\LCDFramework\CLCDDevice.h">
+ <Filter>Header Files\LCDframework</Filter>
+ </ClInclude>
+ <ClInclude Include="src\LCDFramework\CLCDGfx.h">
+ <Filter>Header Files\LCDframework</Filter>
+ </ClInclude>
+ <ClInclude Include="src\LCDFramework\CLCDInput.h">
+ <Filter>Header Files\LCDframework</Filter>
+ </ClInclude>
+ <ClInclude Include="src\LCDFramework\CLCDLabel.h">
+ <Filter>Header Files\LCDframework</Filter>
+ </ClInclude>
+ <ClInclude Include="src\LCDFramework\CLCDList.h">
+ <Filter>Header Files\LCDframework</Filter>
+ </ClInclude>
+ <ClInclude Include="src\LCDFramework\CLCDObject.h">
+ <Filter>Header Files\LCDframework</Filter>
+ </ClInclude>
+ <ClInclude Include="src\LCDFramework\CLCDOutputManager.h">
+ <Filter>Header Files\LCDframework</Filter>
+ </ClInclude>
+ <ClInclude Include="src\LCDFramework\CLCDScreen.h">
+ <Filter>Header Files\LCDframework</Filter>
+ </ClInclude>
+ <ClInclude Include="src\LCDFramework\CLCDTextLog.h">
+ <Filter>Header Files\LCDframework</Filter>
+ </ClInclude>
+ <ClInclude Include="src\LCDFramework\CLCDTextObject.h">
+ <Filter>Header Files\LCDframework</Filter>
+ </ClInclude>
+ <ClInclude Include="src\LCDFramework\ConStream.h">
+ <Filter>Header Files\LCDframework</Filter>
+ </ClInclude>
+ <ClInclude Include="src\LCDFramework\debug.h">
+ <Filter>Header Files\LCDframework</Filter>
+ </ClInclude>
+ <ClInclude Include="src\LCDFramework\LCDFramework.h">
+ <Filter>Header Files\LCDframework</Filter>
+ </ClInclude>
+ <ClInclude Include="src\LCDFramework\misc.h">
+ <Filter>Header Files\LCDframework</Filter>
+ </ClInclude>
+ <ClInclude Include="src\LCDFramework\stdafx.h">
+ <Filter>Header Files\LCDframework</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="res\status\away.bmp">
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>
diff --git a/plugins/MirandaG15/MirandaG15_11.vcxproj.filters b/plugins/MirandaG15/MirandaG15_11.vcxproj.filters index a50d8fb337..d7b19a3fcb 100644 --- a/plugins/MirandaG15/MirandaG15_11.vcxproj.filters +++ b/plugins/MirandaG15/MirandaG15_11.vcxproj.filters @@ -25,6 +25,12 @@ <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
</Filter>
+ <Filter Include="Source Files\LCDframework">
+ <UniqueIdentifier>{00d79f18-bb9f-4b49-a3ac-0e053d0c958d}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Header Files\LCDframework">
+ <UniqueIdentifier>{e90eb6ae-328d-4e9f-9b67-7c3237f9789b}</UniqueIdentifier>
+ </Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\CAppletManager.cpp">
@@ -66,6 +72,51 @@ <ClCompile Include="src\stdafx.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="src\LCDFramework\CLCDBar.cpp">
+ <Filter>Source Files\LCDframework</Filter>
+ </ClCompile>
+ <ClCompile Include="src\LCDFramework\CLCDBitmap.cpp">
+ <Filter>Source Files\LCDframework</Filter>
+ </ClCompile>
+ <ClCompile Include="src\LCDFramework\CLCDConnection.cpp">
+ <Filter>Source Files\LCDframework</Filter>
+ </ClCompile>
+ <ClCompile Include="src\LCDFramework\CLCDConnectionLogitech.cpp">
+ <Filter>Source Files\LCDframework</Filter>
+ </ClCompile>
+ <ClCompile Include="src\LCDFramework\CLCDGfx.cpp">
+ <Filter>Source Files\LCDframework</Filter>
+ </ClCompile>
+ <ClCompile Include="src\LCDFramework\CLCDInput.cpp">
+ <Filter>Source Files\LCDframework</Filter>
+ </ClCompile>
+ <ClCompile Include="src\LCDFramework\CLCDLabel.cpp">
+ <Filter>Source Files\LCDframework</Filter>
+ </ClCompile>
+ <ClCompile Include="src\LCDFramework\CLCDOutputManager.cpp">
+ <Filter>Source Files\LCDframework</Filter>
+ </ClCompile>
+ <ClCompile Include="src\LCDFramework\CLCDScreen.cpp">
+ <Filter>Source Files\LCDframework</Filter>
+ </ClCompile>
+ <ClCompile Include="src\LCDFramework\CLCDTextLog.cpp">
+ <Filter>Source Files\LCDframework</Filter>
+ </ClCompile>
+ <ClCompile Include="src\LCDFramework\CLCDTextObject.cpp">
+ <Filter>Source Files\LCDframework</Filter>
+ </ClCompile>
+ <ClCompile Include="src\LCDFramework\ConStream.cpp">
+ <Filter>Source Files\LCDframework</Filter>
+ </ClCompile>
+ <ClCompile Include="src\LCDFramework\debug.cpp">
+ <Filter>Source Files\LCDframework</Filter>
+ </ClCompile>
+ <ClCompile Include="src\LCDFramework\LCDObject.cpp">
+ <Filter>Source Files\LCDframework</Filter>
+ </ClCompile>
+ <ClCompile Include="src\LCDFramework\misc.cpp">
+ <Filter>Source Files\LCDframework</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\CAppletManager.h">
@@ -125,6 +176,63 @@ <ClInclude Include="src\Version.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="src\LCDFramework\CLCDBar.h">
+ <Filter>Header Files\LCDframework</Filter>
+ </ClInclude>
+ <ClInclude Include="src\LCDFramework\CLCDBitmap.h">
+ <Filter>Header Files\LCDframework</Filter>
+ </ClInclude>
+ <ClInclude Include="src\LCDFramework\CLCDConnection.h">
+ <Filter>Header Files\LCDframework</Filter>
+ </ClInclude>
+ <ClInclude Include="src\LCDFramework\CLCDConnectionLogitech.h">
+ <Filter>Header Files\LCDframework</Filter>
+ </ClInclude>
+ <ClInclude Include="src\LCDFramework\CLCDDevice.h">
+ <Filter>Header Files\LCDframework</Filter>
+ </ClInclude>
+ <ClInclude Include="src\LCDFramework\CLCDGfx.h">
+ <Filter>Header Files\LCDframework</Filter>
+ </ClInclude>
+ <ClInclude Include="src\LCDFramework\CLCDInput.h">
+ <Filter>Header Files\LCDframework</Filter>
+ </ClInclude>
+ <ClInclude Include="src\LCDFramework\CLCDLabel.h">
+ <Filter>Header Files\LCDframework</Filter>
+ </ClInclude>
+ <ClInclude Include="src\LCDFramework\CLCDList.h">
+ <Filter>Header Files\LCDframework</Filter>
+ </ClInclude>
+ <ClInclude Include="src\LCDFramework\CLCDObject.h">
+ <Filter>Header Files\LCDframework</Filter>
+ </ClInclude>
+ <ClInclude Include="src\LCDFramework\CLCDOutputManager.h">
+ <Filter>Header Files\LCDframework</Filter>
+ </ClInclude>
+ <ClInclude Include="src\LCDFramework\CLCDScreen.h">
+ <Filter>Header Files\LCDframework</Filter>
+ </ClInclude>
+ <ClInclude Include="src\LCDFramework\CLCDTextLog.h">
+ <Filter>Header Files\LCDframework</Filter>
+ </ClInclude>
+ <ClInclude Include="src\LCDFramework\CLCDTextObject.h">
+ <Filter>Header Files\LCDframework</Filter>
+ </ClInclude>
+ <ClInclude Include="src\LCDFramework\ConStream.h">
+ <Filter>Header Files\LCDframework</Filter>
+ </ClInclude>
+ <ClInclude Include="src\LCDFramework\debug.h">
+ <Filter>Header Files\LCDframework</Filter>
+ </ClInclude>
+ <ClInclude Include="src\LCDFramework\LCDFramework.h">
+ <Filter>Header Files\LCDframework</Filter>
+ </ClInclude>
+ <ClInclude Include="src\LCDFramework\misc.h">
+ <Filter>Header Files\LCDframework</Filter>
+ </ClInclude>
+ <ClInclude Include="src\LCDFramework\stdafx.h">
+ <Filter>Header Files\LCDframework</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="res\status\away.bmp">
diff --git a/plugins/MirandaG15/LCDFramework/src/CLCDBar.cpp b/plugins/MirandaG15/src/LCDFramework/CLCDBar.cpp index f5701edd35..f5701edd35 100644 --- a/plugins/MirandaG15/LCDFramework/src/CLCDBar.cpp +++ b/plugins/MirandaG15/src/LCDFramework/CLCDBar.cpp diff --git a/plugins/MirandaG15/LCDFramework/src/CLCDBar.h b/plugins/MirandaG15/src/LCDFramework/CLCDBar.h index 1afb446132..1afb446132 100644 --- a/plugins/MirandaG15/LCDFramework/src/CLCDBar.h +++ b/plugins/MirandaG15/src/LCDFramework/CLCDBar.h diff --git a/plugins/MirandaG15/LCDFramework/src/CLCDBitmap.cpp b/plugins/MirandaG15/src/LCDFramework/CLCDBitmap.cpp index 5ce448769d..5ce448769d 100644 --- a/plugins/MirandaG15/LCDFramework/src/CLCDBitmap.cpp +++ b/plugins/MirandaG15/src/LCDFramework/CLCDBitmap.cpp diff --git a/plugins/MirandaG15/LCDFramework/src/CLCDBitmap.h b/plugins/MirandaG15/src/LCDFramework/CLCDBitmap.h index d8c7813b81..d8c7813b81 100644 --- a/plugins/MirandaG15/LCDFramework/src/CLCDBitmap.h +++ b/plugins/MirandaG15/src/LCDFramework/CLCDBitmap.h diff --git a/plugins/MirandaG15/LCDFramework/src/CLCDConnection.cpp b/plugins/MirandaG15/src/LCDFramework/CLCDConnection.cpp index cee754739c..cee754739c 100644 --- a/plugins/MirandaG15/LCDFramework/src/CLCDConnection.cpp +++ b/plugins/MirandaG15/src/LCDFramework/CLCDConnection.cpp diff --git a/plugins/MirandaG15/LCDFramework/src/CLCDConnection.h b/plugins/MirandaG15/src/LCDFramework/CLCDConnection.h index 099f850ec9..099f850ec9 100644 --- a/plugins/MirandaG15/LCDFramework/src/CLCDConnection.h +++ b/plugins/MirandaG15/src/LCDFramework/CLCDConnection.h diff --git a/plugins/MirandaG15/LCDFramework/src/CLCDConnectionLogitech.cpp b/plugins/MirandaG15/src/LCDFramework/CLCDConnectionLogitech.cpp index a36b897e2d..a36b897e2d 100644 --- a/plugins/MirandaG15/LCDFramework/src/CLCDConnectionLogitech.cpp +++ b/plugins/MirandaG15/src/LCDFramework/CLCDConnectionLogitech.cpp diff --git a/plugins/MirandaG15/LCDFramework/src/CLCDConnectionLogitech.h b/plugins/MirandaG15/src/LCDFramework/CLCDConnectionLogitech.h index 1eb8389ee2..631c74121c 100644 --- a/plugins/MirandaG15/LCDFramework/src/CLCDConnectionLogitech.h +++ b/plugins/MirandaG15/src/LCDFramework/CLCDConnectionLogitech.h @@ -3,7 +3,7 @@ #include "CLCDDevice.h"
#include "CLCDConnection.h"
-#include "../g15sdk/lglcd.h"
+#include "g15sdk/lglcd.h"
#define G15_M1_LIGHT 0x01
#define G15_M2_LIGHT 0x02
diff --git a/plugins/MirandaG15/LCDFramework/src/CLCDDevice.h b/plugins/MirandaG15/src/LCDFramework/CLCDDevice.h index f7d9c15922..d7d2efe35e 100644 --- a/plugins/MirandaG15/LCDFramework/src/CLCDDevice.h +++ b/plugins/MirandaG15/src/LCDFramework/CLCDDevice.h @@ -1,7 +1,7 @@ #ifndef _CLCDDEVICE_H_
#define _CLCDDEVICE_H_
-#include "../g15sdk/lglcd.h"
+#include "g15sdk/lglcd.h"
class CLCDDevice {
private:
diff --git a/plugins/MirandaG15/LCDFramework/src/CLCDGfx.cpp b/plugins/MirandaG15/src/LCDFramework/CLCDGfx.cpp index 7240263a79..7240263a79 100644 --- a/plugins/MirandaG15/LCDFramework/src/CLCDGfx.cpp +++ b/plugins/MirandaG15/src/LCDFramework/CLCDGfx.cpp diff --git a/plugins/MirandaG15/LCDFramework/src/CLCDGfx.h b/plugins/MirandaG15/src/LCDFramework/CLCDGfx.h index bdca950718..bdca950718 100644 --- a/plugins/MirandaG15/LCDFramework/src/CLCDGfx.h +++ b/plugins/MirandaG15/src/LCDFramework/CLCDGfx.h diff --git a/plugins/MirandaG15/LCDFramework/src/CLCDInput.cpp b/plugins/MirandaG15/src/LCDFramework/CLCDInput.cpp index d482099de3..d482099de3 100644 --- a/plugins/MirandaG15/LCDFramework/src/CLCDInput.cpp +++ b/plugins/MirandaG15/src/LCDFramework/CLCDInput.cpp diff --git a/plugins/MirandaG15/LCDFramework/src/CLCDInput.h b/plugins/MirandaG15/src/LCDFramework/CLCDInput.h index ccf9def536..ccf9def536 100644 --- a/plugins/MirandaG15/LCDFramework/src/CLCDInput.h +++ b/plugins/MirandaG15/src/LCDFramework/CLCDInput.h diff --git a/plugins/MirandaG15/LCDFramework/src/CLCDLabel.cpp b/plugins/MirandaG15/src/LCDFramework/CLCDLabel.cpp index 6451f76665..6451f76665 100644 --- a/plugins/MirandaG15/LCDFramework/src/CLCDLabel.cpp +++ b/plugins/MirandaG15/src/LCDFramework/CLCDLabel.cpp diff --git a/plugins/MirandaG15/LCDFramework/src/CLCDLabel.h b/plugins/MirandaG15/src/LCDFramework/CLCDLabel.h index b2bcc5bc3b..b2bcc5bc3b 100644 --- a/plugins/MirandaG15/LCDFramework/src/CLCDLabel.h +++ b/plugins/MirandaG15/src/LCDFramework/CLCDLabel.h diff --git a/plugins/MirandaG15/LCDFramework/src/CLCDList.h b/plugins/MirandaG15/src/LCDFramework/CLCDList.h index ae019fe914..ae019fe914 100644 --- a/plugins/MirandaG15/LCDFramework/src/CLCDList.h +++ b/plugins/MirandaG15/src/LCDFramework/CLCDList.h diff --git a/plugins/MirandaG15/LCDFramework/src/CLCDObject.h b/plugins/MirandaG15/src/LCDFramework/CLCDObject.h index 13dbb5a101..13dbb5a101 100644 --- a/plugins/MirandaG15/LCDFramework/src/CLCDObject.h +++ b/plugins/MirandaG15/src/LCDFramework/CLCDObject.h diff --git a/plugins/MirandaG15/LCDFramework/src/CLCDOutputManager.cpp b/plugins/MirandaG15/src/LCDFramework/CLCDOutputManager.cpp index e1cc493a16..e1cc493a16 100644 --- a/plugins/MirandaG15/LCDFramework/src/CLCDOutputManager.cpp +++ b/plugins/MirandaG15/src/LCDFramework/CLCDOutputManager.cpp diff --git a/plugins/MirandaG15/LCDFramework/src/CLCDOutputManager.h b/plugins/MirandaG15/src/LCDFramework/CLCDOutputManager.h index 1011e5d551..1011e5d551 100644 --- a/plugins/MirandaG15/LCDFramework/src/CLCDOutputManager.h +++ b/plugins/MirandaG15/src/LCDFramework/CLCDOutputManager.h diff --git a/plugins/MirandaG15/LCDFramework/src/CLCDScreen.cpp b/plugins/MirandaG15/src/LCDFramework/CLCDScreen.cpp index fa1a59e49a..fa1a59e49a 100644 --- a/plugins/MirandaG15/LCDFramework/src/CLCDScreen.cpp +++ b/plugins/MirandaG15/src/LCDFramework/CLCDScreen.cpp diff --git a/plugins/MirandaG15/LCDFramework/src/CLCDScreen.h b/plugins/MirandaG15/src/LCDFramework/CLCDScreen.h index 1f8b431a73..1f8b431a73 100644 --- a/plugins/MirandaG15/LCDFramework/src/CLCDScreen.h +++ b/plugins/MirandaG15/src/LCDFramework/CLCDScreen.h diff --git a/plugins/MirandaG15/LCDFramework/src/CLCDTextLog.cpp b/plugins/MirandaG15/src/LCDFramework/CLCDTextLog.cpp index d1abb9d704..d1abb9d704 100644 --- a/plugins/MirandaG15/LCDFramework/src/CLCDTextLog.cpp +++ b/plugins/MirandaG15/src/LCDFramework/CLCDTextLog.cpp diff --git a/plugins/MirandaG15/LCDFramework/src/CLCDTextLog.h b/plugins/MirandaG15/src/LCDFramework/CLCDTextLog.h index 312ec8a992..312ec8a992 100644 --- a/plugins/MirandaG15/LCDFramework/src/CLCDTextLog.h +++ b/plugins/MirandaG15/src/LCDFramework/CLCDTextLog.h diff --git a/plugins/MirandaG15/LCDFramework/src/CLCDTextObject.cpp b/plugins/MirandaG15/src/LCDFramework/CLCDTextObject.cpp index 1e06d87774..1e06d87774 100644 --- a/plugins/MirandaG15/LCDFramework/src/CLCDTextObject.cpp +++ b/plugins/MirandaG15/src/LCDFramework/CLCDTextObject.cpp diff --git a/plugins/MirandaG15/LCDFramework/src/CLCDTextObject.h b/plugins/MirandaG15/src/LCDFramework/CLCDTextObject.h index ddc32c5eac..ddc32c5eac 100644 --- a/plugins/MirandaG15/LCDFramework/src/CLCDTextObject.h +++ b/plugins/MirandaG15/src/LCDFramework/CLCDTextObject.h diff --git a/plugins/MirandaG15/LCDFramework/src/ConStream.cpp b/plugins/MirandaG15/src/LCDFramework/ConStream.cpp Binary files differindex 98b3f5c921..98b3f5c921 100644 --- a/plugins/MirandaG15/LCDFramework/src/ConStream.cpp +++ b/plugins/MirandaG15/src/LCDFramework/ConStream.cpp diff --git a/plugins/MirandaG15/LCDFramework/src/ConStream.h b/plugins/MirandaG15/src/LCDFramework/ConStream.h Binary files differindex 78664316e8..78664316e8 100644 --- a/plugins/MirandaG15/LCDFramework/src/ConStream.h +++ b/plugins/MirandaG15/src/LCDFramework/ConStream.h diff --git a/plugins/MirandaG15/LCDFramework/src/LCDFramework.h b/plugins/MirandaG15/src/LCDFramework/LCDFramework.h index cdc9c44a05..ce943d827f 100644 --- a/plugins/MirandaG15/LCDFramework/src/LCDFramework.h +++ b/plugins/MirandaG15/src/LCDFramework/LCDFramework.h @@ -5,7 +5,7 @@ #include <setupapi.h>
extern "C"
{
-#include "../hid/hidsdi.h"
+#include "hid/hidsdi.h"
}
#ifdef _UNICODE
diff --git a/plugins/MirandaG15/LCDFramework/src/LCDObject.cpp b/plugins/MirandaG15/src/LCDFramework/LCDObject.cpp index 2fe0319ca3..2fe0319ca3 100644 --- a/plugins/MirandaG15/LCDFramework/src/LCDObject.cpp +++ b/plugins/MirandaG15/src/LCDFramework/LCDObject.cpp diff --git a/plugins/MirandaG15/LCDFramework/src/debug.cpp b/plugins/MirandaG15/src/LCDFramework/debug.cpp index abca919bfe..abca919bfe 100644 --- a/plugins/MirandaG15/LCDFramework/src/debug.cpp +++ b/plugins/MirandaG15/src/LCDFramework/debug.cpp diff --git a/plugins/MirandaG15/LCDFramework/src/debug.h b/plugins/MirandaG15/src/LCDFramework/debug.h index 39e34ebaae..39e34ebaae 100644 --- a/plugins/MirandaG15/LCDFramework/src/debug.h +++ b/plugins/MirandaG15/src/LCDFramework/debug.h diff --git a/plugins/MirandaG15/LCDFramework/g15sdk/lglcd.h b/plugins/MirandaG15/src/LCDFramework/g15sdk/lglcd.h index c9ef6d11f7..c9ef6d11f7 100644 --- a/plugins/MirandaG15/LCDFramework/g15sdk/lglcd.h +++ b/plugins/MirandaG15/src/LCDFramework/g15sdk/lglcd.h diff --git a/plugins/MirandaG15/LCDFramework/g15sdk/lib/x64/lgLcd.lib b/plugins/MirandaG15/src/LCDFramework/g15sdk/lib/x64/lgLcd.lib Binary files differindex 998bd22c7d..998bd22c7d 100644 --- a/plugins/MirandaG15/LCDFramework/g15sdk/lib/x64/lgLcd.lib +++ b/plugins/MirandaG15/src/LCDFramework/g15sdk/lib/x64/lgLcd.lib diff --git a/plugins/MirandaG15/LCDFramework/g15sdk/lib/x86/lgLcd.lib b/plugins/MirandaG15/src/LCDFramework/g15sdk/lib/x86/lgLcd.lib Binary files differindex a2725403e3..a2725403e3 100644 --- a/plugins/MirandaG15/LCDFramework/g15sdk/lib/x86/lgLcd.lib +++ b/plugins/MirandaG15/src/LCDFramework/g15sdk/lib/x86/lgLcd.lib diff --git a/plugins/MirandaG15/LCDFramework/hid/hid.lib b/plugins/MirandaG15/src/LCDFramework/hid/hid.lib Binary files differindex 09201a3356..09201a3356 100644 --- a/plugins/MirandaG15/LCDFramework/hid/hid.lib +++ b/plugins/MirandaG15/src/LCDFramework/hid/hid.lib diff --git a/plugins/MirandaG15/LCDFramework/hid/hidpi.h b/plugins/MirandaG15/src/LCDFramework/hid/hidpi.h index a23f3a701f..a23f3a701f 100644 --- a/plugins/MirandaG15/LCDFramework/hid/hidpi.h +++ b/plugins/MirandaG15/src/LCDFramework/hid/hidpi.h diff --git a/plugins/MirandaG15/LCDFramework/hid/hidsdi.h b/plugins/MirandaG15/src/LCDFramework/hid/hidsdi.h index f75e07dd21..f75e07dd21 100644 --- a/plugins/MirandaG15/LCDFramework/hid/hidsdi.h +++ b/plugins/MirandaG15/src/LCDFramework/hid/hidsdi.h diff --git a/plugins/MirandaG15/LCDFramework/hid/hidusage.h b/plugins/MirandaG15/src/LCDFramework/hid/hidusage.h index 190b7ae811..190b7ae811 100644 --- a/plugins/MirandaG15/LCDFramework/hid/hidusage.h +++ b/plugins/MirandaG15/src/LCDFramework/hid/hidusage.h diff --git a/plugins/MirandaG15/LCDFramework/hid/x64/hid.lib b/plugins/MirandaG15/src/LCDFramework/hid/x64/hid.lib Binary files differindex a422d76e59..a422d76e59 100644 --- a/plugins/MirandaG15/LCDFramework/hid/x64/hid.lib +++ b/plugins/MirandaG15/src/LCDFramework/hid/x64/hid.lib diff --git a/plugins/MirandaG15/LCDFramework/src/misc.cpp b/plugins/MirandaG15/src/LCDFramework/misc.cpp index 3e861fb529..3e861fb529 100644 --- a/plugins/MirandaG15/LCDFramework/src/misc.cpp +++ b/plugins/MirandaG15/src/LCDFramework/misc.cpp diff --git a/plugins/MirandaG15/LCDFramework/src/misc.h b/plugins/MirandaG15/src/LCDFramework/misc.h index 43e35327c5..43e35327c5 100644 --- a/plugins/MirandaG15/LCDFramework/src/misc.h +++ b/plugins/MirandaG15/src/LCDFramework/misc.h diff --git a/plugins/MirandaG15/LCDFramework/src/stdafx.h b/plugins/MirandaG15/src/LCDFramework/stdafx.h index 8830f34250..8830f34250 100644 --- a/plugins/MirandaG15/LCDFramework/src/stdafx.h +++ b/plugins/MirandaG15/src/LCDFramework/stdafx.h diff --git a/plugins/MirandaG15/src/Miranda.cpp b/plugins/MirandaG15/src/Miranda.cpp index dbe2c4da9f..d40cbc86fa 100644 --- a/plugins/MirandaG15/src/Miranda.cpp +++ b/plugins/MirandaG15/src/Miranda.cpp @@ -42,11 +42,11 @@ #define LCD_FPS 10
#ifdef _WIN64
- #pragma comment(lib, "LCDFramework\\hid\\x64\\hid.lib")
- #pragma comment(lib, "LCDFramework\\g15sdk\\lib\\x64\\lgLcd.lib")
+ #pragma comment(lib, "src\\LCDFramework\\hid\\x64\\hid.lib")
+ #pragma comment(lib, "src\\LCDFramework\\g15sdk\\lib\\x64\\lgLcd.lib")
#else
- #pragma comment(lib, "LCDFramework\\hid\\hid.lib")
- #pragma comment(lib, "LCDFramework\\g15sdk\\lib\\x86\\lgLcd.lib")
+ #pragma comment(lib, "src\\LCDFramework\\hid\\hid.lib")
+ #pragma comment(lib, "src\\LCDFramework\\g15sdk\\lib\\x86\\lgLcd.lib")
#endif
//************************************************************************
|