From ea2c58c2344f3ed9c4fa01f05119c5a3715ffdaa Mon Sep 17 00:00:00 2001 From: Berke Viktor Date: Fri, 13 Jul 2012 17:55:31 +0200 Subject: [PATCH] Rename files, delete old windows makefiles --- config.h.w32 | 12 --- xchat.desktop => hexchat.desktop | 0 xchat.spec => hexchat.spec | 0 plugins/checksum/makefile.mak | 18 ----- plugins/dns/makefile.mak | 22 ------ plugins/doat/makefile.mak | 18 ----- plugins/exec/makefile.mak | 18 ----- plugins/fishlim/makefile.mak | 30 -------- plugins/lua/makefile.mak | 20 ----- plugins/makefile.mak | 71 ------------------ plugins/mpcinfo/makefile.mak | 18 ----- .../{xchat2-perl.html => hexchat-perl.html} | 0 ...t2-perldocs.html => hexchat-perldocs.html} | 0 plugins/perl/makefile-512.mak | 40 ---------- plugins/perl/makefile-514.mak | 42 ----------- plugins/python/makefile.mak | 25 ------ plugins/tcl/makefile.mak | 22 ------ plugins/upd/makefile.mak | 18 ----- plugins/winamp/makefile.mak | 18 ----- plugins/winsys/makefile.mak | 18 ----- plugins/wmpa/makefile.mak | 53 ------------- plugins/xsasl/makefile.mak | 18 ----- .../xtray/icons/{xchat.ico => hexchat.ico} | Bin plugins/xtray/makefile.mak | 37 --------- src/common/makefile.mak | 45 ----------- src/fe-gtk/makefile.mak | 62 --------------- src/fe-text/makefile.mak | 20 ----- src/makefile.mak | 23 ------ src/makeinc.skel.mak | 45 ----------- src/pixmaps/makefile.mak | 18 ----- 30 files changed, 731 deletions(-) delete mode 100644 config.h.w32 rename xchat.desktop => hexchat.desktop (100%) rename xchat.spec => hexchat.spec (100%) delete mode 100644 plugins/checksum/makefile.mak delete mode 100644 plugins/dns/makefile.mak delete mode 100644 plugins/doat/makefile.mak delete mode 100644 plugins/exec/makefile.mak delete mode 100644 plugins/fishlim/makefile.mak delete mode 100644 plugins/lua/makefile.mak delete mode 100644 plugins/makefile.mak delete mode 100644 plugins/mpcinfo/makefile.mak rename plugins/perl/{xchat2-perl.html => hexchat-perl.html} (100%) rename plugins/perl/{xchat2-perldocs.html => hexchat-perldocs.html} (100%) delete mode 100644 plugins/perl/makefile-512.mak delete mode 100644 plugins/perl/makefile-514.mak delete mode 100644 plugins/python/makefile.mak delete mode 100644 plugins/tcl/makefile.mak delete mode 100644 plugins/upd/makefile.mak delete mode 100644 plugins/winamp/makefile.mak delete mode 100644 plugins/winsys/makefile.mak delete mode 100644 plugins/wmpa/makefile.mak delete mode 100644 plugins/xsasl/makefile.mak rename plugins/xtray/icons/{xchat.ico => hexchat.ico} (100%) delete mode 100644 plugins/xtray/makefile.mak delete mode 100644 src/common/makefile.mak delete mode 100644 src/fe-gtk/makefile.mak delete mode 100644 src/fe-text/makefile.mak delete mode 100644 src/makefile.mak delete mode 100644 src/makeinc.skel.mak delete mode 100644 src/pixmaps/makefile.mak diff --git a/config.h.w32 b/config.h.w32 deleted file mode 100644 index 24bd394b..00000000 --- a/config.h.w32 +++ /dev/null @@ -1,12 +0,0 @@ -#define LOCALEDIR "./locale" -#define ENABLE_NLS -#define USE_GMODULE -#define USE_PLUGIN -#define PACKAGE_NAME "xchat" -#define PACKAGE_VERSION "2.8.8-Unofficial" -#define XCHATLIBDIR "." -#define XCHATSHAREDIR "." -#define OLD_PERL -#ifndef USE_IPV6 -#define socklen_t int -#endif diff --git a/xchat.desktop b/hexchat.desktop similarity index 100% rename from xchat.desktop rename to hexchat.desktop diff --git a/xchat.spec b/hexchat.spec similarity index 100% rename from xchat.spec rename to hexchat.spec diff --git a/plugins/checksum/makefile.mak b/plugins/checksum/makefile.mak deleted file mode 100644 index ec8e0455..00000000 --- a/plugins/checksum/makefile.mak +++ /dev/null @@ -1,18 +0,0 @@ -include "..\..\src\makeinc.mak" - -all: checksum.obj checksum.def - link $(LDFLAGS) $(LIBS) /dll /out:xcchecksum.dll /def:checksum.def checksum.obj - -checksum.def: - echo EXPORTS > checksum.def - echo xchat_plugin_init >> checksum.def - echo xchat_plugin_deinit >> checksum.def - -checksum.obj: checksum.c makefile.mak - cl $(CFLAGS) /I.. checksum.c - -clean: - del *.obj - del *.dll - del *.exp - del *.lib diff --git a/plugins/dns/makefile.mak b/plugins/dns/makefile.mak deleted file mode 100644 index 384e6be1..00000000 --- a/plugins/dns/makefile.mak +++ /dev/null @@ -1,22 +0,0 @@ -include "..\..\src\makeinc.mak" - -DNS_OBJECTS = \ -dns.obj \ -thread.obj - -all: $(DNS_OBJECTS) dns.def - link $(LDFLAGS) $(LIBS) /dll /out:xcdns.dll /def:dns.def $(DNS_OBJECTS) - -dns.def: - echo EXPORTS > dns.def - echo xchat_plugin_init >> dns.def - echo xchat_plugin_deinit >> dns.def - -.c.obj: - $(CC) $(CFLAGS) $(GLIB) /I.. /c $< - -clean: - del *.obj - del *.dll - del *.exp - del *.lib diff --git a/plugins/doat/makefile.mak b/plugins/doat/makefile.mak deleted file mode 100644 index 960cae27..00000000 --- a/plugins/doat/makefile.mak +++ /dev/null @@ -1,18 +0,0 @@ -include "..\..\src\makeinc.mak" - -all: doat.obj doat.def - link $(LDFLAGS) $(LIBS) /dll /out:xcdoat.dll /def:doat.def doat.obj - -doat.def: - echo EXPORTS > doat.def - echo xchat_plugin_init >> doat.def - echo xchat_plugin_deinit >> doat.def - -doat.obj: doat.c makefile.mak - cl $(CFLAGS) $(GLIB) /I.. doat.c - -clean: - del *.obj - del *.dll - del *.exp - del *.lib diff --git a/plugins/exec/makefile.mak b/plugins/exec/makefile.mak deleted file mode 100644 index d2153faf..00000000 --- a/plugins/exec/makefile.mak +++ /dev/null @@ -1,18 +0,0 @@ -include "..\..\src\makeinc.mak" - -all: exec.obj exec.def - link $(LDFLAGS) $(LIBS) /dll /out:xcexec.dll /def:exec.def exec.obj - -exec.def: - echo EXPORTS > exec.def - echo xchat_plugin_init >> exec.def - echo xchat_plugin_deinit >> exec.def - -exec.obj: exec.c makefile.mak - cl $(CFLAGS) $(GLIB) /I.. exec.c - -clean: - del *.obj - del *.dll - del *.exp - del *.lib diff --git a/plugins/fishlim/makefile.mak b/plugins/fishlim/makefile.mak deleted file mode 100644 index 4d0be66b..00000000 --- a/plugins/fishlim/makefile.mak +++ /dev/null @@ -1,30 +0,0 @@ -include "..\..\src\makeinc.mak" - -TARGET = xcfishlim.dll - -CFLAGS = $(CFLAGS) - -FISHLIM_OBJECTS = \ -fish.obj \ -irc.obj \ -keystore.obj \ -misc.obj \ -plugin_xchat.obj - -all: $(FISHLIM_OBJECTS) fishlim.def - link $(LDFLAGS) $(LIBS) /dll /out:xcfishlim.dll /def:fishlim.def $(FISHLIM_OBJECTS) - -fishlim.def: - echo EXPORTS > fishlim.def - echo xchat_plugin_init >> fishlim.def - echo xchat_plugin_deinit >> fishlim.def - echo xchat_plugin_get_info >> fishlim.def - -.c.obj: - $(CC) $(CFLAGS) $(GLIB) /I.. /c $< - -clean: - del *.obj - del *.dll - del *.exp - del *.lib diff --git a/plugins/lua/makefile.mak b/plugins/lua/makefile.mak deleted file mode 100644 index 97a7e10b..00000000 --- a/plugins/lua/makefile.mak +++ /dev/null @@ -1,20 +0,0 @@ -include "..\..\src\makeinc.mak" - -DIRENTLIB = ..\..\src\common\dirent-win32.lib - -all: lua.obj lua.def - link $(LDFLAGS) $(LIBS) /dll /out:xclua.dll $(LUALIB).lib $(DIRENTLIB) /def:lua.def lua.obj - -lua.def: - echo EXPORTS > lua.def - echo xchat_plugin_init >> lua.def - echo xchat_plugin_deinit >> lua.def - -lua.obj: lua.c makefile.mak - cl $(CFLAGS) /I.. /Dsnprintf=g_snprintf lua.c - -clean: - del *.obj - del *.dll - del *.exp - del *.lib diff --git a/plugins/makefile.mak b/plugins/makefile.mak deleted file mode 100644 index 19b3cb75..00000000 --- a/plugins/makefile.mak +++ /dev/null @@ -1,71 +0,0 @@ -all: - @cd checksum - @-$(MAKE) /nologo /s /f makefile.mak $@ - @cd ..\gtkpref - @-$(MAKE) /nologo /s /f makefile.mak $@ - @cd ..\dns - @-$(MAKE) /nologo /s /f makefile.mak $@ - @cd ..\doat - @-$(MAKE) /nologo /s /f makefile.mak $@ - @cd ..\exec - @-$(MAKE) /nologo /s /f makefile.mak $@ - @cd ..\fishlim - @-$(MAKE) /nologo /s /f makefile.mak $@ - @cd ..\lua - @-$(MAKE) /nologo /s /f makefile.mak $@ - @cd ..\mpcinfo - @-$(MAKE) /nologo /s /f makefile.mak $@ -# @cd ..\nonbmp -# @-$(MAKE) /nologo /s /f makefile.mak $@ - @cd ..\python - @-$(MAKE) /nologo /s /f makefile.mak $@ - @cd ..\tcl - @-$(MAKE) /nologo /s /f makefile.mak $@ - @cd ..\upd - @-$(MAKE) /nologo /s /f makefile.mak $@ - @cd ..\xsasl - @-$(MAKE) /nologo /s /f makefile.mak $@ - @cd ..\xtray - @-$(MAKE) /nologo /s /f makefile.mak $@ - @cd ..\winamp - @-$(MAKE) /nologo /s /f makefile.mak $@ - @cd ..\winsys - @-$(MAKE) /nologo /s /f makefile.mak $@ - @cd ..\wmpa - @-$(MAKE) /nologo /s /f makefile.mak $@ - -clean: - @cd checksum - @-$(MAKE) /nologo /s /f makefile.mak clean $@ - @cd ..\gtkpref - @-$(MAKE) /nologo /s /f makefile.mak clean $@ - @cd ..\dns - @-$(MAKE) /nologo /s /f makefile.mak clean $@ - @cd ..\doat - @-$(MAKE) /nologo /s /f makefile.mak clean $@ - @cd ..\exec - @-$(MAKE) /nologo /s /f makefile.mak clean $@ - @cd ..\fishlim - @-$(MAKE) /nologo /s /f makefile.mak clean $@ - @cd ..\lua - @-$(MAKE) /nologo /s /f makefile.mak clean $@ - @cd ..\mpcinfo - @-$(MAKE) /nologo /s /f makefile.mak clean $@ -# @cd ..\nonbmp -# @-$(MAKE) /nologo /s /f makefile.mak clean $@ - @cd ..\python - @-$(MAKE) /nologo /s /f makefile.mak clean $@ - @cd ..\tcl - @-$(MAKE) /nologo /s /f makefile.mak clean $@ - @cd ..\upd - @-$(MAKE) /nologo /s /f makefile.mak clean $@ - @cd ..\xsasl - @-$(MAKE) /nologo /s /f makefile.mak clean $@ - @cd ..\xtray - @-$(MAKE) /nologo /s /f makefile.mak clean $@ - @cd ..\winamp - @-$(MAKE) /nologo /s /f makefile.mak clean $@ - @cd ..\winsys - @-$(MAKE) /nologo /s /f makefile.mak clean $@ - @cd ..\wmpa - @-$(MAKE) /nologo /s /f makefile.mak clean $@ diff --git a/plugins/mpcinfo/makefile.mak b/plugins/mpcinfo/makefile.mak deleted file mode 100644 index 4a8a2763..00000000 --- a/plugins/mpcinfo/makefile.mak +++ /dev/null @@ -1,18 +0,0 @@ -include "..\..\src\makeinc.mak" - -all: mpcinfo.obj mpcinfo.def - link $(LDFLAGS) $(LIBS) /dll /out:xcmpcinfo.dll /def:mpcinfo.def mpcinfo.obj - -mpcinfo.def: - echo EXPORTS > mpcinfo.def - echo xchat_plugin_init >> mpcinfo.def - echo xchat_plugin_deinit >> mpcinfo.def - -mpcinfo.obj: mpcinfo.c makefile.mak - cl $(CFLAGS) $(GLIB) /I.. mpcinfo.c - -clean: - del *.obj - del *.dll - del *.exp - del *.lib diff --git a/plugins/perl/xchat2-perl.html b/plugins/perl/hexchat-perl.html similarity index 100% rename from plugins/perl/xchat2-perl.html rename to plugins/perl/hexchat-perl.html diff --git a/plugins/perl/xchat2-perldocs.html b/plugins/perl/hexchat-perldocs.html similarity index 100% rename from plugins/perl/xchat2-perldocs.html rename to plugins/perl/hexchat-perldocs.html diff --git a/plugins/perl/makefile-512.mak b/plugins/perl/makefile-512.mak deleted file mode 100644 index 7f2fbe04..00000000 --- a/plugins/perl/makefile-512.mak +++ /dev/null @@ -1,40 +0,0 @@ -include "..\..\src\makeinc.mak" - -DIRENTLIB = ..\..\src\common\dirent-win32.lib -TARGET = $(PERL512OUTPUT) - -all: $(TARGET) - -perl.def: - echo EXPORTS > perl.def - echo xchat_plugin_init >> perl.def - echo xchat_plugin_deinit >> perl.def - echo xchat_plugin_get_info >> perl.def - -perl.obj: perl.c - $(CC) $(CFLAGS) perl.c $(GLIB) /I$(PERL512PATH)\perl\lib\CORE /I.. /DPERL_DLL=\"$(PERL512LIB).dll\" - -perl512.def: - gendef $(PERL512PATH)\perl\bin\perl512.dll - -$(PERL512LIB).lib: perl512.def -!ifdef X64 - lib /nologo /machine:x64 /def:perl512.def -!else - lib /nologo /machine:x86 /def:perl512.def -!endif - -perl.c: xchat.pm.h - -xchat.pm.h: lib/Xchat.pm lib/IRC.pm - perl.exe generate_header - -$(TARGET): perl.obj perl.def $(PERL512LIB).lib - $(LINK) /DLL /out:$(TARGET) perl.obj $(LDFLAGS) $(PERL512LIB).lib /delayload:$(PERL512LIB).dll $(DIRENTLIB) delayimp.lib user32.lib shell32.lib advapi32.lib /def:perl.def - -clean: - @del $(TARGET) - @del *.obj - @del *.def - @del *.lib - @del *.exp diff --git a/plugins/perl/makefile-514.mak b/plugins/perl/makefile-514.mak deleted file mode 100644 index 4c8d0ebd..00000000 --- a/plugins/perl/makefile-514.mak +++ /dev/null @@ -1,42 +0,0 @@ -include "..\..\src\makeinc.mak" - -DIRENTLIB = ..\..\src\common\dirent-win32.lib -TARGET = $(PERL514OUTPUT) - -all: $(TARGET) - -perl.def: - echo EXPORTS > perl.def - echo xchat_plugin_init >> perl.def - echo xchat_plugin_deinit >> perl.def - echo xchat_plugin_get_info >> perl.def - -# MSVC only supports __inline, while GCC only supports __inline__. This is defined incorretly -# in lib\CORE\config.h in Strawberry Perl, see #define PERL_STATIC_INLINE static __inline__ -perl.obj: perl.c - $(CC) $(CFLAGS) perl.c $(GLIB) /I$(PERL514PATH)\perl\lib\CORE /I.. /DPERL_DLL=\"$(PERL514LIB).dll\" /D__inline__=__inline - -perl514.def: - gendef $(PERL514PATH)\perl\bin\perl514.dll - -$(PERL514LIB).lib: perl514.def -!ifdef X64 - lib /nologo /machine:x64 /def:perl514.def -!else - lib /nologo /machine:x86 /def:perl514.def -!endif - -perl.c: xchat.pm.h - -xchat.pm.h: lib/Xchat.pm lib/IRC.pm - perl.exe generate_header - -$(TARGET): perl.obj perl.def $(PERL514LIB).lib - $(LINK) /DLL /out:$(TARGET) perl.obj $(LDFLAGS) $(PERL514LIB).lib /delayload:$(PERL514LIB).dll $(DIRENTLIB) delayimp.lib user32.lib shell32.lib advapi32.lib /def:perl.def - -clean: - @del $(TARGET) - @del *.obj - @del *.def - @del *.lib - @del *.exp diff --git a/plugins/python/makefile.mak b/plugins/python/makefile.mak deleted file mode 100644 index bc004577..00000000 --- a/plugins/python/makefile.mak +++ /dev/null @@ -1,25 +0,0 @@ -include "..\..\src\makeinc.mak" - -DIRENTLIB = ..\..\src\common\dirent-win32.lib -TARGET = $(PYTHONOUTPUT) - -all: $(TARGET) - -python.def: - echo EXPORTS > python.def - echo xchat_plugin_init >> python.def - echo xchat_plugin_deinit >> python.def - echo xchat_plugin_get_info >> python.def - -python.obj: python.c - $(CC) $(CFLAGS) /I.. /Dusleep=_sleep /DPATH_MAX=255 python.c $(GLIB) /I$(PYTHONPATH)\include /DPYTHON_DLL=\"$(PYTHONLIB).dll\" - -$(TARGET): python.obj python.def - $(LINK) /dll /out:$(TARGET) $(LDFLAGS) python.obj /libpath:$(PYTHONPATH)\libs $(PYTHONLIB).lib $(DIRENTLIB) $(LIBS) /def:python.def - -clean: - del $(TARGET) - del *.obj - del python.def - del *.lib - del *.exp diff --git a/plugins/tcl/makefile.mak b/plugins/tcl/makefile.mak deleted file mode 100644 index c88f5c4f..00000000 --- a/plugins/tcl/makefile.mak +++ /dev/null @@ -1,22 +0,0 @@ -include "..\..\src\makeinc.mak" - -TARGET = $(TCLOUTPUT) - -all: $(TARGET) - -tcl.def: - echo EXPORTS > tcl.def - echo xchat_plugin_init >> tcl.def - echo xchat_plugin_deinit >> tcl.def - echo xchat_plugin_get_info >> tcl.def - -tclplugin.obj: tclplugin.c - $(CC) $(CFLAGS) /I.. tclplugin.c /I$(TCLPATH)\include /DTCL_DLL=\"$(TCLLIB).dll\" - -$(TARGET): tclplugin.obj tcl.def - $(LINK) /dll /out:$(TARGET) $(LDFLAGS) tclplugin.obj /libpath:$(TCLPATH)\lib $(TCLLIB).lib /delayload:$(TCLLIB).dll delayimp.lib /def:tcl.def - -clean: - del $(TARGET) - del *.obj - del tcl.def diff --git a/plugins/upd/makefile.mak b/plugins/upd/makefile.mak deleted file mode 100644 index 34b54cb8..00000000 --- a/plugins/upd/makefile.mak +++ /dev/null @@ -1,18 +0,0 @@ -include "..\..\src\makeinc.mak" - -all: upd.obj upd.def - link $(LDFLAGS) $(LIBS) /dll /out:xcupd.dll /def:upd.def upd.obj - -upd.def: - echo EXPORTS > upd.def - echo xchat_plugin_init >> upd.def - echo xchat_plugin_deinit >> upd.def - -upd.obj: upd.c makefile.mak - cl $(CFLAGS) $(GLIB) /I.. upd.c - -clean: - del *.obj - del *.dll - del *.exp - del *.lib diff --git a/plugins/winamp/makefile.mak b/plugins/winamp/makefile.mak deleted file mode 100644 index 79adf87e..00000000 --- a/plugins/winamp/makefile.mak +++ /dev/null @@ -1,18 +0,0 @@ -include "..\..\src\makeinc.mak" - -all: winamp.obj winamp.def - link $(LDFLAGS) $(LIBS) /dll /out:xcwinamp.dll /def:winamp.def winamp.obj - -winamp.def: - echo EXPORTS > winamp.def - echo xchat_plugin_init >> winamp.def - echo xchat_plugin_deinit >> winamp.def - -winamp.obj: winamp.c makefile.mak - cl $(CFLAGS) /I.. winamp.c - -clean: - del *.obj - del *.dll - del *.exp - del *.lib diff --git a/plugins/winsys/makefile.mak b/plugins/winsys/makefile.mak deleted file mode 100644 index 31f24eb1..00000000 --- a/plugins/winsys/makefile.mak +++ /dev/null @@ -1,18 +0,0 @@ -include "..\..\src\makeinc.mak" - -all: winsys.obj winsys.def - link $(LDFLAGS) $(LIBS) /NODEFAULTLIB:comsupp.lib wbemuuid.lib vccomsup.lib /dll /out:xcwinsys.dll /def:winsys.def winsys.obj - -winsys.def: - echo EXPORTS > winsys.def - echo xchat_plugin_init >> winsys.def - echo xchat_plugin_deinit >> winsys.def - -winsys.obj: winsys.cpp makefile.mak - cl $(CFLAGS) $(GLIB) /DUNICODE /D_UNICODE /Zc:wchar_t- /I.. winsys.cpp - -clean: - del *.obj - del *.dll - del *.exp - del *.lib diff --git a/plugins/wmpa/makefile.mak b/plugins/wmpa/makefile.mak deleted file mode 100644 index 37e0ecd0..00000000 --- a/plugins/wmpa/makefile.mak +++ /dev/null @@ -1,53 +0,0 @@ -include "..\..\src\makeinc.mak" - -TARGET = xcwmpa.dll - -WMPA_OBJECTS = \ -wmpa.obj \ -wmpadialog.obj \ -wmpcdrom.obj \ -wmpcdromcollection.obj \ -wmpclosedcaption.obj \ -wmpcontrols.obj \ -wmpdvd.obj \ -wmperror.obj \ -wmperroritem.obj \ -wmpmedia.obj \ -wmpmediacollection.obj \ -wmpnetwork.obj \ -wmpplayer4.obj \ -wmpplayerapplication.obj \ -wmpplaylist.obj \ -wmpplaylistarray.obj \ -wmpplaylistcollection.obj \ -wmpsettings.obj \ -wmpstringcollection.obj \ -xchat-plugin.obj - -CPPFLAGS = $(CPPFLAGS) /EHsc /D_AFXDLL /D_AFX_NO_DAO_SUPPORT /D_WINDLL /D_USRDLL - -all: $(WMPA_OBJECTS) $(TARGET) - -.cpp.obj: - $(CC) $(CPPFLAGS) /Yc"StdAfx.h" /Fp"wmpa.pch" StdAfx.cpp - $(CC) $(CPPFLAGS) /Yu"StdAfx.h" /Fp"wmpa.pch" /c $< - -$(TARGET): $(WMPA_OBJECTS) - rc /nologo /D_AFXDLL wmpa.rc -!ifdef X64 - midl /nologo /mktyplib203 /char signed /env x64 /h wmpa_h.h /tlb wmpa.tlb wmpa.odl -!else - midl /nologo /mktyplib203 /char signed /env win32 /h wmpa_h.h /tlb wmpa.tlb wmpa.odl -!endif - $(LINK) /DLL /out:$(TARGET) $(LDFLAGS) $(WMPA_OBJECTS) $(LIBS) /def:wmpa.def wmpa.res - -clean: - del $(TARGET) - del *.obj - del wmpa.pch - del wmpa.res - del wmpa.tlb - del wmpa_h.h - del wmpa_i.c - del *.exp - del *.lib diff --git a/plugins/xsasl/makefile.mak b/plugins/xsasl/makefile.mak deleted file mode 100644 index e1ffd0ec..00000000 --- a/plugins/xsasl/makefile.mak +++ /dev/null @@ -1,18 +0,0 @@ -include "..\..\src\makeinc.mak" - -all: xsasl.obj xsasl.def - link $(LDFLAGS) $(LIBS) /dll /out:xcxsasl.dll /def:xsasl.def xsasl.obj - -xsasl.def: - echo EXPORTS > xsasl.def - echo xchat_plugin_init >> xsasl.def - echo xchat_plugin_deinit >> xsasl.def - -xsasl.obj: xsasl.c makefile.mak - cl $(CFLAGS) $(GLIB) /I.. xsasl.c - -clean: - del *.obj - del *.dll - del *.exp - del *.lib diff --git a/plugins/xtray/icons/xchat.ico b/plugins/xtray/icons/hexchat.ico similarity index 100% rename from plugins/xtray/icons/xchat.ico rename to plugins/xtray/icons/hexchat.ico diff --git a/plugins/xtray/makefile.mak b/plugins/xtray/makefile.mak deleted file mode 100644 index ec2c94b3..00000000 --- a/plugins/xtray/makefile.mak +++ /dev/null @@ -1,37 +0,0 @@ -include "..\..\src\makeinc.mak" - -TARGET = xtray.dll - -TRAY_OBJECTS = \ -callbacks.obj \ -sdAlerts.obj \ -sdTray.obj \ -utility.obj \ -xchat.obj \ -xtray.obj - -CPPFLAGS = $(CPPFLAGS) /D_STL70_ /D_STATIC_CPPLIB /EHsc /DUNICODE /D_UNICODE - -all: $(TRAY_OBJECTS) $(TARGET) - -xtray.def: - echo EXPORTS > xtray.def - echo xchat_plugin_init >> xtray.def - echo xchat_plugin_deinit >> xtray.def - -.cpp.obj: - $(CC) $(CPPFLAGS) /I.. /c $< - -res: - rc /nologo resource.rc - -$(TARGET): $(TRAY_OBJECTS) xtray.def res - $(LINK) /DLL /out:$(TARGET) $(LDFLAGS) $(TRAY_OBJECTS) ntstc_msvcrt.lib $(LIBS) /def:xtray.def resource.res - -clean: - del $(TARGET) - del *.obj - del xtray.def - del resource.res - del *.lib - del *.exp diff --git a/src/common/makefile.mak b/src/common/makefile.mak deleted file mode 100644 index d6df2608..00000000 --- a/src/common/makefile.mak +++ /dev/null @@ -1,45 +0,0 @@ -include "..\makeinc.mak" - -COMMON_OBJECTS = \ -cfgfiles.obj \ -chanopt.obj \ -ctcp.obj \ -dcc.obj \ -dirent-win32.obj \ -history.obj \ -identd.obj \ -ignore.obj \ -inbound.obj \ -modes.obj \ -network.obj \ -notify.obj \ -outbound.obj \ -plugin.obj \ -plugin-timer.obj \ -proto-irc.obj \ -server.obj \ -servlist.obj \ -ssl.obj \ -text.obj \ -thread.obj \ -tree.obj \ -url.obj \ -userlist.obj \ -util.obj \ -xchat.obj - -all: $(COMMON_OBJECTS) xchatcommon.lib dirent-win32.lib - -xchatcommon.lib: $(COMMON_OBJECTS) - lib /nologo /out:xchatcommon.lib $(COMMON_OBJECTS) - -dirent-win32.lib: dirent-win32.obj - lib /nologo /out:dirent-win32.lib dirent-win32.obj - -.c.obj:: - $(CC) $(CFLAGS) $(GLIB) $< - -clean: - @del *.obj - @del xchatcommon.lib - @del dirent-win32.lib diff --git a/src/fe-gtk/makefile.mak b/src/fe-gtk/makefile.mak deleted file mode 100644 index 27922405..00000000 --- a/src/fe-gtk/makefile.mak +++ /dev/null @@ -1,62 +0,0 @@ -include "..\makeinc.mak" - -FEGTK_OBJECTS = \ -about.obj \ -ascii.obj \ -banlist.obj \ -chanlist.obj \ -chanview.obj \ -custom-list.obj \ -dccgui.obj \ -editlist.obj \ -fe-gtk.obj \ -fkeys.obj \ -gtkutil.obj \ -ignoregui.obj \ -joind.obj \ -maingui.obj \ -menu.obj \ -notifygui.obj \ -palette.obj \ -pixmaps.obj \ -plugingui.obj \ -plugin-tray.obj \ -rawlog.obj \ -search.obj \ -servlistgui.obj \ -setup.obj \ -sexy-iso-codes.obj \ -sexy-marshal.obj \ -sexy-spell-entry.obj \ -textgui.obj \ -urlgrab.obj \ -userlistgui.obj \ -xtext.obj - -!ifdef X64 -MACHINE_FLAG = /MACHINE:X64 -!else -MACHINE_FLAG = /MACHINE:X86 -!endif - -COMLIB = ..\common\xchatcommon.lib -PROG = xchat.exe - -all: $(PROG) - -.c.obj:: - $(CC) $(CFLAGS) -I..\..\plugins $(GLIB) $(GTK) $< - -$(PROG): $(FEGTK_OBJECTS) $(COMLIB) xchat-icon.obj - $(LINK) /out:$(PROG) /entry:mainCRTStartup $(LDFLAGS) $(LIBS) $(FEGTK_OBJECTS) $(COMLIB) xchat-icon.obj - -xchat.res: xchat.rc ../../xchat.ico - rc /nologo /r xchat.rc - -xchat-icon.obj: xchat.res - cvtres /nologo $(MACHINE_FLAG) /OUT:xchat-icon.obj xchat.res - -clean: - @del *.obj - @del $(PROG) - @del xchat.res diff --git a/src/fe-text/makefile.mak b/src/fe-text/makefile.mak deleted file mode 100644 index 59d277d3..00000000 --- a/src/fe-text/makefile.mak +++ /dev/null @@ -1,20 +0,0 @@ -include "..\makeinc.mak" - -COMLIB = ..\common\xchatcommon.lib -PROG = xchat-text.exe - -!ifdef X64 -PLATOBJ = msvcrt_win2003.obj -!else -PLATOBJ = msvcrt_winxp.obj -!endif - -all: fe-text.obj - link /out:$(PROG) /subsystem:console /nologo $(PLATOBJ) $(LIBS) $(COMLIB) fe-text.obj - -fe-text.obj: fe-text.c makefile.mak - cl $(CFLAGS) $(GLIB) fe-text.c - -clean: - @del *.obj - @del $(PROG) diff --git a/src/makefile.mak b/src/makefile.mak deleted file mode 100644 index cd73b879..00000000 --- a/src/makefile.mak +++ /dev/null @@ -1,23 +0,0 @@ -all: - @cd pixmaps - @-$(MAKE) /nologo /s /f makefile.mak $@ - @cd ..\common - @-$(MAKE) /nologo /s /f makefile.mak $@ - @cd ..\fe-gtk - @-$(MAKE) /nologo /s /f makefile.mak $@ - @cd ..\fe-text - @-$(MAKE) /nologo /s /f makefile.mak $@ - @cd ..\gtk2-prefs - @-$(MAKE) /nologo /s /f makefile.mak $@ - -clean: - @cd pixmaps - @-$(MAKE) /nologo /s /f makefile.mak clean $@ - @cd ..\common - @-$(MAKE) /nologo /s /f makefile.mak clean $@ - @cd ..\fe-gtk - @-$(MAKE) /nologo /s /f makefile.mak clean $@ - @cd ..\fe-text - @-$(MAKE) /nologo /s /f makefile.mak clean $@ - @cd ..\gtk2-prefs - @-$(MAKE) /nologo /s /f makefile.mak clean $@ diff --git a/src/makeinc.skel.mak b/src/makeinc.skel.mak deleted file mode 100644 index 552b6a6e..00000000 --- a/src/makeinc.skel.mak +++ /dev/null @@ -1,45 +0,0 @@ -CC = cl -LINK = link -CFLAGS = $(CFLAGS) /Ox /c /MD /MP /W0 /nologo -CFLAGS = $(CFLAGS) /DWIN32 /DG_DISABLE_CAST_CHECKS /DG_DISABLE_DEPRECATED /DGDK_PIXBUF_DISABLE_DEPRECATED /DGDK_DISABLE_DEPRECATED /DHAVE_STRTOULL /Dstrtoull=_strtoui64 /Dstrcasecmp=stricmp /Dstrncasecmp=strnicmp -CFLAGS = $(CFLAGS) /I$(DEV)\include -CPPFLAGS = /c /MD /W0 /nologo /DWIN32 -LDFLAGS = /subsystem:windows /nologo -LIBS = $(LIBS) gdi32.lib shell32.lib user32.lib advapi32.lib imm32.lib ole32.lib winmm.lib ws2_32.lib wininet.lib comdlg32.lib libeay32.lib ssleay32.lib - -GLIB = /I$(DEV)\include\glib-2.0 /I$(DEV)\lib\glib-2.0\include /I$(DEV)\include\libxml2 -GTK = /I$(DEV)\include\gtk-2.0 /I$(DEV)\lib\gtk-2.0\include /I$(DEV)\include\atk-1.0 /I$(DEV)\include\cairo /I$(DEV)\include\pango-1.0 /I$(DEV)\include\gdk-pixbuf-2.0 -LIBS = $(LIBS) /libpath:$(DEV)\lib gtk-win32-2.0.lib gdk-win32-2.0.lib atk-1.0.lib gio-2.0.lib gdk_pixbuf-2.0.lib pangowin32-1.0.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib intl.lib libxml2.lib -#obs LIBS = $(LIBS) /libpath:$(DEV)\lib libgtk-win32-2.0-0.lib libgdk-win32-2.0-0.lib libatk-1.0-0.lib libgio-2.0-0.lib libgdk_pixbuf-2.0-0.lib libpangowin32-1.0-0.lib libpangocairo-1.0-0.lib libpango-1.0-0.lib libcairo-2.lib libgobject-2.0-0.lib libgmodule-2.0-0.lib libglib-2.0-0.lib libintl-8.lib libxml2-2.lib - -LUALIB = lua51 -LUAOUTPUT = xclua.dll - -PERL512LIB = perl512 -PERL512OUTPUT = xcperl-512.dll -PERL514LIB = perl514 -PERL514OUTPUT = xcperl-514.dll - -PYTHONLIB = python27 -PYTHONOUTPUT = xcpython.dll - -TCLLIB = tcl85 -TCLOUTPUT = xctcl.dll - -!ifdef X64 -CFLAGS = $(CFLAGS) /favor:AMD64 /D_WIN64 -CPPFLAGS = $(CPPFLAGS) /favor:AMD64 /D_WIN64 -LDFLAGS = $(LDFLAGS) msvcrt_win2003.obj - -PERL512PATH = c:\mozilla-build\perl-5.12-x64 -PERL514PATH = c:\mozilla-build\perl-5.14-x64 -PYTHONPATH = c:\mozilla-build\python-2.7-x64 -TCLPATH = c:\mozilla-build\tcl-8.5-x64 -!else -LDFLAGS = $(LDFLAGS) msvcrt_winxp.obj - -PERL512PATH = c:\mozilla-build\perl-5.12-x86 -PERL514PATH = c:\mozilla-build\perl-5.14-x86 -PYTHONPATH = c:\mozilla-build\python-2.7-x86 -TCLPATH = c:\mozilla-build\tcl-8.5-x86 -!endif diff --git a/src/pixmaps/makefile.mak b/src/pixmaps/makefile.mak deleted file mode 100644 index f9535dbe..00000000 --- a/src/pixmaps/makefile.mak +++ /dev/null @@ -1,18 +0,0 @@ -CONV = gdk-pixbuf-csource - -LIST = bookpng book.png \ - hoppng hop.png \ - oppng op.png \ - purplepng purple.png \ - redpng red.png \ - trayfilepng fileoffer.png \ - trayhilightpng highlight.png \ - traymsgpng message.png \ - voicepng voice.png \ - xchatpng ..\..\xchat.png - -all: - @$(CONV) --build-list $(LIST) > inline_pngs.h - -clean: - @del *.h