Commit Graph

83 Commits

Author SHA1 Message Date
Arrigo Marchiori
30915c6163 Make wxrc independent from GUI support
The wxrc program does not depend on the GUI libraries, but only on
the base and XML libraries, so make it possible to build it in non-GUI
builds too.

Closes https://github.com/wxWidgets/wxWidgets/pull/2419
2021-08-06 21:51:11 +02:00
Andriy Byelikov
ded4da5ce5 Add version suffix to gettext message catalog files
Change "make install" to install catalog files with version suffix and
modify the sources to look for suffixed catalog first, while still
falling back to just the base name if the variant with the version is
not found, because the message catalogs are copied manually in practice
under MSW/macOS systems and so won't have the version suffix there.

This allows to make message catalogs installed by different
wxWidgets versions to coexist on the same system, see
https://groups.google.com/g/wx-users/c/L9gC8UgrO6Y

Closes https://github.com/wxWidgets/wxWidgets/pull/2219

Co-Authored-By: Vadim Zeitlin <vadim@wxwidgets.org>
2021-02-15 18:23:05 +01:00
Vadim Zeitlin
e539cb69bb Remove platform-specific translations support
As shown by the fact that no other platform-specific translations were
ever added since the initial version of locale/msw/it.po added way back
in 4d931bcca0 (Translate '&Help' to '&' for italian Windows only,
2005-08-12), this is not especially useful, so just handle this
particular case specially in wxGetStockLabel() and remove support for
platform-specific translations.

This allows to simplify the makefiles and the catalog loading code as
there is no need to deal with the files in subdirectories any more.
2021-02-07 00:06:21 +01:00
Vadim Zeitlin
d1810b0dce Remove setup0.h files
Simplify things by putting setup.h files themselves under version
control and getting rid of setup0.h ones.

The initial motivation for using separate setup0.h files was to allow
having local changes to setup.h, but with Git there is a simple way to
do it by using "git update-index --skip-worktree include/wx/msw/setup.h"
for example, so we don't really need setup0.h any more and dropping them
makes things simpler.
2021-01-31 19:02:56 +01:00
Vadim Zeitlin
f83085cff8 Add back the use of INSTALL_SCRIPT correctly
Due to a momentary lapse of reason, the changes of 99cb097f4d (Install
wx-config as a script, not as a binary program, 2018-08-16) were applied
to the generated Makefile.in file and so were promptly lost during the
next rebake.

Reapply them properly now, by modifying the .bkl file from which this
file is generated.

Note that rebaking now requires bakefile v0.2.12, which adds support for
defining INSTALL_SCRIPT.

See #18197.
2020-05-02 15:55:25 +02:00
flederwiesel
0073b54f8e Pass CPPFLAGS to cpp when generating rcdefs.h
Honour user-defined CPPFLAGS when creating rcdefs.h, this notably fixes
generating the file with wrong architecture when cross-compiling from 64
to 32 bits with CPPFLAGS=-m32.

Closes #17844.
2020-02-02 00:13:55 +01:00
Vadim Zeitlin
0d394eec9c Update to bakefile 0.2.11 and rebake everything
The main/only change in this version is the removal of automatic rules
using old Carbon Rez/DeRez/SetFile tools.
2017-10-21 17:42:30 +02:00
Vadim Zeitlin
545bec0bac Revert "Remove last vestiges of Carbon-related tools from the makefile"
This reverts commit 2a3721bf98 because it
requires further changes in bakefile itself to really work under Mac, where
the build would be broken as soon as configure would be regenerated (which was
forgotten by that commit due to another error, and so the two errors finally
cancelled out).
2017-05-27 18:27:26 +02:00
Vadim Zeitlin
2a3721bf98 Remove last vestiges of Carbon-related tools from the makefile
Don't detect DeRez, Rez and SetFile in configure, they are not used any
longer as .r resource files are not used under modern macOS.
2017-05-20 16:50:59 +02:00
Vadim Zeitlin
01f9accd19 Remove wxPM, wxWidgets port to OS/2.
This port is not used and is not being worked on, so remove it to reduce the
amount of the code which needs to be updated for every global change.

