equal
deleted
inserted
replaced
467 endif |
467 endif |
468 |
468 |
469 # libpng config |
469 # libpng config |
470 ifdef WITH_PNG |
470 ifdef WITH_PNG |
471 CDEFS += -DWITH_PNG |
471 CDEFS += -DWITH_PNG |
472 CFLAGS += $(shell $(LIBPNG_CONFIG) --cppflags --I_opts) |
472 CCFLAGS_PNG := $(shell $(LIBPNG_CONFIG) --cppflags --I_opts) |
|
473 CFLAGS += $(CCFLAGS_PNG) |
473 |
474 |
474 # seems like older libpng versions are broken and need this |
475 # seems like older libpng versions are broken and need this |
475 PNGCONFIG_FLAGS = --ldflags --libs |
476 PNGCONFIG_FLAGS = --ldflags --libs |
476 ifdef STATIC |
477 ifdef STATIC |
477 ifdef OSX |
478 ifdef OSX |
478 # Seems like we need a tiny hack for OSX static to work |
479 # Seems like we need a tiny hack for OSX static to work |
479 LIBS += $(shell $(LIBPNG_CONFIG) --prefix)/lib/libpng.a |
480 LDFLAGS_PNG := $(shell $(LIBPNG_CONFIG) --prefix)/lib/libpng.a |
480 else |
481 else |
481 LIBS += $(shell $(LIBPNG_CONFIG) --static $(PNGCONFIG_FLAGS)) |
482 LDFLAGS_PNG := $(shell $(LIBPNG_CONFIG) --static $(PNGCONFIG_FLAGS)) |
482 endif |
483 endif |
483 else |
484 else |
484 LIBS += $(shell $(LIBPNG_CONFIG) --L_opts $(PNGCONFIG_FLAGS)) |
485 LDFLAGS_PNG := $(shell $(LIBPNG_CONFIG) --L_opts $(PNGCONFIG_FLAGS)) |
485 endif |
486 endif |
|
487 LIBS += $(LDFLAGS_PNG) |
486 endif |
488 endif |
487 |
489 |
488 # use std C++ lib: |
490 # use std C++ lib: |
489 LIBS += -lstdc++ |
491 LIBS += -lstdc++ |
490 ifndef MINGW |
492 ifndef MINGW |