Commit Graph

92 Commits (59e98903b8564f06996f2c27a4d876f642699ed2)

Author SHA1 Message Date
Buginator 1c4c1cc5bd Fix exception handler to obey UAC on windows machines.
It will write the crash report file to CSIDL_PERSONAL (c:\Users\user name\Documents\logs\warzone2100.rpt)

*All* platforms will now always have --debug-file enable as a default. This will write the logs to <configdir>/logs/WZlog*.txt

When a user overrides the configdir, then we will try to use that directory instead of the default as well.

refs ticket:1759

2.3: r10532


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10538 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-12 11:59:41 +02:00
Giel van Schijndel 9c340eb3f7 Use winsock 2 on all build systems (not just autohell like in r7284)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7297 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-06 22:29:37 +02:00
Giel van Schijndel 939f4902ad Replace SDL-net by using BSD sockets instead
NOTE: Still needs some checking and work for Windoze compatibility.

Addresses #435

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7286 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-06 22:29:35 +02:00
Giel van Schijndel d871a85964 Add video playback support:
* Add support for decoding and displaying of OggTheora/Vorbis videos
 * Change all references to *.rpl files to *.ogg files (and lower case them)
 * Add a new menu (and config) option for selecting the size at which to display videos (1x (native), 2x, full screen)

This closes ticket:64 and ticket:46

Code changes are ticket:64 (patch by Gerard Krol, Giel van Schijndel and Buginator)

