diff options
31 files changed, 196 insertions, 185 deletions
diff --git a/build/build-x64.bat b/build/build-x64.bat index ddd49a79..803758f3 100644 --- a/build/build-x64.bat +++ b/build/build-x64.bat @@ -1,11 +1,15 @@ @echo off +set PERL_510=c:\mozilla-build\perl-5.10-x64 +set PERL_512=c:\mozilla-build\perl-5.12-x64 +set DEV_64=c:\mozilla-build\build\xchat-wdk\dep-x64 cd ..\src echo X64 = YES > makeinc.mak +echo DEV64 = %DEV_64% >> makeinc.mak type makeinc.skel >> makeinc.mak -set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\api\crt\stl70 -set LIB=c:\WinDDK\7600.16385.1\lib\wnet\amd64;c:\WinDDK\7600.16385.1\lib\Crt\amd64 +set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt;%WDK_ROOT%\inc\api\crt\stl70 +set LIB=%WDK_ROOT%\lib\wnet\amd64;%WDK_ROOT%\lib\Crt\amd64 set OPATH=%PATH% -set PATH=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 +set PATH=%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\bin\amd64;%PROGRAMFILES(X86)%\Microsoft SDKs\Windows\v7.0A\Bin\x64;%DEV_64%\bin cd common nmake /nologo /f makefile.mak clean cd ..\fe-gtk @@ -19,10 +23,10 @@ nmake /nologo /f makefile.mak clean nmake /nologo /f makefile.mak cd perl set OOPATH=%PATH% -set PATH=%OOPATH%;c:\mozilla-build\perl-5.10-x64\bin +set PATH=%OOPATH%;%PERL_510%\bin nmake /nologo /s /f makefile-510.mak clean nmake /nologo /s /f makefile-510.mak -set PATH=%OOPATH%;c:\mozilla-build\perl-5.12-x64\bin +set PATH=%OOPATH%;%PERL_512%\bin nmake /nologo /s /f makefile-512.mak clean nmake /nologo /s /f makefile-512.mak cd ..\..\build diff --git a/build/build-x86.bat b/build/build-x86.bat index be345934..84345bd5 100644 --- a/build/build-x86.bat +++ b/build/build-x86.bat @@ -1,10 +1,14 @@ @echo off +set PERL_510=c:\mozilla-build\perl-5.10-x86 +set PERL_512=c:\mozilla-build\perl-5.12-x86 +set DEV_32=c:\mozilla-build\build\xchat-wdk\dep-x86 cd ..\src -type makeinc.skel > makeinc.mak -set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\api\crt\stl70 -set LIB=c:\WinDDK\7600.16385.1\lib\wxp\i386;c:\WinDDK\7600.16385.1\lib\Crt\i386 +echo DEV32 = %DEV_32% > makeinc.mak +type makeinc.skel >> makeinc.mak +set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt;%WDK_ROOT%\inc\api\crt\stl70 +set LIB=%WDK_ROOT%\lib\wxp\i386;%WDK_ROOT%\lib\Crt\i386 set OPATH=%PATH% -set PATH=c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin;c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin;c:\mozilla-build\build\xchat-dev32\bin +set PATH=%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\bin;%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\Common7\IDE;%PROGRAMFILES(X86)%\Microsoft SDKs\Windows\v7.0A\Bin;%DEV_32%\bin nmake /nologo /f makefile.mak clean cd pixmaps nmake /nologo /f makefile.mak @@ -15,10 +19,10 @@ nmake /nologo /f makefile.mak clean nmake /nologo /f makefile.mak cd perl set OOPATH=%PATH% -set PATH=%OOPATH%;c:\mozilla-build\perl-5.10-x86\bin +set PATH=%OOPATH%;%PERL_510%\bin nmake /nologo /s /f makefile-510.mak clean nmake /nologo /s /f makefile-510.mak -set PATH=%OOPATH%;c:\mozilla-build\perl-5.12-x86\bin +set PATH=%OOPATH%;%PERL_512%\bin nmake /nologo /s /f makefile-512.mak clean nmake /nologo /s /f makefile-512.mak cd ..\..\build diff --git a/build/build.bat b/build/build.bat index 6c0982de..2190210a 100644 --- a/build/build.bat +++ b/build/build.bat @@ -1,6 +1,7 @@ @echo off +set WDK_ROOT=c:\WinDDK\7600.16385.1 call build-x86.bat call build-x64.bat -set PATH=c:\Program Files (x86)\Inno Setup 5 +set PATH=%PROGRAMFILES(X86)%\Inno Setup 5 compil32 /cc xchat-wdk.iss pause diff --git a/build/dep-extract.bat b/build/dep-extract.bat new file mode 100644 index 00000000..05e40e02 --- /dev/null +++ b/build/dep-extract.bat @@ -0,0 +1,9 @@ +@echo off +set PATH=%PROGRAMW6432%\7-Zip +cd ..\dep-x64 +7z x *.zip +7z x *.7z +cd ..\dep-x86 +7z x *.zip +7z x *.7z +pause diff --git a/build/release-x64.bat b/build/release-x64.bat index 5f465402..2c3e1e55 100644 --- a/build/release-x64.bat +++ b/build/release-x64.bat @@ -1,37 +1,34 @@ @echo off -set GTK_BIN=c:\mozilla-build\build\xchat-dev64\bin -set SSL_BIN=c:\mozilla-build\build\openssl-wdk-1.0.0a-x64\bin -set LUA_BIN=c:\mozilla-build\build\lua-wdk-5.1.4-2-x64\bin -set ENCHANT_BIN=c:\mozilla-build\build\enchant-wdk-1.6.0-x64\bin -set XCHAT_DEST=c:\mozilla-build\build\xchat-wdk-uni +set DEPS_ROOT=..\dep-x64 +set XCHAT_DEST=..\tmp copy ..\src\fe-gtk\xchat.exe %XCHAT_DEST%\xchat.exe.x64 -copy %GTK_BIN%\libgtk-win32-2.0-0.dll %XCHAT_DEST%\libgtk-win32-2.0-0.dll.x64 -copy %GTK_BIN%\libgdk_pixbuf-2.0-0.dll %XCHAT_DEST%\libgdk_pixbuf-2.0-0.dll.x64 -copy %GTK_BIN%\libgio-2.0-0.dll %XCHAT_DEST%\libgio-2.0-0.dll.x64 -copy %GTK_BIN%\libglib-2.0-0.dll %XCHAT_DEST%\libglib-2.0-0.dll.x64 -copy %GTK_BIN%\libgmodule-2.0-0.dll %XCHAT_DEST%\libgmodule-2.0-0.dll.x64 -copy %GTK_BIN%\libgobject-2.0-0.dll %XCHAT_DEST%\libgobject-2.0-0.dll.x64 -copy %GTK_BIN%\libgthread-2.0-0.dll %XCHAT_DEST%\libgthread-2.0-0.dll.x64 -copy %GTK_BIN%\libpng14-14.dll %XCHAT_DEST%\libpng14-14.dll.x64 -copy %GTK_BIN%\libgdk-win32-2.0-0.dll %XCHAT_DEST%\libgdk-win32-2.0-0.dll.x64 -copy %GTK_BIN%\libcairo-2.dll %XCHAT_DEST%\libcairo-2.dll.x64 -copy %GTK_BIN%\libfontconfig-1.dll %XCHAT_DEST%\libfontconfig-1.dll.x64 -copy %GTK_BIN%\libexpat-1.dll %XCHAT_DEST%\libexpat-1.dll.x64 -copy %GTK_BIN%\libfreetype-6.dll %XCHAT_DEST%\libfreetype-6.dll.x64 -copy %GTK_BIN%\libpango-1.0-0.dll %XCHAT_DEST%\libpango-1.0-0.dll.x64 -copy %GTK_BIN%\libpangocairo-1.0-0.dll %XCHAT_DEST%\libpangocairo-1.0-0.dll.x64 -copy %GTK_BIN%\libpangoft2-1.0-0.dll %XCHAT_DEST%\libpangoft2-1.0-0.dll.x64 -copy %GTK_BIN%\libpangowin32-1.0-0.dll %XCHAT_DEST%\libpangowin32-1.0-0.dll.x64 -copy %GTK_BIN%\libatk-1.0-0.dll %XCHAT_DEST%\libatk-1.0-0.dll.x64 -copy %GTK_BIN%\libintl-8.dll %XCHAT_DEST%\libintl-8.dll.x64 -copy %GTK_BIN%\..\lib\gtk-2.0\2.10.0\engines\libpixmap.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines\libpixmap.dll.x64 -copy %GTK_BIN%\..\lib\gtk-2.0\2.10.0\engines\libwimp.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines\libwimp.dll.x64 -copy %GTK_BIN%\..\lib\gtk-2.0\modules\libgail.dll %XCHAT_DEST%\lib\gtk-2.0\modules\libgail.dll.x64 -copy %SSL_BIN%\libeay32.dll %XCHAT_DEST%\libeay32.dll.x64 -copy %SSL_BIN%\ssleay32.dll %XCHAT_DEST%\ssleay32.dll.x64 -copy %SSL_BIN%\zlib1.dll %XCHAT_DEST%\zlib1.dll.x64 -copy %ENCHANT_BIN%\libenchant.dll %XCHAT_DEST%\libenchant.dll.x64 -copy %ENCHANT_BIN%\..\lib\enchant\libenchant_myspell.dll %XCHAT_DEST%\lib\enchant\libenchant_myspell.dll.x64 +copy %DEPS_ROOT%\bin\libgtk-win32-2.0-0.dll %XCHAT_DEST%\libgtk-win32-2.0-0.dll.x64 +copy %DEPS_ROOT%\bin\libgdk_pixbuf-2.0-0.dll %XCHAT_DEST%\libgdk_pixbuf-2.0-0.dll.x64 +copy %DEPS_ROOT%\bin\libgio-2.0-0.dll %XCHAT_DEST%\libgio-2.0-0.dll.x64 +copy %DEPS_ROOT%\bin\libglib-2.0-0.dll %XCHAT_DEST%\libglib-2.0-0.dll.x64 +copy %DEPS_ROOT%\bin\libgmodule-2.0-0.dll %XCHAT_DEST%\libgmodule-2.0-0.dll.x64 +copy %DEPS_ROOT%\bin\libgobject-2.0-0.dll %XCHAT_DEST%\libgobject-2.0-0.dll.x64 +copy %DEPS_ROOT%\bin\libgthread-2.0-0.dll %XCHAT_DEST%\libgthread-2.0-0.dll.x64 +copy %DEPS_ROOT%\bin\libpng14-14.dll %XCHAT_DEST%\libpng14-14.dll.x64 +copy %DEPS_ROOT%\bin\libgdk-win32-2.0-0.dll %XCHAT_DEST%\libgdk-win32-2.0-0.dll.x64 +copy %DEPS_ROOT%\bin\libcairo-2.dll %XCHAT_DEST%\libcairo-2.dll.x64 +copy %DEPS_ROOT%\bin\libfontconfig-1.dll %XCHAT_DEST%\libfontconfig-1.dll.x64 +copy %DEPS_ROOT%\bin\libexpat-1.dll %XCHAT_DEST%\libexpat-1.dll.x64 +copy %DEPS_ROOT%\bin\libfreetype-6.dll %XCHAT_DEST%\libfreetype-6.dll.x64 +copy %DEPS_ROOT%\bin\libpango-1.0-0.dll %XCHAT_DEST%\libpango-1.0-0.dll.x64 +copy %DEPS_ROOT%\bin\libpangocairo-1.0-0.dll %XCHAT_DEST%\libpangocairo-1.0-0.dll.x64 +copy %DEPS_ROOT%\bin\libpangoft2-1.0-0.dll %XCHAT_DEST%\libpangoft2-1.0-0.dll.x64 +copy %DEPS_ROOT%\bin\libpangowin32-1.0-0.dll %XCHAT_DEST%\libpangowin32-1.0-0.dll.x64 +copy %DEPS_ROOT%\bin\libatk-1.0-0.dll %XCHAT_DEST%\libatk-1.0-0.dll.x64 +copy %DEPS_ROOT%\bin\libintl-8.dll %XCHAT_DEST%\libintl-8.dll.x64 +copy %DEPS_ROOT%\lib\gtk-2.0\2.10.0\engines\libpixmap.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines\libpixmap.dll.x64 +copy %DEPS_ROOT%\lib\gtk-2.0\2.10.0\engines\libwimp.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines\libwimp.dll.x64 +copy %DEPS_ROOT%\lib\gtk-2.0\modules\libgail.dll %XCHAT_DEST%\lib\gtk-2.0\modules\libgail.dll.x64 +copy %DEPS_ROOT%\bin\libeay32.dll %XCHAT_DEST%\libeay32.dll.x64 +copy %DEPS_ROOT%\bin\ssleay32.dll %XCHAT_DEST%\ssleay32.dll.x64 +copy %DEPS_ROOT%\bin\zlib1.dll %XCHAT_DEST%\zlib1.dll.x64 +copy %DEPS_ROOT%\bin\libenchant.dll %XCHAT_DEST%\libenchant.dll.x64 +copy %DEPS_ROOT%\lib\enchant\libenchant_myspell.dll %XCHAT_DEST%\lib\enchant\libenchant_myspell.dll.x64 ::copy ..\plugins\ewc\xcewc.dll %XCHAT_DEST%\plugins\xcewc.dll.x64 copy ..\plugins\checksum\xcchecksum.dll %XCHAT_DEST%\plugins\xcchecksum.dll.x64 copy ..\plugins\lua\xclua.dll %XCHAT_DEST%\plugins\xclua.dll.x64 @@ -43,4 +40,4 @@ copy ..\plugins\upd\xcupd.dll %XCHAT_DEST%\plugins\xcupd.dll.x64 copy ..\plugins\xdcc\xcxdcc.dll %XCHAT_DEST%\plugins\xcxdcc.dll.x64 copy ..\plugins\xtray\xtray.dll %XCHAT_DEST%\plugins\xtray.dll.x64 copy ..\plugins\winamp\xcwinamp.dll %XCHAT_DEST%\plugins\xcwinamp.dll.x64 -copy %LUA_BIN%\lua51.dll %XCHAT_DEST%\lua51.dll.x64 +copy %DEPS_ROOT%\bin\lua51.dll %XCHAT_DEST%\lua51.dll.x64 diff --git a/build/release-x86.bat b/build/release-x86.bat index e94e7742..8c234bf1 100644 --- a/build/release-x86.bat +++ b/build/release-x86.bat @@ -1,51 +1,47 @@ @echo off -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 ENCHANT_BIN=c:\mozilla-build\build\enchant-wdk-1.6.0-x86\bin -set XCHAT_DEST=c:\mozilla-build\build\xchat-wdk-uni +set DEPS_ROOT=..\dep-x86 +set XCHAT_DEST=..\tmp rmdir /q /s %XCHAT_DEST% mkdir %XCHAT_DEST% echo 2> portable-mode move portable-mode %XCHAT_DEST% copy ..\src\fe-gtk\xchat.exe %XCHAT_DEST% -copy %GTK_BIN%\libgtk-win32-2.0-0.dll %XCHAT_DEST% -copy %GTK_BIN%\libgdk_pixbuf-2.0-0.dll %XCHAT_DEST% -copy %GTK_BIN%\libgio-2.0-0.dll %XCHAT_DEST% -copy %GTK_BIN%\libglib-2.0-0.dll %XCHAT_DEST% -copy %GTK_BIN%\libgmodule-2.0-0.dll %XCHAT_DEST% -copy %GTK_BIN%\libgobject-2.0-0.dll %XCHAT_DEST% -copy %GTK_BIN%\libgthread-2.0-0.dll %XCHAT_DEST% -copy %GTK_BIN%\libpng14-14.dll %XCHAT_DEST% -copy %GTK_BIN%\libgdk-win32-2.0-0.dll %XCHAT_DEST% -copy %GTK_BIN%\libcairo-2.dll %XCHAT_DEST% -copy %GTK_BIN%\libfontconfig-1.dll %XCHAT_DEST% -copy %GTK_BIN%\libexpat-1.dll %XCHAT_DEST% -copy %GTK_BIN%\freetype6.dll %XCHAT_DEST% -copy %GTK_BIN%\libpango-1.0-0.dll %XCHAT_DEST% -copy %GTK_BIN%\libpangocairo-1.0-0.dll %XCHAT_DEST% -copy %GTK_BIN%\libpangoft2-1.0-0.dll %XCHAT_DEST% -copy %GTK_BIN%\libpangowin32-1.0-0.dll %XCHAT_DEST% -copy %GTK_BIN%\libatk-1.0-0.dll %XCHAT_DEST% -copy %GTK_BIN%\intl.dll %XCHAT_DEST% -xcopy /q /s /i %GTK_BIN%\..\lib\gtk-2.0\2.10.0\engines\libpixmap.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines\ -copy %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\modules\libgail.dll %XCHAT_DEST%\lib\gtk-2.0\modules\ +copy %DEPS_ROOT%\bin\libgtk-win32-2.0-0.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libgdk_pixbuf-2.0-0.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libgio-2.0-0.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libglib-2.0-0.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libgmodule-2.0-0.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libgobject-2.0-0.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libgthread-2.0-0.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libpng14-14.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libgdk-win32-2.0-0.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libcairo-2.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libfontconfig-1.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libexpat-1.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\freetype6.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libpango-1.0-0.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libpangocairo-1.0-0.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libpangoft2-1.0-0.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libpangowin32-1.0-0.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libatk-1.0-0.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\intl.dll %XCHAT_DEST% +xcopy /q /s /i %DEPS_ROOT%\lib\gtk-2.0\2.10.0\engines\libpixmap.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines\ +copy %DEPS_ROOT%\lib\gtk-2.0\2.10.0\engines\libwimp.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines +xcopy /q /s /i %DEPS_ROOT%\lib\gtk-2.0\modules\libgail.dll %XCHAT_DEST%\lib\gtk-2.0\modules\ xcopy /q /s /i etc %XCHAT_DEST%\etc copy ..\COPYING %XCHAT_DEST% -copy %SSL_BIN%\..\LICENSE.OPENSSL %XCHAT_DEST% -copy %SSL_BIN%\..\LICENSE.ZLIB %XCHAT_DEST% -copy %GTK_BIN%\..\share\doc\glib-2.26.0\COPYING %XCHAT_DEST%\LICENSE.GTK -copy %GTK_BIN%\..\share\doc\cairo_1.10.0-1_win32\COPYING-LGPL-2.1 %XCHAT_DEST%\LICENSE.CAIRO -copy %LUA_BIN%\..\COPYRIGHT %XCHAT_DEST%\LICENSE.LUA -copy %ENCHANT_BIN%\..\COPYING %XCHAT_DEST%\LICENSE.ENCHANT -copy %SSL_BIN%\libeay32.dll %XCHAT_DEST% -copy %SSL_BIN%\ssleay32.dll %XCHAT_DEST% -copy %SSL_BIN%\zlib1.dll %XCHAT_DEST% -copy %SSL_BIN%\cert.pem %XCHAT_DEST% -copy %ENCHANT_BIN%\libenchant.dll %XCHAT_DEST% -xcopy /q /s /i %ENCHANT_BIN%\..\lib\enchant\libenchant_myspell.dll %XCHAT_DEST%\lib\enchant\ -::xcopy /q /s /i ..\plugins\ewc\xcewc.dll %XCHAT_DEST%\plugins\ +copy %DEPS_ROOT%\LICENSE.OPENSSL %XCHAT_DEST% +copy %DEPS_ROOT%\LICENSE.ZLIB %XCHAT_DEST% +copy %DEPS_ROOT%\share\doc\glib-2.26.0\COPYING %XCHAT_DEST%\LICENSE.GTK +copy %DEPS_ROOT%\share\doc\cairo_1.10.0-1_win32\COPYING-LGPL-2.1 %XCHAT_DEST%\LICENSE.CAIRO +copy %DEPS_ROOT%\LICENSE.LUA %XCHAT_DEST% +copy %DEPS_ROOT%\LICENSE.ENCHANT %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libeay32.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\ssleay32.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\zlib1.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\cert.pem %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libenchant.dll %XCHAT_DEST% +xcopy /q /s /i %DEPS_ROOT%\lib\enchant\libenchant_myspell.dll %XCHAT_DEST%\lib\enchant\ xcopy /q /s /i ..\plugins\checksum\xcchecksum.dll %XCHAT_DEST%\plugins\ copy ..\plugins\lua\xclua.dll %XCHAT_DEST%\plugins copy ..\plugins\perl\xcperl-510.dll %XCHAT_DEST%\plugins @@ -56,7 +52,7 @@ copy ..\plugins\upd\xcupd.dll %XCHAT_DEST%\plugins copy ..\plugins\xdcc\xcxdcc.dll %XCHAT_DEST%\plugins copy ..\plugins\xtray\xtray.dll %XCHAT_DEST%\plugins copy ..\plugins\winamp\xcwinamp.dll %XCHAT_DEST%\plugins -copy %LUA_BIN%\lua51.dll %XCHAT_DEST% +copy %DEPS_ROOT%\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 -xcopy /q /s /i ..\..\myspell %XCHAT_DEST%\share\myspell +xcopy /q /s /i %DEPS_ROOT%\share\locale %XCHAT_DEST%\share\locale +xcopy /q /s /i ..\dep-x86\myspell %XCHAT_DEST%\share\myspell diff --git a/build/xchat-wdk.iss b/build/xchat-wdk.iss index 1eda5452..b7fc0a81 100644 --- a/build/xchat-wdk.iss +++ b/build/xchat-wdk.iss @@ -19,7 +19,7 @@ DefaultDirName={pf}\XChat-WDK DefaultGroupName=XChat-WDK DisableProgramGroupPage=yes SolidCompression=yes -SourceDir=..\..\xchat-wdk-uni +SourceDir=..\tmp OutputDir=..\xchat-wdk\build FlatComponentsList=no PrivilegesRequired=none diff --git a/build/deps-x64.txt b/dep-x64/deps-x64.txt index 1b07ef8c..e980a79b 100644 --- a/build/deps-x64.txt +++ b/dep-x64/deps-x64.txt @@ -16,3 +16,6 @@ http://ftp.gnome.org/pub/gnome/binaries/win64/gtk+/2.22/gtk+_2.22.0-1_win64.zip http://ftp.gnome.org/pub/gnome/binaries/win64/gtk+/2.22/gtk+-dev_2.22.0-1_win64.zip http://ftp.gnome.org/pub/gnome/binaries/win64/pango/1.28/pango_1.28.3-1_win64.zip http://ftp.gnome.org/pub/gnome/binaries/win64/pango/1.28/pango-dev_1.28.3-1_win64.zip +http://xchat-wdk.googlecode.com/files/Enchant-WDK%201.6.0-2%20x64.7z +http://xchat-wdk.googlecode.com/files/Lua-WDK%205.1.4-2-2%20x64.7z +http://xchat-wdk.googlecode.com/files/OpenSSL-WDK%201.0.0a-2%20x64.7z diff --git a/build/deps-x86.txt b/dep-x86/deps-x86.txt index e11917b5..3cf603c0 100644 --- a/build/deps-x86.txt +++ b/dep-x86/deps-x86.txt @@ -8,7 +8,6 @@ http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/freetype_2.4.2-1_win3 http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/gettext-runtime_0.18.1.1-2_win32.zip http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/gettext-runtime-dev_0.18.1.1-2_win32.zip http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/libpng_1.4.3-1_win32.zip -http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/zlib_1.2.5-2_win32.zip http://ftp.gnome.org/pub/gnome/binaries/win32/gdk-pixbuf/2.22/gdk-pixbuf_2.22.0-1_win32.zip http://ftp.gnome.org/pub/gnome/binaries/win32/gdk-pixbuf/2.22/gdk-pixbuf-dev_2.22.0-1_win32.zip http://ftp.gnome.org/pub/gnome/binaries/win32/glib/2.26/glib_2.26.0-2_win32.zip @@ -17,3 +16,7 @@ http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.22/gtk+_2.22.0-2_win32.zip http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.22/gtk+-dev_2.22.0-2_win32.zip http://ftp.gnome.org/pub/gnome/binaries/win32/pango/1.28/pango_1.28.3-1_win32.zip http://ftp.gnome.org/pub/gnome/binaries/win32/pango/1.28/pango-dev_1.28.3-1_win32.zip +http://xchat-wdk.googlecode.com/files/Enchant-WDK%201.6.0-2%20x86.7z +http://xchat-wdk.googlecode.com/files/Lua-WDK%205.1.4-2-2%20x86.7z +http://xchat-wdk.googlecode.com/files/OpenSSL-WDK%201.0.0a-2%20x86.7z +http://xchat-wdk.googlecode.com/files/myspell-20101001.7z diff --git a/ext/enchant-wdk/src/build-x64.bat b/ext/enchant-wdk/src/build-x64.bat index 455418c0..332af68f 100644 --- a/ext/enchant-wdk/src/build-x64.bat +++ b/ext/enchant-wdk/src/build-x64.bat @@ -1,10 +1,11 @@ @echo off -set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\api\crt\stl70 -set LIB=c:\WinDDK\7600.16385.1\lib\wnet\amd64;c:\WinDDK\7600.16385.1\lib\Crt\amd64 +set WDK_ROOT=c:\WinDDK\7600.16385.1 +set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt;%WDK_ROOT%\inc\api\crt\stl70 +set LIB=%WDK_ROOT%\lib\wnet\amd64;%WDK_ROOT%\lib\Crt\amd64 set OPATH=%PATH% -set PATH=c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\x64 +set PATH=%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\bin\amd64;%PROGRAMFILES(X86)%\Microsoft SDKs\Windows\v7.0A\Bin\x64 nmake -f makefile.mak clean -nmake -f makefile.mak X64=1 DLL=1 MFLAGS=-MD GLIBDIR=c:\mozilla-build\build\xchat-dev64\include\glib-2.0 +nmake -f makefile.mak X64=1 DLL=1 MFLAGS=-MD GLIBDIR=..\glib-x64\include\glib-2.0 echo.Press return when ready to install! pause set PATH=%OPATH% diff --git a/ext/enchant-wdk/src/build-x86.bat b/ext/enchant-wdk/src/build-x86.bat index 2121550d..f5cc71b9 100644 --- a/ext/enchant-wdk/src/build-x86.bat +++ b/ext/enchant-wdk/src/build-x86.bat @@ -1,10 +1,11 @@ @echo off -set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\api\crt\stl70 -set LIB=c:\WinDDK\7600.16385.1\lib\wxp\i386;c:\WinDDK\7600.16385.1\lib\Crt\i386 +set WDK_ROOT=c:\WinDDK\7600.16385.1 +set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt;%WDK_ROOT%\inc\api\crt\stl70 +set LIB=%WDK_ROOT%\lib\wxp\i386;%WDK_ROOT%\lib\Crt\i386 set OPATH=%PATH% -set PATH=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 +set PATH=%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\bin;%PROGRAMFILES(X86)%\Microsoft SDKs\Windows\v7.0A\Bin;%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\Common7\IDE nmake -f makefile.mak clean -nmake -f makefile.mak DLL=1 MFLAGS=-MD GLIBDIR=c:\mozilla-build\build\xchat-dev32\include\glib-2.0 +nmake -f makefile.mak DLL=1 MFLAGS=-MD GLIBDIR=..\glib-x86\include\glib-2.0 echo.Press return when ready to install! pause set PATH=%OPATH% diff --git a/ext/enchant-wdk/src/libenchant.rc b/ext/enchant-wdk/src/libenchant.rc index 8f9b98ec..f8f52651 100644 --- a/ext/enchant-wdk/src/libenchant.rc +++ b/ext/enchant-wdk/src/libenchant.rc @@ -1,7 +1,7 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,6,0,1 + FILEVERSION 1,6,0,2 PRODUCTVERSION 1,6,0,0 FILEFLAGSMASK 0 FILEFLAGS 0 @@ -15,7 +15,7 @@ VS_VERSION_INFO VERSIONINFO BEGIN VALUE "CompanyName", "none" VALUE "FileDescription", "libenchant" - VALUE "FileVersion", "1.6.0.1" + VALUE "FileVersion", "1.6.0.2" VALUE "InternalName", "libenchant" VALUE "OriginalFilename", "libenchant.dll" VALUE "ProductName", "libenchant" diff --git a/ext/enchant-wdk/src/release-x64.bat b/ext/enchant-wdk/src/release-x64.bat index 531b790d..0a40fc71 100644 --- a/ext/enchant-wdk/src/release-x64.bat +++ b/ext/enchant-wdk/src/release-x64.bat @@ -1,9 +1,9 @@ @echo off -set ENCHANT_DEST=c:\mozilla-build\build\enchant-wdk-1.6.0-x64 +set ENCHANT_DEST=..\..\enchant-wdk-1.6.0-x64 set RELEASE_DIR=..\bin\release rmdir /q /s %ENCHANT_DEST% mkdir %ENCHANT_DEST% -copy ..\COPYING.LIB %ENCHANT_DEST%\COPYING +copy ..\COPYING.LIB %ENCHANT_DEST%\LICENSE.ENCHANT xcopy /q /s /i %RELEASE_DIR%\enchant.exe %ENCHANT_DEST%\bin\ copy %RELEASE_DIR%\enchant-lsmod.exe %ENCHANT_DEST%\bin copy %RELEASE_DIR%\libenchant.dll %ENCHANT_DEST%\bin diff --git a/ext/enchant-wdk/src/release-x86.bat b/ext/enchant-wdk/src/release-x86.bat index ee01c999..a33bec76 100644 --- a/ext/enchant-wdk/src/release-x86.bat +++ b/ext/enchant-wdk/src/release-x86.bat @@ -1,9 +1,9 @@ @echo off -set ENCHANT_DEST=c:\mozilla-build\build\enchant-wdk-1.6.0-x86 +set ENCHANT_DEST=..\..\enchant-wdk-1.6.0-x86 set RELEASE_DIR=..\bin\release rmdir /q /s %ENCHANT_DEST% mkdir %ENCHANT_DEST% -copy ..\COPYING.LIB %ENCHANT_DEST%\COPYING +copy ..\COPYING.LIB %ENCHANT_DEST%\LICENSE.ENCHANT xcopy /q /s /i %RELEASE_DIR%\enchant.exe %ENCHANT_DEST%\bin\ copy %RELEASE_DIR%\enchant-lsmod.exe %ENCHANT_DEST%\bin copy %RELEASE_DIR%\libenchant.dll %ENCHANT_DEST%\bin diff --git a/ext/lua-wdk/build-x64.bat b/ext/lua-wdk/build-x64.bat index 4322d3fb..a160cd97 100644 --- a/ext/lua-wdk/build-x64.bat +++ b/ext/lua-wdk/build-x64.bat @@ -1,8 +1,9 @@ @echo off +set WDK_ROOT=c:\WinDDK\7600.16385.1 set OPATH=%PATH% -set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\ddk -set LIB=c:\WinDDK\7600.16385.1\lib\wnet\amd64;c:\WinDDK\7600.16385.1\lib\Crt\amd64 -set PATH=c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64 +set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt;%WDK_ROOT%\inc\ddk +set LIB=%WDK_ROOT%\lib\wnet\amd64;%WDK_ROOT%\lib\Crt\amd64 +set PATH=%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\bin\amd64 set DEST=..\lua-wdk-5.1.4-2-x64 call etc\luavs-x64.bat @echo off @@ -14,19 +15,19 @@ mkdir %DEST% mkdir %DEST%\bin mkdir %DEST%\lib mkdir %DEST%\include -xcopy COPYRIGHT %DEST% +copy COPYRIGHT %DEST%\LICENSE.LUA :: binaries and libraries -xcopy src\lua.exe %DEST%\bin -xcopy src\lua51.dll %DEST%\bin -xcopy src\lua51.exp %DEST%\bin -xcopy src\luac.exe %DEST%\bin +copy src\lua.exe %DEST%\bin +copy src\lua51.dll %DEST%\bin +copy src\lua51.exp %DEST%\bin +copy src\luac.exe %DEST%\bin :: library -xcopy src\lua51.lib %DEST%\lib +copy src\lua51.lib %DEST%\lib :: api -xcopy src\lua.h %DEST%\include -xcopy src\luaconf.h %DEST%\include -xcopy src\lualib.h %DEST%\include -xcopy src\lauxlib.h %DEST%\include -xcopy etc\lua.hpp %DEST%\include +copy src\lua.h %DEST%\include +copy src\luaconf.h %DEST%\include +copy src\lualib.h %DEST%\include +copy src\lauxlib.h %DEST%\include +copy etc\lua.hpp %DEST%\include echo.Finished! pause diff --git a/ext/lua-wdk/build-x86.bat b/ext/lua-wdk/build-x86.bat index dfa47b57..75a054ed 100644 --- a/ext/lua-wdk/build-x86.bat +++ b/ext/lua-wdk/build-x86.bat @@ -1,8 +1,9 @@ @echo off +set WDK_ROOT=c:\WinDDK\7600.16385.1 set OPATH=%PATH% -set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\ddk -set LIB=c:\WinDDK\7600.16385.1\lib\wxp\i386;c:\WinDDK\7600.16385.1\lib\Crt\i386 -set PATH=c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin;c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE +set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt;%WDK_ROOT%\inc\ddk +set LIB=%WDK_ROOT%\lib\wxp\i386;%WDK_ROOT%\lib\Crt\i386 +set PATH=%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\bin;%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\Common7\IDE set DEST=..\lua-wdk-5.1.4-2-x86 call etc\luavs.bat @echo off @@ -14,19 +15,19 @@ mkdir %DEST% mkdir %DEST%\bin mkdir %DEST%\lib mkdir %DEST%\include -xcopy COPYRIGHT %DEST% +copy COPYRIGHT %DEST%\LICENSE.LUA :: binaries and libraries -xcopy src\lua.exe %DEST%\bin -xcopy src\lua51.dll %DEST%\bin -xcopy src\lua51.exp %DEST%\bin -xcopy src\luac.exe %DEST%\bin +copy src\lua.exe %DEST%\bin +copy src\lua51.dll %DEST%\bin +copy src\lua51.exp %DEST%\bin +copy src\luac.exe %DEST%\bin :: library -xcopy src\lua51.lib %DEST%\lib +copy src\lua51.lib %DEST%\lib :: api -xcopy src\lua.h %DEST%\include -xcopy src\luaconf.h %DEST%\include -xcopy src\lualib.h %DEST%\include -xcopy src\lauxlib.h %DEST%\include -xcopy etc\lua.hpp %DEST%\include +copy src\lua.h %DEST%\include +copy src\luaconf.h %DEST%\include +copy src\lualib.h %DEST%\include +copy src\lauxlib.h %DEST%\include +copy etc\lua.hpp %DEST%\include echo.Finished! pause diff --git a/ext/nss-wdk/build-x64.bat b/ext/nss-wdk/build-x64.bat index d8a9e3fd..96bb0422 100644 --- a/ext/nss-wdk/build-x64.bat +++ b/ext/nss-wdk/build-x64.bat @@ -1,7 +1,8 @@ @echo off -set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\ddk -set LIB=c:\WinDDK\7600.16385.1\lib\wnet\amd64;c:\WinDDK\7600.16385.1\lib\Crt\amd64 -set PATH=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\msys\bin;c:\mozilla-build\moztools-x64\bin +set WDK_ROOT=c:\WinDDK\7600.16385.1 +set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt;%WDK_ROOT%\inc\ddk +set LIB=%WDK_ROOT%\lib\wnet\amd64;%WDK_ROOT%\lib\Crt\amd64 +set PATH=%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\bin\amd64;%PROGRAMFILES(X86)%\Microsoft SDKs\Windows\v7.0A\Bin\x64;c:\mozilla-build\msys\bin;c:\mozilla-build\moztools-x64\bin set BUILD_OPT=1 set USE_64=1 set WINDDK_BUILD=1 diff --git a/ext/nss-wdk/build-x86.bat b/ext/nss-wdk/build-x86.bat index 880f7586..c6d4868e 100644 --- a/ext/nss-wdk/build-x86.bat +++ b/ext/nss-wdk/build-x86.bat @@ -1,7 +1,8 @@ @echo off -set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt -set LIB=c:\WinDDK\7600.16385.1\lib\wxp\i386;c:\WinDDK\7600.16385.1\lib\Crt\i386 -set PATH=c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin;c:\mozilla-build\msys\bin;c:\mozilla-build\moztools\bin +set WDK_ROOT=c:\WinDDK\7600.16385.1 +set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt +set LIB=%WDK_ROOT%\lib\wxp\i386;%WDK_ROOT%\lib\Crt\i386 +set PATH=%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\bin;%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\Common7\IDE;%PROGRAMFILES(X86)%\Microsoft SDKs\Windows\v7.0A\Bin;c:\mozilla-build\msys\bin;c:\mozilla-build\moztools\bin set BUILD_OPT=1 set USE_64= set WINDDK_BUILD=1 diff --git a/ext/openssl-wdk/build-x64.bat b/ext/openssl-wdk/build-x64.bat index e5657645..4c6b1e7b 100644 --- a/ext/openssl-wdk/build-x64.bat +++ b/ext/openssl-wdk/build-x64.bat @@ -1,9 +1,12 @@ @echo off +set WDK_ROOT=c:\WinDDK\7600.16385.1 +set PERL_PATH=c:\mozilla-build\perl-5.12-x64\bin +set NASM_PATH=c:\mozilla-build\nasm set OPENSSL_DEST=..\openssl-wdk-1.0.0a-x64 -set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\ddk;c:\mozilla-build\build\openssl-1.0.0a\ms;c:\mozilla-build\build\zlib-x64\include -set LIB=c:\WinDDK\7600.16385.1\lib\wnet\amd64;c:\WinDDK\7600.16385.1\lib\Crt\amd64;c:\mozilla-build\build\zlib-x64\lib -set PATH=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\perl-5.12-x64\bin;c:\Windows\System32;c:\mozilla-build\nasm;c:\mozilla-build\build\zlib-x64\bin -perl Configure VC-WIN64A enable-camellia no-asm zlib-dynamic --openssldir=./ +set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt;%WDK_ROOT%\inc\ddk;ms;zlib-x64\include +set LIB=%WDK_ROOT%\lib\wnet\amd64;%WDK_ROOT%\lib\Crt\amd64;zlib-x64\lib +set PATH=%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\bin\amd64;%PROGRAMFILES(X86)%\Microsoft SDKs\Windows\v7.0A\Bin\x64;%PERL_PATH%;%NASM_PATH%;%SystemRoot%\System32;..\zlib-x64\bin +perl Configure VC-WIN64A enable-camellia zlib-dynamic --openssldir=./ call ms\do_win64a nmake -f ms\ntdll.mak vclean nmake -f ms\ntdll.mak @@ -21,7 +24,7 @@ move lib %OPENSSL_DEST% mkdir %OPENSSL_DEST%\share move openssl.cnf %OPENSSL_DEST%\share\openssl.cnf.example move include-orig include -copy c:\mozilla-build\build\zlib-x64\bin\zlib1.dll %OPENSSL_DEST%\bin +copy zlib-x64\bin\zlib1.dll %OPENSSL_DEST%\bin move cert.pem %OPENSSL_DEST%\bin echo.Finished! pause diff --git a/ext/openssl-wdk/build-x86.bat b/ext/openssl-wdk/build-x86.bat index 20c3ca7d..72155e8a 100644 --- a/ext/openssl-wdk/build-x86.bat +++ b/ext/openssl-wdk/build-x86.bat @@ -1,8 +1,11 @@ @echo off +set WDK_ROOT=c:\WinDDK\7600.16385.1 +set PERL_PATH=c:\mozilla-build\perl-5.12-x86\bin +set NASM_PATH=c:\mozilla-build\nasm set OPENSSL_DEST=..\openssl-wdk-1.0.0a-x86 -set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\ddk;c:\mozilla-build\build\openssl-1.0.0a\ms;c:\mozilla-build\build\zlib-x86\include -set LIB=c:\WinDDK\7600.16385.1\lib\wxp\i386;c:\WinDDK\7600.16385.1\lib\Crt\i386;c:\mozilla-build\build\zlib-x86\lib -set PATH=c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin;c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin;c:\mozilla-build\perl-5.12-x86\bin;c:\Windows\System32;c:\mozilla-build\nasm;c:\mozilla-build\build\zlib-x86\bin +set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt;%WDK_ROOT%\inc\ddk;ms;zlib-x86\include +set LIB=%WDK_ROOT%\lib\wxp\i386;%WDK_ROOT%\lib\Crt\i386;zlib-x86\lib +set PATH=%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\bin;%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\Common7\IDE;%PROGRAMFILES(X86)%\Microsoft SDKs\Windows\v7.0A\Bin;%PERL_PATH%;%NASM_PATH%;%SystemRoot%\System32;..\zlib-x86\bin perl Configure VC-WIN32 enable-camellia zlib-dynamic --openssldir=./ call ms\do_nasm @echo off @@ -22,7 +25,7 @@ move lib %OPENSSL_DEST% mkdir %OPENSSL_DEST%\share move openssl.cnf %OPENSSL_DEST%\share\openssl.cnf.example move include-orig include -copy c:\mozilla-build\build\zlib-x86\bin\zlib1.dll %OPENSSL_DEST%\bin +copy zlib-x86\bin\zlib1.dll %OPENSSL_DEST%\bin move cert.pem %OPENSSL_DEST%\bin echo.Finished! pause diff --git a/plugins/checksum/makefile.mak b/plugins/checksum/makefile.mak index 8d72d094..ec8e0455 100644 --- a/plugins/checksum/makefile.mak +++ b/plugins/checksum/makefile.mak @@ -9,7 +9,7 @@ checksum.def: echo xchat_plugin_deinit >> checksum.def checksum.obj: checksum.c makefile.mak - cl $(CFLAGS) checksum.c + cl $(CFLAGS) /I.. checksum.c clean: del *.obj diff --git a/plugins/lua/makefile.mak b/plugins/lua/makefile.mak index e1ef8822..81399ac6 100644 --- a/plugins/lua/makefile.mak +++ b/plugins/lua/makefile.mak @@ -1,7 +1,7 @@ include "..\..\src\makeinc.mak" 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 $(LUALIB).lib /def:lua.def lua.obj lua.def: echo EXPORTS > lua.def @@ -9,7 +9,7 @@ lua.def: echo xchat_plugin_deinit >> lua.def lua.obj: lua.c makefile.mak - cl $(CFLAGS) /Dsnprintf=g_snprintf /I$(LUAPATH)\include lua.c + cl $(CFLAGS) /I.. /Dsnprintf=g_snprintf lua.c clean: del *.obj diff --git a/plugins/makefile.mak b/plugins/makefile.mak index 788a0fb8..ecb6222a 100644 --- a/plugins/makefile.mak +++ b/plugins/makefile.mak @@ -1,6 +1,4 @@ all: -# @cd ewc -# @-$(MAKE) /nologo /s /f makefile.mak $@ @cd checksum @-$(MAKE) /nologo /s /f makefile.mak $@ @cd ..\lua @@ -19,11 +17,6 @@ all: @-$(MAKE) /nologo /s /f makefile.mak $@ clean: -# @del ewc\*.def -# @del ewc\*.dll -# @del ewc\*.exp -# @del ewc\*.lib -# @del ewc\*.obj @del checksum\*.def @del checksum\*.dll @del checksum\*.exp diff --git a/plugins/perl/makefile-510.mak b/plugins/perl/makefile-510.mak index 619566b5..f407eadb 100644 --- a/plugins/perl/makefile-510.mak +++ b/plugins/perl/makefile-510.mak @@ -18,7 +18,7 @@ perl.def: echo xchat_plugin_get_info >> perl.def perl.obj: perl.c - $(CC) $(CFLAGS) perl.c $(GLIB) -I$(PERLPATH) -DPERL_DLL=\"$(PERLLIB).dll\" + $(CC) $(CFLAGS) perl.c $(GLIB) /I$(PERLPATH) /I.. /DPERL_DLL=\"$(PERLLIB).dll\" perl.c: xchat.pm.h diff --git a/plugins/perl/makefile-512.mak b/plugins/perl/makefile-512.mak index 4ba6a7f7..523c1dcf 100644 --- a/plugins/perl/makefile-512.mak +++ b/plugins/perl/makefile-512.mak @@ -18,7 +18,7 @@ perl.def: echo xchat_plugin_get_info >> perl.def perl.obj: perl.c - $(CC) $(CFLAGS) perl.c $(GLIB) -I$(PERLPATH) -DPERL_DLL=\"$(PERLLIB).dll\" + $(CC) $(CFLAGS) perl.c $(GLIB) /I$(PERLPATH) /I.. /DPERL_DLL=\"$(PERLLIB).dll\" perl.c: xchat.pm.h diff --git a/plugins/python/makefile.mak b/plugins/python/makefile.mak index a0eb7b0c..7414f188 100644 --- a/plugins/python/makefile.mak +++ b/plugins/python/makefile.mak @@ -11,7 +11,7 @@ python.def: echo xchat_plugin_get_info >> python.def python.obj: python.c - $(CC) $(CFLAGS) /Dusleep=_sleep /DPATH_MAX=255 python.c $(GLIB) /I$(PYTHONPATH)\include /DPYTHON_DLL=\"$(PYTHONLIB).dll\" + $(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 $(LIBS) /def:python.def diff --git a/plugins/tcl/makefile.mak b/plugins/tcl/makefile.mak index 252af81b..c88f5c4f 100644 --- a/plugins/tcl/makefile.mak +++ b/plugins/tcl/makefile.mak @@ -11,7 +11,7 @@ tcl.def: echo xchat_plugin_get_info >> tcl.def tclplugin.obj: tclplugin.c - $(CC) $(CFLAGS) tclplugin.c /I$(TCLPATH)\include /DTCL_DLL=\"$(TCLLIB).dll\" + $(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 diff --git a/plugins/upd/makefile.mak b/plugins/upd/makefile.mak index 63a9ace4..34b54cb8 100644 --- a/plugins/upd/makefile.mak +++ b/plugins/upd/makefile.mak @@ -9,7 +9,7 @@ upd.def: echo xchat_plugin_deinit >> upd.def upd.obj: upd.c makefile.mak - cl $(CFLAGS) $(GLIB) upd.c + cl $(CFLAGS) $(GLIB) /I.. upd.c clean: del *.obj diff --git a/plugins/winamp/makefile.mak b/plugins/winamp/makefile.mak index 6fd431bd..79adf87e 100644 --- a/plugins/winamp/makefile.mak +++ b/plugins/winamp/makefile.mak @@ -9,7 +9,7 @@ winamp.def: echo xchat_plugin_deinit >> winamp.def winamp.obj: winamp.c makefile.mak - cl $(CFLAGS) winamp.c + cl $(CFLAGS) /I.. winamp.c clean: del *.obj diff --git a/plugins/xdcc/makefile.mak b/plugins/xdcc/makefile.mak index 280d8d84..0a12347e 100644 --- a/plugins/xdcc/makefile.mak +++ b/plugins/xdcc/makefile.mak @@ -9,7 +9,7 @@ xdcc.def: echo xchat_plugin_deinit >> xdcc.def xdcc.obj: xdcc.c makefile.mak - cl $(CFLAGS) $(GLIB) xdcc.c + cl $(CFLAGS) $(GLIB) /I.. xdcc.c clean: del *.obj diff --git a/src/makeinc.skel b/src/makeinc.skel index 5612d85f..8c1e67c4 100644 --- a/src/makeinc.skel +++ b/src/makeinc.skel @@ -1,48 +1,37 @@ CC = cl LINK = link CFLAGS = $(CFLAGS) /Ox /c /MD /MP2 /W0 /nologo -CFLAGS = $(CFLAGS) /DWIN32 /DG_DISABLE_CAST_CHECKS /DG_DISABLE_DEPRECATED /DGDK_PIXBUF_DISABLE_DEPRECATED /DGDK_DISABLE_DEPRECATED /DUSE_IPV6 /DHAVE_STRTOULL /Dstrtoull=_strtoui64 /Dstrcasecmp=stricmp /Dstrncasecmp=strnicmp -CFLAGS = $(CFLAGS) -Ic:\mozilla-build\build\xchat-wdk\plugins +CFLAGS = $(CFLAGS) /DWIN32 /DG_DISABLE_CAST_CHECKS /DG_DISABLE_DEPRECATED /DGDK_PIXBUF_DISABLE_DEPRECATED /DGDK_DISABLE_DEPRECATED /DUSE_IPV6 /DHAVE_STRTOULL /Dstrtoull=_strtoui64 /Dstrcasecmp=stricmp /Dstrncasecmp=strnicmp /DUSE_OPENSSL +CFLAGS = $(CFLAGS) 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 +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 !ifdef X64 ############################################################# #x64 config -DEV64 = c:\mozilla-build\build\xchat-dev64 -GLIB = -I$(DEV64)\include -I$(DEV64)\include\glib-2.0 -I$(DEV64)\lib\glib-2.0\include -GTK = -I$(DEV64)\include\gtk-2.0 -I$(DEV64)\lib\gtk-2.0\include -I$(DEV64)\include\atk-1.0 -I$(DEV64)\include\cairo -I$(DEV64)\include\pango-1.0 -I$(DEV64)\include\gdk-pixbuf-2.0 +GLIB = /I$(DEV64)\include\glib-2.0 /I$(DEV64)\lib\glib-2.0\include +GTK = /I$(DEV64)\include\gtk-2.0 /I$(DEV64)\lib\gtk-2.0\include /I$(DEV64)\include\atk-1.0 /I$(DEV64)\include\cairo /I$(DEV64)\include\pango-1.0 /I$(DEV64)\include\gdk-pixbuf-2.0 LIBS = $(LIBS) /libpath:$(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 -LIBS = $(LIBS) /libpath:$(OPENSSLPATH)\lib libeay32.lib ssleay32.lib - -CFLAGS = $(CFLAGS) /favor:AMD64 /D_WIN64 -CPPFLAGS = $(CPPFLAGS) /favor:AMD64 /D_WIN64 +CFLAGS = $(CFLAGS) /favor:AMD64 /D_WIN64 /I$(DEV64)\include +CPPFLAGS = $(CPPFLAGS) /favor:AMD64 /D_WIN64 /I$(DEV64)\include LDFLAGS = $(LDFLAGS) msvcrt_win2003.obj -LUAPATH = c:\mozilla-build\build\lua-wdk-5.1.4-2-x64 PYTHONPATH = c:\mozilla-build\python-2.6-x64 TCLPATH = c:\mozilla-build\tcl-8.5-x64 !else ############################################################# #x86 config -DEV32 = c:\mozilla-build\build\xchat-dev32 -GLIB = -I$(DEV32)\include -I$(DEV32)\include\glib-2.0 -I$(DEV32)\lib\glib-2.0\include -GTK = -I$(DEV32)\include\gtk-2.0 -I$(DEV32)\lib\gtk-2.0\include -I$(DEV32)\include\atk-1.0 -I$(DEV32)\include\cairo -I$(DEV32)\include\pango-1.0 -I$(DEV32)\include\gdk-pixbuf-2.0 +GLIB = /I$(DEV32)\include\glib-2.0 /I$(DEV32)\lib\glib-2.0\include +GTK = /I$(DEV32)\include\gtk-2.0 /I$(DEV32)\lib\gtk-2.0\include /I$(DEV32)\include\atk-1.0 /I$(DEV32)\include\cairo /I$(DEV32)\include\pango-1.0 /I$(DEV32)\include\gdk-pixbuf-2.0 LIBS = $(LIBS) /libpath:$(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 -LIBS = $(LIBS) /libpath:$(OPENSSLPATH)\lib libeay32.lib ssleay32.lib - +CFLAGS = $(CFLAGS) /I$(DEV32)\include LDFLAGS = $(LDFLAGS) msvcrt_winxp.obj -LUAPATH = c:\mozilla-build\build\lua-wdk-5.1.4-2-x86 PYTHONPATH = c:\mozilla-build\python-2.6-x86 TCLPATH = c:\mozilla-build\tcl-8.5-x86 !endif |