SoniEx2/c.sexchat
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

huge cleanup on build system

Browse source
This commit is contained in:
berkeviktor@aol.com 2010-08-24 20:03:18 +02:00
parent e0e70fccd4
commit cbcf58aba6
17 changed files with 231 additions and 173 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
build/build-x64.bat
View file

@ -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 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 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 cd common
nmake -f makefile.mak clean nmake /nologo /f makefile.mak clean
cd ..\fe-gtk cd ..\fe-gtk
nmake -f makefile.mak clean nmake /nologo /f makefile.mak clean
cd .. cd ..
nmake -f makefile.mak nmake /nologo /f makefile.mak
cd ..\plugins\ewc cd ..\plugins
nmake -f makefile.mak clean nmake /nologo /f makefile.mak clean
nmake -f makefile.mak nmake /f makefile.mak
cd ..\lua cd ..\build
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
set PATH=%OPATH% set PATH=%OPATH%
call release-x64.bat call release-x64.bat

29
build/build-x86.bat
View file

@ -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 LIB=c:\WinDDK\7600.16385.1\lib\wxp\i386;c:\WinDDK\7600.16385.1\lib\Crt\i386
set OPATH=%PATH% 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 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 cd pixmaps
nmake -f makefile.mak nmake /nologo /f makefile.mak
cd .. cd ..
nmake -f makefile.mak nmake /nologo /f makefile.mak
cd ..\plugins\ewc cd ..\plugins
nmake -f makefile.mak clean nmake /nologo /f makefile.mak clean
nmake -f makefile.mak nmake /nologo /f makefile.mak
cd ..\lua cd ..\build
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
call compile-po-files.bat call compile-po-files.bat
cd ..\build cd ..\build
set PATH=%OPATH% set PATH=%OPATH%

88
build/compile-po-files.bat
View file

@ -6,133 +6,133 @@ rmdir /Q /S locale
mkdir locale mkdir locale
mkdir locale\am\LC_MESSAGES 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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

82
build/release-x86.bat
View file

