Made SkypeClassic plugin compatible with Miranda IM again so that plugins for both IMs can be maintained with one codebase.

Compatibility wrapper for Miranda IM is in ng-compat/m_core.h
Changed files back to C and removed C++ code.
Changed Miranda NG project files so that the c files compile as C++ in order to be compatible with Miranda NG headers (/TP).
Added back build scripts and make file to automatically build Miranda IM version using Makefile.

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

1 files changed, 253 insertions, 0 deletions

diff --git a/protocols/SkypeClassic/Skype_protocol.mak b/protocols/SkypeClassic/Skype_protocol.mak
new file mode 100644
index 0000000000..09154ac812
--- /dev/null
+++ b/protocols/SkypeClassic/Skype_protocol.mak
@@ -0,0 +1,253 @@
+!IF "$(CFG)" == ""

+CFG=Win32 Debug

+!MESSAGE Keine Konfiguration angegeben. Win32 Debug wird als Standard verwendet.

+!ENDIF 

+

+!IF "$(CFG)" != "Win32 Release" && "$(CFG)" != "Win32 Debug" && "$(CFG)" != "Win64 Release" && "$(CFG)" != "Win64 Debug" && "$(CFG)" != "Win32 UNICODE Release" && "$(CFG)" != "Win32 UNICODE Debug" && "$(CFG)" != "Win64 UNICODE Release" && "$(CFG)" != "Win64 UNICODE Debug"

+!MESSAGE Ungültige Konfiguration "$(CFG)" angegeben.

+!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben

+!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:

+!MESSAGE 

+!MESSAGE NMAKE /f "Skype_protocol.mak" CFG="Win32 Debug"

+!MESSAGE 

+!MESSAGE Für die Konfiguration stehen zur Auswahl:

+!MESSAGE 

+!MESSAGE "Win32 Release"

+!MESSAGE "Win32 Debug"

+!MESSAGE "Win64 Release"

+!MESSAGE "Win64 Debug"

+!MESSAGE "Win32 UNICODE Release"

+!MESSAGE "Win32 UNICODE Debug"

+!MESSAGE "Win64 UNICODE Release"

+!MESSAGE "Win64 UNICODE Debug"

+

+!MESSAGE 

+!ERROR Eine ungültige Konfiguration wurde angegeben.

+!ENDIF 

+

+!IF "$(OS)" == "Windows_NT"

+NULL=

+!ELSE 

+NULL=nul

+!ENDIF 

+

+CPP=cl.exe

+MTL=midl.exe

+RSC=rc.exe

+LINK32=link.exe

+

+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib wsock32.lib comctl32.lib Rpcrt4.lib /nologo /dll /pdb:"$(INTDIR)\skype.pdb" /out:"$(OUTDIR)/skype.dll" /implib:"$(INTDIR)\skype.lib" 

+CPPFL=/nologo /W3 /GX- /GR- /TC /I "src/ng-compat/" /I "../../include" /I "src/sdk/" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SKYPE_PROTOCOL_EXPORTS" /Fp"$(INTDIR)\Skype_protocol.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 

+

+!IF  "$(CFG)" == "Win64 Release"

+OUTDIR=.\Release64

+INTDIR=.\Release64

+CPP_PROJ=$(CPPFL) /MD /O2 /D "NDEBUG"

+LINK32_FLAGS=$(LINK32_FLAGS) /incremental:no 

+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 

+RSC_PROJ=/l 0xc07 /fo"$(INTDIR)\Resource.res" /d "NDEBUG" 

+!ELSEIF  "$(CFG)" == "Win32 Release"

+OUTDIR=.\Release

+INTDIR=.\Release

+CPP_PROJ=$(CPPFL) /MD /O2 /D "NDEBUG"

+LINK32_FLAGS=$(LINK32_FLAGS) /incremental:no 

+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 

+RSC_PROJ=/l 0xc07 /fo"$(INTDIR)\Resource.res" /d "NDEBUG" 

+!ELSEIF  "$(CFG)" == "Win64 Debug"

+OUTDIR=Debug64

+INTDIR=$(OUTDIR)

+CPP_PROJ=$(CPPFL) /MDd /Gm /Zi /Od /D "_DEBUG" /GZ 

+LINK32_FLAGS=$(LINK32_FLAGS) /incremental:yes /debug /pdbtype:sept 

+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 

+RSC_PROJ=/l 0xc07 /fo"$(INTDIR)\Resource.res" /d "_DEBUG" 

+!ELSEIF  "$(CFG)" == "Win32 Debug"

+OUTDIR=.\Debug

+INTDIR=$(OUTDIR)

+CPP_PROJ=$(CPPFL) /MDd /Gm /Zi /Od /D "_DEBUG" /GZ 

