Commit Graph

225 Commits

Author SHA1 Message Date
Jonathan Gray
dedc33d99c make hdiutil overwrite the disk image if it already exists, although it will still fail if it is already attached
svn-id: r13445
2004-04-03 07:19:10 +00:00
Jonathan Gray
443c7cdb25 add most of my os x snapshot script as a makefile target
svn-id: r13427
2004-03-29 12:22:03 +00:00
Jonathan Gray
6995157908 use a make variable for static os x package prefix so I don't have to change as many lines, it should probably be changeable via the configure script at some point
svn-id: r13426
2004-03-29 11:59:09 +00:00
Travis Howell
2cd3ba0f84 Add win32 dist
svn-id: r13349
2004-03-21 00:26:23 +00:00
Travis Howell
d90e92019e Add mingw to configure (Not working yet)
svn-id: r13333
2004-03-17 09:14:41 +00:00
Max Horn
deb96003a2 Aaargh, didn't mean to commit this...
svn-id: r13296
2004-03-15 02:28:47 +00:00
Max Horn
782dabbcd3 ...and mor. Next big thing should be to document the overlay stuff, but that'll have to wait till after I slept :-)
svn-id: r13295
2004-03-15 02:21:04 +00:00
Jonathan Gray
1dbb73ee12 use printf instead of echo -n for the echo -n less solaris users
svn-id: r13192
2004-03-04 22:53:14 +00:00
Max Horn
8f8d992a3c sdl-config --static-libs finally works in SDL 1.2.7, make use of it
svn-id: r13172
2004-03-03 23:39:23 +00:00
Max Horn
a3bdb31870 OpenGL *is* needed for the OSX static target, because SDL always links against it
svn-id: r13044
2004-02-25 09:49:03 +00:00
Travis Howell
3999a9d604 OpenGL libs no longer required
svn-id: r13040
2004-02-25 04:32:42 +00:00
Max Horn
cd369ebad2 cleanup
svn-id: r12693
2004-02-01 01:32:43 +00:00
Max Horn
42a3206e6f Removed 'builddir' again (not really needed for now); fixed 'bundle' rule for external build dirs
svn-id: r12683
2004-01-31 00:05:08 +00:00
Max Horn
da76ac5890 Various changes to the build system which allow building ScummVM in an external directory (and as such, allow you to have a debug, a profiling, and a release build from the same set of source files in parallel). Work in progress
svn-id: r12680
2004-01-30 21:54:28 +00:00
Max Horn
671be90c74 add MPEG2 to the static-link-hack
svn-id: r12679
2004-01-30 21:03:17 +00:00
Max Horn
069c21310f oops
svn-id: r12111
2004-01-03 14:11:11 +00:00
Max Horn
56eae68e8b re-enabled .sog and .so3 support for FT
svn-id: r12096
2004-01-03 00:55:40 +00:00
Max Horn
03677b2d65 test is a PHONY target
svn-id: r11888
2003-12-24 16:27:10 +00:00
Max Horn
c76d86c68f added test target to Makefile (so you can do 'make test' now, provided you have cxxtest installed)
svn-id: r11887
2003-12-24 16:17:13 +00:00
Max Horn
bb760a5b73 detect zlib in configure script; use it by default, if available
svn-id: r11544
2003-12-10 00:15:20 +00:00
Max Horn
761d9dacb9 add 'plugins' to all target
svn-id: r10457
2003-09-28 10:44:31 +00:00
Max Horn
18961542f9 remove -Wcast-align, it causes troubles and sparc and has no real benefit elsewhere
svn-id: r10360
2003-09-21 18:39:38 +00:00
Max Horn
002e2a6f67 cleanup
svn-id: r10316
2003-09-19 20:45:35 +00:00
Max Horn
a15fdcea21 plugin work: right now, only with build rules for OS X. Once I can get it to work here, I'll add more build rules. Work in progress, a lot ain't work, but the plugin stuff is disabled by default, so no harm should arise
svn-id: r10292
2003-09-18 13:03:56 +00:00
Max Horn
3f62b662fb didn't mean to commit this
svn-id: r10280
2003-09-17 22:13:38 +00:00
Max Horn
231cb16b5b some tweaks to the build system (work toward plugin support)
svn-id: r10279
2003-09-17 21:53:13 +00:00
Max Horn
f74aa84b2d sync OS X static build rule with Makefile.noconf
svn-id: r9834
2003-08-23 20:36:46 +00:00
Jonathan Gray
ce42f4d3dd patch #791738 g++ 3.4 compile fix, from Falk Hueffner and a few minor local bits in my tree
svn-id: r9807
2003-08-21 13:39:21 +00:00
Jonathan Gray
831826bf48 most people have case sensitive filesystems
svn-id: r9620
2003-08-10 09:45:39 +00:00
James Brown
8cc805121d Tweak a little
svn-id: r9618
2003-08-10 07:52:23 +00:00
Jonathan Gray
e9ea6e45de depend on configure for config.mak so we can pick up changes
svn-id: r9617
2003-08-10 07:47:47 +00:00
Jonathan Gray
51648f1f08 nice friendly message about having to run configure first
svn-id: r9616
2003-08-10 07:34:58 +00:00
Jonathan Gray
063d05f9c8 Makefile.new -> Makefile, Makefile -> Makefile.noconf default Makefile now requires configure script
svn-id: r9614
2003-08-10 06:56:53 +00:00
Jonathan Gray
93482ae5c6 automatically use gcc 3.x specific dependency rules if using gcc 3.x, enable some additional warnings in Makefile.new
svn-id: r9399
2003-08-02 09:21:34 +00:00
Oliver Kiehl
0f85cc3061 rename bs2 to sword2 to have the same name as the original engine.
besides this way all our engines start with an "s" ;)

