Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,902 Commits
1 Branch
0 Tags
544 MiB
Commit Graph

51 Commits (79ed9b96e83e8740e05a5d2a75d06e95467cb514)

Author SHA1 Message Date
Gerard Krol 71bc279c9e Fix some spelling errors in debug messages and comments. Patch by Paul Wise <pabs3>. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6832 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-11 11:51:40 +00:00
Dennis Schridde d8680df439 Bump internal copy of SQLite to 3.6.11 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6756 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-01 10:05:59 +00:00
Dennis Schridde f9ef8289a4 Bump SQLite3 to 3.6.10 
An change was introduced on sqlite3_vfs which causes an incompatible
 pointer error when mixed with older sqlite versions. Thus bump the
 required version to 3.6.10 as well.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6564 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-01-30 18:28:21 +00:00
Giel van Schijndel 810fac209b * Wrap all file lists in the automake and win32 makefiles across lines such that there's only one file on each line 
* Alphabetically sort the file lists

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6144 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-10-13 13:04:37 +00:00
Giel van Schijndel 10ac89541a Update our SQLite copy from 3.5.9 to 3.6.2 
* 3.6.0 introduced an interface change to the VFS layer
 * Updated physfs_vfs.c for the interface change in 3.6.0, breaking compatibility with SQLite < 3.6.0
 * Change the configure script to require sqlite3 >= 3.6

