2010-05-20 20:33 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* config/global.mk
* config/rules.mk
+ Added HB_CFLAGS_DYN variable to pass lib specific options
specially directed to compilation phase when building
to create a .dll. Currently this affects pcre and zlib since
these are included in harbour .dll.
* external/libhpdf/Makefile
* external/pcre/Makefile
* external/png/Makefile
* external/zlib/Makefile
+ Configured HB_CFLAGS_DYN for these libs to properly create
exported symbols in harbour .dll. This was a problem so far
for any non-mingw made harbour .dll.
This commit is contained in:
@@ -17,6 +17,22 @@
|
||||
past entries belonging to author(s): Viktor Szakats.
|
||||
*/
|
||||
|
||||
2010-05-20 20:33 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
|
||||
* config/global.mk
|
||||
* config/rules.mk
|
||||
+ Added HB_CFLAGS_DYN variable to pass lib specific options
|
||||
specially directed to compilation phase when building
|
||||
to create a .dll. Currently this affects pcre and zlib since
|
||||
these are included in harbour .dll.
|
||||
|
||||
* external/libhpdf/Makefile
|
||||
* external/pcre/Makefile
|
||||
* external/png/Makefile
|
||||
* external/zlib/Makefile
|
||||
+ Configured HB_CFLAGS_DYN for these libs to properly create
|
||||
exported symbols in harbour .dll. This was a problem so far
|
||||
for any non-mingw made harbour .dll.
|
||||
|
||||
2010-05-20 19:49 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
|
||||
* harbour/src/rdd/dbf1.c
|
||||
* minor cleanup
|
||||
|
||||
@@ -1107,6 +1107,8 @@ endif
|
||||
# Notice that even single lib/bin builds will currently
|
||||
# result in recursive runs, see rule 'descend'. [vszakats]
|
||||
HB_CFLAGS :=
|
||||
# C flags passed when compiling to create .dll
|
||||
HB_CFLAGS_DYN :=
|
||||
HB_LDFLAGS :=
|
||||
HB_AFLAGS :=
|
||||
HB_PRGFLAGS :=
|
||||
|
||||
@@ -45,7 +45,7 @@ ifeq ($(CC_RULE),)
|
||||
ifneq ($(filter $(LIBNAME),$(HB_DYN_LIBS)),)
|
||||
define cc_comp_all
|
||||
$(CC) $(subst $(CC_DIRSEPFROM),$(CC_DIRSEPTO),$(CC_FLAGS) $(HB_USER_CFLAGS) $(CC_OUT)$(<F:.c=$(OBJ_EXT)) $(CC_IN) $<)
|
||||
$(CC) $(subst $(CC_DIRSEPFROM),$(CC_DIRSEPTO),$(CC_FLAGS) $(HB_USER_CFLAGS) $(CC_OUT)$(<F:.c=$(OBJ_DYN_POSTFIX)$(OBJ_EXT)) $(HB_DYN_COPT) $(CC_IN) $<)
|
||||
$(CC) $(subst $(CC_DIRSEPFROM),$(CC_DIRSEPTO),$(CC_FLAGS) $(HB_USER_CFLAGS) $(CC_OUT)$(<F:.c=$(OBJ_DYN_POSTFIX)$(OBJ_EXT)) $(HB_DYN_COPT) $(HB_CFLAGS_DYN) $(CC_IN) $<)
|
||||
endef
|
||||
CC_RULE = $(cc_comp_all)
|
||||
endif
|
||||
|
||||
1
harbour/external/libhpdf/Makefile
vendored
1
harbour/external/libhpdf/Makefile
vendored
@@ -112,6 +112,7 @@ ifeq ($(HB_SUPPORTED),yes)
|
||||
HB_CFLAGS += $(foreach d,$(HB_HAS_PNG),-I$(d))
|
||||
# Suppress deprecated warnings until libharu gets updated for latest libpng
|
||||
HB_CFLAGS += -DPNG_NO_PEDANTIC_WARNINGS
|
||||
HB_CFLAGS_DYN := -DHPDF_DLL_MAKE
|
||||
|
||||
ifeq ($(HB_COMPILER),mingwarm)
|
||||
HB_CFLAGS += -U__COREDLL__
|
||||
|
||||
5
harbour/external/pcre/Makefile
vendored
5
harbour/external/pcre/Makefile
vendored
@@ -35,7 +35,10 @@ LIBNAME := hbpcre
|
||||
|
||||
ifneq ($(HB_HAS_PCRE_LOCAL),)
|
||||
|
||||
HB_CFLAGS += -DPCRE_STATIC -DHAVE_STDINT_H=0
|
||||
HB_CFLAGS += -DHAVE_STDINT_H=0
|
||||
# only needed for win/wce, for other platforms these are noops
|
||||
HB_CFLAGS += -DPCRE_STATIC
|
||||
HB_CFLAGS_DYN := -UPCRE_STATIC
|
||||
|
||||
ifneq ($(filter $(HB_COMPILER),bcc msvc msvc64 msvcia64 icc iccia64),)
|
||||
HB_CFLAGS += -DHAVE_INTTYPES_H=0
|
||||
|
||||
1
harbour/external/png/Makefile
vendored
1
harbour/external/png/Makefile
vendored
@@ -45,6 +45,7 @@ ifeq ($(filter $(HB_COMPILER),poccarm xcc),)
|
||||
ifneq ($(HB_HAS_ZLIB),)
|
||||
|
||||
HB_CFLAGS += $(foreach d,$(HB_HAS_ZLIB),-I$(d))
|
||||
HB_CFLAGS_DYN := -DPNG_BUILD_DLL
|
||||
|
||||
ifeq ($(HB_COMPILER),djgpp)
|
||||
HB_CFLAGS += -DPNG_NO_SNPRINTF
|
||||
|
||||
2
harbour/external/zlib/Makefile
vendored
2
harbour/external/zlib/Makefile
vendored
@@ -11,6 +11,8 @@ LIBNAME := hbzlib
|
||||
HB_BUILD_WARN := no
|
||||
HB_BUILD_MODE := c
|
||||
|
||||
HB_CFLAGS_DYN := -DZLIB_DLL
|
||||
|
||||
C_SOURCES := \
|
||||
adler32.c \
|
||||
compress.c \
|
||||
|
||||
Reference in New Issue
Block a user