svn-id: r9301
2003-07-30 19:25:31 +00:00
Jonathan Gray
88b70db20f make people happy
svn-id: r9215
2003-07-28 02:06:49 +00:00
Max Horn
6e7c37fb0a disable some more warnings which cause problems with gcc 2.95 or with bad system headers
svn-id: r9051
2003-07-16 20:36:38 +00:00
Max Horn
be261b5d7c moved to more warnings into the GCC 3.x only category
svn-id: r8954
2003-07-12 19:13:25 +00:00
Max Horn
1d93949167 added some more warnings (taken from pentagram)
svn-id: r8736
2003-07-04 11:19:44 +00:00
Max Horn
b31ff8d6d5 make GCC3 happy by default, too <sigh>
svn-id: r8096
2003-05-29 12:02:41 +00:00
Max Horn
96fd0ef671 make poor GCC 2.95 uses happy
svn-id: r8091
2003-05-29 10:55:22 +00:00
Max Horn
cd1493447d Some additional warnings
svn-id: r7960
2003-05-25 16:09:26 +00:00
Max Horn
5626e42f5b Make it possible to disable some/all of our three game modules (scumm/simon/sky) with three flags in the Makefile
svn-id: r7131
2003-04-26 11:44:13 +00:00
Max Horn
2c579c25ce updated Mac OS X static build rule
svn-id: r6846
2003-03-23 13:11:55 +00:00
Max Horn
52cc68fbe1 cleanup
svn-id: r6638
2003-02-26 11:24:44 +00:00
James Brown
4b99f12fe6 Oops
svn-id: r6591
2003-02-07 19:26:03 +00:00
James Brown
270e95a655 Patch 679354: ComI actor redraw patch
svn-id: r6590
2003-02-07 19:24:34 +00:00
Max Horn
166ea5bcee get rid of DUMP_SCRIPTS; in its place, added run time option '-u' to enabled script dumping
svn-id: r6284
2002-12-31 02:09:57 +00:00
Max Horn
098b1d52ca change CFLAGS to CXXFLAGS
svn-id: r5896
2002-12-09 13:38:01 +00:00
Max Horn
5b188353de OS X app bundle should contain static linked executable; 'bool' is part of the C++ standard
svn-id: r5795
2002-12-01 20:29:20 +00:00
Max Horn
a8f01c2532 use := instead of =
svn-id: r5643
2002-11-20 18:05:02 +00:00
Travis Howell
85fe6a1ac5 Include simon debug options by default
svn-id: r5642
2002-11-20 14:45:00 +00:00
Max Horn
36309567c3 Added a bundle target for OS X (creates an .app wrapper); Info.plist contains some user information for that wrapper, like version & copyright (needs to be adjusted for releases)
svn-id: r5514
2002-11-10 22:07:06 +00:00
Tore Anderson
4158976aaf no need to remove the debian/ dir anymore
svn-id: r5392
2002-11-03 15:08:13 +00:00
Tore Anderson
2039c16a62 remove the debian/ dir before symlinking the dists/debian/ dir there,
to make the deb target in the makefile work

