From cbcf58aba6497db777fe41d0b9651d0b905c9605 Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Tue, 24 Aug 2010 20:03:18 +0200 Subject: [PATCH] huge cleanup on build system --- build/build-x64.bat | 29 +++--------- build/build-x86.bat | 29 +++--------- build/compile-po-files.bat | 88 ++++++++++++++++++------------------- build/release-x86.bat | 82 +++++++++++++++++----------------- plugins/ewc/makefile.mak | 5 +-- plugins/lua/makefile.mak | 5 +-- plugins/makefile.mak | 45 +++++++++++++++++++ plugins/perl/makefile.mak | 2 +- plugins/python/makefile.mak | 4 +- plugins/tcl/makefile.mak | 4 +- plugins/xdcc/makefile.mak | 5 +-- src/common/makefile.mak | 2 +- src/fe-gtk/makefile.mak | 7 ++- src/makefile.mak | 25 +++++------ src/makeinc.skel | 15 ++++--- src/pixmaps/makefile.mak | 2 +- xchat-wdk.patch | 55 +++++++++++++++++++++-- 17 files changed, 231 insertions(+), 173 deletions(-) create mode 100644 plugins/makefile.mak diff --git a/build/build-x64.bat b/build/build-x64.bat index 44e13af4..d4378121 100644 --- a/build/build-x64.bat +++ b/build/build-x64.bat @@ -7,29 +7,14 @@ set LIB=c:\WinDDK\7600.16385.1\lib\wnet\amd64;c:\WinDDK\7600.16385.1\lib\Crt\amd set OPATH=%PATH% set PATH=c:\WinDDK\7600.16385.1\bin\x86\amd64;c:\WinDDK\7600.16385.1\bin\x86;c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\x64;c:\mozilla-build\build\xchat-dev64\bin;c:\mozilla-build\perl-5.12-x64\bin cd common -nmake -f makefile.mak clean +nmake /nologo /f makefile.mak clean cd ..\fe-gtk -nmake -f makefile.mak clean +nmake /nologo /f makefile.mak clean cd .. -nmake -f makefile.mak -cd ..\plugins\ewc -nmake -f makefile.mak clean -nmake -f makefile.mak -cd ..\lua -nmake -f makefile.mak clean -nmake -f makefile.mak -cd ..\perl -nmake -f makefile.mak clean -nmake -f makefile.mak -cd ..\python -nmake -f makefile.mak clean -nmake -f makefile.mak -cd ..\tcl -nmake -f makefile.mak clean -nmake -f makefile.mak -cd ..\xdcc -nmake -f makefile.mak clean -nmake -f makefile.mak -cd ..\..\build +nmake /nologo /f makefile.mak +cd ..\plugins +nmake /nologo /f makefile.mak clean +nmake /f makefile.mak +cd ..\build set PATH=%OPATH% call release-x64.bat diff --git a/build/build-x86.bat b/build/build-x86.bat index 6eddb451..72814e0a 100644 --- a/build/build-x86.bat +++ b/build/build-x86.bat @@ -5,30 +5,15 @@ set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\Win set LIB=c:\WinDDK\7600.16385.1\lib\wxp\i386;c:\WinDDK\7600.16385.1\lib\Crt\i386 set OPATH=%PATH% set PATH=c:\WinDDK\7600.16385.1\bin\x86\x86;c:\WinDDK\7600.16385.1\bin\x86;c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin;c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE;c:\mozilla-build\build\xchat-dev32\bin;c:\mozilla-build\mingw32\bin;c:\mozilla-build\perl-5.12-x86\bin -nmake -f makefile.mak clean +nmake /nologo /f makefile.mak clean cd pixmaps -nmake -f makefile.mak +nmake /nologo /f makefile.mak cd .. -nmake -f makefile.mak -cd ..\plugins\ewc -nmake -f makefile.mak clean -nmake -f makefile.mak -cd ..\lua -nmake -f makefile.mak clean -nmake -f makefile.mak -cd ..\perl -nmake -f makefile.mak clean -nmake -f makefile.mak -cd ..\python -nmake -f makefile.mak clean -nmake -f makefile.mak -cd ..\tcl -nmake -f makefile.mak clean -nmake -f makefile.mak -cd ..\xdcc -nmake -f makefile.mak clean -nmake -f makefile.mak -cd ..\..\build +nmake /nologo /f makefile.mak +cd ..\plugins +nmake /nologo /f makefile.mak clean +nmake /nologo /f makefile.mak +cd ..\build call compile-po-files.bat cd ..\build set PATH=%OPATH% diff --git a/build/compile-po-files.bat b/build/compile-po-files.bat index 9c82dd16..68e9b729 100644 --- a/build/compile-po-files.bat +++ b/build/compile-po-files.bat @@ -6,133 +6,133 @@ rmdir /Q /S locale mkdir locale mkdir locale\am\LC_MESSAGES -msgfmt -cvo locale\am\LC_MESSAGES\xchat.mo am.po +msgfmt -co locale\am\LC_MESSAGES\xchat.mo am.po mkdir locale\az\LC_MESSAGES -msgfmt -cvo locale\az\LC_MESSAGES\xchat.mo az.po +msgfmt -co locale\az\LC_MESSAGES\xchat.mo az.po mkdir locale\be\LC_MESSAGES -msgfmt -cvo locale\be\LC_MESSAGES\xchat.mo be.po +msgfmt -co locale\be\LC_MESSAGES\xchat.mo be.po mkdir locale\bg\LC_MESSAGES -msgfmt -cvo locale\bg\LC_MESSAGES\xchat.mo bg.po +msgfmt -co locale\bg\LC_MESSAGES\xchat.mo bg.po mkdir locale\ca\LC_MESSAGES -msgfmt -cvo locale\ca\LC_MESSAGES\xchat.mo ca.po +msgfmt -co locale\ca\LC_MESSAGES\xchat.mo ca.po mkdir locale\cs\LC_MESSAGES -msgfmt -cvo locale\cs\LC_MESSAGES\xchat.mo cs.po +msgfmt -co locale\cs\LC_MESSAGES\xchat.mo cs.po mkdir locale\de\LC_MESSAGES -msgfmt -cvo locale\de\LC_MESSAGES\xchat.mo de.po +msgfmt -co locale\de\LC_MESSAGES\xchat.mo de.po mkdir locale\el\LC_MESSAGES -msgfmt -cvo locale\el\LC_MESSAGES\xchat.mo el.po +msgfmt -co locale\el\LC_MESSAGES\xchat.mo el.po mkdir locale\en_GB\LC_MESSAGES -msgfmt -cvo locale\en_GB\LC_MESSAGES\xchat.mo en_GB.po +msgfmt -co locale\en_GB\LC_MESSAGES\xchat.mo en_GB.po mkdir locale\es\LC_MESSAGES -msgfmt -cvo locale\es\LC_MESSAGES\xchat.mo es.po +msgfmt -co locale\es\LC_MESSAGES\xchat.mo es.po mkdir locale\et\LC_MESSAGES -msgfmt -cvo locale\et\LC_MESSAGES\xchat.mo et.po +msgfmt -co locale\et\LC_MESSAGES\xchat.mo et.po mkdir locale\eu\LC_MESSAGES -msgfmt -cvo locale\eu\LC_MESSAGES\xchat.mo eu.po +msgfmt -co locale\eu\LC_MESSAGES\xchat.mo eu.po mkdir locale\fi\LC_MESSAGES -msgfmt -cvo locale\fi\LC_MESSAGES\xchat.mo fi.po +msgfmt -co locale\fi\LC_MESSAGES\xchat.mo fi.po mkdir locale\fr\LC_MESSAGES -msgfmt -cvo locale\fr\LC_MESSAGES\xchat.mo fr.po +msgfmt -co locale\fr\LC_MESSAGES\xchat.mo fr.po mkdir locale\gl\LC_MESSAGES -msgfmt -cvo locale\gl\LC_MESSAGES\xchat.mo gl.po +msgfmt -co locale\gl\LC_MESSAGES\xchat.mo gl.po mkdir locale\hi\LC_MESSAGES -msgfmt -cvo locale\hi\LC_MESSAGES\xchat.mo hi.po +msgfmt -co locale\hi\LC_MESSAGES\xchat.mo hi.po mkdir locale\hu\LC_MESSAGES -msgfmt -cvo locale\hu\LC_MESSAGES\xchat.mo hu.po +msgfmt -co locale\hu\LC_MESSAGES\xchat.mo hu.po mkdir locale\it\LC_MESSAGES -msgfmt -cvo locale\it\LC_MESSAGES\xchat.mo it.po +msgfmt -co locale\it\LC_MESSAGES\xchat.mo it.po mkdir locale\ja\LC_MESSAGES -msgfmt -cvo locale\ja\LC_MESSAGES\xchat.mo ja.po +msgfmt -co locale\ja\LC_MESSAGES\xchat.mo ja.po mkdir locale\kn\LC_MESSAGES -msgfmt -cvo locale\kn\LC_MESSAGES\xchat.mo kn.po +msgfmt -co locale\kn\LC_MESSAGES\xchat.mo kn.po mkdir locale\ko\LC_MESSAGES -msgfmt -cvo locale\ko\LC_MESSAGES\xchat.mo ko.po +msgfmt -co locale\ko\LC_MESSAGES\xchat.mo ko.po mkdir locale\lt\LC_MESSAGES -msgfmt -cvo locale\lt\LC_MESSAGES\xchat.mo lt.po +msgfmt -co locale\lt\LC_MESSAGES\xchat.mo lt.po mkdir locale\lv\LC_MESSAGES -msgfmt -cvo locale\lv\LC_MESSAGES\xchat.mo lv.po +msgfmt -co locale\lv\LC_MESSAGES\xchat.mo lv.po mkdir locale\mk\LC_MESSAGES -msgfmt -cvo locale\mk\LC_MESSAGES\xchat.mo mk.po +msgfmt -co locale\mk\LC_MESSAGES\xchat.mo mk.po mkdir locale\ms\LC_MESSAGES -msgfmt -cvo locale\ms\LC_MESSAGES\xchat.mo ms.po +msgfmt -co locale\ms\LC_MESSAGES\xchat.mo ms.po mkdir locale\nb\LC_MESSAGES -msgfmt -cvo locale\nb\LC_MESSAGES\xchat.mo nb.po +msgfmt -co locale\nb\LC_MESSAGES\xchat.mo nb.po mkdir locale\nl\LC_MESSAGES -msgfmt -cvo locale\nl\LC_MESSAGES\xchat.mo nl.po +msgfmt -co locale\nl\LC_MESSAGES\xchat.mo nl.po mkdir locale\no\LC_MESSAGES -msgfmt -cvo locale\no\LC_MESSAGES\xchat.mo no.po +msgfmt -co locale\no\LC_MESSAGES\xchat.mo no.po mkdir locale\pa\LC_MESSAGES -msgfmt -cvo locale\pa\LC_MESSAGES\xchat.mo pa.po +msgfmt -co locale\pa\LC_MESSAGES\xchat.mo pa.po mkdir locale\pl\LC_MESSAGES -msgfmt -cvo locale\pl\LC_MESSAGES\xchat.mo pl.po +msgfmt -co locale\pl\LC_MESSAGES\xchat.mo pl.po mkdir locale\pt\LC_MESSAGES -msgfmt -cvo locale\pt\LC_MESSAGES\xchat.mo pt.po +msgfmt -co locale\pt\LC_MESSAGES\xchat.mo pt.po mkdir locale\pt_BR\LC_MESSAGES -msgfmt -cvo locale\pt_BR\LC_MESSAGES\xchat.mo pt_BR.po +msgfmt -co locale\pt_BR\LC_MESSAGES\xchat.mo pt_BR.po mkdir locale\ru\LC_MESSAGES -msgfmt -cvo locale\ru\LC_MESSAGES\xchat.mo ru.po +msgfmt -co locale\ru\LC_MESSAGES\xchat.mo ru.po mkdir locale\sk\LC_MESSAGES -msgfmt -cvo locale\sk\LC_MESSAGES\xchat.mo sk.po +msgfmt -co locale\sk\LC_MESSAGES\xchat.mo sk.po mkdir locale\sl\LC_MESSAGES -msgfmt -cvo locale\sl\LC_MESSAGES\xchat.mo sl.po +msgfmt -co locale\sl\LC_MESSAGES\xchat.mo sl.po mkdir locale\sq\LC_MESSAGES -msgfmt -cvo locale\sq\LC_MESSAGES\xchat.mo sq.po +msgfmt -co locale\sq\LC_MESSAGES\xchat.mo sq.po mkdir locale\sr\LC_MESSAGES -msgfmt -cvo locale\sr\LC_MESSAGES\xchat.mo sr.po +msgfmt -co locale\sr\LC_MESSAGES\xchat.mo sr.po mkdir locale\sv\LC_MESSAGES -msgfmt -cvo locale\sv\LC_MESSAGES\xchat.mo sv.po +msgfmt -co locale\sv\LC_MESSAGES\xchat.mo sv.po mkdir locale\th\LC_MESSAGES -msgfmt -cvo locale\th\LC_MESSAGES\xchat.mo th.po +msgfmt -co locale\th\LC_MESSAGES\xchat.mo th.po mkdir locale\uk\LC_MESSAGES -msgfmt -cvo locale\uk\LC_MESSAGES\xchat.mo uk.po +msgfmt -co locale\uk\LC_MESSAGES\xchat.mo uk.po mkdir locale\vi\LC_MESSAGES -msgfmt -cvo locale\vi\LC_MESSAGES\xchat.mo vi.po +msgfmt -co locale\vi\LC_MESSAGES\xchat.mo vi.po mkdir locale\wa\LC_MESSAGES -msgfmt -cvo locale\wa\LC_MESSAGES\xchat.mo wa.po +msgfmt -co locale\wa\LC_MESSAGES\xchat.mo wa.po mkdir locale\zh_CN\LC_MESSAGES -msgfmt -cvo locale\zh_CN\LC_MESSAGES\xchat.mo zh_CN.po +msgfmt -co locale\zh_CN\LC_MESSAGES\xchat.mo zh_CN.po mkdir locale\zh_TW\LC_MESSAGES -msgfmt -cvo locale\zh_TW\LC_MESSAGES\xchat.mo zh_TW.po +msgfmt -co locale\zh_TW\LC_MESSAGES\xchat.mo zh_TW.po diff --git a/build/release-x86.bat b/build/release-x86.bat index f31097ee..da32d3dc 100644 --- a/build/release-x86.bat +++ b/build/release-x86.bat @@ -3,47 +3,47 @@ set GTK_BIN=c:\mozilla-build\build\xchat-dev32\bin set SSL_BIN=c:\mozilla-build\build\openssl-wdk-1.0.0a-x86\bin set LUA_BIN=c:\mozilla-build\build\lua-wdk-5.1.4-2-x86\bin set XCHAT_DEST=c:\mozilla-build\build\xchat-wdk-uni -rmdir /Q /S %XCHAT_DEST% +rmdir /q /s %XCHAT_DEST% mkdir %XCHAT_DEST% -xcopy ..\src\fe-gtk\xchat.exe %XCHAT_DEST% -xcopy %GTK_BIN%\libgtk-win32-2.0-0.dll %XCHAT_DEST% -xcopy %GTK_BIN%\libgdk_pixbuf-2.0-0.dll %XCHAT_DEST% -xcopy %GTK_BIN%\libgio-2.0-0.dll %XCHAT_DEST% -xcopy %GTK_BIN%\libglib-2.0-0.dll %XCHAT_DEST% -xcopy %GTK_BIN%\libgmodule-2.0-0.dll %XCHAT_DEST% -xcopy %GTK_BIN%\libgobject-2.0-0.dll %XCHAT_DEST% -xcopy %GTK_BIN%\libgthread-2.0-0.dll %XCHAT_DEST% -xcopy %GTK_BIN%\libpng14-14.dll %XCHAT_DEST% -::xcopy %GTK_BIN%\zlib1.dll %XCHAT_DEST% -xcopy %GTK_BIN%\libgdk-win32-2.0-0.dll %XCHAT_DEST% -xcopy %GTK_BIN%\libcairo-2.dll %XCHAT_DEST% -xcopy %GTK_BIN%\libfontconfig-1.dll %XCHAT_DEST% -xcopy %GTK_BIN%\libexpat-1.dll %XCHAT_DEST% -xcopy %GTK_BIN%\freetype6.dll %XCHAT_DEST% -xcopy %GTK_BIN%\libpango-1.0-0.dll %XCHAT_DEST% -xcopy %GTK_BIN%\libpangocairo-1.0-0.dll %XCHAT_DEST% -xcopy %GTK_BIN%\libpangoft2-1.0-0.dll %XCHAT_DEST% -xcopy %GTK_BIN%\libpangowin32-1.0-0.dll %XCHAT_DEST% -xcopy %GTK_BIN%\libatk-1.0-0.dll %XCHAT_DEST% -xcopy %GTK_BIN%\intl.dll %XCHAT_DEST% -::xcopy /S /I %GTK_BIN%\..\lib\gtk-2.0 %XCHAT_DEST%\lib\gtk-2.0 -::rmdir /Q /S %XCHAT_DEST%\lib\gtk-2.0\include -xcopy /S /I %GTK_BIN%\..\lib\gtk-2.0\2.10.0\engines\libwimp.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines\ -xcopy /S /I etc %XCHAT_DEST%\etc -xcopy ..\COPYING %XCHAT_DEST% -xcopy %SSL_BIN%\..\LICENSE.OPENSSL %XCHAT_DEST% -xcopy %SSL_BIN%\..\LICENSE.ZLIB %XCHAT_DEST% -xcopy %SSL_BIN%\libeay32.dll %XCHAT_DEST% -xcopy %SSL_BIN%\ssleay32.dll %XCHAT_DEST% -xcopy %SSL_BIN%\zlib1.dll %XCHAT_DEST% -xcopy /S /I ..\plugins\ewc\xcewc.dll %XCHAT_DEST%\plugins\ -xcopy /S /I ..\plugins\lua\xclua.dll %XCHAT_DEST%\plugins\ -xcopy /S /I ..\plugins\perl\xcperl.dll %XCHAT_DEST%\plugins\ -xcopy /S /I ..\plugins\python\xcpython.dll %XCHAT_DEST%\plugins\ -xcopy /S /I ..\plugins\tcl\xctcl.dll %XCHAT_DEST%\plugins\ -xcopy /S /I ..\plugins\xdcc\xcxdcc.dll %XCHAT_DEST%\plugins\ -xcopy %LUA_BIN%\lua51.dll %XCHAT_DEST% -xcopy /S /I /Q ..\po\locale %XCHAT_DEST%\locale -xcopy /S /I /Q %GTK_BIN%\..\share\locale %XCHAT_DEST%\share\locale +xcopy /q ..\src\fe-gtk\xchat.exe %XCHAT_DEST% +xcopy /q %GTK_BIN%\libgtk-win32-2.0-0.dll %XCHAT_DEST% +xcopy /q %GTK_BIN%\libgdk_pixbuf-2.0-0.dll %XCHAT_DEST% +xcopy /q %GTK_BIN%\libgio-2.0-0.dll %XCHAT_DEST% +xcopy /q %GTK_BIN%\libglib-2.0-0.dll %XCHAT_DEST% +xcopy /q %GTK_BIN%\libgmodule-2.0-0.dll %XCHAT_DEST% +xcopy /q %GTK_BIN%\libgobject-2.0-0.dll %XCHAT_DEST% +xcopy /q %GTK_BIN%\libgthread-2.0-0.dll %XCHAT_DEST% +xcopy /q %GTK_BIN%\libpng14-14.dll %XCHAT_DEST% +::xcopy /q %GTK_BIN%\zlib1.dll %XCHAT_DEST% +xcopy /q %GTK_BIN%\libgdk-win32-2.0-0.dll %XCHAT_DEST% +xcopy /q %GTK_BIN%\libcairo-2.dll %XCHAT_DEST% +xcopy /q %GTK_BIN%\libfontconfig-1.dll %XCHAT_DEST% +xcopy /q %GTK_BIN%\libexpat-1.dll %XCHAT_DEST% +xcopy /q %GTK_BIN%\freetype6.dll %XCHAT_DEST% +xcopy /q %GTK_BIN%\libpango-1.0-0.dll %XCHAT_DEST% +xcopy /q %GTK_BIN%\libpangocairo-1.0-0.dll %XCHAT_DEST% +xcopy /q %GTK_BIN%\libpangoft2-1.0-0.dll %XCHAT_DEST% +xcopy /q %GTK_BIN%\libpangowin32-1.0-0.dll %XCHAT_DEST% +xcopy /q %GTK_BIN%\libatk-1.0-0.dll %XCHAT_DEST% +xcopy /q %GTK_BIN%\intl.dll %XCHAT_DEST% +::xcopy /q /s /i %GTK_BIN%\..\lib\gtk-2.0 %XCHAT_DEST%\lib\gtk-2.0 +::rmdir /q /s %XCHAT_DEST%\lib\gtk-2.0\include +xcopy /q /s /i %GTK_BIN%\..\lib\gtk-2.0\2.10.0\engines\libwimp.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines\ +xcopy /q /s /i etc %XCHAT_DEST%\etc +xcopy /q ..\COPYING %XCHAT_DEST% +xcopy /q %SSL_BIN%\..\LICENSE.OPENSSL %XCHAT_DEST% +xcopy /q %SSL_BIN%\..\LICENSE.ZLIB %XCHAT_DEST% +xcopy /q %SSL_BIN%\libeay32.dll %XCHAT_DEST% +xcopy /q %SSL_BIN%\ssleay32.dll %XCHAT_DEST% +xcopy /q %SSL_BIN%\zlib1.dll %XCHAT_DEST% +xcopy /q /s /i ..\plugins\ewc\xcewc.dll %XCHAT_DEST%\plugins\ +xcopy /q /s /i ..\plugins\lua\xclua.dll %XCHAT_DEST%\plugins\ +xcopy /q /s /i ..\plugins\perl\xcperl.dll %XCHAT_DEST%\plugins\ +xcopy /q /s /i ..\plugins\python\xcpython.dll %XCHAT_DEST%\plugins\ +xcopy /q /s /i ..\plugins\tcl\xctcl.dll %XCHAT_DEST%\plugins\ +xcopy /q /s /i ..\plugins\xdcc\xcxdcc.dll %XCHAT_DEST%\plugins\ +xcopy /q %LUA_BIN%\lua51.dll %XCHAT_DEST% +xcopy /q /s /i ..\po\locale %XCHAT_DEST%\locale +xcopy /q /s /i %GTK_BIN%\..\share\locale %XCHAT_DEST%\share\locale echo 2> portable-mode move portable-mode %XCHAT_DEST% diff --git a/plugins/ewc/makefile.mak b/plugins/ewc/makefile.mak index a81c060e..9b9f21c1 100644 --- a/plugins/ewc/makefile.mak +++ b/plugins/ewc/makefile.mak @@ -1,8 +1,7 @@ include "..\..\src\makeinc.mak" -xcewc.dll: ewc.obj ewc.def +all: ewc.obj ewc.def link $(LDFLAGS) $(LIBS) /dll /out:xcewc.dll /def:ewc.def ewc.obj - dir xcewc.dll ewc.def: echo EXPORTS > ewc.def @@ -10,7 +9,7 @@ ewc.def: echo xchat_plugin_deinit >> ewc.def ewc.obj: ewc.c makefile.mak - cl $(CFLAGS) /I.. ewc.c + cl $(CFLAGS) ewc.c clean: del *.obj diff --git a/plugins/lua/makefile.mak b/plugins/lua/makefile.mak index 3059660d..e1ef8822 100644 --- a/plugins/lua/makefile.mak +++ b/plugins/lua/makefile.mak @@ -1,8 +1,7 @@ include "..\..\src\makeinc.mak" -xclua.dll: lua.obj lua.def +all: lua.obj lua.def link $(LDFLAGS) $(LIBS) /dll /out:xclua.dll /libpath:$(LUAPATH)\lib $(LUALIB).lib /def:lua.def lua.obj - dir xclua.dll lua.def: echo EXPORTS > lua.def @@ -10,7 +9,7 @@ lua.def: echo xchat_plugin_deinit >> lua.def lua.obj: lua.c makefile.mak - cl $(CFLAGS) /Dsnprintf=g_snprintf /I.. /I$(LUAPATH)\include /I.. lua.c + cl $(CFLAGS) /Dsnprintf=g_snprintf /I$(LUAPATH)\include lua.c clean: del *.obj diff --git a/plugins/makefile.mak b/plugins/makefile.mak new file mode 100644 index 00000000..8a83b5a6 --- /dev/null +++ b/plugins/makefile.mak @@ -0,0 +1,45 @@ +all: + @cd ewc + @-$(MAKE) /nologo /s /f makefile.mak $@ + @cd ..\lua + @-$(MAKE) /nologo /s /f makefile.mak $@ + @cd ..\perl + @-$(MAKE) /nologo /s /f makefile.mak $@ + @cd ..\python + @-$(MAKE) /nologo /s /f makefile.mak $@ + @cd ..\tcl + @-$(MAKE) /nologo /s /f makefile.mak $@ + @cd ..\xdcc + @-$(MAKE) /nologo /s /f makefile.mak $@ + +clean: + @del ewc\*.def + @del ewc\*.dll + @del ewc\*.exp + @del ewc\*.lib + @del ewc\*.obj + @del lua\*.def + @del lua\*.dll + @del lua\*.exp + @del lua\*.lib + @del lua\*.obj + @del perl\*.def + @del perl\*.dll + @del perl\*.exp + @del perl\*.lib + @del perl\*.obj + @del python\*.def + @del python\*.dll + @del python\*.exp + @del python\*.lib + @del python\*.obj + @del tcl\*.def + @del tcl\*.dll + @del tcl\*.exp + @del tcl\*.lib + @del tcl\*.obj + @del xdcc\*.def + @del xdcc\*.dll + @del xdcc\*.exp + @del xdcc\*.lib + @del xdcc\*.obj diff --git a/plugins/perl/makefile.mak b/plugins/perl/makefile.mak index 3d79f794..fd54f458 100644 --- a/plugins/perl/makefile.mak +++ b/plugins/perl/makefile.mak @@ -11,7 +11,7 @@ perl.def: echo xchat_plugin_get_info >> perl.def perl.obj: perl.c - $(CC) $(CFLAGS) perl.c $(GLIB) -I.. -I$(PERLPATH) -DPERL_DLL=\"$(PERLLIB).dll\" + $(CC) $(CFLAGS) perl.c $(GLIB) -I$(PERLPATH) -DPERL_DLL=\"$(PERLLIB).dll\" perl.c: xchat.pm.h diff --git a/plugins/python/makefile.mak b/plugins/python/makefile.mak index 1b71f40c..a0eb7b0c 100644 --- a/plugins/python/makefile.mak +++ b/plugins/python/makefile.mak @@ -11,10 +11,10 @@ python.def: echo xchat_plugin_get_info >> python.def python.obj: python.c - $(CC) $(CFLAGS) /Dusleep=_sleep /DPATH_MAX=255 python.c $(GLIB) /I.. /I$(PYTHONPATH)\include /DPYTHON_DLL=\"$(PYTHONLIB).dll\" + $(CC) $(CFLAGS) /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 $(LIBS) /def:python.def + $(LINK) /dll /out:$(TARGET) $(LDFLAGS) python.obj /libpath:$(PYTHONPATH)\libs $(PYTHONLIB).lib $(LIBS) /def:python.def clean: del $(TARGET) diff --git a/plugins/tcl/makefile.mak b/plugins/tcl/makefile.mak index 51d31efb..252af81b 100644 --- a/plugins/tcl/makefile.mak +++ b/plugins/tcl/makefile.mak @@ -11,10 +11,10 @@ tcl.def: echo xchat_plugin_get_info >> tcl.def tclplugin.obj: tclplugin.c - $(CC) $(CFLAGS) tclplugin.c /I$(TCLPATH)\include /I../../include /I.. /DTCL_DLL=\"$(TCLLIB).dll\" + $(CC) $(CFLAGS) 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 + $(LINK) /dll /out:$(TARGET) $(LDFLAGS) tclplugin.obj /libpath:$(TCLPATH)\lib $(TCLLIB).lib /delayload:$(TCLLIB).dll delayimp.lib /def:tcl.def clean: del $(TARGET) diff --git a/plugins/xdcc/makefile.mak b/plugins/xdcc/makefile.mak index 38a0735f..280d8d84 100644 --- a/plugins/xdcc/makefile.mak +++ b/plugins/xdcc/makefile.mak @@ -1,8 +1,7 @@ include "..\..\src\makeinc.mak" -xcxdcc.dll: xdcc.obj xdcc.def +all: xdcc.obj xdcc.def link $(LDFLAGS) $(LIBS) /dll /out:xcxdcc.dll /def:xdcc.def xdcc.obj - dir xcxdcc.dll xdcc.def: echo EXPORTS > xdcc.def @@ -10,7 +9,7 @@ xdcc.def: echo xchat_plugin_deinit >> xdcc.def xdcc.obj: xdcc.c makefile.mak - cl $(CFLAGS) $(GLIB) /I.. xdcc.c + cl $(CFLAGS) $(GLIB) xdcc.c clean: del *.obj diff --git a/src/common/makefile.mak b/src/common/makefile.mak index ee046895..12ac05cd 100644 --- a/src/common/makefile.mak +++ b/src/common/makefile.mak @@ -3,7 +3,7 @@ include "..\makeinc.mak" all: $(COMMON_OBJECTS) xchatcommon.lib xchatcommon.lib: $(COMMON_OBJECTS) - lib -out:xchatcommon.lib $(COMMON_OBJECTS) + lib /nologo /out:xchatcommon.lib $(COMMON_OBJECTS) .c.obj: $(CC) $(CFLAGS) $(GLIB) $< diff --git a/src/fe-gtk/makefile.mak b/src/fe-gtk/makefile.mak index cd4ca1db..6ec86d3a 100644 --- a/src/fe-gtk/makefile.mak +++ b/src/fe-gtk/makefile.mak @@ -15,11 +15,10 @@ mmx_cmod.o: mmx_cmod.S gcc -DUNDERSCORE_SYMBOLS -c mmx_cmod.S .c.obj: - $(CC) $(CFLAGS) $(GLIB) $(GTK) $(SPELL) $< + $(CC) $(CFLAGS) -I..\..\plugins $(GLIB) $(GTK) $(SPELL) $< $(PROG): $(FEGTK_OBJECTS) $(COMLIB) xchat-icon.obj - $(LINK) /out:$(PROG) /ENTRY:mainCRTStartup $(LDFLAGS) $(LIBS) $(FEGTK_OBJECTS) $(COMLIB) xchat-icon.obj - @dir $(PROG) + $(LINK) /out:$(PROG) /entry:mainCRTStartup $(LDFLAGS) $(LIBS) $(FEGTK_OBJECTS) $(COMLIB) xchat-icon.obj xchat.rc: echo XC_ICON ICON "../../xchat.ico" > xchat.rc @@ -28,7 +27,7 @@ xchat.res: xchat.rc ../../xchat.ico rc /r xchat.rc xchat-icon.obj: xchat.res - cvtres /NOLOGO $(MACHINE_FLAG) /OUT:xchat-icon.obj xchat.res + cvtres /nologo $(MACHINE_FLAG) /OUT:xchat-icon.obj xchat.res clean: del *.obj diff --git a/src/makefile.mak b/src/makefile.mak index 5864f956..cae74cd4 100644 --- a/src/makefile.mak +++ b/src/makefile.mak @@ -1,16 +1,15 @@ all: - copy ..\plugins\xchat-plugin.h common - @cd common - @-$(MAKE) -f makefile.mak $@ - @cd ..\fe-gtk - @-$(MAKE) -f makefile.mak $@ + cd common + @-$(MAKE) /nologo /s /f makefile.mak $@ + cd ..\fe-gtk + @-$(MAKE) /nologo /s /f makefile.mak $@ clean: - del common\*.obj - del common\xchatcommon.lib - del fe-gtk\*.obj - del fe-gtk\mmx_cmod.o - del fe-gtk\xchat.exe - del fe-gtk\xchat.rc - del fe-gtk\xchat.RES - del pixmaps\*.h + @del common\*.obj + @del common\xchatcommon.lib + @del fe-gtk\*.obj + @del fe-gtk\mmx_cmod.o + @del fe-gtk\xchat.exe + @del fe-gtk\xchat.rc + @del fe-gtk\xchat.RES + @del pixmaps\*.h diff --git a/src/makeinc.skel b/src/makeinc.skel index f9d30deb..6c1c3984 100644 --- a/src/makeinc.skel +++ b/src/makeinc.skel @@ -1,6 +1,7 @@ CC = cl LINK = link -CFLAGS = $(CFLAGS) /Ox /c /MD /nologo /DWIN32 /DG_DISABLE_CAST_CHECKS /Dstrcasecmp=stricmp /Dstrncasecmp=strnicmp /Dstrtoull=_strtoui64 /DHAVE_STRTOULL -DUSE_IPV6 +CFLAGS = $(CFLAGS) /Ox /c /MD /MP2 /W0 /nologo /DWIN32 /DG_DISABLE_CAST_CHECKS /Dstrcasecmp=stricmp /Dstrncasecmp=strnicmp /Dstrtoull=_strtoui64 /DHAVE_STRTOULL -DUSE_IPV6 +CFLAGS = $(CFLAGS) -Ic:\mozilla-build\build\xchat-wdk\plugins CPPFLAGS = /c /MD /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 @@ -8,9 +9,9 @@ LIBS = $(LIBS) gdi32.lib shell32.lib user32.lib advapi32.lib imm32.lib ole32.lib !ifdef X64 ############################################################# #x64 config -GLIB = -Ic:/mozilla-build/build/xchat-dev64/include/glib-2.0 -Ic:/mozilla-build/build/xchat-dev64/lib/glib-2.0/include -GTK = -Ic:/mozilla-build/build/xchat-dev64/include/gtk-2.0 -Ic:/mozilla-build/build/xchat-dev64/lib/gtk-2.0/include -Ic:/mozilla-build/build/xchat-dev64/include/atk-1.0 -Ic:/mozilla-build/build/xchat-dev64/include/cairo -Ic:/mozilla-build/build/xchat-dev64/include/pango-1.0 -Ic:/mozilla-build/build/xchat-dev64/include/glib-2.0 -Ic:/mozilla-build/build/xchat-dev64/lib/glib-2.0/include -Ic:/mozilla-build/build/xchat-dev64/include/freetype2 -Ic:/mozilla-build/build/xchat-dev64/include -Ic:/mozilla-build/build/xchat-dev64/include/libpng14 -LIBS = $(LIBS) /libpath:c:/mozilla-build/build/xchat-dev64/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 gdi32.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 +GLIB = -Ic:\mozilla-build\build\xchat-dev64\include\glib-2.0 -Ic:\mozilla-build\build\xchat-dev64\lib\glib-2.0\include +GTK = -Ic:\mozilla-build\build\xchat-dev64\include\gtk-2.0 -Ic:\mozilla-build\build\xchat-dev64\lib\gtk-2.0\include -Ic:\mozilla-build\build\xchat-dev64\include\atk-1.0 -Ic:\mozilla-build\build\xchat-dev64\include\cairo -Ic:\mozilla-build\build\xchat-dev64\include\pango-1.0 -Ic:\mozilla-build\build\xchat-dev64\include\glib-2.0 -Ic:\mozilla-build\build\xchat-dev64\lib\glib-2.0\include -Ic:\mozilla-build\build\xchat-dev64\include +LIBS = $(LIBS) /libpath:c:\mozilla-build\build\xchat-dev64\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 OPENSSLPATH = c:\mozilla-build\build\openssl-wdk-1.0.0a-x64 CFLAGS = $(CFLAGS) /DUSE_OPENSSL /I$(OPENSSLPATH)\include @@ -27,9 +28,9 @@ TCLPATH = c:\mozilla-build\tcl-8.5-x64 !else ############################################################# #x86 config -GLIB = -Ic:/mozilla-build/build/xchat-dev32/include/glib-2.0 -Ic:/mozilla-build/build/xchat-dev32/lib/glib-2.0/include -GTK = -Ic:/mozilla-build/build/xchat-dev32/include/gtk-2.0 -Ic:/mozilla-build/build/xchat-dev32/lib/gtk-2.0/include -Ic:/mozilla-build/build/xchat-dev32/include/atk-1.0 -Ic:/mozilla-build/build/xchat-dev32/include/cairo -Ic:/mozilla-build/build/xchat-dev32/include/pango-1.0 -Ic:/mozilla-build/build/xchat-dev32/include/glib-2.0 -Ic:/mozilla-build/build/xchat-dev32/lib/glib-2.0/include -Ic:/mozilla-build/build/xchat-dev32/include/freetype2 -Ic:/mozilla-build/build/xchat-dev32/include -Ic:/mozilla-build/build/xchat-dev32/include/libpng14 -LIBS = $(LIBS) /libpath:c:/mozilla-build/build/xchat-dev32/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 gdi32.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 +GLIB = -Ic:\mozilla-build\build\xchat-dev32\include\glib-2.0 -Ic:\mozilla-build\build\xchat-dev32\lib\glib-2.0\include +GTK = -Ic:\mozilla-build\build\xchat-dev32\include\gtk-2.0 -Ic:\mozilla-build\build\xchat-dev32\lib\gtk-2.0\include -Ic:\mozilla-build\build\xchat-dev32\include\atk-1.0 -Ic:\mozilla-build\build\xchat-dev32\include\cairo -Ic:\mozilla-build\build\xchat-dev32\include\pango-1.0 -Ic:\mozilla-build\build\xchat-dev32\include\glib-2.0 -Ic:\mozilla-build\build\xchat-dev32\lib\glib-2.0\include -Ic:\mozilla-build\build\xchat-dev32\include +LIBS = $(LIBS) /libpath:c:\mozilla-build\build\xchat-dev32\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 OPENSSLPATH = c:\mozilla-build\build\openssl-wdk-1.0.0a-x86 CFLAGS = $(CFLAGS) /DUSE_OPENSSL /I$(OPENSSLPATH)\include diff --git a/src/pixmaps/makefile.mak b/src/pixmaps/makefile.mak index e113b591..4c7702d1 100644 --- a/src/pixmaps/makefile.mak +++ b/src/pixmaps/makefile.mak @@ -12,7 +12,7 @@ LIST = bookpng book.png \ xchatpng ..\..\xchat.png all: - $(CONV) --build-list $(LIST) > inline_pngs.h + @$(CONV) --build-list $(LIST) > inline_pngs.h clean: del *.h diff --git a/xchat-wdk.patch b/xchat-wdk.patch index 748fec6b..8a253ff5 100644 --- a/xchat-wdk.patch +++ b/xchat-wdk.patch @@ -323,6 +323,30 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/outbound.c xchat-wdk/src #include #include #include +diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/plugin-timer.c xchat-wdk/src/common/plugin-timer.c +--- xchat-wdk.orig/src/common/plugin-timer.c 2005-02-02 11:03:51 +0100 ++++ xchat-wdk/src/common/plugin-timer.c 2010-08-24 19:57:22 +0200 +@@ -1,7 +1,7 @@ + #include + #include + #include +-#include "xchat-plugin.h" ++#include + + #ifdef WIN32 + #define strcasecmp stricmp +diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/plugin.c xchat-wdk/src/common/plugin.c +--- xchat-wdk.orig/src/common/plugin.c 2010-08-14 03:46:21 +0200 ++++ xchat-wdk/src/common/plugin.c 2010-08-24 19:57:38 +0200 +@@ -34,7 +34,7 @@ + #include "text.h" + #define PLUGIN_C + typedef struct session xchat_context; +-#include "xchat-plugin.h" ++#include + #include "plugin.h" + + diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/proto-irc.c xchat-wdk/src/common/proto-irc.c --- xchat-wdk.orig/src/common/proto-irc.c 2010-05-30 04:28:04 +0200 +++ xchat-wdk/src/common/proto-irc.c 2010-08-19 00:03:40 +0200 @@ -553,7 +577,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/util.c xchat-wdk/src/com } diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/xchat.c xchat-wdk/src/common/xchat.c --- xchat-wdk.orig/src/common/xchat.c 2008-06-08 09:58:58 +0200 -+++ xchat-wdk/src/common/xchat.c 2010-08-19 00:03:40 +0200 ++++ xchat-wdk/src/common/xchat.c 2010-08-24 19:57:56 +0200 @@ -22,7 +22,6 @@ #include #include @@ -562,6 +586,15 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/xchat.c xchat-wdk/src/co #define WANTSOCKET #include "inet.h" +@@ -38,7 +37,7 @@ + #include "cfgfiles.h" + #include "chanopt.h" + #include "ignore.h" +-#include "xchat-plugin.h" ++#include + #include "plugin.h" + #include "plugin-timer.h" + #include "notify.h" diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/xchat.h xchat-wdk/src/common/xchat.h --- xchat-wdk.orig/src/common/xchat.h 2010-08-07 09:14:45 +0200 +++ xchat-wdk/src/common/xchat.h 2010-08-19 00:03:40 +0200 @@ -880,15 +913,17 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/palette.c xchat-wdk/src/ #include diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/plugin-tray.c xchat-wdk/src/fe-gtk/plugin-tray.c --- xchat-wdk.orig/src/fe-gtk/plugin-tray.c 2010-08-14 03:46:21 +0200 -+++ xchat-wdk/src/fe-gtk/plugin-tray.c 2010-08-19 00:03:40 +0200 -@@ -1,7 +1,6 @@ ++++ xchat-wdk/src/fe-gtk/plugin-tray.c 2010-08-24 19:58:14 +0200 +@@ -1,8 +1,7 @@ /* Copyright (C) 2006-2007 Peter Zelezny. */ #include -#include - #include "../common/xchat-plugin.h" +-#include "../common/xchat-plugin.h" ++#include #include "../common/xchat.h" #include "../common/xchatc.h" + #include "../common/inbound.h" @@ -298,10 +297,10 @@ nets = tray_count_networks (); chans = tray_count_channels (); @@ -985,6 +1020,18 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/plugin-tray.c xchat-wdk/ word[1], network); return XCHAT_EAT_NONE; +diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/plugingui.c xchat-wdk/src/fe-gtk/plugingui.c +--- xchat-wdk.orig/src/fe-gtk/plugingui.c 2010-05-16 05:20:22 +0200 ++++ xchat-wdk/src/fe-gtk/plugingui.c 2010-08-24 19:58:08 +0200 +@@ -35,7 +35,7 @@ + #include "../common/xchat.h" + #define PLUGIN_C + typedef struct session xchat_context; +-#include "../common/xchat-plugin.h" ++#include + #include "../common/plugin.h" + #include "../common/util.h" + #include "../common/outbound.h" diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/rawlog.c xchat-wdk/src/fe-gtk/rawlog.c --- xchat-wdk.orig/src/fe-gtk/rawlog.c 2010-05-16 05:20:22 +0200 +++ xchat-wdk/src/fe-gtk/rawlog.c 2010-08-19 00:03:40 +0200