Changeset 678
- Timestamp:
- 17/08/08 13:22:33 (5 months ago)
- Location:
- trunk
- Files:
-
- 3 modified
-
README.win32 (modified) (3 diffs)
-
win32/jabberd2/jabberd2.vcproj (modified) (7 diffs)
-
win32/setup/libraries.wxs (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/README.win32
r673 r678 48 48 Remember to apply the patch you find there too. 49 49 50 6. http://dev.mysql.com/downloads/mysql/5.0.html 50 6. http://www.zlib.net/ 51 52 zlib sources, linking to: zlib1.lib, convert & use VC project files at: 53 projects/visualc6, link to Win32_DLL_ASM_Release. If you encounter MASM 54 error: 55 .\inffas32.asm(647) : error A2070: invalid instruction operands 56 Add a "dword ptr" type qualifier before "[esp]" as described here: 57 http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=166511 58 59 7. http://dev.mysql.com/downloads/mysql/5.0.html 51 60 52 61 MySQL, auth & storage module, binary, linking to: libmysql.lib 53 62 54 7. http://www.sqlite.org/download.html63 8. http://www.sqlite.org/download.html 55 64 56 65 SQLite, auth & storage module, source, linking to: sqlite3.lib. Since … … 58 67 sqlite-source-3.x.zip from SQLite downloads. 59 68 60 8. http://tortoisesvn.tigris.org/69 9. http://tortoisesvn.tigris.org/ 61 70 62 71 TortoiseSVN with SubWCRev tool binary to generate version.h and version.wxi. … … 64 73 (Done by default by TortoiseSVN installer) 65 74 66 9. http://wix.sourceforge.net/releases/75 10. http://wix.sourceforge.net/releases/ 67 76 68 77 WiX 3.0.4401.0 or newer for building MSI jabberd2 setup inside VS2005 IDE 69 78 70 1 0. http://www.activestate.com/store/activeperl/download/79 11. http://www.activestate.com/store/activeperl/download/ 71 80 72 81 ActivePerl (or any Perl distribution) perl command present in PATH -
trunk/win32/jabberd2/jabberd2.vcproj
r677 r678 62 62 <Tool 63 63 Name="VCLinkerTool" 64 AdditionalDependencies="libidn.lib libgsasl.lib libeay32MT.lib ssleay32MT.lib dnsapi.lib ws2_32.lib libexpat.lib "64 AdditionalDependencies="libidn.lib libgsasl.lib libeay32MT.lib ssleay32MT.lib dnsapi.lib ws2_32.lib libexpat.lib zlib1.lib" 65 65 OutputFile="../bin/debug/$(ProjectName).dll" 66 66 AdditionalLibraryDirectories="../lib/debug;../lib" … … 138 138 <Tool 139 139 Name="VCLinkerTool" 140 AdditionalDependencies="libidn.lib libgsasl.lib libeay32MT.lib ssleay32MT.lib dnsapi.lib ws2_32.lib libexpat.lib "140 AdditionalDependencies="libidn.lib libgsasl.lib libeay32MT.lib ssleay32MT.lib dnsapi.lib ws2_32.lib libexpat.lib zlib1.lib" 141 141 OutputFile="../bin/$(ProjectName).dll" 142 142 AdditionalLibraryDirectories="../lib" … … 345 345 </File> 346 346 <File 347 RelativePath="..\..\sx\compress.c" 348 > 349 </File> 350 <File 347 351 RelativePath="..\..\sx\env.c" 348 352 > … … 539 543 Name="VCCustomBuildTool" 540 544 Description="Updating $(InputDir)$(InputName)" 541 CommandLine="subwcrev ..\.. $(InputPath) $(InputDir)$(InputName) "545 CommandLine="subwcrev ..\.. $(InputPath) $(InputDir)$(InputName)
" 542 546 AdditionalDependencies="$(InputDir)..\.svn\entries" 543 547 Outputs="$(InputDir)$(InputName)" … … 550 554 Name="VCCustomBuildTool" 551 555 Description="Updating $(InputDir)$(InputName)" 552 CommandLine="subwcrev ..\.. $(InputPath) $(InputDir)$(InputName) "556 CommandLine="subwcrev ..\.. $(InputPath) $(InputDir)$(InputName)
" 553 557 AdditionalDependencies="$(InputDir)..\.svn\entries" 554 558 Outputs="$(InputDir)$(InputName)" … … 569 573 Name="VCCustomBuildTool" 570 574 Description="Updating $(InputDir)$(InputName)" 571 CommandLine="subwcrev ..\.. $(InputPath) $(InputDir)$(InputName) "575 CommandLine="subwcrev ..\.. $(InputPath) $(InputDir)$(InputName)
" 572 576 AdditionalDependencies="$(InputDir)..\.svn\entries" 573 577 Outputs="$(InputDir)$(InputName)" … … 580 584 Name="VCCustomBuildTool" 581 585 Description="Updating $(InputDir)$(InputName)" 582 CommandLine="subwcrev ..\.. $(InputPath) $(InputDir)$(InputName) "586 CommandLine="subwcrev ..\.. $(InputPath) $(InputDir)$(InputName)
" 583 587 AdditionalDependencies="$(InputDir)..\.svn\entries" 584 588 Outputs="$(InputDir)$(InputName)" -
trunk/win32/setup/libraries.wxs
r674 r678 18 18 <File Id="udns.dll" Name="udns.dll" KeyPath="yes" Vital="yes" /> 19 19 </Component> 20 <Component Id="zlib1.dll" Guid="{D0FCED72-651D-4E1B-BFA5-85BCA9E337C9}"> 21 <File Id="zlib1.dll" Name="zlib1.dll" KeyPath="yes" Vital="yes" /> 22 </Component> 20 23 </DirectoryRef> 21 24 </Fragment> … … 27 30 <ComponentRef Id="sqlite3.dll" /> 28 31 <ComponentRef Id="udns.dll" /> 32 <ComponentRef Id="zlib1.dll" /> 29 33 </ComponentGroup> 30 34 </Fragment>