@ -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 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 LUA_BIN=c:\mozilla-build\build\lua-wdk-5.1.4-2-x86\bin
set XCHAT_DEST=c:\mozilla-build\build\xchat-wdk-uni set XCHAT_DEST=c:\mozilla-build\build\xchat-wdk-uni
rmdir /Q /S %XCHAT_DEST% rmdir /q /s %XCHAT_DEST%
mkdir %XCHAT_DEST% mkdir %XCHAT_DEST%
xcopy ..\src\fe-gtk\xchat.exe %XCHAT_DEST% xcopy /q ..\src\fe-gtk\xchat.exe %XCHAT_DEST%
xcopy %GTK_BIN%\libgtk-win32-2.0-0.dll %XCHAT_DEST% xcopy /q %GTK_BIN%\libgtk-win32-2.0-0.dll %XCHAT_DEST%
xcopy %GTK_BIN%\libgdk_pixbuf-2.0-0.dll %XCHAT_DEST% xcopy /q %GTK_BIN%\libgdk_pixbuf-2.0-0.dll %XCHAT_DEST%
xcopy %GTK_BIN%\libgio-2.0-0.dll %XCHAT_DEST% xcopy /q %GTK_BIN%\libgio-2.0-0.dll %XCHAT_DEST%
xcopy %GTK_BIN%\libglib-2.0-0.dll %XCHAT_DEST% xcopy /q %GTK_BIN%\libglib-2.0-0.dll %XCHAT_DEST%
xcopy %GTK_BIN%\libgmodule-2.0-0.dll %XCHAT_DEST% xcopy /q %GTK_BIN%\libgmodule-2.0-0.dll %XCHAT_DEST%
xcopy %GTK_BIN%\libgobject-2.0-0.dll %XCHAT_DEST% xcopy /q %GTK_BIN%\libgobject-2.0-0.dll %XCHAT_DEST%
xcopy %GTK_BIN%\libgthread-2.0-0.dll %XCHAT_DEST% xcopy /q %GTK_BIN%\libgthread-2.0-0.dll %XCHAT_DEST%
xcopy %GTK_BIN%\libpng14-14.dll %XCHAT_DEST% xcopy /q %GTK_BIN%\libpng14-14.dll %XCHAT_DEST%
::xcopy %GTK_BIN%\zlib1.dll %XCHAT_DEST% ::xcopy /q %GTK_BIN%\zlib1.dll %XCHAT_DEST%
xcopy %GTK_BIN%\libgdk-win32-2.0-0.dll %XCHAT_DEST% xcopy /q %GTK_BIN%\libgdk-win32-2.0-0.dll %XCHAT_DEST%
xcopy %GTK_BIN%\libcairo-2.dll %XCHAT_DEST% xcopy /q %GTK_BIN%\libcairo-2.dll %XCHAT_DEST%
xcopy %GTK_BIN%\libfontconfig-1.dll %XCHAT_DEST% xcopy /q %GTK_BIN%\libfontconfig-1.dll %XCHAT_DEST%
xcopy %GTK_BIN%\libexpat-1.dll %XCHAT_DEST% xcopy /q %GTK_BIN%\libexpat-1.dll %XCHAT_DEST%
xcopy %GTK_BIN%\freetype6.dll %XCHAT_DEST% xcopy /q %GTK_BIN%\freetype6.dll %XCHAT_DEST%
xcopy %GTK_BIN%\libpango-1.0-0.dll %XCHAT_DEST% xcopy /q %GTK_BIN%\libpango-1.0-0.dll %XCHAT_DEST%
xcopy %GTK_BIN%\libpangocairo-1.0-0.dll %XCHAT_DEST% xcopy /q %GTK_BIN%\libpangocairo-1.0-0.dll %XCHAT_DEST%
xcopy %GTK_BIN%\libpangoft2-1.0-0.dll %XCHAT_DEST% xcopy /q %GTK_BIN%\libpangoft2-1.0-0.dll %XCHAT_DEST%
xcopy %GTK_BIN%\libpangowin32-1.0-0.dll %XCHAT_DEST% xcopy /q %GTK_BIN%\libpangowin32-1.0-0.dll %XCHAT_DEST%
xcopy %GTK_BIN%\libatk-1.0-0.dll %XCHAT_DEST% xcopy /q %GTK_BIN%\libatk-1.0-0.dll %XCHAT_DEST%
xcopy %GTK_BIN%\intl.dll %XCHAT_DEST% xcopy /q %GTK_BIN%\intl.dll %XCHAT_DEST%
::xcopy /S /I %GTK_BIN%\..\lib\gtk-2.0 %XCHAT_DEST%\lib\gtk-2.0 ::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 ::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 /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 /S /I etc %XCHAT_DEST%\etc xcopy /q /s /i etc %XCHAT_DEST%\etc
xcopy ..\COPYING %XCHAT_DEST% xcopy /q ..\COPYING %XCHAT_DEST%
xcopy %SSL_BIN%\..\LICENSE.OPENSSL %XCHAT_DEST% xcopy /q %SSL_BIN%\..\LICENSE.OPENSSL %XCHAT_DEST%
xcopy %SSL_BIN%\..\LICENSE.ZLIB %XCHAT_DEST% xcopy /q %SSL_BIN%\..\LICENSE.ZLIB %XCHAT_DEST%
xcopy %SSL_BIN%\libeay32.dll %XCHAT_DEST% xcopy /q %SSL_BIN%\libeay32.dll %XCHAT_DEST%
xcopy %SSL_BIN%\ssleay32.dll %XCHAT_DEST% xcopy /q %SSL_BIN%\ssleay32.dll %XCHAT_DEST%
xcopy %SSL_BIN%\zlib1.dll %XCHAT_DEST% xcopy /q %SSL_BIN%\zlib1.dll %XCHAT_DEST%
xcopy /S /I ..\plugins\ewc\xcewc.dll %XCHAT_DEST%\plugins\ xcopy /q /s /i ..\plugins\ewc\xcewc.dll %XCHAT_DEST%\plugins\
xcopy /S /I ..\plugins\lua\xclua.dll %XCHAT_DEST%\plugins\ xcopy /q /s /i ..\plugins\lua\xclua.dll %XCHAT_DEST%\plugins\
xcopy /S /I ..\plugins\perl\xcperl.dll %XCHAT_DEST%\plugins\ xcopy /q /s /i ..\plugins\perl\xcperl.dll %XCHAT_DEST%\plugins\
xcopy /S /I ..\plugins\python\xcpython.dll %XCHAT_DEST%\plugins\ xcopy /q /s /i ..\plugins\python\xcpython.dll %XCHAT_DEST%\plugins\
xcopy /S /I ..\plugins\tcl\xctcl.dll %XCHAT_DEST%\plugins\ xcopy /q /s /i ..\plugins\tcl\xctcl.dll %XCHAT_DEST%\plugins\
xcopy /S /I ..\plugins\xdcc\xcxdcc.dll %XCHAT_DEST%\plugins\ xcopy /q /s /i ..\plugins\xdcc\xcxdcc.dll %XCHAT_DEST%\plugins\
xcopy %LUA_BIN%\lua51.dll %XCHAT_DEST% xcopy /q %LUA_BIN%\lua51.dll %XCHAT_DEST%
xcopy /S /I /Q ..\po\locale %XCHAT_DEST%\locale xcopy /q /s /i ..\po\locale %XCHAT_DEST%\locale
xcopy /S /I /Q %GTK_BIN%\..\share\locale %XCHAT_DEST%\share\locale xcopy /q /s /i %GTK_BIN%\..\share\locale %XCHAT_DEST%\share\locale
echo 2> portable-mode echo 2> portable-mode
move portable-mode %XCHAT_DEST% move portable-mode %XCHAT_DEST%

