From: Eric Y. K. <eri...@gm...> - 2006-10-29 09:36:25
Attachments:
darcs4O7Hvz
|
To: wxhaskell-unstable <wxh...@li...> From: Eric Kow <eri...@lo...> Subject: darcs patch: Update Windows/VC++ build for 0.10.1 (from jeremy.odon... X-Mail-Originator: Darcs Version Control System X-Darcs-Version: 1.0.8 (release) DarcsURL: http://darcs.haskell.org/wxhaskell MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=_" --=_ Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Sun Oct 29 09:29:57 CET 2006 Eric Kow <eri...@lo...> * Update Windows/VC++ build for 0.10.1 (from jer...@gm...). = --=_ Content-Type: text/x-darcs-patch; name="update-windows_vc__-build-for-0_10_1-_from-jeremy_odonoghue_gmail_com__.dpatch" Content-Transfer-Encoding: quoted-printable Content-Description: A darcs patch for your repository! New patches: [Update Windows/VC++ build for 0.10.1 (from jer...@gm...). Eric Kow <eri...@lo...>**20061029082957 = ] { hunk ./wxc/wxc-2.4.dsp 56 -# ADD LINK32 zlib.lib regex.lib png.lib jpeg.lib tiff.lib wxmsw.lib kernel= 32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.= lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rp= crt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /machine:I386 /nod= efaultlib:"LIBCMT" /out:"..\out\wxc\wxc-msw2.4.2-0.9.4.dll" /libpath:"..\..= \wxWindows-2.4.2\lib"=0D +# ADD LINK32 zlib.lib regex.lib png.lib jpeg.lib tiff.lib wxmsw.lib kernel= 32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.= lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rp= crt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /machine:I386 /nod= efaultlib:"LIBCMT" /out:"..\out\wxc\wxc-msw2.4.2-0.10.1.dll" /libpath:"..\.= .\wxWindows-2.4.2\lib"=0D hunk ./wxc/wxc-2.4.dsp 59 -PostBuild_Cmds=3Decho Generating mingw32 import library ... ..\bin\reimp .= .\out\wxc\wxc-msw2.4.2-0.9.4.lib move libwxc-msw2.4.2-0.9.4.a ..\out\wxc mo= ve wxc-msw2.4.2-0.9.4.def ..\out\wxc echo Done.=0D +PostBuild_Cmds=3Decho Generating mingw32 import library ... ..\bin\reimp .= .\out\wxc\wxc-msw2.4.2-0.10.1.lib move libwxc-msw2.4.2-0.10.1.a ..\out\wxc = move wxc-msw2.4.2-0.10.1.def ..\out\wxc echo Done.=0D hunk ./wxc/wxc-2.4.dsp 86 -# ADD LINK32 zlibd.lib regexd.lib pngd.lib jpegd.lib tiffd.lib wxmswd.lib = kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib sh= ell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.= lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /debug /mach= ine:I386 /nodefaultlib:"LIBCMTD" /out:"..\out\wxc\wxcd-msw2.4.2-0.9.4.dll" = /pdbtype:sept /libpath:"..\..\wxWindows-2.4.2\lib"=0D +# ADD LINK32 zlibd.lib regexd.lib pngd.lib jpegd.lib tiffd.lib wxmswd.lib = kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib sh= ell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.= lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /debug /mach= ine:I386 /nodefaultlib:"LIBCMTD" /out:"..\out\wxc\wxcd-msw2.4.2-0.10.1.dll"= /pdbtype:sept /libpath:"..\..\wxWindows-2.4.2\lib"=0D hunk ./wxc/wxc-2.4.dsp 89 -PostBuild_Cmds=3Decho Generating mingw32 import library ... ..\bin\reimp .= .\out\wxc\wxcd-msw2.4.2-0.9.4.lib move libwxcd-msw2.4.2-0.9.4.a ..\out\wxc = move wxcd-msw2.4.2-0.9.4.def ..\out\wxc echo Done.=0D +PostBuild_Cmds=3Decho Generating mingw32 import library ... ..\bin\reimp .= .\out\wxc\wxcd-msw2.4.2-0.10.1.lib move libwxcd-msw2.4.2-0.10.1.a ..\out\wx= c move wxcd-msw2.4.2-0.10.1.def ..\out\wxc echo Done.=0D } Context: [Add support for toolbar divider and other toolbar options (from shelarcy@g= mail.com) jer...@gm...**20061023095411] = [Add support for toolbar divider (for she...@gm...) jer...@gm...**20061023094720] = [Add support for list item mask (from she...@gm...) jer...@gm...**20061023094528] = [Add support for Calendar events (from sha...@gm...) jer...@gm...**20061023094412] = [Add support for wxWidgets version >=3D 2.5 (Sound API, db API) jer...@gm...**20061023094049] = [Shelarcy patch: fix typos in wxHaskell samples/contrib jer...@gm...**20060830114937] = [(OS X) Skip intermediate step of compiling master.o. Eric Kow <eri...@lo...>**20060813212620 = Removing this step (which compiles master.o, and combines it with other stuff to get the real library we want) avoids weird error messages like = ld: out/wxc/master.o undefined symbol 36218 (__ZdaPv) can't be a weak definition = It's quite possible that this breaks something else, though... = ] = [Update VC++ project file to reflect new wxWidgets version support (unteste= d) jer...@gm...**20060817170205] = [Update VC++ project file to reflect updated DLL version supporting wxWidge= ts 2.6.3 jer...@gm...**20060817170011] = [Update revision numbers and wxversion guesses for Windows / VC++ (jeremy.o= don...@gm...) jer...@gm...**20060817165704] = [Shelarcy patch (VC project for wxWindows 2.6.3) jer...@gm...**20060816134707] = [Shelarcy patch (WxcTypes.hs) jer...@gm...**20060816115419] = [Shelarcy patch (eljdialup.cpp) jer...@gm...**20060816114418] = [Shelarcy patch (db.cpp) jer...@gm...**20060816113728] = [(wxc, Unicode) Files for compiling unicode version under Visual Studio. shelarcy <she...@ca...>**20060813212315 = This is Eric Kow recording on Shelarcy's behalf. This corresponds to vers= ion 08 of my Unicode patch. = ] = [Add a small makefile for compiling the samples. Eric Kow <eri...@lo...>**20060813211705 = (This comes from version 08 of my Unicode patch). = ] = [(wxcore, Unicode) Add/use ability to interact with C wchar_t. Eric Kow <eri...@lo...>**20060813211211 = This corresponds to the wxcore part of my Unicode patch, version 08 modulo trailing whitespace. = I believe this would require for wxWidgets and wxhaskell to be compiled wi= th Unicode enabled. = ] = [(wxdirect, Unicode) Use the Haskell types for C wchar_t and friends. Eric Kow <eri...@lo...>**20060813210420 = I believe this would require that wxWidgets be compiled with Unicode enabled. = ] = [(wxc, Unicode) Use wxChar instead of char. Eric Kow <eri...@lo...>**20060813205557 = wxChar is a C preprocessor macro that selects for char under --disable-unicode, and for wchar_t under --enable-unicode. = This corresponds to version 08 of my Unicode patch, but only the parts which affect wxc. = ] = [[wxhaskell-from-cvs @ 2005-05-08 08:12:51 by dleijen] dleijen**20050508081251 updated change log ] = [[wxhaskell-from-cvs @ 2005-05-08 07:24:23 by dleijen] dleijen**20050508072423 Compile wx via -fvia-C to fix crash with ghci on windows ] = [TAG wxhakell-0-9-4 Unknown tagger**20060712042545] = Patch bundle hash: b3dc26bf116e9a52140b4d4e5c13d5da914430e2 --=_-- . |