FMVs can be found at http://download.gna.org/warzone/videos/sequences_ogg.zip (for now at least)
Videos encoded by Angus Lees


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6119 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-08 18:24:19 +00:00
Giel van Schijndel 0651625733 * Remove unused variable `line_num`
* win32 Makefile system:
  * Compile with debug symbols and all warnings enabled on both debug ''and'' non-debug builds
  * Only use -Werror-implicit-function-declaration when compiling C sources, as for C++ implicit function declarations are illegal anyway (and g++ thus doesn't like this compiler option)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5647 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-23 13:59:12 +00:00
Giel van Schijndel c1fb0af729 * -mwindows is a linker flag, so move it from CFLAGS and CXXFLAGS to LDFLAGS
* autorevision is a command line utility, not a GUI program, so strip the -mwindows flag from its linker flags

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5646 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-23 13:48:50 +00:00
Dennis Schridde 022315eef0 Hardcode top_srcdir to make building from non-topdir possible, dont depend on the touch command, fix LDFLAGS to not depend on the removed TARGET variable
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5476 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-10 20:10:16 +00:00
Giel van Schijndel 77bc79ab88 Remove the TARGET option (I shouldn't have added it back) and select the windows-specific link line for the win32 makefiles
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5475 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-10 19:52:33 +00:00
Giel van Schijndel 6fcbc73c2c Merge the DATA build option (for the win32 makefile build system) into INSTALLER as the data packages are only required when building an installer
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5473 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-10 17:51:31 +00:00
Giel van Schijndel a81de28500 Add the TARGET option to the win32 makefile system's config template
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5472 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-10 17:36:37 +00:00
Giel van Schijndel d914e3cccd Don't use the `mingw32-` prefix in the win32 makefiles, as MinGW's default distribution doesn't provide all executables with `mingw32-` prefix, but it does provide all of them without the prefix
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5471 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-10 17:26:11 +00:00
Giel van Schijndel da5f5edd81 include config.mk from the `makerules` directory, not the base/root directory
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5470 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-10 17:19:17 +00:00
Dennis Schridde faf8153b50 Old versions for Flex do not like the space in -o filename
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5463 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-10 09:35:10 +00:00
Dennis Schridde b770951532 makefile.raw -> makefile.win32
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5457 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-09 19:17:15 +00:00
Dennis Schridde bb9e24cf3f Reduce "raw" Makefiles to "win32" Makefiles by removing logic from configure.mk
Command variables stay, but DIRSEP variable got removed

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5401 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-06 14:28:50 +00:00
Dennis Schridde 45f23a4926 Merge commit 'HEAD@{3}'
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5347 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-28 22:32:44 +00:00
Dennis Schridde fcd1455f44 Merge commit 'HEAD@{4}'
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5346 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-28 22:32:14 +00:00
Dennis Schridde 68ad79d44a Move warning flags out of CPPFLAGS for raw Makefiles
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5344 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-28 15:58:51 +00:00
Dennis Schridde 89f6301a6f Do not create or remove subdirs if we are building directly from the source directory
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5339 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-26 18:20:54 +00:00
Dennis Schridde 7af41b6f3a Substitute / with $(DIRSEP) where necessary. Fixes last remainder of bug #11883 (hopefully).
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5326 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-25 00:13:18 +00:00
Dennis Schridde 050ec39c11 Use the (also new in this commit) relative variants of the directories almost everywhere.
Exception is when generating the .wz files, where we need the path to the build directory and building a reverse relative path to $(srcdir) will be messy.
Also silence submake.mk a great deal.
Bug #11883 should be fixed now for the most part.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5325 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-24 23:41:52 +00:00
Dennis Schridde 876b00154a Forgot one uppercase makefile.raw...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5324 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-24 23:19:09 +00:00
Dennis Schridde 286aea9a79 Do not abort if mkdir complains about already existing directories.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5323 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-24 22:53:30 +00:00
Dennis Schridde 16bd0a829a Part of bug #11883: Issues with the improved raw Makefiles.
- Provide the missing Windows commands
- Remove TEST_D, because it has no suitable syntactical equivalent on Windows.
   (Just create directories unconditionaly. You will probably notice if there exits a file of the same name...)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5320 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-24 22:34:56 +00:00
Dennis Schridde 73b35ab8d6 Rename top_srcdir/top_builddir to abs_top_srcdir/abs_top_builddir, to make this more obvious.
Their use is currently flawed, since it will not work in directories with spaces in them... (


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5319 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-24 20:19:54 +00:00
Dennis Schridde 9bd8b24921 Boost raw Makefiles
- Use PACKAGE, PACKAGE_VERSION, remove VERSION
- Allow out-of-source-dir builds (mkdir build && cd build && make -f ../Makefile.raw)
- Move config.mk from $(top_srcdir)/makerules/config.mk to $(top_builddir)/config.mk
   When keeping current behaviour (srcdir=builddir), this means: Move it from makerules into the main directory


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5308 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-23 13:54:47 +00:00
Giel van Schijndel 55d0221158 make *.lex.h depend on the FLEX rule as well for the raw Makefile system
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5029 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-10 21:28:06 +00:00
Giel van Schijndel 73be5e4b4d Add BUILT_SOURCES and CLEANFILES to the raw Makefile system as well (similar to the vars with the same name in automake)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5028 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-10 21:13:14 +00:00
Giel van Schijndel 0f71381685 Lets use some proper make rules!
* Use $@ and $< to refer to the targets and dependencies of make rules
 * Don't refer to make rule dependencies and targets by copying them!
 * Putting make rules on multiple lines isn't bad, in fact it increases readability!
 * Mark phony make rules (i.e. rules who's actions don't produce files) as `.PHONY`

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4846 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-28 20:58:13 +00:00
Giel van Schijndel a5a74770e8 Allow proper linking of the exceptionhandler with the raw Makefile system
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4845 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-28 20:46:33 +00:00
Giel van Schijndel fdcadfcc8f Compile & link in Dr. MinGW's exceptionhandler
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4490 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-05 16:15:14 +00:00
Giel van Schijndel 465d5d73fe Use $(CPPFLAGS) as well when compiling with the raw makefile system
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4488 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-05 15:58:25 +00:00
Dennis Schridde bf93d41317 It's libGLC in the devpkg, not libglc32... Perhaps that's a mistake in OpenGLC's buildscripts...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3495 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-15 23:26:13 +00:00
Dennis Schridde 72419616fa Link against libpng12, so the libpng12.a symlink issue in the devpkg is not anymore noticed. (People having moved their libpng12.a should move it back...)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3493 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-15 22:39:23 +00:00
Dennis Schridde fc384c7c44 Apparently Make doesn't expand CFLAGS in CXXFLAGS+=$(CFLAGS), so duplicate the line instead...
Also use GNU99 instead of C99 and CXX for .cpp files.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3489 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-15 19:35:04 +00:00
Dennis Schridde d1f744e97c Move c99 out of cxxflags...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3488 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-15 19:23:31 +00:00
Dennis Schridde 97244be45d Properly define C(XX)FLAGS instead of modifying Make rules.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3487 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-15 19:16:02 +00:00
Giel van Schijndel 70b196b017 * Only use -Werror-implicit-function-declaration when compiling C code (not when compiling C++)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3486 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-15 19:02:26 +00:00
Giel van Schijndel 238aa3e9e4 * Compile C files as C99 with the raw Makefile system
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3485 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-15 18:23:48 +00:00
Dennis Schridde bbbd4942fe Move the deps of our deps to the right of our deps...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3419 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-09 20:51:48 +00:00
Dennis Schridde e7ed93d5f9 - Move libraries to satisfy our dep's deps out of the PLATFORM choice, since they would be the same for windows and mingw32.
- Link against GLC instead of glc32 for windows, since that is what the devpkg contains.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3418 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-09 20:26:29 +00:00
Dennis Schridde f6a9f7c864 - Link against all required libs for PLATFORM=windows (How shall mingw32 be treated? Does make's syntax allow an OR? Then we could unify them again...)
- Remove -L. for mingw32, since libdbghelp.a is now included in the devpkg.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3417 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-09 20:23:23 +00:00
Dennis Schridde ca607873eb Correct include paths for Makefile.raw:
- Include include/ after any other dir
- Add include/libpng12 to the paths


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3414 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-08 23:01:54 +00:00
Giel van Schijndel d135ff55a0 * Update the raw Makefile config.mk template
* Don't comment out the defaults as they're quite sane
  * Use C:/devpkg as the default DEVDIR
  * Add a comment above the stuff that's only needed for distributors

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3385 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-06 16:10:08 +00:00
Giel van Schijndel 06f01e129a * #Define PACKAGE_VERSION instead of VERSION in the raw Makefiles (synonymous to r3125 which was for the Code::Blocks project file)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3141 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-23 19:58:20 +00:00
Dennis Schridde 9cc0a628c1 Do parts of the proposed changes in "[Warzone-dev] build issues in FreeBSD system" by Yaroslav Kolomiyets from 24.10.2006:
- SDL header includes don't use SDL/ anymore (raw Makefiles and MSVC Project adapted).


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2863 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-24 11:49:51 +00:00
Giel van Schijndel ed950825a9 * Utilize the Popt library for command line parsing
* Add popt as a build dependency to build systems:
   * autotools
   * Debian package build-depends
   * raw Makefiles
   * Code::Blocks project file
 * Make ParseCommandLine and ParseCommandLineEarly const correct
 * Rewrite ParseCommandLine and ParseCommandLineEarly to utilize Popt


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2800 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-11 17:59:32 +00:00
Giel van Schijndel 59c1b8fc11 * Add AutoRevision to raw makefile system
* Set raw makefiles up to use AutoRevision to generate src/autorevision.h

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2722 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-05 02:29:46 +00:00
Giel van Schijndel ac6069f791 * Make sure the raw Makefiles link against GLC
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2543 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-11 22:55:34 +00:00
Giel van Schijndel aaf2a42747 * Synchronize raw Makefile system with changes to NSIS file in r2466
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2475 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-25 16:11:24 +00:00