equal
deleted
inserted
replaced
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 # iconv is enabled defaultly on OSX > 10.3 |
451 ifdef OSX |
452 ifdef OSX |
452 ifndef JAGUAR |
453 ifndef JAGUAR |
453 LIBS += -liconv |
454 WITH_ICONV=1 |
454 endif |
455 LIBS += -liconv |
|
456 endif |
|
457 endif |
|
458 |
|
459 ifdef WITH_ICONV |
|
460 CDEFS += -DWITH_ICONV |
|
461 ifdef WITH_ICONV_PATH |
|
462 CFLAGS += -I$(WITH_ICONV_PATH) |
|
463 endif |
455 endif |
464 endif |
456 |
465 |
457 # enables/disables assert() |
466 # enables/disables assert() |
458 ifdef DISABLE_ASSERTS |
467 ifdef DISABLE_ASSERTS |
459 CFLAGS += -DNDEBUG |
468 CFLAGS += -DNDEBUG |