5
plugins/ewc/makefile.mak
View file

@ -1,8 +1,7 @@
include "..\..\src\makeinc.mak" 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 link $(LDFLAGS) $(LIBS) /dll /out:xcewc.dll /def:ewc.def ewc.obj
dir xcewc.dll
ewc.def: ewc.def:
echo EXPORTS > ewc.def echo EXPORTS > ewc.def
@ -10,7 +9,7 @@ ewc.def:
echo xchat_plugin_deinit >> ewc.def echo xchat_plugin_deinit >> ewc.def
ewc.obj: ewc.c makefile.mak ewc.obj: ewc.c makefile.mak
cl $(CFLAGS) /I.. ewc.c cl $(CFLAGS) ewc.c
clean: clean:
del *.obj del *.obj

5
plugins/lua/makefile.mak
View file

@ -1,8 +1,7 @@
include "..\..\src\makeinc.mak" 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 link $(LDFLAGS) $(LIBS) /dll /out:xclua.dll /libpath:$(LUAPATH)\lib $(LUALIB).lib /def:lua.def lua.obj
dir xclua.dll
lua.def: lua.def:
echo EXPORTS > lua.def echo EXPORTS > lua.def
@ -10,7 +9,7 @@ lua.def:
echo xchat_plugin_deinit >> lua.def echo xchat_plugin_deinit >> lua.def
lua.obj: lua.c makefile.mak 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: clean:
del *.obj del *.obj

45
plugins/makefile.mak Normal file
View file

@ -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

2
plugins/perl/makefile.mak
View file

@ -11,7 +11,7 @@ perl.def:
echo xchat_plugin_get_info >> perl.def echo xchat_plugin_get_info >> perl.def
perl.obj: perl.c 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 perl.c: xchat.pm.h

4
plugins/python/makefile.mak
View file