+LINK32_FLAGS=$(LINK32_FLAGS) /incremental:yes /debug /pdbtype:sept 

+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 

+RSC_PROJ=/l 0xc07 /fo"$(INTDIR)\Resource.res" /d "_DEBUG" 

+!ELSEIF  "$(CFG)" == "Win64 UNICODE Release"

+OUTDIR=.\Release64-UNICODE

+INTDIR=.\Release64-UNICODE

+CPP_PROJ=$(CPPFL) /MD /O2 /D "NDEBUG" /D "UNICODE" /D "_UNICODE"

+LINK32_FLAGS=$(LINK32_FLAGS) /incremental:no 

+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 

+RSC_PROJ=/l 0xc07 /fo"$(INTDIR)\Resource.res" /d "NDEBUG" 

+!ELSEIF  "$(CFG)" == "Win32 UNICODE Release"

+OUTDIR=.\Release-UNICODE

+INTDIR=.\Release-UNICODE

+CPP_PROJ=$(CPPFL) /MD /O2 /D "NDEBUG" /D "UNICODE" /D "_UNICODE"

+LINK32_FLAGS=$(LINK32_FLAGS) /incremental:no 

+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 

+RSC_PROJ=/l 0xc07 /fo"$(INTDIR)\Resource.res" /d "NDEBUG" 

+!ELSEIF  "$(CFG)" == "Win64 UNICODE Debug"

+OUTDIR=Debug64-UNICODE

+INTDIR=$(OUTDIR)

+CPP_PROJ=$(CPPFL) /MDd /Gm /Zi /Od /D "_DEBUG" /D "UNICODE" /D "_UNICODE"  

+LINK32_FLAGS= $(LINK32_FLAGS) /incremental:yes /debug /pdbtype:sept 

+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 

+RSC_PROJ=/l 0xc07 /fo"$(INTDIR)\Resource.res" /d "_DEBUG" 

+!ELSEIF  "$(CFG)" == "Win32 UNICODE Debug"

+OUTDIR=.\Debug-UNICODE

+INTDIR=$(OUTDIR)

+CPP_PROJ=$(CPPFL) /MDd /Gm /Zi /Od /D "_DEBUG" /D "UNICODE" /D "_UNICODE" /GZ

+LINK32_FLAGS=$(LINK32_FLAGS) /incremental:yes /debug /pdbtype:sept 

+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 

+RSC_PROJ=/l 0xc07 /fo"$(INTDIR)\Resource.res" /d "_DEBUG" 

+!ENDIF

+

+LINK32_OBJS= \

+	"$(INTDIR)\contacts.obj" \

+	"$(INTDIR)\debug.obj" \

+	"$(INTDIR)\gchat.obj" \

+	"$(INTDIR)\pthread.obj" \

+	"$(INTDIR)\skype.obj" \

+	"$(INTDIR)\skypeapi.obj" \

+	"$(INTDIR)\skypeopt.obj" \

+	"$(INTDIR)\skypeprofile.obj" \

+	"$(INTDIR)\skypesvc.obj" \

+	"$(INTDIR)\utf8.obj" \

+	"$(INTDIR)\voiceservice.obj" \

+	"$(INTDIR)\msglist.obj" \

+	"$(INTDIR)\memlist.obj" \

+	"$(INTDIR)\util.obj" \

+	"$(INTDIR)\msgq.obj" \

+	"$(INTDIR)\alogon.obj" \

+	"$(INTDIR)\Resource.res"

+

+ALL : "$(OUTDIR)\skype.dll"

+

+

+CLEAN :

+	-@erase "$(INTDIR)\contacts.obj"

+	-@erase "$(INTDIR)\debug.obj"

+	-@erase "$(INTDIR)\gchat.obj"

+	-@erase "$(INTDIR)\pthread.obj"

+	-@erase "$(INTDIR)\Resource.res"

+	-@erase "$(INTDIR)\skype.obj"

+	-@erase "$(INTDIR)\skypeapi.obj"

+	-@erase "$(INTDIR)\skypeopt.obj"

+	-@erase "$(INTDIR)\skypeprofile.obj"

+	-@erase "$(INTDIR)\skypesvc.obj"

+	-@erase "$(INTDIR)\msglist.obj"

+	-@erase "$(INTDIR)\memlist.obj"

+	-@erase "$(INTDIR)\util.obj"

+	-@erase "$(INTDIR)\msgq.obj" \

+	-@erase "$(INTDIR)\alogon.obj" \

+	-@erase "$(INTDIR)\utf8.obj"

+	-@erase "$(INTDIR)\vc60.idb"

+	-@erase "$(INTDIR)\voiceservice.obj"

