Commit Graph

2079 Commits

Author SHA1 Message Date
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
81f3129f77 Explicitly specify target names for all configurations in VC10 projects.
The target names were not specified for the "Release" configuration in some
projects, resulting in (harmless, but annoying) warnings during the build.

Closes #15439.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74719 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-08-27 22:49:38 +00:00
Vadim Zeitlin
9e2e5d0759 Use $(OutDir) instead of explicit directories in VC10 project files.
This makes it simpler to use a different output directory as it only needs to
be changed in one place.

See #15439.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74718 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-08-27 22:49:34 +00:00
Stefan Csomor
3f45b63e4d correct base for carbon is 10.6 max
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-08-25 08:36:54 +00:00
Stefan Csomor
0dd6bd1895 adding correct valid architectures
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74709 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-08-25 08:28:43 +00:00
Stefan Csomor
4e4aacdf12 carbon sdk must be 10.7 max, 10.8 is not supported anymore
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-08-24 19:05:28 +00:00
Stefan Csomor
68b9924c4e leave i386 compiler to default
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74706 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-08-24 19:00:09 +00:00
Vadim Zeitlin
4132e6de41 Add webviewarchivehandler.cpp to manually maintained VC10 project file.
Closes #15427.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74705 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-08-24 14:33:33 +00:00
Vadim Zeitlin
6ce0ccf593 Fix DLL targets names in manually maintained VC10 project files.
This takes care of annoying warning about "target name does not match linker
output file name" when building the DLLs.

Closes #15435.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74702 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-08-24 14:33:16 +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
Vadim Zeitlin
e4c7db4552 Remove wxUniversal configuration from the MSVC 10 project files.
As these configurations are not present in the automatically generated files
any more, remove them from the manually created ones too.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-26 15:27:51 +00:00
Vadim Zeitlin
591c850f68 Remove more exclusions from Inno Setup file.
Some excluded entries were not-existent anyhow (.cvsignore, wxPython, *.pch)
while others could be useful to have (misc).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74565 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-17 12:57:41 +00:00
Vadim Zeitlin
218e641ac2 Don't exclude tests from wxMSW-Setup.exe.
The tests are useful to have to be able to check some functionality.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74564 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-17 12:57:38 +00:00
Vadim Zeitlin
d136f2abf1 Exclude "osx" files, not "mac" ones, from Inno Setup file.
"mac" subdirectories don't exist any more.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74563 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-17 12:57:35 +00:00
Vadim Zeitlin
9bd7659972 Remove redundant lines from Inno Setup file.
We don't need to handle the documentation files separately when they are
already taken care of together with everything else anyhow.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-17 12:57:32 +00:00
Vadim Zeitlin
6dbc37ce70 Remove Inno Setup file dependency on c:\daily path.
Generate the output file in the parent of the sources directory and take care
of copying it to c:\daily in bld_chm_exe.bat itself.

This allows to use wxwidgets.iss without that batch file and also on systems
without c:\ drive at all.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74560 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-17 12:57:26 +00:00
Vadim Zeitlin
beee5d6863 Use "INNO" env var in Inno Setup script only if it's defined.
Just use the sources directory itself if %INNO% is not defined. In fact, I
think we could always use the source directory, actually, but just in case
there was some reason to do it like this, keep using %INNO% if it is defined.

Also check that WXW_VER environment variable that we use is, in fact, defined.

FIX: Use relative path, not %WXWIN% in ISS script.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74559 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-17 12:57:23 +00:00
Vadim Zeitlin
e86aa7a62c Add a test for eol-native file existence in the release script.
Otherwise it could silently create a distribution with the files with wrong
EOLs.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74556 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-17 12:57:15 +00:00
Vadim Zeitlin
fa699cbaaf Make it possible to use svn-find-native-eols script without svn checkout.
This should make it simpler to use it for other people.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74554 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-17 12:57:07 +00:00
Vadim Zeitlin
63fd12c735 Add manually created VC10 project and solution files for the library.
These files were obtained by importing the VC9 files and then setting up the
dependencies correctly in the solution. This is just a temporary solution and
we'll hopefully generate them with bakefile-1 for the 3.0 release but for now
this is better than nothing.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74549 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-16 15:47:14 +00:00
Vadim Zeitlin
6ed612f498 Don't build tex2rtf and HelpGen utils in non-GUI buildbot builds.
Both of those are obsolete and don't exist in 2.9 any longer.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74512 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-14 11:32:46 +00:00
Vadim Zeitlin
330d01ae47 Better fix for wxX11 linking problems than r74499.
Fix wxX11 without breaking wxGTK/Windows makefiles generation.

Closes #15327.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74510 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-13 23:35:55 +00:00
Dimitri Schoolwerth
49e6c3d6cc Regenerated Xcode projects.
Updated the Xcode projects to include wakeuppipe.cpp.
Also fixes the wxiphone project which appeared to have 2 source file references concatenated (stattext.mm and slider.mm) since the last commit. This unfortunately happens sometimes when running makeprojects.applescript.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74503 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-13 21:59:26 +00:00
Vadim Zeitlin
5b608795d4 Use "MSW" and "Windows" more accurately to avoid confusion.
"MSW" is used as the name of toolkit using the standard Windows UI while
"Windows" is the name of the OS under which wxGTK can be now used too (in
addition to wxMSW).

This terminology is not perfect but at least let's keep it unambiguous.

Closes #15328.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74502 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-13 20:07:51 +00:00
Vadim Zeitlin
46ba8e87c7 Do include src/generic/animateg.cpp in wxUniv/X11 sources.
This fixes linking of the widgets sample when using wxUniv/X11.

It partially reverts the changes of r73290 which only included this file in
some selected ports instead of all of them for some reason.

