Commit Graph

64 Commits (8919334d9bbb998b34d296250549fc13e80be83e)

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 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 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 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 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 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
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
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 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 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 e28c8c4606 * Add support for compiling with gettext to the raw Makefiles (note this _does_ require the latest devpkg)
* Add the ability to compile .mo catalog files from gettext .po files to the raw Makefiles (all catalog files are dumped into data/locale)
 * On Windows make gettext use the LOCALEDIR (as defined in makerules/config.mk) which is a subdirectory of the directory that contains Warzone 2100's executable as it's locale directory

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2394 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-16 22:50:05 +00:00
Giel van Schijndel aa9a519794 * Remove support for decoding (and encoding in case of screenshot dump code) of JPEG pictures
* Remove some dead (commented out) & dirty code from multiint.c which used JPEG code (image_load_from_jpg)
 * Remove dead (commented out) code from screen.c which used JPEG code (function static GLuint image_create_texture)
 * Remove unused backdrop types from pieblitfunc.[ch]
 * Convert last JPEG files into PNG, add a "comment" property on those: "All of these are converted from JPEG files, so this is JPEG quality."

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1490 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-17 18:24:31 +00:00
Giel van Schijndel 51347f365c * remove MP3 decoding support
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1472 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-16 13:44:41 +00:00
Giel van Schijndel ee27f41be7 * add -Werror-implicit-function-declaration to CFLAGS
* Fix a spelling error in a string in src/droid.c
 * `make -C po update-po`

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1406 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-09 15:02:04 +00:00
Giel van Schijndel 0730665b1e fix raw makefiles
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1338 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-02 20:49:14 +00:00
Dennis Schridde 1f51cc6520 Adapt raw Makefiles to r1164
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1166 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-23 17:27:33 +00:00
Per Inge Mathisen 9a0d08f699 Clean up IMD loading, informed by -Wextra, removing lots of redundant and
unused code. Also add -Wno-unused-label to Makefile.raw builds, too, to
skip the warning generated by flex that we cannot fix.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1148 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-19 17:37:11 +00:00
Dennis Schridde c557889c92 Without -g no debug info at all is placed in the exe...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1113 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-15 12:37:59 +00:00
Dennis Schridde db78168f8a Don't enforce -g0 and -O2 and while we are at it remove the useless -g2, which is the default level of debugging.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1104 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-14 17:50:12 +00:00
Giel van Schijndel 0fcfaebdd0 fix linker order:
* PHYSFS sometimes depends on libZ (e.g. when PHYSFS_close is called on an opened file, which it now probably never is since WZ links fine with wrong linker order)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1091 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-11 13:28:44 +00:00
Dennis Schridde 73121112c9 - Finally Win98 compatible again!
- We apparently missed a contributor in the AUTHORS file...


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1023 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-21 18:15:18 +00:00
Dennis Schridde 0f0da23e46 Raw Makefiles: Compatibility fix for make versions < 3.81
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1009 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-15 13:26:01 +00:00
Dennis Schridde 8636f63a4c Raw Makefiles: Forgotten support for mingw32 libaries
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1003 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-13 21:16:18 +00:00
Dennis Schridde 52f1b21e24 Raw Makefiles:
- Check for MAKENSIS if INSTALLER is set
- Seperate windows-support from mingw32-support


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1000 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-13 20:55:33 +00:00
Dennis Schridde 2e967ee264 More merging and Makefile improvements:
- Remove (wrong) double definition of main
- Make enabling/disabling of DATA and INSTALLER easier in raw Makefiles
- Remove COMPRESS and COMPILER from raw Makefiles
- MAKENSIS is no longer mandatory for raw Makefiles


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@979 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-09 01:28:01 +00:00
Dennis Schridde f28630f634 Forgotten change
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@978 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-08 23:48:12 +00:00
Dennis Schridde 027b868929 Change libraries for raw Makefiles again. This should now more closely represent the sdl-config.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@976 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-08 23:25:38 +00:00