@ -11,10 +11,10 @@ python.def:
echo xchat_plugin_get_info >> python.def echo xchat_plugin_get_info >> python.def
python.obj: python.c 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 $(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: clean:
del $(TARGET) del $(TARGET)

4
plugins/tcl/makefile.mak
View file

@ -11,10 +11,10 @@ tcl.def:
echo xchat_plugin_get_info >> tcl.def echo xchat_plugin_get_info >> tcl.def
tclplugin.obj: tclplugin.c 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 $(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: clean:
del $(TARGET) del $(TARGET)

5
plugins/xdcc/makefile.mak
View file

@ -1,8 +1,7 @@
include "..\..\src\makeinc.mak" 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 link $(LDFLAGS) $(LIBS) /dll /out:xcxdcc.dll /def:xdcc.def xdcc.obj
dir xcxdcc.dll
xdcc.def: xdcc.def:
echo EXPORTS > xdcc.def echo EXPORTS > xdcc.def
@ -10,7 +9,7 @@ xdcc.def:
echo xchat_plugin_deinit >> xdcc.def echo xchat_plugin_deinit >> xdcc.def
xdcc.obj: xdcc.c makefile.mak xdcc.obj: xdcc.c makefile.mak
cl $(CFLAGS) $(GLIB) /I.. xdcc.c cl $(CFLAGS) $(GLIB) xdcc.c
clean: clean:
del *.obj del *.obj

2
src/common/makefile.mak
View file

@ -3,7 +3,7 @@ include "..\makeinc.mak"
all: $(COMMON_OBJECTS) xchatcommon.lib all: $(COMMON_OBJECTS) xchatcommon.lib
xchatcommon.lib: $(COMMON_OBJECTS) xchatcommon.lib: $(COMMON_OBJECTS)
lib -out:xchatcommon.lib $(COMMON_OBJECTS) lib /nologo /out:xchatcommon.lib $(COMMON_OBJECTS)
.c.obj: .c.obj:
$(CC) $(CFLAGS) $(GLIB) $< $(CC) $(CFLAGS) $(GLIB) $<

7
src/fe-gtk/makefile.mak
View file

@ -15,11 +15,10 @@ mmx_cmod.o: mmx_cmod.S
gcc -DUNDERSCORE_SYMBOLS -c mmx_cmod.S gcc -DUNDERSCORE_SYMBOLS -c mmx_cmod.S
.c.obj: .c.obj:
$(CC) $(CFLAGS) $(GLIB) $(GTK) $(SPELL) $< $(CC) $(CFLAGS) -I..\..\plugins $(GLIB) $(GTK) $(SPELL) $<
$(PROG): $(FEGTK_OBJECTS) $(COMLIB) xchat-icon.obj $(PROG): $(FEGTK_OBJECTS) $(COMLIB) xchat-icon.obj
$(LINK) /out:$(PROG) /ENTRY:mainCRTStartup $(LDFLAGS) $(LIBS) $(FEGTK_OBJECTS) $(COMLIB) xchat-icon.obj $(LINK) /out:$(PROG) /entry:mainCRTStartup $(LDFLAGS) $(LIBS) $(FEGTK_OBJECTS) $(COMLIB) xchat-icon.obj
@dir $(PROG)
xchat.rc: xchat.rc:
echo XC_ICON ICON "../../xchat.ico" > xchat.rc echo XC_ICON ICON "../../xchat.ico" > xchat.rc
@ -28,7 +27,7 @@ xchat.res: xchat.rc ../../xchat.ico
rc /r xchat.rc rc /r xchat.rc
xchat-icon.obj: xchat.res 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: clean:
del *.obj del *.obj

25
src/makefile.mak
View file

@ -1,16 +1,15 @@
all: all:
copy ..\plugins\xchat-plugin.h common cd common
@cd common @-$(MAKE) /nologo /s /f makefile.mak $@
@-$(MAKE) -f makefile.mak $@ cd ..\fe-gtk
@cd ..\fe-gtk @-$(MAKE) /nologo /s /f makefile.mak $@
@-$(MAKE) -f makefile.mak $@
clean: clean:
del common\*.obj @del common\*.obj
del common\xchatcommon.lib @del common\xchatcommon.lib
del fe-gtk\*.obj @del fe-gtk\*.obj
del fe-gtk\mmx_cmod.o @del fe-gtk\mmx_cmod.o
del fe-gtk\xchat.exe @del fe-gtk\xchat.exe
del fe-gtk\xchat.rc @del fe-gtk\xchat.rc
del fe-gtk\xchat.RES @del fe-gtk\xchat.RES
del pixmaps\*.h @del pixmaps\*.h

15
src/makeinc.skel
View file

@ -1,6 +1,7 @@
CC = cl CC = cl
LINK = link 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 CPPFLAGS = /c /MD /nologo /DWIN32
LDFLAGS = /subsystem:windows /nologo LDFLAGS = /subsystem:windows /nologo
LIBS = $(LIBS) gdi32.lib shell32.lib user32.lib advapi32.lib imm32.lib ole32.lib winmm.lib ws2_32.lib 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 !ifdef X64
############################################################# #############################################################
#x64 config #x64 config
GLIB = -Ic:/mozilla-build/build/xchat-dev64/include/glib-2.0 -Ic:/mozilla-build/build/xchat-dev64/lib/glib-2.0/include 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 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 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 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 OPENSSLPATH = c:\mozilla-build\build\openssl-wdk-1.0.0a-x64
CFLAGS = $(CFLAGS) /DUSE_OPENSSL /I$(OPENSSLPATH)\include CFLAGS = $(CFLAGS) /DUSE_OPENSSL /I$(OPENSSLPATH)\include
@ -27,9 +28,9 @@ TCLPATH = c:\mozilla-build\tcl-8.5-x64
!else !else
############################################################# #############################################################
#x86 config #x86 config
GLIB = -Ic:/mozilla-build/build/xchat-dev32/include/glib-2.0 -Ic:/mozilla-build/build/xchat-dev32/lib/glib-2.0/include 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 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 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 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 OPENSSLPATH = c:\mozilla-build\build\openssl-wdk-1.0.0a-x86
CFLAGS = $(CFLAGS) /DUSE_OPENSSL /I$(OPENSSLPATH)\include CFLAGS = $(CFLAGS) /DUSE_OPENSSL /I$(OPENSSLPATH)\include

2
src/pixmaps/makefile.mak
View file

@ -12,7 +12,7 @@ LIST = bookpng book.png \
xchatpng ..\..\xchat.png xchatpng ..\..\xchat.png
all: all:
$(CONV) --build-list $(LIST) > inline_pngs.h @$(CONV) --build-list $(LIST) > inline_pngs.h
clean: clean:
del *.h del *.h

55
xchat-wdk.patch
View file

@ -323,6 +323,30 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/outbound.c xchat-wdk/src
#include <time.h> #include <time.h>
#include <signal.h> #include <signal.h>
#include <sys/stat.h> #include <sys/stat.h>
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 <stdlib.h>
#include <string.h>
#include <glib.h>
-#include "xchat-plugin.h"
+#include <xchat-plugin.h>
#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 <xchat-plugin.h>
#include "plugin.h"
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/proto-irc.c xchat-wdk/src/common/proto-irc.c 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.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 +++ 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 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.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 @@ @@ -22,7 +22,6 @@
#include <time.h> #include <time.h>
#include <sys/types.h> #include <sys/types.h>
@ -562,6 +586,15 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/xchat.c xchat-wdk/src/co
#define WANTSOCKET #define WANTSOCKET
#include "inet.h" #include "inet.h"
@@ -38,7 +37,7 @@
#include "cfgfiles.h"
#include "chanopt.h"
#include "ignore.h"
-#include "xchat-plugin.h"
+#include <xchat-plugin.h>
#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 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.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 +++ 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 <fcntl.h> #include <fcntl.h>
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/plugin-tray.c xchat-wdk/src/fe-gtk/plugin-tray.c 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.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 +++ xchat-wdk/src/fe-gtk/plugin-tray.c 2010-08-24 19:58:14 +0200
@@ -1,7 +1,6 @@ @@ -1,8 +1,7 @@
/* Copyright (C) 2006-2007 Peter Zelezny. */ /* Copyright (C) 2006-2007 Peter Zelezny. */
#include <string.h> #include <string.h>
-#include <unistd.h> -#include <unistd.h>
#include "../common/xchat-plugin.h" -#include "../common/xchat-plugin.h"
+#include <xchat-plugin.h>
#include "../common/xchat.h" #include "../common/xchat.h"
#include "../common/xchatc.h" #include "../common/xchatc.h"
#include "../common/inbound.h"
@@ -298,10 +297,10 @@ @@ -298,10 +297,10 @@
nets = tray_count_networks (); nets = tray_count_networks ();
chans = tray_count_channels (); 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); word[1], network);
return XCHAT_EAT_NONE; 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 <xchat-plugin.h>
#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 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.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 +++ xchat-wdk/src/fe-gtk/rawlog.c 2010-08-19 00:03:40 +0200