cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
57,434 Commits 1 Branch 0 Tags 333 MiB
eb6b14dc71
Commit Graph

53 Commits

Author SHA1 Message Date
Vadim Zeitlin
bd0f3ca697 Rebake all the samples and others makefiles too. 
The samples makefiles were not regenerated after the recent Scintilla changes
(see r74425), do it now. There are no real changes for most of them (except
stc sample), but it ensures that rerunning bakefile doesn't change anything.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-07-13 02:33:00 +00:00
Vadim Zeitlin
a4830bb560 Always add libwxscintilla in monolithic mode. 
The library was already present in the makefiles but came before the
monolithic library itself, which broke the linking of the samples when using
GNU ld as the dependent libraries must come after the libraries using them.

Closes #13837.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-07-06 12:41:02 +00:00
Vadim Zeitlin
bed99c2256 Rebake the rest of the files after TOOLKIT change in MSW bakefile. 
This should have been part of r74406 but I only rebaked wxWidgets make/project
files themselves and not the samples/utils/demos files in it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74407 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-07-06 12:32:23 +00:00
Vadim Zeitlin
22a3b6e4b2 Don't include wxUniversal configurations in MSVC project files. 
wxUniversal is practically not used under MSW and just confuses people.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-01-21 16:37:01 +00:00
Vadim Zeitlin
14b682f7c3 Increase version to 2.9.5. 
Rebake all the project/make files.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72007 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-07-10 23:51:44 +00:00
Vadim Zeitlin
51ec29ea5d Always link with expat in monolithic build. 
Fix linking errors when using wxXML in sttaic monolithic build: in this case
we must link with expat but it was listed too early, before wxWidgets
libraries using it, in the bakefile-generated makefiles.

Now add it to the end of the linker command line too by including -lexpat in
EXTRALIBS_FOR_BASE which are appended to the linker arguments.

Notice that now -lexpat is linked twice because it is still added by
<wx-lib>xml</wx-lib> in bakefiles, even in monolithic build, but I don't know
how to avoid it and it is harmless anyhow.

Closes #12573.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70116 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-12-25 13:28:01 +00:00
Vadim Zeitlin
00eef16d51 Rebake everything using bakefile 0.2.9. 
Update configure and bakefile.m4 for the new version too.

Also add the missing makefiles and projects for the XTI sample.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66836 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-02-03 15:02:45 +00:00
Vadim Zeitlin
3cb332c155 Remove unnecessary mondrian.{ico,xpm} files from samples directory. 
Standardize on using sample.rc and sample icon in all the samples, it was
confusing that some of them used it and other didn't, without any apparent
logic.

