summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Lantsev <aunsane@gmail.com>2016-02-17 16:24:34 +0000
committerAlexander Lantsev <aunsane@gmail.com>2016-02-17 16:24:34 +0000
commit939e01edacc5746bc9c6501721f270751a9be10d (patch)
tree9ee488e72880dcfca349cff9fa173095f222ee58
parent962a3d06bbd73aa7bb46eb8ae3e65c31a1902d5d (diff)
MirLua: m_popup moved to separate lua library
git-svn-id: http://svn.miranda-ng.org/main/trunk@16293 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--plugins/MirLua/Modules/m_popup/m_popup.vcxproj28
-rw-r--r--plugins/MirLua/Modules/m_popup/src/main.cpp (renamed from plugins/MirLua/src/m_popup.cpp)0
-rw-r--r--plugins/MirLua/Modules/m_popup/src/stdafx.cxx1
-rw-r--r--plugins/MirLua/Modules/m_popup/src/stdafx.h12
-rw-r--r--plugins/MirLua/src/mlua_module_loader.cpp1
-rw-r--r--plugins/MirLua/src/stdafx.h3
6 files changed, 41 insertions, 4 deletions
diff --git a/plugins/MirLua/Modules/m_popup/m_popup.vcxproj b/plugins/MirLua/Modules/m_popup/m_popup.vcxproj
new file mode 100644
index 0000000000..eab741dac9
--- /dev/null
+++ b/plugins/MirLua/Modules/m_popup/m_popup.vcxproj
@@ -0,0 +1,28 @@
+<?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">
+ <ProjectName>m_popup</ProjectName>
+ <ProjectGuid>{D5C9CA74-4E25-478A-B890-75EB13E6DB1C}</ProjectGuid>
+ </PropertyGroup>
+ <ImportGroup Label="PropertySheets">
+ <Import Project="$(ProjectDir)..\module.props" />
+ </ImportGroup>
+</Project>
diff --git a/plugins/MirLua/src/m_popup.cpp b/plugins/MirLua/Modules/m_popup/src/main.cpp
index c99ea7c146..c99ea7c146 100644
--- a/plugins/MirLua/src/m_popup.cpp
+++ b/plugins/MirLua/Modules/m_popup/src/main.cpp
diff --git a/plugins/MirLua/Modules/m_popup/src/stdafx.cxx b/plugins/MirLua/Modules/m_popup/src/stdafx.cxx
new file mode 100644
index 0000000000..fd4f341c7b
--- /dev/null
+++ b/plugins/MirLua/Modules/m_popup/src/stdafx.cxx
@@ -0,0 +1 @@
+#include "stdafx.h"
diff --git a/plugins/MirLua/Modules/m_popup/src/stdafx.h b/plugins/MirLua/Modules/m_popup/src/stdafx.h
new file mode 100644
index 0000000000..e6f48ac834
--- /dev/null
+++ b/plugins/MirLua/Modules/m_popup/src/stdafx.h
@@ -0,0 +1,12 @@
+#ifndef _COMMON_H_
+#define _COMMON_H_
+
+#include <windows.h>
+
+#include <lua.hpp>
+
+#include <m_core.h>
+#include <m_utils.h>
+#include <m_popup.h>
+
+#endif //_COMMON_H_ \ No newline at end of file
diff --git a/plugins/MirLua/src/mlua_module_loader.cpp b/plugins/MirLua/src/mlua_module_loader.cpp
index 18137a6868..33068165ab 100644
--- a/plugins/MirLua/src/mlua_module_loader.cpp
+++ b/plugins/MirLua/src/mlua_module_loader.cpp
@@ -39,7 +39,6 @@ void CLuaModuleLoader::LoadModules()
Preload(MLUA_SOUNDS, luaopen_m_sounds);
// regirter delay loading of other modules
Preload(MLUA_MSGBUTTONSBAR, luaopen_m_msg_buttonsbar);
- Preload(MLUA_POPUP, luaopen_m_popup);
Preload(MLUA_TOPTOOLBAR, luaopen_m_toptoolbar);
}
diff --git a/plugins/MirLua/src/stdafx.h b/plugins/MirLua/src/stdafx.h
index 82c6e97b29..7e6f966375 100644
--- a/plugins/MirLua/src/stdafx.h
+++ b/plugins/MirLua/src/stdafx.h
@@ -88,9 +88,6 @@ LUAMOD_API int (luaopen_m_message)(lua_State *L);
#include "m_msg_buttonsbar.h"
-#define MLUA_POPUP "m_popup"
-LUAMOD_API int (luaopen_m_popup)(lua_State *L);
-
#include "m_protocols.h"
#include "m_schedule.h"