Also remove tests for VisualAge compiler which isn't used since ages.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76533 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-15 23:56:58 +00:00
Vadim Zeitlin
588135982a Restore correct wx-config creation and work around MinGW lack of symlinks.
This undoes the changes of r72205 and r72249 (see #14517) as using relative
paths for wx-config symlink didn't work correctly if non-default values for
$bindir and/or $libdir were used (i.e. if they were not siblings).

Instead, fix the original problem of lack of symlinks when using MinGW
directly: just use "cp -p" if "ln -s" fails. This should work everywhere and
do the right thing.

Closes #15463.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74758 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-09-04 00:14:42 +00:00
Vadim Zeitlin
3f66f6a5b3 Remove all lines containing cvs/svn "$Id$" keyword.
This keyword is not expanded by Git which means it's not replaced with the
correct revision value in the releases made using git-based scripts and it's
confusing to have lines with unexpanded "$Id$" in the released files. As
expanding them with Git is not that simple (it could be done with git archive
and export-subst attribute) and there are not many benefits in having them in
the first place, just remove all these lines.

If nothing else, this will make an eventual transition to Git simpler.

Closes #14487.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-26 16:02:46 +00:00
Václav Slavík
e0ea79b805 Fix installed wx-config broken by r72205.
In an attempt to fix DESTDIR support on platforms without symbolic
links, this commit completely broke the wx-config symlink created by
"make install" everywhere (unless you were insane enough to use
"--prefix=/", that is): $(libdir) is absolute path and so using
../$(libdir) has no chance of working.

Fixed by using `basename $(libdir)`. This is still unsatisfactory,
because it assumes that $(libdir) and $(bindir) are at the same level in
the filesystem -- which, while usually true, is by no means guaranteed.
But at least this works most of the time.

See #14517.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72249 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-29 08:52:52 +00:00
Vadim Zeitlin
b0067d881b Use relative path for wx-config symlink in "make install".
This fixes "make DESTDIR=..." Broken by r71050 but still allows "make
DESTDIR=... install" to work even under MinGW where "ln -s" is mapped to "cp"
and so doesn't work with non-existing first argument.

Closes #14517.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72205 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-24 20:45:36 +00:00
Vadim Zeitlin
adb783cc0a Remove another unneeded TOOLKIT test from the bakefiles.
Don't check the toolkit unnecessarily, this doesn't really change anything
right now but will not break wxGTK build under MSW when support for it is
added.

Closes #14379.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-12 21:42:02 +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
ed00533b86 Added missing DESTDIR to wx-config installation make rule.
All paths should be prefixed by $(DESTDIR) but it was forgotten in "ln -s"
command.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71050 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-29 19:19:05 +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
526954c596 Globally use "wxWindows licence" consistently.
Use "wxWindows licence" and not "wxWidgets licence" (the latter doesn't
exist) and consistently spell "licence" using British spelling.

See #12165.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-13 13:29:13 +00:00
Václav Slavík
84cd6e0c68 added COMPILER_PREFIX support to wxpresets
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-19 13:57:25 +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
b158f13e16 avoid bakefile warnings about actions unsupported in MSVS formats by not using them in this case (this doesn't change the generated project files anyhow)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57550 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-12-25 18:49:29 +00:00
Václav Slavík
aa163cb549 removed a warning that should only be a FIXME
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-10-12 13:03:53 +00:00
Vadim Zeitlin
7da8bfe30d add VC9 project files (closes #9960)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56164 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-10-08 16:42:00 +00:00
Francesco Montorsi
417f513723 add wx_xrc.bkl bakefile wxpreset to the list of files to install; set Id in the svn:keyword for that file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-10-07 17:51:13 +00:00
Vadim Zeitlin
98a04b4a2a test for utils/wxrc/Makefile existence and not utils/wxrc which always exists when building in source directory (#9928)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55397 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-08-31 16:29:11 +00:00
Václav Slavík
bad4a10f24 silence warnings about <headers>
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-02-12 11:29:35 +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
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
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
710526dea5 fixed wx-config symlink creation with non-empty DESTDIR
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43431 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-11-15 15:46:11 +00:00
Václav Slavík
09abe5d47d fixed makefiles to fail if building wxrc fails
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40350 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-28 10:38:22 +00:00
David Elliott
891ace0538 Separate RESCOMP into WINDRES (for Win32) and REZ (for Mac OS).
Don't check for windres as bakefile.m4 now does it properly.
Rename MACRESCOMP to POSTLINK_COMMAND.
Rename MACRESWXCONFIG to WXCONFIG_POSTLINK_COMMAND.
Use newest bakefile.m4 (with similar changes).
Add --rezflags option back to wx-config so existing user Makefiles don't break.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-25 04:51:08 +00:00
Michael Wetherell
58b59bb7d5 rcdefs.h is a real file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36181 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-15 15:36:33 +00:00
Włodzimierz Skiba
2a4d2d4680 'rcdefs.h' action has to be phony, otherwise it is expected to be file existing after action execution.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36141 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-09 19:59:29 +00:00
Michael Wetherell
47bff9ff8b Correct the directory rcdefs.h installs to
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36135 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-09 00:10:31 +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
2f5e790cb1 Restore ALL_BASE_HEADERS to its previous meaning of 'all for a given port' as
it is used in this sense in rpmspec.bkl, add ALL_PORTS_BASE_HEADERS for
'make dist', and rebake.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35945 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-18 20:50:46 +00:00
Włodzimierz Skiba
712593b003 More ports in non autoconf formats.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35765 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-29 13:54:37 +00:00
Michael Wetherell
2b5e2b5847 Fix for 'make dist' to include headers for all ports
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35647 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-22 16:22:31 +00:00
Václav Slavík
9f0ff522c7 fixed presets installation for scrdir!=. case
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-12 19:00:24 +00:00
Vadim Zeitlin
abc1acc90d removed stray ^Ms
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35476 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-12 14:27:02 +00:00
Václav Slavík
07910a9a7e install bakefile presets (patch 1253143)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35307 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-24 19:20:18 +00:00
Michael Wetherell
4d931bcca0 Translate '&Help' to '&' for italian Windows only
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35180 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-12 15:29:57 +00:00
Włodzimierz Skiba
1dba7b4c69 wxOS2 with Open Watcom: correct PCH usage, missing headers, warning fixes, source cleaning and other Watcom adjustements.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34904 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-21 17:30:41 +00:00
Robin Dunn
a4297f6a8c Remove rules for building resource files on wxMac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33591 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-13 22:57:18 +00:00
Václav Slavík
7b3dba4927 fixed wxrc's dependencies
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32706 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-03-09 23:01:35 +00:00
Julian Smart
e2ac17aa7a Further AFM removal
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-15 13:20:19 +00:00
Ron Lee
10f206ad20 For autoconf/unix builds update the hardcoded afm dir too.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29871 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 07:50:21 +00:00
Václav Slavík
f9e1c3c501 fixed wxrc installation and cleaning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29751 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-09 12:53:00 +00:00