equal
deleted
inserted
replaced
222 ifdef OSX |
222 ifdef OSX |
223 LDFLAGS+=-framework Cocoa |
223 LDFLAGS+=-framework Cocoa |
224 endif |
224 endif |
225 |
225 |
226 ifdef WITH_SDL |
226 ifdef WITH_SDL |
227 ifndef SDL-CONFIG |
227 ifndef SDL_CONFIG |
228 $(error WITH_SDL can't be used when SDL-CONFIG is not set. Edit Makefile.config to correct this) |
228 $(error WITH_SDL can't be used when SDL_CONFIG is not set. Edit Makefile.config to correct this) |
229 endif |
229 endif |
230 endif |
230 endif |
231 |
231 |
232 ifdef WITH_PNG |
232 ifdef WITH_PNG |
233 ifndef LIBPNG-CONFIG |
233 ifndef LIBPNG_CONFIG |
234 $(error WITH_PNG can't be used when LIBPNG-CONFIG is not set. Edit Makefile.config to correct this) |
234 $(error WITH_PNG can't be used when LIBPNG_CONFIG is not set. Edit Makefile.config to correct this) |
235 endif |
235 endif |
236 endif |
236 endif |
237 |
237 |
238 ############################################################################## |
238 ############################################################################## |
239 # |
239 # |
404 endif |
404 endif |
405 |
405 |
406 # SDL config |
406 # SDL config |
407 ifdef WITH_SDL |
407 ifdef WITH_SDL |
408 CDEFS += -DWITH_SDL |
408 CDEFS += -DWITH_SDL |
409 CFLAGS += $(shell $(SDL-CONFIG) --cflags) |
409 CFLAGS += $(shell $(SDL_CONFIG) --cflags) |
410 ifdef STATIC |
410 ifdef STATIC |
411 LIBS += $(shell $(SDL-CONFIG) --static-libs) |
411 LIBS += $(shell $(SDL_CONFIG) --static-libs) |
412 else |
412 else |
413 LIBS += $(shell $(SDL-CONFIG) --libs) |
413 LIBS += $(shell $(SDL_CONFIG) --libs) |
414 endif |
414 endif |
415 endif |
415 endif |
416 |
416 |
417 # zlib config |
417 # zlib config |
418 ifdef WITH_ZLIB |
418 ifdef WITH_ZLIB |
430 endif |
430 endif |
431 |
431 |
432 # libpng config |
432 # libpng config |
433 ifdef WITH_PNG |
433 ifdef WITH_PNG |
434 CDEFS += -DWITH_PNG |
434 CDEFS += -DWITH_PNG |
435 CFLAGS += $(shell $(LIBPNG-CONFIG) --cppflags --I_opts) |
435 CFLAGS += $(shell $(LIBPNG_CONFIG) --cppflags --I_opts) |
436 |
436 |
437 # seems like older libpng versions are broken and need this |
437 # seems like older libpng versions are broken and need this |
438 PNGCONFIG_FLAGS = --ldflags --libs |
438 PNGCONFIG_FLAGS = --ldflags --libs |
439 ifdef STATIC |
439 ifdef STATIC |
440 ifdef OSX |
440 ifdef OSX |
441 # Seems like we need a tiny hack for OSX static to work |
441 # Seems like we need a tiny hack for OSX static to work |
442 LIBS += $(shell $(LIBPNG-CONFIG) --prefix)/lib/libpng.a |
442 LIBS += $(shell $(LIBPNG_CONFIG) --prefix)/lib/libpng.a |
443 else |
443 else |
444 LIBS += $(shell $(LIBPNG-CONFIG) --static $(PNGCONFIG_FLAGS)) |
444 LIBS += $(shell $(LIBPNG_CONFIG) --static $(PNGCONFIG_FLAGS)) |
445 endif |
445 endif |
446 else |
446 else |
447 LIBS += $(shell $(LIBPNG-CONFIG) --L_opts $(PNGCONFIG_FLAGS)) |
447 LIBS += $(shell $(LIBPNG_CONFIG) --L_opts $(PNGCONFIG_FLAGS)) |
448 endif |
448 endif |
449 endif |
449 endif |
450 |
450 |
451 ifdef OSX |
451 ifdef OSX |
452 ifndef JAGUAR |
452 ifndef JAGUAR |