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

2009-07-16 14:57 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* config/global.cf
    ! Switched to use HB_FLAGSEXTRA for __PLATFORM__ macros instead
      of cumulating HB_USER_PRGFLAGS. It didn't work in linux/watcom
      builds from win hosts. This way also HB_HOST_FLAG_ isn't needed.

  * config/wce/global.cf
    - Deleted commented HB_FLAGSEXTRA line.

  * source/hbpcre/_hbconf.h
    * Minor formatting.
This commit is contained in:
Viktor Szakats
2009-07-16 13:00:14 +00:00
parent 635029ae24
commit 4ff8a0a513
4 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
harbour/ChangeLog
View File

@@ -17,6 +17,18 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-07-16 14:57 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* config/global.cf
! Switched to use HB_FLAGSEXTRA for __PLATFORM__ macros instead
of cumulating HB_USER_PRGFLAGS. It didn't work in linux/watcom
builds from win hosts. This way also HB_HOST_FLAG_ isn't needed.
* config/wce/global.cf
- Deleted commented HB_FLAGSEXTRA line.
* source/hbpcre/_hbconf.h
* Minor formatting.
2009-07-16 14:19 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/config/global.cf
! yet another fix for exporting relative paths in HB_BIN_COMPILE

45
harbour/config/global.cf
View File

@@ -213,29 +213,28 @@ ifneq ($(HB_HOST_ARCH)$(HB_HOST_CPU),$(HB_ARCHITECTURE)$(HB_CPU))
endif
endif
endif
ifneq ($(HB_HOST_FLAG_),done)
export HB_HOST_FLAG_=done
# Setup platform macros (undefine host, define target)
ifeq ($(HB_HOST_ARCH),win)
HB_USER_PRGFLAGS += -undef:__PLATFORM__WINDOWS
else ifeq ($(HB_HOST_ARCH),dos)
HB_USER_PRGFLAGS += -undef:__PLATFORM__DOS
else ifeq ($(HB_HOST_ARCH),os2)
HB_USER_PRGFLAGS += -undef:__PLATFORM__OS2
else ifeq ($(HB_HOST_ARCH),linux)
HB_USER_PRGFLAGS += -undef:__PLATFORM__LINUX -undef:__PLATFORM__UNIX
endif
ifeq ($(HB_ARCHITECTURE),win)
HB_USER_PRGFLAGS += -D__PLATFORM__WINDOWS
else ifeq ($(HB_ARCHITECTURE),wce)
HB_USER_PRGFLAGS += -D__PLATFORM__WINDOWS -D__PLATFORM__WINCE
else ifeq ($(HB_ARCHITECTURE),dos)
HB_USER_PRGFLAGS += -D__PLATFORM__DOS
else ifeq ($(HB_ARCHITECTURE),os2)
HB_USER_PRGFLAGS += -D__PLATFORM__OS2
else ifeq ($(HB_ARCHITECTURE),linux)
HB_USER_PRGFLAGS += -D__PLATFORM__LINUX -D__PLATFORM__UNIX
endif
# Setup platform macros (undefine host, define target)
HB_FLAGSEXTRA :=
ifeq ($(HB_HOST_ARCH),win)
HB_FLAGSEXTRA += -undef:__PLATFORM__WINDOWS
else ifeq ($(HB_HOST_ARCH),dos)
HB_FLAGSEXTRA += -undef:__PLATFORM__DOS
else ifeq ($(HB_HOST_ARCH),os2)
HB_FLAGSEXTRA += -undef:__PLATFORM__OS2
else ifeq ($(HB_HOST_ARCH),linux)
HB_FLAGSEXTRA += -undef:__PLATFORM__LINUX -undef:__PLATFORM__UNIX
endif
ifeq ($(HB_ARCHITECTURE),win)
HB_FLAGSEXTRA += -D__PLATFORM__WINDOWS
else ifeq ($(HB_ARCHITECTURE),wce)
HB_FLAGSEXTRA += -D__PLATFORM__WINDOWS -D__PLATFORM__WINCE
else ifeq ($(HB_ARCHITECTURE),dos)
HB_FLAGSEXTRA += -D__PLATFORM__DOS
else ifeq ($(HB_ARCHITECTURE),os2)
HB_FLAGSEXTRA += -D__PLATFORM__OS2
else ifeq ($(HB_ARCHITECTURE),linux)
HB_FLAGSEXTRA += -D__PLATFORM__LINUX -D__PLATFORM__UNIX
endif
endif

2
harbour/config/wce/global.cf
View File

@@ -9,8 +9,6 @@ HB_GT_LIBS += gtwvt gtgui
# Favor size for CE builds.
HB_GCMODE = 0
#HB_FLAGSEXTRA = -D__PLATFORM__WINCE
ifeq ($(HB_DYNLIB),yes)
HB_CDYNLIB = -DHB_DYNLIB
endif

2
harbour/source/hbpcre/_hbconf.h
View File

@@ -5,7 +5,7 @@
#ifndef HB_CONFIG_H
#define HB_CONFIG_H
#if !defined(HB_DYNLIB)
#if !defined( HB_DYNLIB )
#define PCRE_STATIC
#endif