Remove the now unnecessary icon files, including the dialogs sample icon which
seemed to be corrupted (this closes #11146).

Also replace multiple OS/2 resource files with a single one in the sample
directory. The OS/2 projects/makefiles would need to be updated to use them.

Remove dialogs sample icon.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64645 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-06-20 17:42:33 +00:00
Václav Slavík
b796194b15 Regenerated makefiles after removing USE_GDIPLUS. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63925 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-04-09 14:14:26 +00:00
Kevin Ollivier
00fb97de2c Rebake. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63106 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-01-09 19:56:18 +00:00
Kevin Ollivier
f82b7036e8 Rebake after last commit. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62682 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-11-18 19:22:58 +00:00
Vadim Zeitlin
7880889720 Rebake everything using bakefile 0.2.7. 
Also updated aclocal inputs and regenerated configure.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-10-22 16:53:10 +00:00
Kevin Ollivier
d5e7ffcf7a Make sure all Bakefile formats that use CRLF line feeds are set to use CRLF in SVN. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62327 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-10-08 04:07:02 +00:00
Vadim Zeitlin
d12d9edacb Rebake all the samples, demos and tests makefiles. 
This should have been committed together with the changes to the debug flags
handling in build/bakefiles in r61887.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-09-12 13:38:08 +00:00
Chris Elliott
95ff11c4bb update bakefile to 0.2.6 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-04-24 10:36:24 +00:00
Vadim Zeitlin
b44f5137ce link with wininet.lib under Windows to avoid linking errors in wxUSE_URL_NATIVE==1 build (#10338) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58118 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-01-15 13:33:51 +00:00
Vadim Zeitlin
506e9b7ed2 rebaked using bakefile 0.2.5 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-10-27 16:40:51 +00:00
Vadim Zeitlin
8ece421c6c rebaked makefiles with 0.2.4 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56158 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-10-08 15:44:49 +00:00
Kevin Ollivier
7664a67f57 Rebake after bakefile changes. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55754 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-09-20 23:59:10 +00:00
Kevin Ollivier
509f339a81 rebake 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55457 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-09-04 07:57:32 +00:00
Václav Slavík
6e0fbb3dbf regenerated makefiles with bkl-0.2.3 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51346 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-01-23 12:13:07 +00:00
Vadim Zeitlin
7379e47609 rebaked everything, fixes problems with OpenGL samples makefiles 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50703 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-12-15 00:25:59 +00:00
Chris Elliott
444833b323 update makefiles 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-10-11 15:58:04 +00:00
Robin Dunn
ae4ccf12b6 rebaked after changing the version number 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44396 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-02-07 02:14:45 +00:00
Robin Dunn
25bb1412af Move version number to 2.8.0.0 and rebake the makefiles 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-11-10 02:32:01 +00:00
Robin Dunn
3abcf424a3 Bumping the version number also requires that version.h be modified, 
and also rebaking the makeifles.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-09 01:20:56 +00:00
Julian Smart
3b2cb4316b Moved wxRichTextCtrl to its own library 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39882 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-06-29 07:16:39 +00:00
Vadim Zeitlin
77a7dfc1a1 regenerated all makefiles with bakefile 0.2.0; removed REZ option from config.bkl as it's now defined by bakefile 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37463 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-02-10 19:51:08 +00:00
Vadim Zeitlin
4cbcfb73a0 regenerated after version.bkl changes fixing -compatibility_version for Darwin 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-10-03 21:05:25 +00:00
Michael Wetherell
2113bc7764 Rebake after MSLU and other changes 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35063 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-08-03 16:10:12 +00:00
Julian Smart
0d90d6ea7a Rebake for 2.6.2 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34946 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-07-28 12:48:14 +00:00
Julian Smart
4818141bb2 Changed version number 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33511 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-04-11 15:50:13 +00:00
Julian Smart
8c9f8f91cd Updated version to 2.5.5 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32997 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-03-23 13:05:13 +00:00
Julian Smart
b14abf14c7 Regenerated makefiles 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-02-12 18:53:20 +00:00
Ryan Norton
dd65d8c830 wxURI. Move Convert/to/fromURI into uri.cpp so that it is compiled in base. Regenerate Bakefiles. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30125 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-10-27 22:47:26 +00:00
Julian Smart
9c2d002b3e Regenerated makefiles for 3rd-party lib change 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29731 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-10-08 11:20:24 +00:00
Ryan Norton
c33fae85b0 Regen Bakefiles for OSX HID integration 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29431 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-09-27 06:53:08 +00:00
Julian Smart
c4839ccf58 Regenerated makefiles for 2.5.2 
Other version updates
Added list of Cocoa files


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27410 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-05-24 14:12:40 +00:00
Václav Slavík
b92ca8cf62 regenerated makefiles 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25873 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-02-19 19:36:30 +00:00
David Elliott
c3255f5fba Bakefile 0.1.3 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25810 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-02-15 02:14:15 +00:00
David Elliott
b92ca05a69 Baked bakefiles 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25360 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-01-24 06:22:55 +00:00
David Elliott
b17c174693 Baked files with Bakefile 0.1.2 (Mac OS 10.3 Python 2.3) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25285 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-01-22 03:48:09 +00:00
Václav Slavík
9bfe7ad92d regenerated makefiles 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-12-15 11:42:03 +00:00
Vadim Zeitlin
b71531ad92 regenerated after adding gzstream.* and vidmode.h 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23978 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-09-27 15:48:14 +00:00
Julian Smart
ec08d395bd Updated makefiles etc. for 2.5.1 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23603 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-09-15 15:36:27 +00:00
Václav Slavík
75a0a7b7de change MSW libs directories so that libraries are shared by builds 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-08-15 22:08:13 +00:00
Václav Slavík
4e209a2064 1) some compilers (Watcom) don't like it if wxBase library PCH file contains 
symbols from GUI components and won't link a DLL
2) fixed subdirs recursion code - all options must be output
3) fixed subdirs recursion code - all options must be output
4) fix for watcom resource compiler


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22703 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-08-08 13:15:16 +00:00
Václav Slavík
fd9f42b6a9 regenerated makefiles 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22659 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-08-06 22:44:22 +00:00
Václav Slavík
076f10e054 regenerated after adding DEBUG_ options 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22442 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-08-01 18:17:11 +00:00
Václav Slavík
bdc408c4c6 1. use three numbers version in win32 DLLs on unstable branch 
2. automatically increase major soname version with every unstable release


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22292 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-07-25 12:38:48 +00:00