Commit Graph

178 Commits

Author SHA1 Message Date
Vadim Zeitlin
9dab58b103 Define NDEBUG when building 3rd party libraries.
We are not interested in asserts in 3rd party libraries so make them disappear
by defining NDEBUG when building them.

Closes #11155.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-09-18 16:15:54 +00:00
Peter Cawley
3c3ead1d15 Merged GSOC Ribbon work from SOC2009_RIBBON branch into trunk.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-09-16 12:06:02 +00:00
Vadim Zeitlin
c6684d425d Use "d" suffix according to DEBUG_RUNTIME_LIBS, not DEBUG_FLAG.
The "d" suffix is now only used under Windows and indicates that we link with
debug CRT version.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61887 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-09-12 11:29:11 +00:00
Kevin Ollivier
19beefa6f3 On Mac, ensure that the library path and dependencies point to the right location whether or not the library is installed.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-15 16:07:56 +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
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
Vadim Zeitlin
1c4293cb91 added wxPropertyGrid from Jaakko Salli (#9934)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55576 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-12 20:57:41 +00:00
Václav Slavík
c88a264a08 supress warning about in custom build steps with VC7+ (temporary workaround until bakefile 0.2.4)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51357 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-01-24 11:25:15 +00:00
Václav Slavík
2275c73268 updated bakefiles to take advantage of Bakefile 0.2.3 (now required)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51345 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-01-23 12:04:13 +00:00
Václav Slavík
cc8953a695 fixed generating of makefiles that don't include common.bkl and so didn't have IS_MSVC_PRJ defined
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50716 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-12-15 11:20:59 +00:00
Václav Slavík
24dfe91709 removed ANSI configs from VisualC++ project files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50237 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-11-25 11:14:40 +00:00
Vadim Zeitlin
9c7ad5466b define wxUSE_UNICODE=0 in non-Unicode build to prevent it from getting automatically defined as 1 by setup.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50162 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-11-22 15:29:51 +00:00
Václav Slavík
591a3be426 removed remains of build system support for contrib
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50066 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-11-18 22:12:23 +00:00
Václav Slavík
7a4fa5692d Added support for Visual C++ 2003 project files (still disabled until Bakefile 0.2.3 release
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50065 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-11-18 21:54:54 +00:00
Václav Slavík
5acf8f1d43 enable VS2005 project files for samples, but without dependencies on library projects, it's better than nothing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50052 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-11-18 18:00:21 +00:00
Vadim Zeitlin
1e6b2edfc8 remove ODBC and DBgrid libraries
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49352 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-10-23 13:40:27 +00:00
Vadim Zeitlin
3442c078ad build updates for libtiff 3.8.2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48824 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-09-20 00:01:33 +00:00
Vadim Zeitlin
5d88a6b579 added wxDEPRECATED_BUT_USED_INTERNALLY macro and use it for the old wxLog::DoLog() overloads
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46479 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-06-15 15:08:51 +00:00
Václav Slavík
dad909f709 make it posible to change the compiler part of objects directory by setting COMPILER_PREFIX make variable
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46036 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-05-15 12:48:26 +00:00
Václav Slavík
303a585db2 fixed linking in monolithic case if USE_STC=0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-05-03 09:32:58 +00:00
Václav Slavík
b1b592ad75 don't compile Scintilla sources with -Wall
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45471 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-14 19:05:45 +00:00
Robin Dunn
54429bb380 Bakefile and other changes for new locations of STC and wxSVGFileDC.
Remove old files in contrib.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-05 06:27:23 +00:00
Václav Slavík
18bab03e69 removed C++BuilderX project files, they are broken, not used by anybody and the product is dead
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44742 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-10 19:25:51 +00:00
Václav Slavík
9c26fe83eb fixes to InputPath values in custom build steps
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44321 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-26 12:41:04 +00:00
Václav Slavík
81073d9209 SETUPHDIR is Bakefile variable, not MSVC IDE one
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-17 08:40:56 +00:00
Václav Slavík
1ff18f49b9 added support for Bakefile's upcoming msvs2005prj format (not enabled by default yet, would fail with the latest released version otherwise)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44186 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-10 14:03:23 +00:00
Václav Slavík
79a2ea3463 require bakefile-0.2.1; remove workarounds for older versions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43519 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-11-19 13:24:05 +00:00
Václav Slavík
6589dc98a0 don't use top_builddir so that configure.in works with autoconf 2.5x as well as 2.60+
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43039 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-11-04 17:08:49 +00:00
Robin Dunn
2713e62971 Add USE_GDIPLUS option that will control (for the makefile builds) if
the gdiplus.lib library is added to the link, and whether
wxUSE_GRAPHICS_CONTEXT should be defined.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41645 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-05 22:45:17 +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
Julian Smart
50acee04cd Initial commit of wxAUI
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39589 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-06 13:12:07 +00:00
Włodzimierz Skiba
b9c94fbf31 PCH support for !MSW/!autoconf platforms.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39483 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-31 12:10:38 +00:00
Włodzimierz Skiba
66b9f7f7e4 Various dummy.cpp centralized in common/dummy.cpp. Build rebaked.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39482 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-31 11:48:45 +00:00
Włodzimierz Skiba
92d594fc71 Workaround to broken WinCE directory scanning for all includes (#ifdefed for other ports).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-20 21:32:34 +00:00
Václav Slavík
0019dee69e don't link against 3rd party image libs when building non-GUI targets
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-23 16:38:47 +00:00
Włodzimierz Skiba
03575f9bd3 Don't link with media lib with USE_MEDIA==0.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37856 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 15:01:59 +00:00
Michael Wetherell
1b48afd23d Move oleacc.lib from the VC++ projects/makefiles to libraries.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37045 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-21 22:50:46 +00:00
Włodzimierz Skiba
43b0b6bc59 wxMGL bakefiled for OpenWatcom (needs bakefiles from CVS but compatible with bkl 0.1.9.X for other ports.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-08 23:58:18 +00:00
Michael Wetherell
b974b0da43 Let TARGET_CPU work with either upper or lower case
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36317 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-30 20:13:48 +00:00
Michael Wetherell
92641c0dc0 Correct the include order for the resource compiler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36134 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-08 23:17:24 +00:00
Michael Wetherell
c8d5853155 Add rcdefs.h and support for automatic manifests on Windows
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36133 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-08 22:49:46 +00:00
Michael Wetherell
e40b74ba83 Add CPU_TARGET option to msvc makefiles for targeting AMD64 and IA64
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35908 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-16 20:25:10 +00:00
Włodzimierz Skiba
790fc140a9 Compensation for bkl 0.1.9.X/eVC4/RTTI bug.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35259 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-22 14:54:41 +00:00
Michael Wetherell
c7f476c90d Copy univ/setup.h instead of msw/setup.h for wxUniversal in VC++ project
files. Fixes bug 1230504.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-08 13:34:42 +00:00
Vadim Zeitlin
a649ec0158 oops, wxUSE_UNICODE_MSLU and not wxUSE_MSLU
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35010 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-30 00:22:40 +00:00
Vadim Zeitlin
22df83431d define wxUSE_MSLU=1 in compiler flags if MSLU=1 was given in the make flags
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35009 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-30 00:17:24 +00:00
Włodzimierz Skiba
52abdc8300 LIBDIRNAME unique between ports buildable with Open Watcom.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34907 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-22 12:44:44 +00:00
Włodzimierz Skiba
7121be53c7 eVC3 compatibility workaround.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34906 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-21 17:44:06 +00:00
Václav Slavík
31da10deab use libtool versioning of shared libs on Unix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34810 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-04 09:58:07 +00:00
Václav Slavík
05a0bcdec6 moved version-related variables to separate file in preparation for sonames fix (no real changes yet)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34779 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-06-29 21:53:53 +00:00