From 3ac10dfb4e4a20b23c96151865846477d4843b19 Mon Sep 17 00:00:00 2001 From: Alexander Lantsev Date: Fri, 8 Jan 2016 11:48:55 +0000 Subject: MirLua: winapi cleanup git-svn-id: http://svn.miranda-ng.org/main/trunk@16060 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/MirLua/Modules/WinAPI/WinAPI.vcxproj | 12 +--- plugins/MirLua/Modules/WinAPI/src/stdafx.h | 2 +- plugins/MirLua/Modules/WinAPI/src/winapi.cpp | 4 +- plugins/MirLua/Modules/common.filters | 32 --------- plugins/MirLua/Modules/common.props | 98 ---------------------------- plugins/MirLua/Modules/module.props | 38 +++++------ 6 files changed, 20 insertions(+), 166 deletions(-) delete mode 100644 plugins/MirLua/Modules/common.filters delete mode 100644 plugins/MirLua/Modules/common.props (limited to 'plugins/MirLua/Modules') 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 @@ Release x64 - - {bd291bf0-d804-4818-8311-de871e6bceaa} - - WinAPI + winapi {045bac91-34d1-4b43-b52b-566801be7f85} - - - $(ProjectDir)..\..\..\..\libs\liblua\include;%(AdditionalIncludeDirectories) - - - \ No newline at end of file + 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 @@ -62,7 +63,6 @@ #include #include - #include #include 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 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - - Source Files - - - Header Files - - - Resource Files - - - Source Files - - - \ 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 @@ - - - - 10.0 - $(ProjectDir)..\..\..\..\bin10\lib - $(ProjectDir)..\..\..\..\bin12\lib - $(ProjectDir)..\..\..\..\bin14\lib - - - $(ProjectName) - Win32Proj - Unicode - v100 - v110_xp - v120_xp - v140_xp - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true - false - - - - - - $(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) - 4995;4996;4312;4091;%(DisableSpecificWarnings) - OnlyExplicitInline - false - Level4 - Use - stdafx.h - false - - - 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) - $(CommonLibDir) - true - false - Windows - $(IntDir)$(TargetName).lib - false - - - $(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\include\msapi - - - - - - Disabled - false - DEBUG;%(PreprocessorDefinitions) - true - MultiThreadedDebugDLL - - - - - - - - - - Full - true - Size - true - true - NDEBUG;%(PreprocessorDefinitions) - false - MultiThreadedDLL - true - - - true - true - UseLinkTimeCodeGeneration - /PDBALTPATH:%_PDB% - - - - - - Create - - - - NotUsing - - - - - - - - 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 @@  - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - + + {bd291bf0-d804-4818-8311-de871e6bceaa} + - false - false DynamicLibrary - $(SolutionDir)$(Configuration)\Scripts\ - $(SolutionDir)$(Configuration)64\Scripts\ + $(SolutionDir)$(Configuration)\Scripts\ - + + + + $(ProjectDir)..\..\..\..\bin10\lib;%(AdditionalLibraryDirectories) + $(ProjectDir)..\..\..\..\bin12\lib;%(AdditionalLibraryDirectories) + $(ProjectDir)..\..\..\..\bin14\lib;%(AdditionalLibraryDirectories) + + + $(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\libs\liblua\include;%(AdditionalIncludeDirectories) + + -- cgit v1.2.3