From b902dbd19a72a24208c2c2f7221d9eb9877fb0b1 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 16 Jun 2010 09:50:20 +0000 Subject: [PATCH] 2010-06-16 11:45 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/win/mingw.mk + Added (commented) support for -m32/-m64 options. This may be useful in the future f.e. for mingw tdm 4.5.0 compiler which can build both 64 and 32-bit targets using the same compiler binaries. * config/global.mk * config/wce/mingwarm.mk * config/wce/poccarm.mk * config/wce/msvcarm.mk * config/win/xcc.mk * config/win/mingw.mk * config/win/pocc.mk * config/win/bcc.mk * config/win/watcom.mk * config/win/cygwin.mk * config/win/msvc.mk * config/os2/watcom.mk + Changed to init RCFLAGS from global.mk. * config/global.mk + Added support for theoretical QNX cross-builds. * ChangeLog * Updated QNX TODO list. --- harbour/ChangeLog | 35 ++++++++++++++++++++++++++++++---- harbour/config/global.mk | 4 ++++ harbour/config/os2/watcom.mk | 2 +- harbour/config/wce/mingwarm.mk | 2 +- harbour/config/wce/msvcarm.mk | 1 - harbour/config/wce/poccarm.mk | 1 - harbour/config/win/bcc.mk | 1 - harbour/config/win/cygwin.mk | 2 +- harbour/config/win/mingw.mk | 14 +++++++++++++- harbour/config/win/msvc.mk | 1 - harbour/config/win/pocc.mk | 1 - harbour/config/win/watcom.mk | 2 +- harbour/config/win/xcc.mk | 1 - 13 files changed, 52 insertions(+), 15 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 61a9af085b..94658815b2 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,33 @@ The license applies to all entries newer than 2009-04-28. */ +2010-06-16 11:45 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * config/win/mingw.mk + + Added (commented) support for -m32/-m64 options. + This may be useful in the future f.e. for mingw tdm 4.5.0 + compiler which can build both 64 and 32-bit targets using + the same compiler binaries. + + * config/global.mk + * config/wce/mingwarm.mk + * config/wce/poccarm.mk + * config/wce/msvcarm.mk + * config/win/xcc.mk + * config/win/mingw.mk + * config/win/pocc.mk + * config/win/bcc.mk + * config/win/watcom.mk + * config/win/cygwin.mk + * config/win/msvc.mk + * config/os2/watcom.mk + + Changed to init RCFLAGS from global.mk. + + * config/global.mk + + Added support for theoretical QNX cross-builds. + + * ChangeLog + * Updated QNX TODO list. + 2010-06-16 11:14 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/global.mk + Added HB_COMPILER autodetection for QNX. Minor optimization. @@ -396,12 +423,12 @@ ; NOTE on QNX: All binaries build cleanly, hbtest works. ; TOFIX/TODO: - - hbrun seems to misdetect the width of the terminal - - Clean some hacks in QNX port - - platform autodetection missing - - TODO_CRTSCTS + - hbrun seems to misdetect the width of the terminal (gttrm). + - Clean some hacks in QNX port (gttrm) + - TODO_CRTSCTS (hbcom) - pgsql/mysql/openssl dependent libs don't build due to missing constants/functions. + - platform autodetection missing [DONE] ! Due to missing $(realpath), locally hosted packages are never detected, which causes hbmk2 to miss pcre lib. - retest whole port from vanilla SVN source, test MT diff --git a/harbour/config/global.mk b/harbour/config/global.mk index cb219f7463..95f288c331 100644 --- a/harbour/config/global.mk +++ b/harbour/config/global.mk @@ -1248,6 +1248,7 @@ HB_CFLAGS_STA := HB_CFLAGS_DYN := CFLAGS := +RCFLAGS := ARFLAGS := LDFLAGS := DFLAGS := @@ -1323,6 +1324,9 @@ ifneq ($(HB_HOST_PLAT)$(HB_HOST_CPU),$(HB_PLATFORM)$(HB_CPU)) ifeq ($(HB_PLATFORM),beos) HB_PRGFLAGS += -D__PLATFORM__BEOS -D__PLATFORM__UNIX endif + ifeq ($(HB_PLATFORM),qnx) + HB_PRGFLAGS += -D__PLATFORM__QNX -D__PLATFORM__UNIX + endif endif endif endif diff --git a/harbour/config/os2/watcom.mk b/harbour/config/os2/watcom.mk index 05d6a75b5a..a41a46cb61 100644 --- a/harbour/config/os2/watcom.mk +++ b/harbour/config/os2/watcom.mk @@ -59,7 +59,7 @@ endif RC := wrc RC_OUT := -fo= -RCFLAGS := -q -r -zm -bt=os2 +RCFLAGS += -q -r -zm -bt=os2 LD := wlink ifeq ($(HB_BUILD_DEBUG),yes) diff --git a/harbour/config/wce/mingwarm.mk b/harbour/config/wce/mingwarm.mk index 202dc8d358..6e0ce1ac78 100644 --- a/harbour/config/wce/mingwarm.mk +++ b/harbour/config/wce/mingwarm.mk @@ -38,7 +38,7 @@ endif RC := $(HB_CCPATH)$(HB_CCPREFIX)windres RC_OUT := -o$(subst x,x, ) -RCFLAGS := -O coff +RCFLAGS += -O coff ifneq ($(filter $(HB_BUILD_STRIP),all lib),) ARSTRIP = && ${HB_CCPATH}${HB_CCPREFIX}strip -S $(LIB_DIR)/$@ diff --git a/harbour/config/wce/msvcarm.mk b/harbour/config/wce/msvcarm.mk index 96d74262f0..b03148b1e7 100644 --- a/harbour/config/wce/msvcarm.mk +++ b/harbour/config/wce/msvcarm.mk @@ -76,7 +76,6 @@ endif RC := rc.exe RC_OUT := -fo$(subst x,x, ) -RCFLAGS := ifeq ($(filter $(HB_COMPILER_VER),1200 1300 1310 1400 1500),) RCFLAGS += -nologo endif diff --git a/harbour/config/wce/poccarm.mk b/harbour/config/wce/poccarm.mk index f9708997e8..c96a850e8f 100644 --- a/harbour/config/wce/poccarm.mk +++ b/harbour/config/wce/poccarm.mk @@ -38,7 +38,6 @@ endif RC := porc.exe RC_OUT := -fo$(subst x,x, ) -RCFLAGS := LD := polink.exe LD_OUT := -out: diff --git a/harbour/config/win/bcc.mk b/harbour/config/win/bcc.mk index 414e0fd683..d6d33e1b54 100644 --- a/harbour/config/win/bcc.mk +++ b/harbour/config/win/bcc.mk @@ -58,7 +58,6 @@ endif RC := brcc32.exe RC_OUT := -fo -RCFLAGS := LD := ilink32.exe LIBPATHS := $(subst /,$(BACKSLASH),-L"$(LIB_DIR)") diff --git a/harbour/config/win/cygwin.mk b/harbour/config/win/cygwin.mk index a8891815ac..060556fa17 100644 --- a/harbour/config/win/cygwin.mk +++ b/harbour/config/win/cygwin.mk @@ -35,7 +35,7 @@ endif RC := $(HB_CCPATH)$(HB_CCPREFIX)windres RC_OUT := -o$(subst x,x, ) -RCFLAGS := -O coff +RCFLAGS += -O coff ifneq ($(filter $(HB_BUILD_STRIP),all lib),) ARSTRIP = && ${HB_CCPATH}${HB_CCPREFIX}strip -S $(LIB_DIR)/$@ diff --git a/harbour/config/win/mingw.mk b/harbour/config/win/mingw.mk index affd600fd9..d208b72a90 100644 --- a/harbour/config/win/mingw.mk +++ b/harbour/config/win/mingw.mk @@ -54,13 +54,25 @@ ifneq ($(HB_BUILD_OPTIM),no) endif endif +#ifeq ($(HB_COMPILER),mingw64) +# CFLAGS += -m64 +# DFLAGS += -m64 +# LDFLAGS += -m64 +# RCFLAGS += -m64 +#else +# CFLAGS += -m32 +# DFLAGS += -m32 +# LDFLAGS += -m32 +# RCFLAGS += -m32 +#endif + ifeq ($(HB_BUILD_DEBUG),yes) CFLAGS += -g endif RC := $(HB_CCPATH)$(HB_CCPREFIX)windres RC_OUT := -o$(subst x,x, ) -RCFLAGS := -O coff +RCFLAGS += -O coff ifneq ($(filter $(HB_BUILD_STRIP),all lib),) ARSTRIP = && ${HB_CCPATH}${HB_CCPREFIX}strip -S $(LIB_DIR)/$@ diff --git a/harbour/config/win/msvc.mk b/harbour/config/win/msvc.mk index bf70d3fac5..281e1fb3be 100644 --- a/harbour/config/win/msvc.mk +++ b/harbour/config/win/msvc.mk @@ -63,7 +63,6 @@ endif RC := rc.exe RC_OUT := -fo$(subst x,x, ) -RCFLAGS := # Windows SDK 7.0 also supports it, but we cannot detect it. ifeq ($(filter $(HB_COMPILER_VER),1200 1300 1310 1400 1500),) RCFLAGS += -nologo diff --git a/harbour/config/win/pocc.mk b/harbour/config/win/pocc.mk index e6445a1289..8d233ad8b4 100644 --- a/harbour/config/win/pocc.mk +++ b/harbour/config/win/pocc.mk @@ -33,7 +33,6 @@ endif RC := porc.exe RC_OUT := -fo$(subst x,x, ) -RCFLAGS := LD := polink.exe LD_OUT := -out: diff --git a/harbour/config/win/watcom.mk b/harbour/config/win/watcom.mk index 4f42348833..6d3ae91ded 100644 --- a/harbour/config/win/watcom.mk +++ b/harbour/config/win/watcom.mk @@ -53,7 +53,7 @@ endif RC := wrc RC_OUT := -fo= -RCFLAGS := -q -r -zm -bt=nt +RCFLAGS += -q -r -zm -bt=nt LD := wlink ifeq ($(HB_BUILD_DEBUG),yes) diff --git a/harbour/config/win/xcc.mk b/harbour/config/win/xcc.mk index dc2f098921..d08ba1c4d5 100644 --- a/harbour/config/win/xcc.mk +++ b/harbour/config/win/xcc.mk @@ -41,7 +41,6 @@ endif RC := xRC.exe RC_OUT := -fo$(subst x,x, ) -RCFLAGS := LD := xLink.exe LD_OUT := -out: