equal
deleted
inserted
replaced
128 # |
128 # |
129 |
129 |
130 |
130 |
131 # Makefile version tag |
131 # Makefile version tag |
132 # it checks if the version tag in Makefile.config is the same and force update outdated config files |
132 # it checks if the version tag in Makefile.config is the same and force update outdated config files |
133 MAKEFILE_VERSION:=10 |
133 MAKEFILE_VERSION:=9 |
134 |
134 |
135 # CONFIG_WRITER has to be found even for manual configuration |
135 # CONFIG_WRITER has to be found even for manual configuration |
136 CONFIG_WRITER=makefiledir/Makefile.config_writer |
136 CONFIG_WRITER=makefiledir/Makefile.config_writer |
137 |
137 |
138 ifndef MANUAL_CONFIG |
138 ifndef MANUAL_CONFIG |
483 else |
483 else |
484 LIBS += $(shell $(LIBPNG-CONFIG) --L_opts $(PNGCONFIG_FLAGS)) |
484 LIBS += $(shell $(LIBPNG-CONFIG) --L_opts $(PNGCONFIG_FLAGS)) |
485 endif |
485 endif |
486 endif |
486 endif |
487 |
487 |
488 ifdef WITH_ICONV |
488 ifdef OSX |
|
489 ifndef JAGUAR |
489 LIBS += -liconv |
490 LIBS += -liconv |
490 CFLAGS += -DWITH_ICONV |
491 endif |
491 endif |
492 endif |
492 |
493 |
493 # enables/disables assert() |
494 # enables/disables assert() |
494 ifdef DISABLE_ASSERTS |
495 ifdef DISABLE_ASSERTS |
495 CFLAGS += -DNDEBUG |
496 CFLAGS += -DNDEBUG |