MirLua: winapi cleanup

git-svn-id: http://svn.miranda-ng.org/main/trunk@16060 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

6 files changed, 20 insertions, 166 deletions

diff --git a/plugins/MirLua/Modules/WinAPI/WinAPI.vcxproj b/plugins/MirLua/Modules/WinAPI/WinAPI.vcxproj
index 86a81c3522..b26fd1f049 100644
--- a/plugins/MirLua/Modules/WinAPI/WinAPI.vcxproj
+++ b/plugins/MirLua/Modules/WinAPI/WinAPI.vcxproj
@@ -17,20 +17,12 @@
       <Configuration>Release</Configuration>

       <Platform>x64</Platform>

     </ProjectConfiguration>

-    <ProjectReference Include="..\..\..\..\libs\liblua\liblua.vcxproj">

-      <Project>{bd291bf0-d804-4818-8311-de871e6bceaa}</Project>

-    </ProjectReference>

   </ItemGroup>

   <PropertyGroup Label="Globals">

-    <ProjectName>WinAPI</ProjectName>

+    <ProjectName>winapi</ProjectName>

     <ProjectGuid>{045bac91-34d1-4b43-b52b-566801be7f85}</ProjectGuid>

   </PropertyGroup>

   <ImportGroup Label="PropertySheets">

     <Import Project="$(ProjectDir)..\module.props" />

   </ImportGroup>

-  <ItemDefinitionGroup>

-    <ClCompile>

-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\libs\liblua\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-    </ClCompile>

-  </ItemDefinitionGroup>

-</Project>
\ No newline at end of file
+</Project>

diff --git a/plugins/MirLua/Modules/WinAPI/src/stdafx.h b/plugins/MirLua/Modules/WinAPI/src/stdafx.h
index 9b4664bd1f..f2207236e2 100644
--- a/plugins/MirLua/Modules/WinAPI/src/stdafx.h
+++ b/plugins/MirLua/Modules/WinAPI/src/stdafx.h
@@ -43,6 +43,7 @@
 * NOTES

 *

 ***/

+

 #define LUA_WINAPI_LIB extern "C" int __declspec(dllexport)

 

 #include <lua.hpp>

@@ -62,7 +63,6 @@
 #include <sys/stat.h>

 #include <sys/utime.h>

 

-

 #include <m_core.h>

 #include <m_utils.h>

 

diff --git a/plugins/MirLua/Modules/WinAPI/src/winapi.cpp b/plugins/MirLua/Modules/WinAPI/src/winapi.cpp
index dbf564d210..c3aa9f4d0e 100644
--- a/plugins/MirLua/Modules/WinAPI/src/winapi.cpp
+++ b/plugins/MirLua/Modules/WinAPI/src/winapi.cpp
@@ -2142,14 +2142,14 @@ static luaL_Reg winApi[] =
 	{ NULL, NULL }

 };

 

-LUA_WINAPI_LIB luaopen_WinAPI(lua_State *L)

