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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
2ac679060c
Revert accidental commit of __BUILD_CONFIG in r4582
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4583 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-13 22:29:01 +00:00
af308831e8
when one of the crossbuild commands fail, terminate execution (exit 1)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4582 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-13 22:25:15 +00:00
31bf8a371b
Revive the crossbuild scripts
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4581 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-13 18:48:18 +00:00
9c90950e4a
Add exceptionhandler to the MSVC project for r4484
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4514 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-05 23:44:15 +00:00
39b6c60501
* Change and clean up the cursors API
...
* Get rid of resource.h which duplicated code and as such was a maintenance hell/burden
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4422 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-30 13:23:11 +00:00
57389641e7
Remove the last content of deliverance.h (#define MAX_STR_LENGTH 256) to wzglobal.h and remove it
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4219 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-21 23:02:22 +00:00
cb2f0a30df
Patch MSVC Solution file to depend on SQLite and change eol-style to native for them, since otherwise patches will not apply.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4044 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-14 18:16:04 +00:00
3858daf4a1
Reset MSVC version from 9 to 8, since otherwise MSVC8 will refuse to load the project files. (bug #11219 )
...
Does MS provide some kind of templating system? Like autotools generate Makefiles from Makefile.am.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3950 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-08 11:28:40 +00:00
d3455b699a
Properly set include/library directories for MSVC
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3949 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-08 01:45:45 +00:00
b9725d9e48
Add the sqlite3 directory to the MSVC project file (patch #991 by Buginator)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3901 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-03 08:54:06 +00:00
5896b769e4
Reverted changes to the MSVC project which TortoiseSVN silently commited (what the...?)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3838 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-18 19:52:01 +00:00
6ddadf6a5e
Updated ChangeLog.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3837 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-18 19:48:21 +00:00
b7e36a5b77
Require devpkg to be in ./devpkg/ for msvc.
...
This saves the trouble of having to edit the paths for lib/include dirs and enables us to have the FlexBison.rules there, too.
Thus FlexBison.rules is removed and to be found in the msvc devpkg from now on.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3657 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-02 18:17:58 +00:00
8d34975fd3
Add license on FlexBison.rules.
...
Moving it to devpkg would be prefered if possible. If someone can test whether that is possible...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3605 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-30 21:34:55 +00:00
69016895ca
* Remove gatewaysup.c from MSVC project file (patch by Buginator)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3521 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-20 19:00:51 +00:00
31a863a90b
Setup eol-style CRLF for vcproj files
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3473 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-14 20:49:48 +00:00
1c44cf8568
path #938 by Bugginator: MSVC projectfile updates. You need the static libraries from http://download.gna.org/warzone/development/devpkg/2.1/msvc80/ now.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3472 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-14 19:57:50 +00:00
Giel van Schijndel
Dennis Schridde
Roman C