fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2010-05-20 21:07 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* config/global.mk
  * config/rules.mk
  * external/pcre/Makefile
    + Added HB_CFLAGS_STA variable to hold C compiler options 
      passed solely when compiling for static lib.
    * Change PCRE setup to use HB_CFLAGS_STA instead of -U 
      trick at the same time silencing msvc warning.
This commit is contained in:
Viktor Szakats
2010-05-20 19:07:59 +00:00
parent c17e6e8610
commit 1c380b63ed
4 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
harbour/ChangeLog
View File

@@ -17,6 +17,15 @@
past entries belonging to author(s): Viktor Szakats.
*/
2010-05-20 21:07 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* config/global.mk
* config/rules.mk
* external/pcre/Makefile
+ Added HB_CFLAGS_STA variable to hold C compiler options
passed solely when compiling for static lib.
* Change PCRE setup to use HB_CFLAGS_STA instead of -U
trick at the same time silencing msvc warning.
2010-05-20 20:33 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* config/global.mk
* config/rules.mk

7
harbour/config/global.mk
View File

@@ -1107,12 +1107,15 @@ 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 :=
# C flags passed when compiling to create static lib
HB_CFLAGS_STA :=
# C flags passed when compiling to create dynamic lib
HB_CFLAGS_DYN :=
CFLAGS :=
ARFLAGS :=
LDFLAGS :=

2
harbour/config/rules.mk
View File

@@ -44,7 +44,7 @@ ifeq ($(CC_RULE),)
ifneq ($(LIBNAME),)
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_EXT)) $(HB_CFLAGS_STA) $(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)

5
harbour/external/pcre/Makefile vendored
View File

@@ -36,9 +36,8 @@ LIBNAME := hbpcre
ifneq ($(HB_HAS_PCRE_LOCAL),)
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
# only needed for win/wce, for other platforms this is noop
HB_CFLAGS_STA := -DPCRE_STATIC
ifneq ($(filter $(HB_COMPILER),bcc msvc msvc64 msvcia64 icc iccia64),)
HB_CFLAGS += -DHAVE_INTTYPES_H=0