817 Commits

Author SHA1 Message Date
aquileia
ed780b0058 vcproj: Disable stack validity check
The instructions to confirm the stack pointer position led to poorly
optimized code and abysmal performance. This made the debug configuration
basically useless.

This fix is based on
randomascii.wordpress.com/2011/07/22/visual-c-debug-buildsfast-checks-cause-5x-slowdowns/
2015-12-03 08:58:37 +01:00
Andreas Löf
81480d1d77 Merge branch 'master' into sdl2 2015-12-01 22:33:24 +13:00
aquileia
5d825d4aca vcproj: Update for 53ed94d & aae8e70
[skip ci]
2015-11-24 22:02:33 +01:00
Ignacio R. Morelle
53ed94da25 log/windows: Integrate implementation of --wconsole
This makes it so we no longer try to steal the console back to a log
file when using --wconsole with the new redirection code. Now the
--wconsole switch triggers a special mode of the log file manager that
uses a native console instead of log files.

As a necessary bonus to appease compilers, the GUI2 version info dialog
now uses the correct log file path when not started with the --wconsole
switch. Yay!
2015-11-23 03:42:14 -03:00
Ignacio R. Morelle
aae8e70c7a log/windows: Add our own stdout/stderr redirection on Windows
This replaces SDL 1.2's built-in stdout/stderr redirection, which writes
the log file to the process working directory (usually an
admin-restricted location) instead of a more accessible user-writable
location.

My approach combines stdout and stderr into a single log file which
includes the process id and timestamp in its filename in order to
accomodate multiple instances and (coming later) log rotation. The log
file is created in the user's temporary directory defined by Windows,
and then relocated to the game user data dir as soon as it is set-up the
first time, placed in the Windows-specific logs/ subdir.