Closes #15327.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74499 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-13 13:03:09 +00:00
Vadim Zeitlin
20125017a4 Extract compiler-specific macro definitions in a new wx/compiler.h.
This solves the problem with wx/defs.h -> wx/platform.h -> wx/setup.h which
resolves to msvc/wx/setup.h -> wx/version.h -> wx/cpp.h include path which
resulted in __VISUALC__ not being defined in wx/cpp.h.

This problem was not new but went unnoticed for a long time and was only
discovered when wxCHECK_VISUALC_VERSION() started being used in wx/cpp.h too
as now the compiler started warning about wrong #if syntax due to it being
undefined.

Putting the compiler-specific definitions in a separate file allows this file
to be included from wx/cpp.h to ensure that these symbols are always defined
in it and also makes things a little better organized.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74496 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-13 02:30:21 +00:00
Vadim Zeitlin
497b4e64ce Fix checking for GTK+ 3.0 in configure.
Update gtk-3.0.m4 to work correctly with gthread module and regenerate
configure using the new version of this file.

Closes #15319.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74475 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-10 20:48:48 +00:00
Václav Slavík
661698e54f Define WXBUILDING in Xcode projects.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74471 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-10 16:35:07 +00:00
Vadim Zeitlin
d53c1e7b09 Define XML_STATIC in Expat header instead of Expat projects.
This reverts r74444 and defines XML_STATIC unconditionally in Expat sources
themselves as we always use the built-in Expat as a static library, so this
solution is simpler and more portable.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74446 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-07 14:44:56 +00:00
Vadim Zeitlin
23cebdf4f5 Define XML_STATIC for Expat build to fix linking of Windows DLLs.
The new Expat assumes it's built as a DLL by default, define XML_STATIC to
indicate that this is not the case as we always build it as a static library.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74444 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-07 13:58:33 +00:00
Vadim Zeitlin
0053219faf Remove the TOOLKIT test from msvc-headers-setuo-h definition.
This is unnecessary now that TOOLKIT is back to being a constant again and
results in errors if GTK TOOLKIT is enabled.

Closes #14965.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74438 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-07 12:58:45 +00:00
Vadim Zeitlin
11a3e7b6da Update the version of Expat used to 2.1.0.
Merge with the latest version, mostly discarding our changes to 1.95.6 as they
seem to be unnecessary any longer, keep just bakefile-specific addition to
configure.

Also update our own makefile to define HAVE_EXPAT_CONFIG_H which is now needed
by Unix build.

Closes #11677.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-07 12:45:30 +00:00
Vadim Zeitlin
c80ae45452 Only link with libwxscintilla if using Scintilla is enabled.
Correct the changes of r74408 to avoid using libwxscintilla if we don't build
it at all.

See #13837.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-06 19:14:59 +00:00
Paul Cornett
79bca169e5 move treeentry_gtk.h to include/wx/gtk/private/
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74416 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-06 15:44:21 +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
f901941933 Make TOOLKIT variable constant in MSW makefiles.
This fixes duplicate lines defining rules for generic files for more than one
port in the makefiles.

Closes #14979.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74406 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-06 11:59:35 +00:00
Vadim Zeitlin
2ccfebab09 Extract PipeIOHandler class into a header and rename to wxWakeUpPipe.
No real changes to the class, just make it possible to reuse it outside of
Unix wxEventLoop code.

See #10258.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-03 00:27:28 +00:00
Stefan Csomor
6b34995cc6 partial revert, as we still need Xcode 3.1 for 10.5, Xcode 3.2 is 10.6+ only
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74269 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-06-20 07:22:00 +00:00
Stefan Csomor
629a9eb730 update Xcode format
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74268 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-06-20 07:13:44 +00:00
Stefan Csomor
52c46c7ea0 common schemes, Xcode 4/5 updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74267 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-06-20 07:09:27 +00:00
Stefan Csomor
771a3ee1d9 updated project files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74265 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-06-20 06:54:55 +00:00
Stefan Csomor
ac732982f8 update project files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-06-19 16:35:18 +00:00
Stefan Csomor
158ba0c276 updated Xcode project files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-06-02 15:02:06 +00:00
Vadim Zeitlin
691745ab41 Add a public wxModalDialogHook class for intercepting modal dialogs.
Extract wxModalDialogHook from wx/testing.h into its own wx/modalhook.h,
extend it to allow to be notified not only about showing modal dialogs but
also about dismissing them and document it and show its use in the dialogs
sample.

Also replace all the WX_TESTING_SHOW_MODAL_HOOK macros occurrences with
WX_HOOK_MODAL_DIALOG.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74037 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-05-20 13:15:41 +00:00
Robin Dunn
933f92684f revert part of last change, run configure from the builddir or cwd, not from configure's location.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73866 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-04-26 16:48:23 +00:00
Robin Dunn
dd203d5b86 Changes needed to help builder.py be more generic and working well with other modules
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73855 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-04-26 06:37:17 +00:00
Robin Dunn
9ad2035a4f also check for the SDK in subtrees used by newer XCodes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73807 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-04-10 23:06:21 +00:00
Vadim Zeitlin
5b45240914 Remove rightarr.cur which doesn't exist any more from files list.
This should have been part of r73491, see #14991.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73791 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-04-08 10:03:55 +00:00
Václav Slavík
45c363c5eb Use the same wxDEBUG_LEVEL settings for Xcode projects as elsewhere.
Use the same debug flag default settings in the build/osx Xcode projects
as are used by all other makefiles and projects - that is,
wxDEBUG_LEVEL=1.  This is done automatically by the headers, no need to
define any extra symbols when building.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73773 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-04-03 18:13:30 +00:00
Robin Dunn
7c3f702506 don't use string module
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73603 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-03-05 06:50:28 +00:00