svn-id: r5378
2002-11-02 11:06:35 +00:00
Tore Anderson
60339d6e9a Added a deb target in the Makefile.
Removed the debian/ dir, or so I hope.

svn-id: r5367
2002-11-01 18:05:06 +00:00
Jonathan Gray
d93e639086 patch #628997 support for ogg vorbis instead of cd tracks by Daniel Schepler. Uncomment the relevant lines in the makefile to use
svn-id: r5320
2002-10-27 01:12:10 +00:00
Max Horn
dc65a40a73 added some comments; conveniently allow to enable -Wshadow and -Werror
svn-id: r5268
2002-10-23 00:20:11 +00:00
Max Horn
80fad40394 added SIMONDEBUG to Makefile
svn-id: r5241
2002-10-22 12:06:54 +00:00
Max Horn
bbc3ed3e8f oops
svn-id: r5105
2002-10-08 00:13:04 +00:00
Max Horn
8a7637cfc1 added methods to String class that convert a string to upper/lower case; changed config class to keep all domains as lower case (fixes bug #scummvm)
svn-id: r5104
2002-10-08 00:11:41 +00:00
Max Horn
68c14be9d4 taking out the -Werror again for now, till we have time to resolve some other build warnings
svn-id: r5002
2002-09-22 04:05:40 +00:00
Max Horn
5c74800450 added -Wno-unknown-pragmas to fix warnings related to #pragma mark
svn-id: r4996
2002-09-22 01:54:44 +00:00
Max Horn
45ce1d1113 don't tolerate warnings
svn-id: r4994
2002-09-22 00:38:02 +00:00
Max Horn
c72bfca50d please be careful when commiting every modified file instead of only commiting selected files :-)
svn-id: r4912
2002-09-09 09:59:26 +00:00
Jean-Yves Simon
5b8eb34406 patch attempts to fix the MI2 music bug pointed out in bug report #551028
svn-id: r4908
2002-09-09 05:03:55 +00:00
Max Horn
523d8e64c0 rewrote config class; cleanup; code restructuring
svn-id: r4903
2002-09-08 01:08:12 +00:00
Max Horn
26648880e8 we are not using ncurses, are we?
svn-id: r4818
2002-08-24 13:52:16 +00:00
Max Horn
e0cfd49ef7 patch #598405
svn-id: r4799
2002-08-21 20:47:12 +00:00
Max Horn
39654fa719 don't use OS X rules by default for SDL backend; use cp instead of ln to create the local build.rules file
svn-id: r4797
2002-08-21 17:43:00 +00:00
Max Horn
ee3ea28e6c first go at modularizing the build system
svn-id: r4796
2002-08-21 17:35:46 +00:00
Max Horn
2ebd2ba0b5 engine.* moved to common (where it belongs); added distclean target which gets rid of the .deps dirs, too; removed -Isound
svn-id: r4794
2002-08-21 16:53:11 +00:00
Max Horn
ce46866403 Initial revision
svn-id: r4785
2002-08-21 16:07:07 +00:00
Max Horn
9ad01eba91 got rid of UNIX_X11 - instead, use UNIX + X11_BACKEND
svn-id: r4632
2002-07-25 21:34:06 +00:00
James Brown
c579c16bf1 Dumb up filename case insensitivity
svn-id: r4504
2002-07-09 14:31:00 +00:00
Travis Howell
e9e17ee36f Add OpenGL support patch from Andre Souza
svn-id: r4422
2002-06-17 13:16:51 +00:00
Travis Howell
bf82c90330 Reverse patch as requested by Endy
svn-id: r4419
2002-06-14 04:31:17 +00:00
Travis Howell
8169e55560 Add OpenGL support patch from Andre Souza
svn-id: r4418
2002-06-14 03:52:02 +00:00
Max Horn
62eeaddfd4 merged Makefile.macosx into master Makefile
svn-id: r4413
2002-06-07 14:11:29 +00:00
Vincent Hamm
657a92e964 fixed a missplaced memset in akos code. Fixed a typo in the Makefile
svn-id: r4384
2002-05-25 18:56:28 +00:00
Lionel Ulmer
3255ea1278 Forgot to remove another SDLism from the X11 compilation :-) (no, no,
it's not on purpose to increase our SF stats :-) ).

svn-id: r4383
2002-05-25 18:50:06 +00:00
Lionel Ulmer
7b2cb2b0e9 Fix a little bit the Makefile to not have both UNIX and UNIX_X11
defined when building the X11 driver.

svn-id: r4382
2002-05-25 18:35:56 +00:00
Lionel Ulmer
db4e603fde Fix X11 compiling with the new unified Makefile and remove the old
Makefile.x11

svn-id: r4343
2002-05-16 18:45:58 +00:00
Nicolas Noble
5edf1e6d7f Added an ALSA sequencer support. Updated readme.txt to explain it, and
Makefile to allow the user to enable it. I also reorganised the Makefile
a bit, since there is now one more optionnal library. BBrox, I also
merged your Makefile.x11 in it, just take a look at it!

svn-id: r4341
2002-05-16 06:46:50 +00:00
James Brown
2b50dd2742 Add config file support. Thanks |Pixel| :)
svn-id: r4111
2002-04-27 16:58:29 +00:00
Max Horn
c9ea27332c Makefile.mingw now uses Makefile.common, too
svn-id: r4105
2002-04-27 11:06:27 +00:00
Max Horn
5fb37d8907 Slightly revised Makefiles, now share common stuff in Makefile.common; added simple Makefile for MacOS X
svn-id: r4088
2002-04-26 13:39:31 +00:00
Nicolas Bacca
9adea875fc Removed mp3_cd reference
svn-id: r3983
2002-04-17 20:49:57 +00:00
Ludvig Strigeus
8714d5a41c Updated makefile
svn-id: r3938
2002-04-14 18:21:30 +00:00
Ludvig Strigeus
fef5edf12f Added mididrv.cpp, removed USE_ADLIB
svn-id: r3928
2002-04-13 19:12:18 +00:00
Travis Howell
087a6ed761 Added main.cpp and extra simon *.cpp files to makefiles
svn-id: r3914
2002-04-13 01:47:19 +00:00
James Brown
ab4d230f57 Fix minor typo
svn-id: r3870
2002-04-05 04:38:59 +00:00
James Brown
8448963ee5 Fix mp3_cd support
svn-id: r3869
2002-04-05 04:35:41 +00:00
Vincent Hamm
71be0400dc Fixed most of the speed issues of insane
svn-id: r3833
2002-03-25 22:46:32 +00:00
Vincent Hamm
11cb8db187 Various fix in insane
svn-id: r3830
2002-03-25 17:45:55 +00:00
Vincent Hamm
8a3adc01ee Fixed Makefile
svn-id: r3827
2002-03-25 11:09:10 +00:00
Vincent Hamm
57cf1bfbee Rechanged the way the scumm class is choose (sorry, can't make up my mind). Implemented the different versions of loadCharset
svn-id: r3820
2002-03-25 02:09:05 +00:00
Vincent Hamm
29f2188c2d Moved the v3 specific version of readIndex
svn-id: r3817
2002-03-25 01:20:05 +00:00
Vincent Hamm
92a19c45ae Fixed pal init
svn-id: r3815
2002-03-24 17:49:47 +00:00
Vincent Hamm
f5741df25c Fixed garbadge in inventory section. Removed unused library in the Makefile
svn-id: r3806
2002-03-24 00:27:00 +00:00
Vincent Hamm
ccf69ad76b Changed the way games are detected. Now the detection is done out of the scumm object. We can now create de good scumm object depending of the game detected. Warning: the implementation is not yet finalised and the in game gui is more broken than ever....
svn-id: r3802
2002-03-23 20:34:47 +00:00
James Brown
87ac8ae487 Apply some patches by syke to prevent buffer overruns, etc.
svn-id: r3723
2002-03-10 17:33:04 +00:00
Vincent Hamm
cf868605f6 Preliminary smush playback support.
svn-id: r3669
2002-03-06 19:58:06 +00:00
Vincent Hamm
c7d58aca84 Final part of V7 merging process. The FULL_THROTTLE define is not required any more
svn-id: r3660
2002-03-06 00:18:22 +00:00
Vincent Hamm
cef0ef44d3 Changed the scummVar system to a dynamic one. Started to remove all the reference to FULL_TROTTLE define.
svn-id: r3624
2002-02-23 23:23:28 +00:00
Ludvig Strigeus
cc6c3a164b Fixed two missing files from make dist.
The scummvm-0.1.0 release was fixed also.

svn-id: r3545
2002-01-15 13:23:06 +00:00
Ludvig Strigeus
30ed07c91b added missing fmopl.h for make dist
svn-id: r3542
2002-01-13 19:48:30 +00:00
Ludvig Strigeus
e756d78082 updated for akos.cpp
svn-id: r3534
2001-12-28 12:14:53 +00:00
Ludvig Strigeus
4deb5ae644 mistyped name of USE_ADLIB
svn-id: r3519
2001-12-02 22:51:03 +00:00
Ludvig Strigeus
c392e29031 fixed to compile on unix (again)
svn-id: r3514
2001-12-01 17:50:19 +00:00
Ludvig Strigeus
fec7bee984 fixed to compile on unix
svn-id: r3513
2001-12-01 17:44:59 +00:00
Claudio Matsuoka
0c4537cd98 Merged Lionel Ulmer's support to play music in unix using
Timidity.

svn-id: r3501
2001-11-19 00:23:52 +00:00
Claudio Matsuoka
14d89432bb Merged Tom Dunstan's debugger readline patch. Define
HAVE_READLINE to enable it.

svn-id: r3500
2001-11-19 00:04:34 +00:00
Ludvig Strigeus
b8d259d60e music support,
fixed timing bugs

svn-id: r3491
2001-11-14 18:40:39 +00:00
Ludvig Strigeus
2d4bd6d7a0 save/load dialog
svn-id: r3478
2001-11-09 18:57:46 +00:00
Claudio Matsuoka
e55d303f22 Using sdl-config --libs as LIBS, will override for cross-build.
svn-id: r3469
2001-11-07 10:28:33 +00:00
Claudio Matsuoka
fffb53aa53 Re-added changes to allow cygwin and beos cross-compilation.
svn-id: r3468
2001-11-06 22:59:59 +00:00
Ludvig Strigeus
e5aca15a0b bug fixes,
speech in dott

svn-id: r3454
2001-11-05 19:21:49 +00:00
Claudio Matsuoka
bdd798b163 Using full path for SDL includes (-ISDL doesn't seem to work for
native builds).

svn-id: r3451
2001-11-03 06:17:36 +00:00
Claudio Matsuoka
9cdb642e83 Replaced config-sdl {--flags,--libs} by the actual parameters, with
no absolute paths, to allow cross-compilation to Cygwin and BeOS.
Also made all objects depend on Makefile.

svn-id: r3450
2001-11-03 06:11:52 +00:00
Ludvig Strigeus
832e2cf984 debugger skeleton implemented
svn-id: r3443
2001-10-23 19:54:06 +00:00
Ludvig Strigeus
794163c1a3 preliminary DOTT support
svn-id: r3433
2001-10-16 10:01:48 +00:00
Ludvig Strigeus
862192dbeb 'make dist' supported
svn-id: r3432
2001-10-12 08:22:12 +00:00
Ludvig Strigeus
669dd77ee2 Autodetection of endianness.
svn-id: r3412
2001-10-09 17:38:20 +00:00
Ludvig Strigeus
c30932afbe Initial revision
svn-id: r3408
2001-10-09 14:30:12 +00:00