This closes ticket:66

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6034 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-09-16 20:02:16 +00:00
Giel van Schijndel 73bd4b81f9 Don't #define DATADIR when compiling SQLite as it causes conflicts with some Windows headers (objidl.h:95) 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6029 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-09-15 06:06:59 +00:00
Giel van Schijndel 9d7a8e8d43 Update our SQLite copy from 3.5.4 to 3.5.9 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6019 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-09-14 13:48:22 +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 6088fca5af * Make xGetTempname (from the PhysicsFS VFS for SQLite) return a bogus filename to keep SQLite happy 
- We can safely catch the only one case where this filename is used (see comment in diff for an explanation)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5984 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-09-09 20:07:16 +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
Dennis Schridde 504ffcc625 Dont output any warnings in external sqlite. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5231 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-06-07 19:11:14 +00:00
Giel van Schijndel 2be33c4286 Use WZ_DECL_UNUSED to squelch warnings about unused parameters in the PhysicsFS SQLite-VFS implementation 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5212 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-06-04 19:50:50 +00:00
Giel van Schijndel 46805bb32f Fix bug #11480: 
* Don't call PHYSFS_close if our PHYSFS_file* pointer is NULL


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4895 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-05-03 10:17:06 +00:00
Roman C a1008c093d Reduce amount of junk in the MSVC compilation output by about 70%. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4279 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-03-23 22:15:28 +00:00
Dennis Schridde a3d8cdbdb2 New include order in frame.h. This should fix msvc problems hopefully. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4096 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-03-16 03:10:05 +00:00
Dennis Schridde 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
Giel van Schijndel 08e68d9c54 Don't initalise the 'file' pointer with itself 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4004 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-03-10 23:06:00 +00:00
Giel van Schijndel dd0655b915 Make sure that xFullPathname uses SQLITE_OK as its return value for success (and SQLITE_IOERR for failure) 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4003 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-03-10 23:05:38 +00:00
Giel van Schijndel c4a62d5139 Rename sqlite3.diff to sqlite3.5.4.diff and update it to be a diff against r3997 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3999 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-03-10 17:00:31 +00:00
Giel van Schijndel fa47b4ff72 Revert r3997 (we now have the original 3.5.4 in SVN history, at r3997) 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3998 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-03-10 16:57:11 +00:00
Giel van Schijndel 9e7ba7bc22 Oops, r3994 still had some of our changes in it (r3992 to be precise), so this __is__ the clean 3.5.4 version 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3997 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-03-10 16:55:01 +00:00
Dennis Schridde 65dd2bce19 Update the diff to r3995 to log the base revision inside the file (svn diff -r3994 sqlite3.c > sqlite3.diff) 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3996 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-03-10 14:46:46 +00:00
Giel van Schijndel 4e9e8e60d6 Revert r3994 (we now have the original 3.5.4 in SVN history, at r3994) 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3995 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-03-10 13:52:21 +00:00
Giel van Schijndel 64dd1a52c5 Revert to SQLite before all modifications (i.e. this is the amalgamation of 3.5.4) 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3994 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-03-10 13:49:58 +00:00
Dennis Schridde f0ab52dbd3 Fix some missing initialisers 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3992 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-03-10 11:42:18 +00:00
Dennis Schridde d7bb157c7b Strip -Werror from WZ_CFLAGS for sqlite3, since there are far more warnings... 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3991 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-03-10 11:10:35 +00:00
Giel van Schijndel 33216b2e9d Move all stuff that actually belongs in CPPFLAGS (but is called CFLAGS) to AM_CPPFLAGS 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3988 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-03-10 10:50:58 +00:00
Giel van Schijndel 037471b784 Update sqlite3.diff for r3984 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3987 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-03-10 10:15:45 +00:00
Dennis Schridde d8409c9819 - Don't define CFLAGS anymore, export WZ_CFLAGS instead, which can be overridden by make commandlines 
- Set -DYY_NO_INPUT only in those places where needed
- Add some previously forgotten CFLAGS where needed
- Remove extranous -lintl from WIN32_LIBS
- Remove apparently unnecessary directory from Mac include (png_util doesn't need it either)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3986 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-03-10 02:01:46 +00:00
Dennis Schridde 67247633e5 mutexIsNT() is never used -> warning -> error -> I remove it 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3984 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-03-10 00:59:29 +00:00
Dennis Schridde 9f44219b1c Move addition of CFLAGS from configure.ac to the places they are actually needed. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3983 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-03-09 20:08:42 +00:00
Giel van Schijndel 0af1927488 Provide two functions (sqlite3_register_physfs_vfs and sqlite3_unregister_physfs_vfs) for registering and unregistering of the PhysicsFS implementation for SQLite's VFS 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3982 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-03-09 17:04:42 +00:00
Giel van Schijndel 5bf53cd315 Relicense the PhysicsFS implementation of SQLite's (3.5+) VFS to the zlib license to be fully compatible with PhysicsFS 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3981 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-03-09 17:04:35 +00:00
Giel van Schijndel 93f7fc095a Update the sqlite3.diff for r3971 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3972 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-03-09 11:50:43 +00:00
Dennis Schridde 3f67498774 Prevent problem with the definition of DATADIR (wz' configure defines it to a string, what objidl.h does not like, because it uses that name as an identifier). 
This also should cut down compilation a bit...


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3971 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-03-09 11:42:53 +00:00
Giel van Schijndel b467d49a2e Fix the MSVC project file for sqlite3; patch by Buginator 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3958 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-03-08 18:24:20 +00:00
Giel van Schijndel 84b03f9468 Allow compiling of sqlite3.c by disabling -Wmissing-field-initializers when compiling in lib/sqlite3/ 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3954 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-03-08 15:26:48 +00:00
Giel van Schijndel 9b71eb9821 Add a partially completed SQLite VFS (requires SQLite 3.5+) implementation for PhysicsFS 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3951 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-03-08 14:23:07 +00:00
Dennis Schridde 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
Dennis Schridde 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
Dennis Schridde 73581e05b3 Apply patch #991 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3918 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-03-05 18:05:57 +00:00
Dennis Schridde 4e520d46fc Patch #991 by Buginator: Update MSVC .sln for sqlite3 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3902 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-03-03 11:35:30 +00:00
Giel van Schijndel 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
Giel van Schijndel 5e5426e88b Fix a small typo in 'oinst_LIBRARIES' -> 'noinst_LIBRARIES' 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3898 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-03-02 22:45:44 +00:00