+LUA_WINAPI_LIB luaopen_winapi(lua_State *L)

 {

 	luaL_newlib(L, winApi);

 	

 	for (size_t i = 0; consts[i].name != NULL; i++)

 	{

 		lua_pushstring(L, consts[i].name);

-        lua_pushnumber(L, consts[i].value);

+		lua_pushnumber(L, consts[i].value);

 		lua_settable(L, -3);

 	}

 

diff --git a/plugins/MirLua/Modules/common.filters b/plugins/MirLua/Modules/common.filters
deleted file mode 100644
index 1af5b5334c..0000000000
--- a/plugins/MirLua/Modules/common.filters
+++ /dev/null
@@ -1,32 +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="Header Files">

-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>

-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>

-    </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>

-  </ItemGroup>

-

-  <ItemGroup>

-    <ClCompile Include="*.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClInclude Include="*.h;*.hpp">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ResourceCompile Include="*.rc">

-      <Filter>Resource Files</Filter>

-    </ResourceCompile>

-    <None Include="*.def">

-      <Filter>Source Files</Filter>

-    </None>

-  </ItemGroup>

-</Project>
\ No newline at end of file
diff --git a/plugins/MirLua/Modules/common.props b/plugins/MirLua/Modules/common.props
deleted file mode 100644
index 0e6422d781..0000000000
--- a/plugins/MirLua/Modules/common.props
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup Label="UserMacros">

-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

-    <CommonLibDir Condition="'$(VisualStudioVersion)' == '10.0'">$(ProjectDir)..\..\..\..\bin10\lib</CommonLibDir>

-    <CommonLibDir Condition="'$(VisualStudioVersion)' == '12.0'">$(ProjectDir)..\..\..\..\bin12\lib</CommonLibDir>

-    <CommonLibDir Condition="'$(VisualStudioVersion)' == '14.0'">$(ProjectDir)..\..\..\..\bin14\lib</CommonLibDir>

-  </PropertyGroup>

-  <PropertyGroup>

-    <RootNamespace>$(ProjectName)</RootNamespace>

-    <Keyword>Win32Proj</Keyword>

-    <CharacterSet>Unicode</CharacterSet>

-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>

-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110_xp</PlatformToolset>

-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120_xp</PlatformToolset>

-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0'">v140_xp</PlatformToolset>

-    <IntDir Condition="'$(Platform)'=='Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>

-    <IntDir Condition="'$(Platform)'=='x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>

-    <WholeProgramOptimization Condition="'$(Configuration)'=='Release'">true</WholeProgramOptimization>

-    <LinkIncremental Condition="'$(Configuration)'=='Release'">false</LinkIncremental>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

-  <ItemDefinitionGroup>

-    <ClCompile>

-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <DisableSpecificWarnings>4995;4996;4312;4091;%(DisableSpecificWarnings)</DisableSpecificWarnings>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <IntrinsicFunctions>false</IntrinsicFunctions>

-      <WarningLevel>Level4</WarningLevel>

-      <PrecompiledHeader>Use</PrecompiledHeader>

-      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>

-      <ExceptionHandling>false</ExceptionHandling>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>winmm.lib;Wtsapi32.lib;netapi32.lib;pdh.lib;shlwapi.lib;Strmiids.lib;gdiplus.lib;dbghelp.lib;Setupapi.lib;msimg32.lib;comctl32.lib;ws2_32.lib;UxTheme.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <AdditionalLibraryDirectories>$(CommonLibDir)</AdditionalLibraryDirectories>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <GenerateMapFile>false</GenerateMapFile>

-      <SubSystem>Windows</SubSystem>

-      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

-    </Link>

-    <ResourceCompile>

-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\include\msapi</AdditionalIncludeDirectories>

-    </ResourceCompile>

-  </ItemDefinitionGroup>

-

-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <WholeProgramOptimization>false</WholeProgramOptimization>

-      <PreprocessorDefinitions>DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MinimalRebuild>true</MinimalRebuild>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-    </ClCompile>

-    <Link>

-      <LinkTimeCodeGeneration>

-      </LinkTimeCodeGeneration>

-    </Link>

-  </ItemDefinitionGroup>

-

-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">

-    <ClCompile>

-      <Optimization>Full</Optimization>

-      <OmitFramePointers>true</OmitFramePointers>

-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

-      <WholeProgramOptimization>true</WholeProgramOptimization>

-      <StringPooling>true</StringPooling>

-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MinimalRebuild>false</MinimalRebuild>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-    </ClCompile>

-    <Link>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>

-      <AdditionalOptions Condition="'$(VisualStudioVersion)' == '10.0'">/PDBALTPATH:%_PDB%</AdditionalOptions>

-    </Link>

-  </ItemDefinitionGroup>

-

-  <ItemGroup>

-    <ClCompile Include="src\stdafx.cxx">

-      <PrecompiledHeader>Create</PrecompiledHeader>

-    </ClCompile>

-    <ClCompile Include="src\*.cpp" />

-    <ClCompile Include="src\*.c">

-      <PrecompiledHeader>NotUsing</PrecompiledHeader>

-    </ClCompile>

-    <ClInclude Include="src\*.hpp" />

-    <ClInclude Include="src\*.h" />

-    <ResourceCompile Include="res\*.rc" />

-    <None Include="src\*.def" />

-  </ItemGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-</Project>

diff --git a/plugins/MirLua/Modules/module.props b/plugins/MirLua/Modules/module.props
index 59c3cc1d87..0e5f79deaa 100644
--- a/plugins/MirLua/Modules/module.props
+++ b/plugins/MirLua/Modules/module.props
@@ -1,31 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>

 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ImportGroup Label="PropertySheets">

-  </ImportGroup>

   <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>

+    <ProjectReference Include="..\..\..\..\libs\liblua\liblua.vcxproj">

+      <Project>{bd291bf0-d804-4818-8311-de871e6bceaa}</Project>

+    </ProjectReference>

   </ItemGroup>

   <PropertyGroup>

-    <GenerateManifest>false</GenerateManifest>

-    <EmbedManifest>false</EmbedManifest>

     <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <OutDir Condition="'$(Platform)'=='Win32'">$(SolutionDir)$(Configuration)\Scripts\</OutDir>

-    <OutDir Condition="'$(Platform)'=='x64'">$(SolutionDir)$(Configuration)64\Scripts\</OutDir>

+    <OutDir>$(SolutionDir)$(Configuration)\Scripts\</OutDir>

   </PropertyGroup>

-  <Import Project="common.props"/>

+  <Import Project="$(ProjectDir)..\..\..\build\vc.common\common.props"/>

+  <ItemDefinitionGroup>

+    <Link>

+      <AdditionalLibraryDirectories Condition="'$(VisualStudioVersion)' == '10.0'">$(ProjectDir)..\..\..\..\bin10\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <AdditionalLibraryDirectories Condition="'$(VisualStudioVersion)' == '12.0'">$(ProjectDir)..\..\..\..\bin12\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <AdditionalLibraryDirectories Condition="'$(VisualStudioVersion)' == '14.0'">$(ProjectDir)..\..\..\..\bin14\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+    </Link>

+    <ClCompile>

+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\libs\liblua\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+    </ClCompile>

+  </ItemDefinitionGroup>

 </Project>