mir_core: added header files for Enlightenment

4 files changed, 26 insertions, 18 deletions

diff --git a/src/mir_core/mir_core.mk b/src/mir_core/mir_core.mk
index fa62392e26..f6186ffec1 100644
--- a/src/mir_core/mir_core.mk
+++ b/src/mir_core/mir_core.mk
@@ -52,8 +52,8 @@ LibPath                := $(LibraryPathSwitch).
 AR       := ar rcus
 CXX      := g++
 CC       := gcc
-CXXFLAGS :=  -g $(pkg-config --cflags --libs elementary) -fPIC $(Preprocessors)
-CFLAGS   :=  -g $(pkg-config --cflags --libs elementary) -fPIC $(Preprocessors)
+CXXFLAGS :=  -g $(shell  pkg-config --cflags --libs elementary)  -fPIC $(Preprocessors)
+CFLAGS   :=  -g $(shell  pkg-config --cflags --libs elementary)  -fPIC $(Preprocessors)
 ASFLAGS  := 
 AS       := as
 
diff --git a/src/mir_core/mir_core.project b/src/mir_core/mir_core.project
index 5b379a7eb1..4a24b8ce91 100644
--- a/src/mir_core/mir_core.project
+++ b/src/mir_core/mir_core.project
@@ -28,6 +28,11 @@
     <File Name="src/binbuffer.cpp"/>
   </VirtualDirectory>
   <VirtualDirectory Name="include">
+    <File Name="../../include/m_gui.h"/>
+    <File Name="../../include/m_utils.h"/>
+    <File Name="../../include/m_types.h"/>
+    <File Name="../../include/m_system.h"/>
+    <File Name="../../include/m_string.h"/>
     <File Name="src/stdafx.h"/>
     <File Name="src/tinyxml2.h"/>
     <File Name="src/miranda.h"/>
@@ -43,7 +48,7 @@
       <ResourceCompiler Options=""/>
     </GlobalSettings>
     <Configuration Name="Debug" CompilerType="gnu g++" DebuggerType="GNU gdb debugger" Type="Dynamic Library" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
-      <Compiler Options="-g;$(pkg-config --cflags --libs elementary) -fPIC" C_Options="-g;$(pkg-config --cflags --libs elementary) -fPIC" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0">
+      <Compiler Options="-g $(shell  pkg-config --cflags --libs elementary)  -fPIC" C_Options="-g $(shell  pkg-config --cflags --libs elementary)  -fPIC" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0">
         <IncludePath Value="."/>
         <IncludePath Value="../../include"/>
       </Compiler>
@@ -83,7 +88,7 @@
       </Completion>
     </Configuration>
     <Configuration Name="Release" CompilerType="gnu g++" DebuggerType="GNU gdb debugger" Type="Dynamic Library" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
-      <Compiler Options="-O2;$(pkg-config --cflags --libs elementary) -fPIC" C_Options="-O2;$(pkg-config --cflags --libs elementary) -fPIC" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0">
+      <Compiler Options="-O2 $(shell  pkg-config --cflags --libs elementary) -fPIC" C_Options="-O2 $(shell pkg-config --cflags --libs elementary) -fPIC" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0">
         <IncludePath Value="."/>
         <IncludePath Value="../../include"/>
         <IncludePath Value="`pkg-config --cflags --libs elementary`"/>
diff --git a/src/mir_core/src/Linux/CCtrlBase.cpp b/src/mir_core/src/Linux/CCtrlBase.cpp
index bfb7d7e7fc..61d03c99af 100644
--- a/src/mir_core/src/Linux/CCtrlBase.cpp
+++ b/src/mir_core/src/Linux/CCtrlBase.cpp
@@ -105,6 +105,7 @@ void CCtrlBase::NotifyChange()
 LRESULT CCtrlBase::SendMsg(UINT Msg, WPARAM wParam, LPARAM lParam) const
 {
 	// return ::SendMessage(m_hwnd, Msg, wParam, lParam);
+	return 0;
 }
 
 void CCtrlBase::SetText(const wchar_t *text)
diff --git a/src/mir_core/src/stdafx.h b/src/mir_core/src/stdafx.h
index 86a8f5681b..f053907693 100644
--- a/src/mir_core/src/stdafx.h
+++ b/src/mir_core/src/stdafx.h
@@ -27,21 +27,23 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define INCL_WINSOCK_API_TYPEDEFS 1
 
 #ifdef _MSC_VER
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#include <windows.h>
-#include <windowsx.h>
-#include <shlobj.h>
-#include <commctrl.h>
-#include <ShellAPI.h>
-#include <vssym32.h>
-#include <Uxtheme.h>
-#include <Richedit.h>
-#include <Wtsapi32.h>
+	#include <winsock2.h>
+	#include <ws2tcpip.h>
+	#include <windows.h>
+	#include <windowsx.h>
+	#include <shlobj.h>
+	#include <commctrl.h>
+	#include <ShellAPI.h>
+	#include <vssym32.h>
+	#include <Uxtheme.h>
+	#include <Richedit.h>
+	#include <Wtsapi32.h>
 
-#include <process.h>
-#include <io.h>
-#include <direct.h>
+	#include <process.h>
+	#include <io.h>
+	#include <direct.h>
+#else
+	#include <Elementary.h>
 #endif // _WINDOWS
 
 #include <malloc.h>