The most pressing issues this solves are the lack of built-in
stdout/stderr redirection in SDL 2's SDL2main.lib entry point, and
Unicode path issues with SDL 1.2 (bug #22897). Additionally, it allows
us to not have to rely on UAC virtualization anymore; this is arguably
far more important because it has been known to break on occasion (e.g.
<http://r.wesnoth.org/t42970>), and starting with version 1.13.2 we want
to declare Windows Vista - 10 compatibility in our side-by-side manifest
(see commit e119f4071f047c6d740ebec4636985fdf39349bc).

Currently missing features coming later:

 * Log rotation (otherwise the logs/ dir may grow forever)
 * wesnothd support (although the code is already required to be linked
   into wesnothd due to it being required by the FS API)
 * Integration with the version info dialog
2015-11-23 03:21:42 -03:00
Andreas Löf
1890e948e4 Merge branch 'master' into sdl2 2015-10-26 18:57:32 +13:00
aquileia
74c1b6fade vcproj: Remove unneeded tools
The Proxy Generaor Tool is obsolete since VC10, we don't use the IDL compiler.
2015-10-25 19:12:23 +01:00
Charles Dang
c7aa47443d CB Project: replaced DWINVER with _WIN32_IE
The former doesn't appear to do anything and was probably a typo
2015-10-21 14:44:01 +11:00
Andreas Löf
ae1d364318 Merge branch 'master' into sdl2 2015-10-15 09:57:15 +13:00
aquileia
45c1872777 vcproj: Improve formatting
Delete occurences of the UTF-8 BOM, fix version recognition of 'Visual Studio Version Selector' for Visual C++ 2008
2015-09-27 14:20:28 +02:00
aquileia
eb55fe772f vcproj: SDL2 update 2015-09-25 21:35:34 +02:00
aquileia
02563ac176 vcproj: Update for 3c11aa6 & 3ed4eed 2015-09-25 14:25:20 +02:00
aquileia
74bf61c424 vcproj: Update for 3c11aa6 & 3ed4eed 2015-09-25 14:22:01 +02:00
Celtic Minstrel
eebe3cfb75 Revert f0a837227824a055362296b7db423bcdc7354c38 for SDL1.2 only 2015-09-23 23:34:24 -04:00
Celtic Minstrel
f0a8372278 OSX: Remove SDLApplication class as SDL2 also implements it
This fixes a runtime warning about duplicate class definitions
(All the menu stuff still works.)
2015-09-23 23:26:27 -04:00
Celtic Minstrel
c68fc094d7 XCode: Fix unresolved merge conflict 2015-09-23 22:42:24 -04:00
Andreas Löf
9ae3b29f4a Merge with master 2015-09-21 23:07:49 +12:00
Celtic Minstrel
a3e3f5e719 Update XCode project file 2015-09-20 19:37:21 -04:00
Celtic Minstrel
6a09ef61e7 Update XCode project file 2015-09-20 19:30:54 -04:00
Charles Dang
a4fe9c0474 Updated codeblocks projectfile 2015-09-21 07:44:23 +11:00
mattsc
6a3a346e41 Xcode project: do not warn about unused local typedefs
Otherwise Xcode 7 (and its version of clang) produce more than 100
boost related unused typedef warnings.
2015-09-19 15:27:17 -07:00
aquileia
6dd554c979 Update vcproj for 7875501, 20fafde & 0abde38 2015-09-19 21:31:58 +02:00
Andreas Löf
22cff55dc8 Merge pull request #475 into sdl2 from CelticMinstrel:quit-confirm2 2015-09-11 18:55:11 +12:00
Charles Dang
9ca044abdb Updated codeblock projectfile 2015-09-10 15:00:53 +11:00
Celtic Minstrel
480a2a746c XCode project: Remove -Werror setting 2015-09-09 22:49:04 -04:00
Celtic Minstrel
348f3b480b Update XCode project 2015-09-09 21:55:05 -04:00
Celtic Minstrel
b0ecf09ee9 Finish changes for XCode SDL2 compilation to work 2015-09-09 11:42:35 -04:00
Andreas Löf
9204d0af45 Remove SDL_main from OSX entry point under SDL2
SDL_main is not used any longer in SDL2. These changes instead call
direcly into the wesnoth main function after setting up the OSX
environment.
2015-09-09 11:42:27 -04:00
Celtic Minstrel
9ffec1e33e Update XCode project to build against SDL2 instead of SDL1.2 2015-09-09 11:42:21 -04:00
mattsc
1d4bde10f6 Update Xcode project file 2015-09-02 07:19:25 -07:00
Charles Dang
6c333d8278 Updated cb projectfile for 0abde389dc1a 2015-09-01 22:56:10 +11:00
mattsc
f8dc5d027c Merge pull request #464 from CelticMinstrel/trans
XCode: Copy translations to target if they have been built
2015-08-25 20:02:32 -07:00
Ignacio R. Morelle
92dd610d4c fs: Remove Windows-only bits of the legacy filesystem API implementation
These aren't used by anything else.
2015-08-23 17:28:40 -03:00
Charles Dang
9c2c079a3a Dropped HAVE_PYTHON and USE_GZIP defines
As far as I can tell, these do nothing
2015-08-23 10:37:28 +11:00
Celtic Minstrel
113cd70616 XCode: Copy translations to target if they have been built 2015-08-22 16:48:53 -04:00
mattsc
6a37f437be Xcode project: update pango modules
The previous version of the modules worked only with OS X 10.9. This
version works with both 10.10 and 10.9 (and potentially with 10.8; we
currently have no 10.8 system available for testing).

These modules do not work on OS X 10.6 and 10.7. Different methods of
building Wesnoth will be provided for those OS X versions (and
potentially for 10.8).

OS X 10.5 and earlier is no longer supported by Wesnoth 1.13 (that is
unchanged by this commit).
2015-08-16 19:16:11 -07:00
Charles Dang
565caec797 Updated codeblocks readme 2015-08-17 10:10:36 +11:00
Martin Proud
7f57d911b8 Merge pull request #448 from CelticMinstrel/master
Reorganize XCode project
2015-08-15 00:31:19 -05:00
aquileia
5cf8cf2b32 vcproj: Fix File node from PR #447 2015-08-12 00:29:13 +02:00
Celtic Minstrel
bec2e6259e Reorganize XCode project
- All files are now ordered alphabetically.
- All referenced header files are now known to the project file.
- Duplicated references to source files and libraries are removed.
- References to defunct sources are removed.
- Source files are now largely stored in a structure mirroring the file system structure,
meaning a few new added groups and some files moved around (some of which were
in nonsensical places before).
2015-08-08 21:28:26 -04:00
Celtic Minstrel
f619b4cc63 Update build stuff
(Sconscript, CMakeLists, tests, project files)
2015-08-07 22:50:34 -04:00
Celtic Minstrel
819eab2f96 Add dialog to allow user to customize which label groups are displayed 2015-08-07 16:44:50 -04:00
mattsc
f168f1d3e2 Update Xcode project file 2015-07-30 10:41:46 -07:00
Charles Dang
e7345dd69a Updated codeblocks projectfile to use boost 1.58 libs 2015-07-30 17:53:19 +11:00
aquileia
db5bae762d vcproj: Add debug settings via .vcxproj.user
As user options aren't upgraded with the solution, we provide them in both
formats.
2015-07-28 16:04:29 +02:00
aquileia
d279aa4afe vcproj: Fixes and cleanup
Fixed an issue caused by 659b9a4 - the 'Start Debugging' option was
basically useless as the process terminates itself if OMP_WAIT_POLICY
isn't defined.

Cleaned up unnecessary configurations for WindowsTimeout.

Fixed duplicate manifest.

Disabled WML unit tests on MSVC Debug builds as they would quintuple build
duration (over 60s per test).

Re-enabled stdout redirection in WML_tests.cmd to avoid spamming the
command line.

Updated vcproj for daa2140 (added multimenu widget).
2015-07-26 15:05:38 +02:00
aquileia
cbd024fea9 vcproj: Add png screenshot support 2015-07-26 15:05:36 +02:00
Charles Dang
f374f537b2 Updated codeblocks projectfile 2015-07-26 03:52:14 +11:00
aquileia
00259251fa vcproj: Merge manifest information 2015-07-24 02:42:01 +02:00
Ignacio R. Morelle
877ead550a Add Windows resource file for wesnothd 2015-07-20 21:16:04 -04:00