Commit Graph

20 Commits

Author SHA1 Message Date
peter1138
45a0557b37 (svn r4217) Replace SDL-CONFIG and LIBPNG-CONFIG with SDL_CONFIG and LIBPNG_CONFIG 2006-03-31 21:06:55 +00:00
bjarni
5bbf004936 (svn r4197) reentered STATIC_ZLIB_PATH (removed in 4183) since it turned out that it's used after all 2006-03-31 10:04:18 +00:00
bjarni
f70c45782e (svn r4183) -Codechange: [Makefile]: removed MANUAL_CONFIG as it's not used anymore
This should hopefully fix the issue where WITH_SDL can be defined while SDL-CONFIG is not
	Added an error if WITH_SDL is defined but SDL-CONFIG is not. The same goes for WITH_PNG even though nobody reported this as a problem
	removed STATIC_ZLIB_PATH as it turns out that nobody used it
2006-03-30 20:14:06 +00:00
tron
6b40512a3c (svn r4076) Back out r4074. It doesn't work and leads to make endlessly calling itself. NOTE: Delete Makefile.config to recover. 2006-03-24 06:40:49 +00:00
bjarni
41f4c473da (svn r4074) -Feature: [Makefile] the makefile can now detect if iconv is present in the system
if detected, WITH_ICONV will be defined in the C code
	WITH_ICONV is also added to Makefile.config
	OSX do not use this flag setting in Makefile.config, as it is set at compile time based on target OS version
	the actual C code is not changed as the current iconv code is hardcoded for OSX and would break if any other OS got iconv
	This detection system is by request of Darkvater
2006-03-23 23:54:43 +00:00
truelight
da2ebf897d (svn r4070) -Fix: on OSX COCOA was set by default, even with DEDICATED, while those 2 conflict 2006-03-23 17:38:31 +00:00
truelight
be15d8ec2e (svn r3864) -Fix: small problems with make-system, making room for a wrapper-configure 2006-03-14 19:10:33 +00:00
bjarni
fb301cced7 (svn r3672) -Fix: [makefile] fixed bug where some settings where overwritten with the default ones when MAKEFILE_VERSION was changed 2006-02-25 16:57:17 +00:00
bjarni
50a1e16943 (svn r3281) -Feature: [OSX] added native cocoa sound and video drivers (egladil)
you can still use SDL drivers if you like and you have to run "make upgradeconf" to start using the cocoa drivers (or manually write WITH_COCOA:=1)
	since SDL breaks the cocoa drivers, you can't compile with both SDL and cocoa support
	Using cocoa drivers makes it easier to make universal binaries and it solves:
	-FS#18 [OSX] SDL is weird in universal binaries
	-FS#2  [OSX] lazy pointer crash on exit
	-FS#10 [OSX] linking error when linking statically to SDL 1.2.8 (needless to explain this, but it means it should be able to compile statically with the default settings now)
	-[ 1215073 ] Switching to large size out of fullscreen crashes
	Using SDL drivers will still have those issues though
2005-12-10 11:16:45 +00:00
bjarni
97b3afe9ae (svn r3230) -Feature: [OSX] OSX builds can now change where it searches for dynamic libs and can move libs into the bundle
This is not a fix for the issues with static linking, more like a workaround. Static linking still got issues
	Apple recommends to use dynamic linking anyway, so I guess this doesn't matter much
2005-11-23 12:21:54 +00:00
bjarni
c6287f942d (svn r2506) - Fix: [OSX, makefile] The makefile can now also see OSX 10.4 as OSX 2005-07-01 18:16:16 +00:00
bjarni
83943cd246 (svn r2461) -Feature [Makefile] libpng-config can now be called something else in Makefile.config
useful if you for some reason got a libpng-config, which is called something else
2005-06-19 17:05:24 +00:00
tron
14f482aeb5 (svn r2328) There's no need for extra magic to detect libpng on FreeBSD 2005-05-16 08:30:32 +00:00
bjarni
3c7e16f80b (svn r972) Makefile: added make release (currently only works on mac)
Mac: sets the STATIC flag if no makefile.config is found
2004-12-07 17:58:06 +00:00
truelight
d6a1f3e412 (svn r942) -Merged branch/network back into the trunk 2004-12-04 17:54:56 +00:00
bjarni
19501ccf41 (svn r862) Cygwin: libdetection now sets the flags properly if no Makefile.config is found
Cygwin: workaround: libpng is automatically not used even if present until the Cygwin/libpng problem is solved
2004-12-01 11:50:20 +00:00
Bjarni
4950c36769 (svn r856) Makefile: added the flags CYGWIN and MINGW to libdetection. They were missing in the autodetected makefile.config 2004-11-29 20:26:00 +00:00
tron
87adce3ca0 (svn r655) Add the necessary bits to make building on SunOS/Solaris work 2004-11-17 09:07:29 +00:00
tron
5a07c9bd71 (svn r619) Add the necessary bits to make building under BeOS using GNU Make work 2004-11-15 07:53:09 +00:00
truelight
efaeb275f7 (svn r1) Import of revision 975 of old (crashed) SVN 2004-08-09 17:04:08 +00:00