Commit Graph

142 Commits (29201b4c539749a0d743fe9ff90d8bdb4b92aa04)

Author SHA1 Message Date
Guangcong Luo 5a974ed226 Windows installer fixes:
* Make the cross-compile script Ubuntu-compatible
 * Don't redownload the music mod if we already have it
 * Download sequences (if we don't already have it)
 * Remove EULA agreement (The GPL is not a EULA)
 * Install OpenAL silently (Its license is not a EULA; see ML discussion)

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7327 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-06 22:29:40 +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 8f7322f717 Improve buildsystem for cross compiling
* Make sure to pass CXXFLAGS to ./configure as well
 * Allow for overriding of CFLAGS and CXXFLAGS when building for the building system
  - CFLAGS_FOR_BUILD
  - CXXFLAGS_FOR_BUILD

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7283 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-06 22:29:34 +02:00
Gerard Krol 5601741b95 Brace for impact, this is the new terrain renderer!
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6682 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-21 23:35:21 +00:00
Per Inge Mathisen ac5170ab5d Remove more dead gateway code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6665 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-19 21:14:24 +00:00
Buginator 55d3044f15 Updated MSVC project & solution file(s).
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6637 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-15 05:42:09 +00:00
Dennis Schridde aac41748dc Bump copyright
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6617 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-10 18:01:48 +00: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 becaf21060 Revert r6058: I stupidly used "git svn dcommit" instead of "git stash pop" (yes I know they don't even look the same...)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6059 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-20 15:54:41 +00:00
Giel van Schijndel 53d6990a55 Initial FMV support
patch: http://developer.wz2100.net/attachment/ticket/64/FMV5c.patch

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6058 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-20 15:52:01 +00:00
Giel van Schijndel 043cc9d278 Fix a spelling error in the MSVC project files causing problems with the #include path
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6027 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-14 19:47:56 +00:00
Giel van Schijndel 140f553d06 * Change the autotools build system such that if the system provides an SQLite version that meets our requirements we use that instead of the one in our own repository
* Require sqlite3 versions >= 3.5.4 and < 3.6 (due to r5984 these versions are possible)
 * Move physfs_vfs.[ch] from lib/sqlite3/ to lib/framework/
 * Update the autotools, raw win32 Makefile, Code::Blocks and MSVC build systems
  - NOTE: Xcode still requires an update

This closes ticket:59


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6018 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-14 13:40:28 +00:00
Giel van Schijndel 360dc86ef4 * Make CHECK_OBJECT, CHECK_PROJECTILE and CHECK_STRUCTURE macros that redirect to a function
* Add two new files: src/baseobject.[ch]
 * Have CHECK_OBJECT call any of CHECK_DROID, CHECK_PROJECTILE or CHECK_STRUCTURE depending on the object's type
 * Change CHECK_DROID and checkDroid to use the AT_MACRO to get the current filename and line number
 * Change checkDroid to use ASSERT_HELPER to provide the source of the assertion

NOTE: The autotools, Code::Blocks, win32 Makefiles and MSVC buildsystems are updated, Xcode will still require an update

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5866 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-24 15:56:00 +00:00
Giel van Schijndel ced8a64ad1 Revert r5768 which got committed accidentily
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5772 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-03 23:09:33 +00:00
Giel van Schijndel d54e360aa7 Add some code to hook into Mumble's Link plugin and provide Mumble with positional information about the player's current viewing position in Warzone
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5768 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-03 20:53:14 +00:00
Giel van Schijndel 763bc7bbd8 Add a new parser: message_parser which parses research message data in a significantly different format from the current CSV message format as "parsed" by loadViewData (this allows for easier gettext translation)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5695 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-28 21:01:05 +00:00
Giel van Schijndel 410c511363 Don't duplicate $CFLAGS in $__BOTHFLAGS
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5624 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-20 23:22:36 +00:00
Giel van Schijndel 09f59a0200 Use some more options from the __BUILD_CONFIG.USER file in __BUILD_CONFIG
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5623 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-20 23:15:37 +00:00
Giel van Schijndel 5526f2c61a * Move type OBJECT_POSITION (and macro POSITION_OBJ to declare it) from structuredef.h to the new file positiondef.h
* Update build systems: autotools, raw win32 makefiles, Code::Blocks project and MSVC project
 * Rename _droid and _base_object forward declaration types to DROID and BASE_OBJECT respectively
 * Add two forward declarations for BASE_OBJECT and DROID to scriptfuncs.h so that it can declare pointers to these types
 * src/messagedef.h depends on lib/ivis_common/ivisdef.h and src/positiondef.h so #include those
 * Don't #include stuff from src/ in lib/script/chat_processing.h
 * Remove all unnecessary #inlucdes from src/ from lib/script/chat_lexer.l

NOTE: Build systems not mentioned above might need updating.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5531 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-13 18:15:03 +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
Dennis Schridde 302a557478 Rename "raw" Makefiles to "win32" Makefiles
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5402 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-06 14:29:04 +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 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 fd2bfb0e0f Prepare for another fix for parts of bug #11883: Issues with the improved raw Makefiles
- Rename Makefile.raw to lowercase


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5321 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-24 22:48:45 +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 1aa21f208e * Update Debian changelog
* Fix win32 version info
  * We live in 2008 now...
  * Use 2.0.993.0 instead of 2.0.3.0 for 2.1 beta3 (the same scheme was used for beta1 & beta2)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5227 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-07 12:26:03 +00:00
Giel van Schijndel 6a5ee556f6 Revert r4830:
* This should fix a heap corruption introduced with the new level_parser

Closes #9 ( http://trac.wz2100.net/ticket/9 )


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5163 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-24 12:20:23 +00:00
Giel van Schijndel f0e80e53c4 Update MSVC project file for addition of parsetest code to --selftest in r5060 (I accidentily committed that together with the fix to lib/event/event.c)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5062 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-12 12:41:54 +00:00
Roman C 1521a97bd8 Suppress #line creation for scriptvals_parser and level_parser, this fixes MSVC compilation.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4857 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-29 15:22:27 +00:00
Giel van Schijndel df291b43fc Update the Code::Blocks and MSVC projects for the addition of the level parser in r4830
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4831 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-28 00:11:37 +00:00
Giel van Schijndel cf04b1797d Pass all "non-special" parameters from __BUILD_SCRIPT to the configure script
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4702 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-20 19:24:02 +00:00
Giel van Schijndel a85956c8df Make building with multiple threads (make -j3) optional for the crossbuild script
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4668 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-17 16:09:14 +00:00
Giel van Schijndel 0b96e9ba0a Add the ability to the crossbuild script to build with --enable-debug=relaxed
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4665 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-17 15:48:41 +00:00
Giel van Schijndel 7b46d4ba9a Parse through all commandline parameters to the crossbuild script by means of a for-loop
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4664 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-17 15:02:53 +00:00
Giel van Schijndel 40cc8f09ac Give the configure and crossbuild scripts the possibility to specify the compression method on the command line (--with-nsis-compression)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4663 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-17 14:32:48 +00:00
Giel van Schijndel 3e825febcd Update the Code::Blocks and MSVC projects for r4637
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4638 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-15 20:55:57 +00:00
Giel van Schijndel 11c5df9783 Dang, I should go to bed... r4600 contained yet another stupid error
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4601 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 02:19:28 +00:00
Giel van Schijndel fd0b4b56af Fix small error from r4599
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4600 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 02:15:07 +00:00
Giel van Schijndel f1ac1acad0 Use file __BUILD_CONFIG.USER for user specific configurations
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4599 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 02:09:33 +00:00
Giel van Schijndel cc46c9c737 Use ${PREFIX} as installer-extdir instead of ${PREFIX}/bin
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4598 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 02:00:36 +00:00
Giel van Schijndel e7a54e8ca3 Keep debug disabled when building an installer...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4597 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 01:51:16 +00:00
Giel van Schijndel 826dd585f3 Use ${CONF_EXTRA_FLAGS} for disabling/enabling debug builds
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4596 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 01:46:54 +00:00
Giel van Schijndel 150d50a6ae * --disable-debug (i.e. do a "release build") when crosscompiling for Windows
* Change directory to the root of the working copy when crossbuilding


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4594 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 00:35:06 +00:00
Giel van Schijndel 7ed537a019 Pass the ${PREFIX} variable from the crossbuild script to pkg-config
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4590 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-13 23:53:30 +00:00
Giel van Schijndel 6f0a6c4988 Also use a CPPFLAGS_FOR_BUILD (alongside CC and CXX) and pass it to the configure script as well
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4588 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-13 23:00:40 +00:00
Giel van Schijndel 247b8b9747 Pass the --build (as in buildsystem) compilers to the configure script
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4586 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-13 22:50:43 +00:00
Giel van Schijndel a0c3f42e5b export the PKG_CONFIG_PATH variable so that it gets to pkg-config
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4585 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-13 22:46:41 +00:00
Giel van Schijndel 22925948a5 Make the used crosscompiler configurable
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4584 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-13 22:30:33 +00:00