153d0aa5b6
* include/hbdefs.h
+ Added similar to HB_DONT_DEFINE_BOOL hack: HB_DONT_DEFINE_LONG.
(needed until we clear up our types.)
* contrib/hbfimage/fi_winfu.c
* contrib/hbfimage/fi_wrp.c
* contrib/hbfimage/Makefile
* doc/whatsnew.txt
% Deleted #includes/macro checks not necessary.
! Disabled body of fi_winfu.c when not compiled under
Windows. This fixes one Linux compilation error.
% Replaced HB_OS_WIN_USED with HB_DONT_DEFINE_BOOL and
HB_DONT_DEFINE_LONG, moved foreign headers before
Harbour headers, added non-Harbour Windows detection
in fi_wrp.c (I'm not sure that is necessary), so that
it now compiles on both Windows and non-Windows (Linux
tested) systems.
+ Renabled on Linux in Makefile.
; Please review/test these changes.
45 lines
691 B
Makefile
45 lines
691 B
Makefile
#
|
|
# $Id$
|
|
#
|
|
|
|
ROOT = ../../
|
|
|
|
LIBNAME=hbfimage
|
|
|
|
HB_INC_FREEIMAGE_OK =
|
|
|
|
ifneq ($(HB_ARCHITECTURE),dos)
|
|
|
|
ifeq ($(HB_INC_FREEIMAGE),)
|
|
ifeq ($(HB_XBUILD),)
|
|
HB_INC_FREEIMAGE = /usr/include
|
|
endif
|
|
endif
|
|
|
|
HB_INC_FREEIMAGE_OK += $(foreach d, $(HB_INC_FREEIMAGE), $(if $(wildcard $(d)/FreeImage.h),$(d),))
|
|
endif
|
|
|
|
ifneq ($(strip $(HB_INC_FREEIMAGE_OK)),)
|
|
|
|
HB_USER_CFLAGS += $(foreach d, $(HB_INC_FREEIMAGE_OK), -I$(d))
|
|
|
|
C_SOURCES = \
|
|
fi_winfu.c \
|
|
fi_wrp.c \
|
|
|
|
PRG_SOURCES= \
|
|
|
|
PRG_HEADERS=\
|
|
freeimage.ch \
|
|
|
|
include $(TOP)$(ROOT)config/header.cf
|
|
INSTALL_RULE_HEADERS := $(INSTALL_RULE)
|
|
include $(TOP)$(ROOT)config/lib.cf
|
|
|
|
install::
|
|
$(INSTALL_RULE_HEADERS)
|
|
|
|
else
|
|
include $(TOP)$(ROOT)config/none.cf
|
|
endif
|