Commit Graph

201 Commits

Author SHA1 Message Date
Vadim Zeitlin
d48f13a168 Allow building wxGTK under Windows with MSVC.
Replace a few more __WXMSW__ tests with __WINDOWS__ ones and modify bakefiles
to allow specifying the toolkit to be built in wxMSW makefiles.

Closes #13902.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73290 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-12-28 16:03:03 +00:00
Vadim Zeitlin
235a997f9a Use "_x64" instead of "amd64" for x64 MSW makefile builds.
Still accept "amd64" as a valid TARGET_CPU value but also accept, and
encourage people to use, "x64".

Add a new section about the build system changes to the change log and added a
mini-TOC to it to make navigating it a bit easier and show what changes are
there at a glance.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71978 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-07 13:27:59 +00:00
Vadim Zeitlin
9043a590ce Use COMPILER_VERSION and ARCH_SUFFIX in libraries names in Windows makefiles.
For the official builds (only), include the compiler version and the
architecture suffix, unless it's the default x86, into the DLL names, to allow
their concurrent installations for multiple compiler versions and architectures.

Closes #13857.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71924 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-01 21:35:23 +00:00
Vadim Zeitlin
df1547b7bc No real changes, just rename DIR_SUFFIX_CPU to ARCH_SUFFIX in bakefiles.
This will be soon used in the libraries names and not only in the directory
paths so rename the variable to make things more clear (or at least less
confusing).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71923 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-01 21:35:18 +00:00
Vadim Zeitlin
5c3f21c6a3 Use PLATFORM checks in bakefiles instead of TOOLKIT checks.
No real changes as the output is currently the same for all supported
PLATFORM/TOOLKIT combinations anyhow but prefer checking for PLATFORM to
prepare for the support of GTK toolkit under MSW platform.

Closes #14379.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71700 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-08 18:44:10 +00:00
Vadim Zeitlin
e762ef8f53 Fix precompiled headers use with MSVC in wxGTK sources.
Don't use PCH for C sources, do include wx/wxprec.h from all wxGTK C++
sources.

Closes #14224.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71360 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-04 20:35:48 +00:00
Vadim Zeitlin
49a63afbad Avoid CRT deprecation warnings for MSVC build using makefiles too.
Define _CRT_SECURE_NO_DEPRECATE, _CRT_NON_CONFORMING_SWPRINTFS and
_SCL_SECURE_NO_WARNINGS when using makefiles to build the library too for
consistency with the project files.

These defines are only needed for VC8 and later but should do no harm for the
previous versions.

See #11009.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-07 21:38:31 +00:00
Vadim Zeitlin
0e1f8ea4a3 Remove wxMGL port.
The company behind MGL toolkit (SciTech) doesn't exist since several years and
this port is not used by anybody, so remove it to ease maintenance burden.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70353 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-15 14:46:41 +00:00
Vadim Zeitlin
bd362275b8 Remove Palm OS port.
The platform targeted by this port doesn't exist any more and the port never
achieved really working state so remove the code to avoid having to maintain
it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70345 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-15 01:05:28 +00:00
Vadim Zeitlin
4707c7c3d1 Disable VC8+ deprecation warnings for standard functions at bakefile level.
We already define the symbols needed to disable the warnings in wx/defs.h but
this isn't enough for third party code not including it, so define them in the
project settings directly.

Closes #11009.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-29 22:05:46 +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
ea10101a15 Link tests with webview library only if it is actually available.
This allows the tests to build again even on the machines without the
prerequisites for building wxWebView.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69589 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-30 14:19:59 +00:00
Steve Lamerton
467d261e9d Rename web library to webview.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-19 10:45:16 +00:00
Steve Lamerton
cfcf1d6ee3 Application of the most recent wxWebView patch, the only changes were so tab to space conversions. Please note this probably won't compile.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@67698 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-04 15:40:00 +00:00
Dimitri Schoolwerth
4c51a665c6 Fixed various typos.
Applied patch by snowleopard2 fixing a bunch of typos such as misspellings and double words in the documentation. Combined the patch with some local queued typos waiting to be committed as well as adding new typo fixes inspired by the patch.

Function names with American spelling were not changed nor was third-party code touched. The only code changes involve some changes in strings that are translated ("Can not" -> "Cannot").

Closes #13063 (again).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-22 14:17:38 +00:00
Václav Slavík
cc118a9b0e Fix VC2008 dependencies with Bakefile 0.2.9.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-13 17:09:33 +00:00
Vadim Zeitlin
57c7447463 Link console programs with PNG library in monolithic build.
PNG images are used by the main wxWidgets library itself now and so linking
with the monolithic wx library introduces dependencies on PNG as well, even
for the console applications. Link them with linpng to avoid linker errors.

Closes #12889.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66848 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-05 20:25:09 +00:00
Václav Slavík
fdb97de42b Remove USE_GDIPLUS setting from bakefiles.
GDI+ DLL is always loaded dynamically at runtime, so there's no reason
to link against it anymore.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63924 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-09 14:12:08 +00:00
Václav Slavík
c59422a40f define NDEBUG if not using debug CRT
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-12-15 15:38:05 +00:00
Vadim Zeitlin
94b6ce7f4b Use X64 machine type for MSVC linker instead of old AMD64.
The officially supported machine type name is X64 now, even if AMD64 is still
supported.

Closes #10711.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62825 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-12-08 16:36:37 +00:00
Vadim Zeitlin
41c89b9107 Define _CRT_SECURE_NO_WARNINGS when building 3rd party libs with MSVC.
Avoid dozens of warnings about "unsafe" use of the standard C library
functions in 3rd party code which are harmless and which we don't care about
in any case.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62752 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-12-01 00:42:19 +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
Václav Slavík
00100882f5 Post-0.2.6 version of Bakefile is required.
This is because of two recent changes: addition of the 'ribbon'
library (with filenames shared with other libs) and unconditional
enabling of debug info with VC++. Both of these uncovered bugs
in Bakefile's VC++ support that weren't fixed until after 0.2.6.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62468 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-22 06:43:52 +00:00
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