equal
deleted
inserted
replaced
210 ifdef UNIX |
210 ifdef UNIX |
211 ifndef DEDICATED |
211 ifndef DEDICATED |
212 $(error You need to have SDL installed in order to run OpenTTD on UNIX. Use DEDICATED if you want to compile a CLI based server) |
212 $(error You need to have SDL installed in order to run OpenTTD on UNIX. Use DEDICATED if you want to compile a CLI based server) |
213 endif |
213 endif |
214 endif |
214 endif |
215 endif |
|
216 |
|
217 # For some reason it will not link with libpng if SDL is disabled |
|
218 # this automatically disables libpng if no SDL is found |
|
219 ifndef WITH_SDL |
|
220 WITH_PNG:= |
|
221 endif |
215 endif |
222 |
216 |
223 |
217 |
224 |
218 |
225 ############################################################################## |
219 ############################################################################## |
413 # FreeBSD doesn't use libpng-config |
407 # FreeBSD doesn't use libpng-config |
414 ifdef FREEBSD |
408 ifdef FREEBSD |
415 LIBS += -lpng |
409 LIBS += -lpng |
416 else |
410 else |
417 CFLAGS += `libpng-config --cflags` |
411 CFLAGS += `libpng-config --cflags` |
418 ifdef OSX |
412 |
419 ifdef STATIC |
|
420 # Seems like we need a tiny hack for OSX static to work |
|
421 LIBS += `libpng-config --prefix`/lib/libpng.a |
|
422 else |
|
423 LIBS += `libpng-config --libs` |
|
424 endif |
|
425 else |
|
426 # seems like older libpng versions are broken and need this |
413 # seems like older libpng versions are broken and need this |
427 PNGCONFIG_FLAGS = --ldflags --libs |
414 PNGCONFIG_FLAGS = --ldflags --libs |
428 ifdef STATIC |
415 ifdef STATIC |
429 LIBS += `libpng-config --static $(PNGCONFIG_FLAGS)` |
416 LIBS += `libpng-config --static $(PNGCONFIG_FLAGS)` |
430 else |
417 else |
431 LIBS += `libpng-config $(PNGCONFIG_FLAGS)` |
418 LIBS += `libpng-config --L_opts $(PNGCONFIG_FLAGS)` |
432 endif |
|
433 endif |
419 endif |
434 endif |
420 endif |
435 endif |
421 endif |
436 |
422 |
437 # enables/disables assert() |
423 # enables/disables assert() |