+	-@erase "$(INTDIR)\skype.exp"

+	-@erase "$(INTDIR)\skype.pdb"

+	-@erase "$(INTDIR)\skype.lib"

+	-@erase "$(OUTDIR)\skype.dll"

+

+"$(OUTDIR)" :

+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

+

+.c{$(INTDIR)}.obj::

+   $(CPP) @<<

+   $(CPP_PROJ) $< 

+<<

+

+"$(OUTDIR)\skype.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

+    $(LINK32) @<<

+  $(LINK32_FLAGS) $(LINK32_OBJS)

+<<

+

+

+!IF "$(NO_EXTERNAL_DEPS)" != "1"

+!IF EXISTS("Skype_protocol.dep")

+!INCLUDE "Skype_protocol.dep"

+!ELSE 

+!MESSAGE Warning: cannot find "Skype_protocol.dep"

+!ENDIF 

+!ENDIF 

+

+

+SOURCE=.\src\alogon.c

+

+"$(INTDIR)\alogon.obj" : $(SOURCE) "$(INTDIR)"

+	$(CPP) $(CPP_PROJ) $(SOURCE)

+

+SOURCE=.\src\contacts.c

+

+"$(INTDIR)\contacts.obj" : $(SOURCE) "$(INTDIR)"

+	$(CPP) $(CPP_PROJ) $(SOURCE)

+

+SOURCE=.\src\debug.c

+

+"$(INTDIR)\debug.obj" : $(SOURCE) "$(INTDIR)"

+	$(CPP) $(CPP_PROJ) $(SOURCE)

+

+SOURCE=.\src\gchat.c

+

+"$(INTDIR)\gchat.obj" : $(SOURCE) "$(INTDIR)"

+	$(CPP) $(CPP_PROJ) $(SOURCE)

+

+SOURCE=.\src\msgq.c

+

+"$(INTDIR)\msgq.obj" : $(SOURCE) "$(INTDIR)"

+	$(CPP) $(CPP_PROJ) $(SOURCE)

+

+SOURCE=.\src\msglist.c

+

+"$(INTDIR)\msglist.obj" : $(SOURCE) "$(INTDIR)"

+	$(CPP) $(CPP_PROJ) $(SOURCE)

+

+SOURCE=.\src\memlist.c

+

+"$(INTDIR)\memlist.obj" : $(SOURCE) "$(INTDIR)"

+	$(CPP) $(CPP_PROJ) $(SOURCE)

+

+SOURCE=.\src\pthread.c

+

+"$(INTDIR)\pthread.obj" : $(SOURCE) "$(INTDIR)"

+	$(CPP) $(CPP_PROJ) $(SOURCE)

+

+SOURCE=.\src\skype.c

+

+"$(INTDIR)\skype.obj" : $(SOURCE) "$(INTDIR)"

+	$(CPP) $(CPP_PROJ) $(SOURCE)

+

+SOURCE=.\src\skypeapi.c

+

+"$(INTDIR)\skypeapi.obj" : $(SOURCE) "$(INTDIR)"

+	$(CPP) $(CPP_PROJ) $(SOURCE)

+

+SOURCE=.\src\skypeopt.c

+

+"$(INTDIR)\skypeopt.obj" : $(SOURCE) "$(INTDIR)"

+	$(CPP) $(CPP_PROJ) $(SOURCE)

+

+SOURCE=.\src\skypeprofile.c

+

+"$(INTDIR)\skypeprofile.obj" : $(SOURCE) "$(INTDIR)"

+	$(CPP) $(CPP_PROJ) $(SOURCE)

+

+SOURCE=.\src\skypesvc.c

+

+"$(INTDIR)\skypesvc.obj" : $(SOURCE) "$(INTDIR)"

+	$(CPP) $(CPP_PROJ) $(SOURCE)

+

+SOURCE=.\src\utf8.c

+

+"$(INTDIR)\utf8.obj" : $(SOURCE) "$(INTDIR)"

+	$(CPP) $(CPP_PROJ) $(SOURCE)

+

+SOURCE=.\src\util.c

+

+"$(INTDIR)\util.obj" : $(SOURCE) "$(INTDIR)"

+	$(CPP) $(CPP_PROJ) $(SOURCE)

+

+SOURCE=.\src\voiceservice.c

+

+"$(INTDIR)\voiceservice.obj" : $(SOURCE) "$(INTDIR)"

+	$(CPP) $(CPP_PROJ) $(SOURCE)

+

+SOURCE=.\res\Resource.rc

+

+"$(INTDIR)\Resource.res" : $(SOURCE) "$(INTDIR)"

+	$(RSC) $(RSC_PROJ) $(SOURCE)

+