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

2009-02-06 23:47 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* common.mak
  * harbour-wce-spec
  * harbour-win-spec
  * harbour.spec
  * make_b32.bat
  * make_b32.mak
  * make_gcc.mak
  * make_gcc.sh
  * make_gnu.bat
  * make_gnu.sh
  * make_gnu_os2.cmd
  * make_gnu_xmingw.sh
  * make_gnu_xmingwce.sh
  * make_vc.bat
  * make_vc.mak
  * mpkg_tgz.sh
  * bin/hb-func.sh
  * bin/hb-mkslib.sh
  * bin/hbmk.bat
  * bin/hbmk_os2.cmd
  * bin/postinst.sh
  * config/bin.cf
  * config/bsd/gcc.cf
  * config/darwin/gcc.cf
  * config/dos/bcc16.cf
  * config/dos/djgpp.cf
  * config/dos/owatcom.cf
  * config/dos/rsx32.cf
  * config/hpux/gcc.cf
  * config/lib.cf
  * config/linux/gcc.cf
  * config/linux/owatcom.cf
  * config/os2/gcc.cf
  * config/os2/icc.cf
  * config/rules.cf
  * config/sunos/gcc.cf
  * config/win/bcc32.cf
  * config/win/dm.cf
  * config/win/gcc.cf
  * config/win/icc.cf
  * config/win/mingw.cf
  * config/win/mingwce.cf
  * config/win/msvc.cf
  * config/win/msvcce.cf
  * config/win/owatcom.cf
  * config/win/pocc.cf
  * config/win/pocc64.cf
  * config/win/poccce.cf
  * config/win/rsxnt.cf
  * config/win/xcc.cf
  * contrib/gtalleg/Makefile
  * contrib/hbapollo/Makefile
  * contrib/hbcurl/Makefile
  * contrib/hbfbird/Makefile
  * contrib/hbfimage/Makefile
  * contrib/hbgd/Makefile
  * contrib/hbgd/tests/hbmk_b32.bat
  * contrib/hbgd/tests/hbmk_vc.bat
  * contrib/hbgf/hbgfgtk/Makefile
  * contrib/hbhpdf/Makefile
  * contrib/hbmysql/Makefile
  * contrib/hbodbc/Makefile
  * contrib/hbpgsql/Makefile
  * contrib/hbssl/Makefile
  * contrib/hbtip/ChangeLog
  * contrib/hbwhat/Makefile
  * contrib/hbwhat/tests/hbmk_b32.bat
  * contrib/hbwhat/tests/hbmk_vc.bat
  * contrib/mtpl_b32.bat
  * contrib/mtpl_b32.mak
  * contrib/mtpl_gcc.mak
  * contrib/mtpl_gcc.sh
  * contrib/mtpl_vc.bat
  * contrib/mtpl_vc.mak
  * contrib/rddads/Makefile
  * contrib/rddsql/sddfb/Makefile
  * contrib/rddsql/sddmy/Makefile
  * contrib/rddsql/sddpg/Makefile
  * doc/es/tracing.txt
  * doc/gmake.txt
  * doc/tracing.txt
  * include/hbapi.h
  * source/main/harbour.c
  * source/pp/hbpp.c
  * source/rdd/dbffpt/Makefile
  * source/vm/cmdarg.c
  * source/vm/Makefile
  * source/vm/vmmt/Makefile
  * tests/multifnc/Makefile
  * tests/testid.prg
  * utils/hbdoc/Makefile
  * utils/hbi18n/Makefile
  * utils/hbmake/hbmake.prg
  * utils/hbmake/Makefile
  * utils/hbrun/Makefile
  * utils/hbtest/Makefile
    * Renamed remaining build configration envvars:
      - PRG_USR -> HB_USER_PRGFLAGS
      - C_USR   -> HB_USER_CFLAGS
      - L_USR   -> HB_USER_LDFLAGS
      - A_USR   -> HB_USER_AFLAGS
      - MK_USR  -> HB_USER_MAKEFLAGS
      (finally settled with HB_USER* instead of HB_USR*,
      this also means that HB_USER_LIBS was kept unchanged.)
    ; Please update your environment.
      You may use these commands to make it easy:
      gsar -o -sPRG_USR -rHB_USER_PRGFLAGS  *
      gsar -o -sC_USR   -rHB_USER_CFLAGS    *
      gsar -o -sL_USR   -rHB_USER_LDFLAGS   *
      gsar -o -sA_USR   -rHB_USER_AFLAGS    *
      gsar -o -sMK_USR  -rHB_USER_MAKEFLAGS *
This commit is contained in:
Viktor Szakats
2009-02-06 23:15:37 +00:00
parent 3ad2bff030
commit a341b29acd
97 changed files with 425 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
harbour/ChangeLog
View File

@@ -8,6 +8,119 @@
2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2009-02-06 23:47 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* common.mak
* harbour-wce-spec
* harbour-win-spec
* harbour.spec
* make_b32.bat
* make_b32.mak
* make_gcc.mak
* make_gcc.sh
* make_gnu.bat
* make_gnu.sh
* make_gnu_os2.cmd
* make_gnu_xmingw.sh
* make_gnu_xmingwce.sh
* make_vc.bat
* make_vc.mak
* mpkg_tgz.sh
* bin/hb-func.sh
* bin/hb-mkslib.sh
* bin/hbmk.bat
* bin/hbmk_os2.cmd
* bin/postinst.sh
* config/bin.cf
* config/bsd/gcc.cf
* config/darwin/gcc.cf
* config/dos/bcc16.cf
* config/dos/djgpp.cf
* config/dos/owatcom.cf
* config/dos/rsx32.cf
* config/hpux/gcc.cf
* config/lib.cf
* config/linux/gcc.cf
* config/linux/owatcom.cf
* config/os2/gcc.cf
* config/os2/icc.cf
* config/rules.cf
* config/sunos/gcc.cf
* config/win/bcc32.cf
* config/win/dm.cf
* config/win/gcc.cf
* config/win/icc.cf
* config/win/mingw.cf
* config/win/mingwce.cf
* config/win/msvc.cf
* config/win/msvcce.cf
* config/win/owatcom.cf
* config/win/pocc.cf
* config/win/pocc64.cf
* config/win/poccce.cf
* config/win/rsxnt.cf
* config/win/xcc.cf
* contrib/gtalleg/Makefile
* contrib/hbapollo/Makefile
* contrib/hbcurl/Makefile
* contrib/hbfbird/Makefile
* contrib/hbfimage/Makefile
* contrib/hbgd/Makefile
* contrib/hbgd/tests/hbmk_b32.bat
* contrib/hbgd/tests/hbmk_vc.bat
* contrib/hbgf/hbgfgtk/Makefile
* contrib/hbhpdf/Makefile
* contrib/hbmysql/Makefile
* contrib/hbodbc/Makefile
* contrib/hbpgsql/Makefile
* contrib/hbssl/Makefile
* contrib/hbtip/ChangeLog
* contrib/hbwhat/Makefile
* contrib/hbwhat/tests/hbmk_b32.bat
* contrib/hbwhat/tests/hbmk_vc.bat
* contrib/mtpl_b32.bat
* contrib/mtpl_b32.mak
* contrib/mtpl_gcc.mak
* contrib/mtpl_gcc.sh
* contrib/mtpl_vc.bat
* contrib/mtpl_vc.mak
* contrib/rddads/Makefile
* contrib/rddsql/sddfb/Makefile
* contrib/rddsql/sddmy/Makefile
* contrib/rddsql/sddpg/Makefile
* doc/es/tracing.txt
* doc/gmake.txt
* doc/tracing.txt
* include/hbapi.h
* source/main/harbour.c
* source/pp/hbpp.c
* source/rdd/dbffpt/Makefile
* source/vm/cmdarg.c
* source/vm/Makefile
* source/vm/vmmt/Makefile
* tests/multifnc/Makefile
* tests/testid.prg
* utils/hbdoc/Makefile
* utils/hbi18n/Makefile
* utils/hbmake/hbmake.prg
* utils/hbmake/Makefile
* utils/hbrun/Makefile
* utils/hbtest/Makefile
* Renamed remaining build configration envvars:
- PRG_USR -> HB_USER_PRGFLAGS
- C_USR -> HB_USER_CFLAGS
- L_USR -> HB_USER_LDFLAGS
- A_USR -> HB_USER_AFLAGS
- MK_USR -> HB_USER_MAKEFLAGS
(finally settled with HB_USER* instead of HB_USR*,
this also means that HB_USER_LIBS was kept unchanged.)
; Please update your environment.
You may use these commands to make it easy:
gsar -o -sPRG_USR -rHB_USER_PRGFLAGS *
gsar -o -sC_USR -rHB_USER_CFLAGS *
gsar -o -sL_USR -rHB_USER_LDFLAGS *
gsar -o -sA_USR -rHB_USER_AFLAGS *
gsar -o -sMK_USR -rHB_USER_MAKEFLAGS *
2009-02-06 23:00 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* include/hbpp.h
* Minor rearrangement of previous state.

46
harbour/bin/hb-func.sh
View File

@@ -165,13 +165,13 @@ mk_hbtools()
HB_SYS_LIBS="-lm"
HB_CRS_LIB=""
HB_SLN_LIB=""
if [ "${C_USR//-DHB_PCRE_REGEX/}" != "${C_USR}" ]; then
if [ "${HB_USER_CFLAGS//-DHB_PCRE_REGEX/}" != "${HB_USER_CFLAGS}" ]; then
HB_SYS_LIBS="-lpcre ${HB_SYS_LIBS}"
hb_libs="${hb_libs//hbpcre/}"
elif [ "${C_USR//-DHB_POSIX_REGEX/}" != "${C_USR}" ]; then
elif [ "${HB_USER_CFLAGS//-DHB_POSIX_REGEX/}" != "${HB_USER_CFLAGS}" ]; then
hb_libs="${hb_libs//hbpcre/}"
fi
if [ "${C_USR//-DHB_EXT_ZLIB/}" != "${C_USR}" ]; then
if [ "${HB_USER_CFLAGS//-DHB_EXT_ZLIB/}" != "${HB_USER_CFLAGS}" ]; then
HB_SYS_LIBS="-lz ${HB_SYS_LIBS}"
hb_libs="${hb_libs//hbzlib/}"
fi
@@ -201,24 +201,24 @@ mk_hbtools()
fi
HB_SLN_LIB="slang"
fi
CC_C_USR="-O3 ${CC_C_USR}"
if [ "${C_USR//-mlp64/}" != "${C_USR}" ]; then
CC_C_USR="${CC_C_USR} -mlp64"
CC_L_USR="${CC_L_USR} -mlp64"
elif [ "${C_USR//-mlp32/}" != "${C_USR}" ]; then
CC_C_USR="${CC_C_USR} -mlp32"
CC_L_USR="${CC_L_USR} -mlp32"
elif [ "${C_USR//-m64/}" != "${C_USR}" ]; then
CC_C_USR="${CC_C_USR} -m64"
CC_L_USR="${CC_L_USR} -m64"
elif [ "${C_USR//-m32/}" != "${C_USR}" ]; then
CC_C_USR="${CC_C_USR} -m32"
CC_L_USR="${CC_L_USR} -m32"
CC_HB_USER_CFLAGS="-O3 ${CC_HB_USER_CFLAGS}"
if [ "${HB_USER_CFLAGS//-mlp64/}" != "${HB_USER_CFLAGS}" ]; then
CC_HB_USER_CFLAGS="${CC_HB_USER_CFLAGS} -mlp64"
CC_HB_USER_LDFLAGS="${CC_HB_USER_LDFLAGS} -mlp64"
elif [ "${HB_USER_CFLAGS//-mlp32/}" != "${HB_USER_CFLAGS}" ]; then
CC_HB_USER_CFLAGS="${CC_HB_USER_CFLAGS} -mlp32"
CC_HB_USER_LDFLAGS="${CC_HB_USER_LDFLAGS} -mlp32"
elif [ "${HB_USER_CFLAGS//-m64/}" != "${HB_USER_CFLAGS}" ]; then
CC_HB_USER_CFLAGS="${CC_HB_USER_CFLAGS} -m64"
CC_HB_USER_LDFLAGS="${CC_HB_USER_LDFLAGS} -m64"
elif [ "${HB_USER_CFLAGS//-m32/}" != "${HB_USER_CFLAGS}" ]; then
CC_HB_USER_CFLAGS="${CC_HB_USER_CFLAGS} -m32"
CC_HB_USER_LDFLAGS="${CC_HB_USER_LDFLAGS} -m32"
fi
if [ "${C_USR//-fPIC/}" != "${C_USR}" ]; then
CC_C_USR="${CC_C_USR} -fPIC"
elif [ "${C_USR//-fpic/}" != "${C_USR}" ]; then
CC_C_USR="${CC_C_USR} -fpic"
if [ "${HB_USER_CFLAGS//-fPIC/}" != "${HB_USER_CFLAGS}" ]; then
CC_HB_USER_CFLAGS="${CC_HB_USER_CFLAGS} -fPIC"
elif [ "${HB_USER_CFLAGS//-fpic/}" != "${HB_USER_CFLAGS}" ]; then
CC_HB_USER_CFLAGS="${CC_HB_USER_CFLAGS} -fpic"
fi
echo "Generating ${hb_tool}... "
@@ -321,9 +321,9 @@ HB_USRLIBS=""
HB_USRLPATH=""
HB_GEN=""
HB_MODE=""
LN_OPT="${CC_L_USR}"
CC_OPT="${CC_C_USR}"
HB_OPT="${CC_PRG_USR}"
LN_OPT="${CC_HB_USER_LDFLAGS}"
CC_OPT="${CC_HB_USER_CFLAGS}"
HB_OPT="${CC_HB_USER_PRGFLAGS}"
[ -n "\$TMPDIR" ] || TMPDIR="\$TMP"
[ -n "\$TMPDIR" ] || TMPDIR="\$TEMP"

4
harbour/bin/hb-mkslib.sh
View File

@@ -138,7 +138,7 @@ elif [ "${SLIB_EXT}" = ".dll" ]; then
SYSLIBS="-luser32 -lwinspool -lgdi32 -lcomctl32 -lcomdlg32 -lole32"
SYSLIBS="${SYSLIBS} -loleaut32 -luuid -lmpr -lwsock32 -lws2_32 -lmapi32"
fi
${CCPREFIX}gcc -shared -o "${FULLNAME}" $OBJLST ${linker_options} ${L_USR} ${SYSLIBS} ${HB_DLLIBS} && \
${CCPREFIX}gcc -shared -o "${FULLNAME}" $OBJLST ${linker_options} ${HB_USER_LDFLAGS} ${SYSLIBS} ${HB_DLLIBS} && \
cd "${dir}" && \
rm -f "${DSTDIR}${FULLNAME}" && \
mv -f "${OTMPDIR}/${FULLNAME}" "${DSTDIR}${FULLNAME}"
@@ -146,7 +146,7 @@ else
#FULLNAME="${BASE}-${VERSION}${SLIB_EXT}"
#FULLNAME="${BASE}{SLIB_EXT}.${VERSION}"
FULLNAME="${LIB_NAME}${SLIB_EXT}"
${CCPREFIX}gcc -shared -fPIC -o "${FULLNAME}" $OBJLST ${linker_options} ${L_USR} && \
${CCPREFIX}gcc -shared -fPIC -o "${FULLNAME}" $OBJLST ${linker_options} ${HB_USER_LDFLAGS} && \
cd "${dir}" && \
mv -f "${OTMPDIR}/${FULLNAME}" "${DSTDIR}${FULLNAME}"
fi

26
harbour/bin/hbmk.bat
View File

@@ -128,7 +128,7 @@ if "%_HB_MT%" == "yes" set _HB_MT=mt
if "%OS%" == "Windows_NT" set _HB_PRG_NAME=%~n1
if not "%OS%" == "Windows_NT" set _HB_PRG_NAME=%1
%HB_BIN_INSTALL%\harbour %_HB_PRG_NAME%.prg -n -q0 -i%HB_INC_INSTALL% %2 %3 %PRG_USR%
%HB_BIN_INSTALL%\harbour %_HB_PRG_NAME%.prg -n -q0 -i%HB_INC_INSTALL% %2 %3 %HB_USER_PRGFLAGS%
:A_DOS
@@ -137,7 +137,7 @@ if "%_HB_MT%" == "yes" set _HB_MT=mt
if not "%HB_COMPILER%" == "djgpp" goto A_DOS_DJGPP_NOT
echo %_HB_PRG_NAME%.c > _hb_mk.tmp
echo -o%_HB_PRG_NAME%.exe -O3 %C_USR% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% >> _hb_mk.tmp
echo -o%_HB_PRG_NAME%.exe -O3 %HB_USER_CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% >> _hb_mk.tmp
echo -lhbcpage >> _hb_mk.tmp
echo -lhbdebug >> _hb_mk.tmp
echo -lhbvm >> _hb_mk.tmp
@@ -168,15 +168,15 @@ if "%_HB_MT%" == "yes" set _HB_MT=mt
if not "%HB_COMPILER%" == "rsx32" goto A_DOS_RSX32_NOT
gcc %_HB_PRG_NAME%.c -O3 -Zrsx32 %C_USR% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -lhbcpage -lhbdebug -lhbvm -lhbrtl -lgtdos -lgtcgi -lgtstd -lgtpca -lhblang -lhbrdd -lhbrtl -lhbvm -lhbmacro -lhbpp -lrddfpt -lrddntx -lrddnsx -lrddcdx -lhbhsx -lhbsix -lhbcommon -lhbpcre -lhbzlib
gcc %_HB_PRG_NAME%.c -O3 -Zrsx32 %HB_USER_CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -lhbcpage -lhbdebug -lhbvm -lhbrtl -lgtdos -lgtcgi -lgtstd -lgtpca -lhblang -lhbrdd -lhbrtl -lhbvm -lhbmacro -lhbpp -lrddfpt -lrddntx -lrddnsx -lrddcdx -lhbhsx -lhbsix -lhbcommon -lhbpcre -lhbzlib
goto CLEANUP
:A_DOS_RSX32_NOT
if not "%HB_COMPILER%" == "owatcom" goto END
wpp386 -j -w3 -5s -5r -fp5 -oxehtz -zq -zt0 -bt=DOS %C_USR% %_HB_PRG_NAME%.c -fo=%_HB_PRG_NAME%.obj
echo OP osn=DOS OP stack=65536 OP CASEEXACT OP stub=cwstub.exe %L_USR% NAME %_HB_PRG_NAME%.exe > _hb_mk.tmp
wpp386 -j -w3 -5s -5r -fp5 -oxehtz -zq -zt0 -bt=DOS %HB_USER_CFLAGS% %_HB_PRG_NAME%.c -fo=%_HB_PRG_NAME%.obj
echo OP osn=DOS OP stack=65536 OP CASEEXACT OP stub=cwstub.exe %HB_USER_LDFLAGS% NAME %_HB_PRG_NAME%.exe > _hb_mk.tmp
echo FILE %_HB_PRG_NAME%.obj >> _hb_mk.tmp
echo LIB hbcpage.lib >> _hb_mk.tmp
echo LIB hbdebug.lib >> _hb_mk.tmp
@@ -216,8 +216,8 @@ if "%_HB_MT%" == "yes" set _HB_MT=mt
if "%_HB_GUI%" == "yes" set _HB_USR_C=%_HB_USR_C% -tW
if not "%_HB_SHARED%" == "yes" bcc32 -q -tWM -O2 -OS -Ov -Oi -Oc -d %C_USR% %_HB_USR_C% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% %_HB_PRG_NAME%.c %HB_USER_LIBS% hbcpage.lib hbdebug.lib hbvm%_HB_MT%.lib hbrtl.lib gtcgi.lib gtgui.lib gtpca.lib gtstd.lib gtwin.lib gtwvt.lib hblang.lib hbrdd.lib hbmacro.lib hbpp.lib rddfpt.lib rddntx.lib rddnsx.lib rddcdx.lib hbhsx.lib hbsix.lib hbcommon.lib hbpcre.lib hbzlib.lib
if "%_HB_SHARED%" == "yes" bcc32 -q -tWM -O2 -OS -Ov -Oi -Oc -d %C_USR% %_HB_USR_C% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% %_HB_PRG_NAME%.c %HB_USER_LIBS% harbour%_HB_MT%-11-b32.lib hbmainstd.lib hbmainwin.lib hbcommon.lib
if not "%_HB_SHARED%" == "yes" bcc32 -q -tWM -O2 -OS -Ov -Oi -Oc -d %HB_USER_CFLAGS% %_HB_USR_C% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% %_HB_PRG_NAME%.c %HB_USER_LIBS% hbcpage.lib hbdebug.lib hbvm%_HB_MT%.lib hbrtl.lib gtcgi.lib gtgui.lib gtpca.lib gtstd.lib gtwin.lib gtwvt.lib hblang.lib hbrdd.lib hbmacro.lib hbpp.lib rddfpt.lib rddntx.lib rddnsx.lib rddcdx.lib hbhsx.lib hbsix.lib hbcommon.lib hbpcre.lib hbzlib.lib
if "%_HB_SHARED%" == "yes" bcc32 -q -tWM -O2 -OS -Ov -Oi -Oc -d %HB_USER_CFLAGS% %_HB_USR_C% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% %_HB_PRG_NAME%.c %HB_USER_LIBS% harbour%_HB_MT%-11-b32.lib hbmainstd.lib hbmainwin.lib hbcommon.lib
goto CLEANUP
@@ -230,8 +230,8 @@ if "%_HB_MT%" == "yes" set _HB_MT=mt
if not "%_HB_GUI%" == "yes" set _HB_USR_L=/subsystem:console
if "%_HB_GUI%" == "yes" set _HB_USR_L=/subsystem:windows
if not "%_HB_SHARED%" == "yes" cl -nologo -W3 %C_USR% %_HB_USR_C% -I%HB_INC_INSTALL% %_HB_PRG_NAME%.c /link /libpath:%HB_LIB_INSTALL% %L_USR% %_HB_USR_L% %HB_USER_LIBS% hbcpage.lib hbdebug.lib hbvm%_HB_MT%.lib hbrtl.lib gtcgi.lib gtgui.lib gtpca.lib gtstd.lib gtwin.lib gtwvt.lib hblang.lib hbrdd.lib hbmacro.lib hbpp.lib rddntx.lib rddnsx.lib rddcdx.lib rddfpt.lib hbhsx.lib hbsix.lib hbcommon.lib hbpcre.lib hbzlib.lib user32.lib wsock32.lib advapi32.lib gdi32.lib
if "%_HB_SHARED%" == "yes" cl -nologo -W3 %C_USR% %_HB_USR_C% -I%HB_INC_INSTALL% %_HB_PRG_NAME%.c /link /libpath:%HB_LIB_INSTALL% %L_USR% %_HB_USR_L% %HB_USER_LIBS% harbour%_HB_MT%-11-vc.lib hbmainstd.lib hbmainwin.lib hbcommon.lib user32.lib wsock32.lib advapi32.lib gdi32.lib
if not "%_HB_SHARED%" == "yes" cl -nologo -W3 %HB_USER_CFLAGS% %_HB_USR_C% -I%HB_INC_INSTALL% %_HB_PRG_NAME%.c /link /libpath:%HB_LIB_INSTALL% %HB_USER_LDFLAGS% %_HB_USR_L% %HB_USER_LIBS% hbcpage.lib hbdebug.lib hbvm%_HB_MT%.lib hbrtl.lib gtcgi.lib gtgui.lib gtpca.lib gtstd.lib gtwin.lib gtwvt.lib hblang.lib hbrdd.lib hbmacro.lib hbpp.lib rddntx.lib rddnsx.lib rddcdx.lib rddfpt.lib hbhsx.lib hbsix.lib hbcommon.lib hbpcre.lib hbzlib.lib user32.lib wsock32.lib advapi32.lib gdi32.lib
if "%_HB_SHARED%" == "yes" cl -nologo -W3 %HB_USER_CFLAGS% %_HB_USR_C% -I%HB_INC_INSTALL% %_HB_PRG_NAME%.c /link /libpath:%HB_LIB_INSTALL% %HB_USER_LDFLAGS% %_HB_USR_L% %HB_USER_LIBS% harbour%_HB_MT%-11-vc.lib hbmainstd.lib hbmainwin.lib hbcommon.lib user32.lib wsock32.lib advapi32.lib gdi32.lib
goto CLEANUP
:A_WIN_MSVC_NOT
@@ -239,22 +239,22 @@ if "%_HB_MT%" == "yes" set _HB_MT=mt
if "%HB_COMPILER%" == "gcc" set HB_COMPILER=mingw
if not "%HB_COMPILER%" == "mingw" goto A_WIN_MINGW_NOT
gcc %_HB_PRG_NAME%.c -O3 -o%_HB_PRG_NAME%.exe %C_USR% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -lhbcpage -lhbdebug -lhbvm%_HB_MT% -lhbrtl -lgtcgi -lgtgui -lgtpca -lgtstd -lgtwin -lgtwvt -lhblang -lhbrdd -lhbrtl -lhbvm%_HB_MT% -lhbmacro -lhbpp -lrddfpt -lrddntx -lrddnsx -lrddcdx -lhbhsx -lhbsix -lhbcommon -lhbpcre -lhbzlib
gcc %_HB_PRG_NAME%.c -O3 -o%_HB_PRG_NAME%.exe %HB_USER_CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -lhbcpage -lhbdebug -lhbvm%_HB_MT% -lhbrtl -lgtcgi -lgtgui -lgtpca -lgtstd -lgtwin -lgtwvt -lhblang -lhbrdd -lhbrtl -lhbvm%_HB_MT% -lhbmacro -lhbpp -lrddfpt -lrddntx -lrddnsx -lrddcdx -lhbhsx -lhbsix -lhbcommon -lhbpcre -lhbzlib
goto CLEANUP
:A_WIN_MINGW_NOT
if not "%HB_COMPILER%" == "rsxnt" goto A_WIN_RSXNT_NOT
gcc %_HB_PRG_NAME%.c -O3 -Zwin32 %C_USR% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -lhbcpage -lhbdebug -lhbvm%_HB_MT% -lhbrtl -lgtcgi -lgtgui -lgtpca -lgtstd -lgtwin -lgtwvt -lhblang -lhbrdd -lhbrtl -lhbvm%_HB_MT% -lhbmacro -lhbpp -lrddfpt -lrddntx -lrddnsx -lrddcdx -lhbhsx -lhbsix -lhbcommon -lhbpcre -lhbzlib
gcc %_HB_PRG_NAME%.c -O3 -Zwin32 %HB_USER_CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -lhbcpage -lhbdebug -lhbvm%_HB_MT% -lhbrtl -lgtcgi -lgtgui -lgtpca -lgtstd -lgtwin -lgtwvt -lhblang -lhbrdd -lhbrtl -lhbvm%_HB_MT% -lhbmacro -lhbpp -lrddfpt -lrddntx -lrddnsx -lrddcdx -lhbhsx -lhbsix -lhbcommon -lhbpcre -lhbzlib
goto CLEANUP
:A_WIN_RSXNT_NOT
if not "%HB_COMPILER%" == "owatcom" goto END
wpp386 -j -w3 -5s -5r -fp5 -oxehtz -zq -zt0 -mf -bt=NT %C_USR% %_HB_PRG_NAME%.c -fo=%_HB_PRG_NAME%.obj
echo OP osn=NT OP stack=65536 OP CASEEXACT %L_USR% NAME %_HB_PRG_NAME%.exe > _hb_mk.tmp
wpp386 -j -w3 -5s -5r -fp5 -oxehtz -zq -zt0 -mf -bt=NT %HB_USER_CFLAGS% %_HB_PRG_NAME%.c -fo=%_HB_PRG_NAME%.obj
echo OP osn=NT OP stack=65536 OP CASEEXACT %HB_USER_LDFLAGS% NAME %_HB_PRG_NAME%.exe > _hb_mk.tmp
echo FILE %_HB_PRG_NAME%.obj >> _hb_mk.tmp
echo LIB hbcpage.lib >> _hb_mk.tmp
echo LIB hbdebug.lib >> _hb_mk.tmp

10
harbour/bin/hbmk_os2.cmd
View File

@@ -74,28 +74,28 @@ if "%_HB_MT%" == "MT" set _HBVM_LIB=hbvmmt
:COMPILE
%HB_BIN_INSTALL%\harbour %1.prg -n -i%HB_INC_INSTALL% %2 %3 %PRG_USR%
%HB_BIN_INSTALL%\harbour %1.prg -n -i%HB_INC_INSTALL% %2 %3 %HB_USER_PRGFLAGS%
:A_DOS
if not "%HB_COMPILER%" == "gcc" goto A_OS2_GCC_NOT
gcc %1.c -O3 %C_USR% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -lhbcpage -lhbdebug -l_HBVM_LIB -lhbrtl -lgtcgi -lgtstd -lgtos2 -lgtpca -lhblang -lhbrdd -lhbrtl -l_HBVM_LIB -lhbmacro -lhbpp -lrddfpt -lrddntx -lrddnsx -lrddcdx -lhbsix -lhbcommon -lhbpcre -lhbzlib
gcc %1.c -O3 %HB_USER_CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -lhbcpage -lhbdebug -l_HBVM_LIB -lhbrtl -lgtcgi -lgtstd -lgtos2 -lgtpca -lhblang -lhbrdd -lhbrtl -l_HBVM_LIB -lhbmacro -lhbpp -lrddfpt -lrddntx -lrddnsx -lrddcdx -lhbsix -lhbcommon -lhbpcre -lhbzlib
goto CLEANUP
:A_OS2_GCC_NOT
if not "%HB_COMPILER%" == "icc" goto A_OS2_ICC_NOT
icc /Gs+ /W2 /Se /Sd+ /Ti+ /C- /Tp %C_USR% -I%HB_INC_INSTALL% %1.c %HB_LIB_INSTALL%\hbcpage.lib %HB_LIB_INSTALL%\hbdebug.lib %HB_LIB_INSTALL%\_HBVM_LIB.lib %HB_LIB_INSTALL%\hbrtl.lib %HB_LIB_INSTALL%\gtcgi.lib %HB_LIB_INSTALL%\gtstd.lib %HB_LIB_INSTALL%\gtos2.lib %HB_LIB_INSTALL%\gtpca.lib %HB_LIB_INSTALL%\hblang.lib %HB_LIB_INSTALL%\hbrdd.lib %HB_LIB_INSTALL%\hbrtl.lib %HB_LIB_INSTALL%\_HBVM_LIB.lib %HB_LIB_INSTALL%\hbmacro.lib %HB_LIB_INSTALL%\hbpp.lib %HB_LIB_INSTALL%\rddfpt.lib %HB_LIB_INSTALL%\rddntx.lib %HB_LIB_INSTALL%\rddnsx.lib %HB_LIB_INSTALL%\rddcdx.lib %HB_LIB_INSTALL%\hbsix.lib %HB_LIB_INSTALL%\hbcommon.lib %HB_LIB_INSTALL%\hbpcre.lib %HB_LIB_INSTALL%\hbzlib.lib
icc /Gs+ /W2 /Se /Sd+ /Ti+ /C- /Tp %HB_USER_CFLAGS% -I%HB_INC_INSTALL% %1.c %HB_LIB_INSTALL%\hbcpage.lib %HB_LIB_INSTALL%\hbdebug.lib %HB_LIB_INSTALL%\_HBVM_LIB.lib %HB_LIB_INSTALL%\hbrtl.lib %HB_LIB_INSTALL%\gtcgi.lib %HB_LIB_INSTALL%\gtstd.lib %HB_LIB_INSTALL%\gtos2.lib %HB_LIB_INSTALL%\gtpca.lib %HB_LIB_INSTALL%\hblang.lib %HB_LIB_INSTALL%\hbrdd.lib %HB_LIB_INSTALL%\hbrtl.lib %HB_LIB_INSTALL%\_HBVM_LIB.lib %HB_LIB_INSTALL%\hbmacro.lib %HB_LIB_INSTALL%\hbpp.lib %HB_LIB_INSTALL%\rddfpt.lib %HB_LIB_INSTALL%\rddntx.lib %HB_LIB_INSTALL%\rddnsx.lib %HB_LIB_INSTALL%\rddcdx.lib %HB_LIB_INSTALL%\hbsix.lib %HB_LIB_INSTALL%\hbcommon.lib %HB_LIB_INSTALL%\hbpcre.lib %HB_LIB_INSTALL%\hbzlib.lib
goto CLEANUP
:A_OS2_ICC_NOT
if not "%HB_COMPILER%" == "owatcom" goto END
wpp386 -j -w3 -5s -5r -fp5 -oxehtz -zq -zt0 -mf -bt=OS2 %C_USR% %_HB_PRG_NAME%.c -fo=%_HB_PRG_NAME%.obj
echo OP stack=65536 OP CASEEXACT %L_USR% NAME %_HB_PRG_NAME%.exe > _hb_mk.tmp
wpp386 -j -w3 -5s -5r -fp5 -oxehtz -zq -zt0 -mf -bt=OS2 %HB_USER_CFLAGS% %_HB_PRG_NAME%.c -fo=%_HB_PRG_NAME%.obj
echo OP stack=65536 OP CASEEXACT %HB_USER_LDFLAGS% NAME %_HB_PRG_NAME%.exe > _hb_mk.tmp
echo FILE %_HB_PRG_NAME%.obj >> _hb_mk.tmp
echo LIB hbcpage.lib >> _hb_mk.tmp
echo LIB hbdebug.lib >> _hb_mk.tmp

4
harbour/bin/postinst.sh
View File

@@ -56,7 +56,7 @@ then
# We must build an archive index on Darwin
#AR="${CCPREFIX}ar -crs"
AR="libtool"
AR_OPT="-static ${LIBTOOL_USR} -o "
AR_OPT="-static ${LIBTOOHB_USER_LDFLAGS} -o "
fi
if [ -n "${HB_TOOLS_PREF}" ]; then
@@ -83,7 +83,7 @@ then
fi
# build hbfm lib with memory statistic
(cd ${hb_root}/source/vm
export C_USR="${C_USR//-DHB_FM_STATISTICS_OFF/} -DHB_FM_STATISTICS"
export HB_USER_CFLAGS="${HB_USER_CFLAGS//-DHB_FM_STATISTICS_OFF/} -DHB_FM_STATISTICS"
rm -f fm.o
${MAKE} -r fm.o
${AR} ${AR_OPT} ${HB_LIB_INSTALL}/libhbfm.a fm.o

4
harbour/common.mak
View File

@@ -98,8 +98,8 @@ HBFLAGSPLT = -D__PLATFORM__WINCE
!else
HBFLAGSPLT = -gc3
!endif
HARBOURFLAGSLIB= -n1 $(HBFLAGSCMN) $(HBFLAGSDBG) $(HBFLAGSPLT) $(PRG_USR)
HARBOURFLAGSEXE= -n $(HBFLAGSCMN) $(HBFLAGSDBG) $(HBFLAGSPLT) -gc0 $(PRG_USR)
HARBOURFLAGSLIB= -n1 $(HBFLAGSCMN) $(HBFLAGSDBG) $(HBFLAGSPLT) $(HB_USER_PRGFLAGS)
HARBOURFLAGSEXE= -n $(HBFLAGSCMN) $(HBFLAGSDBG) $(HBFLAGSPLT) -gc0 $(HB_USER_PRGFLAGS)
#**********************************************************
# Directory macros. These should never have to change.

2
harbour/config/bin.cf
View File

@@ -31,7 +31,7 @@ ALL_OBJS = $(ALL_C_OBJS) $(ALL_PRG_OBJS)
first:: dirbase descend
descend:: dirbase
+@$(MK) -C $(ARCH_DIR) -f $(GRANDP)Makefile TOP=$(GRANDP) $(EXE_NAME) $(MK_USR)
+@$(MK) -C $(ARCH_DIR) -f $(GRANDP)Makefile TOP=$(GRANDP) $(EXE_NAME) $(HB_USER_MAKEFLAGS)
$(EXE_NAME) : $(ALL_OBJS)
$(LD_RULE)

6
harbour/config/bsd/gcc.cf
View File

@@ -73,11 +73,11 @@ LINKPATHS += -L/usr/local/lib
endif
ifneq ($(findstring -DHB_PCRE_REGEX, $(C_USR)),)
ifneq ($(findstring -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
LINKLIBS += -lpcre
endif
ifneq ($(findstring -DHB_EXT_ZLIB, $(C_USR)),)
ifneq ($(findstring -DHB_EXT_ZLIB, $(HB_USER_CFLAGS)),)
LINKLIBS += -lz
endif
@@ -86,7 +86,7 @@ LINKLIBS += -lm -Wl,--end-group
LDFLAGS += $(LINKPATHS)
AR = ar
ARFLAGS = $(A_USR)
ARFLAGS = $(HB_USER_AFLAGS)
AR_RULE = $(AR) $(ARFLAGS) r $(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@
include $(TOP)$(ROOT)config/rules.cf

10
harbour/config/darwin/gcc.cf
View File

@@ -92,24 +92,24 @@ endif
endif
ifneq ($(findstring -DHB_PCRE_REGEX, $(C_USR)),)
ifneq ($(findstring -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
LINKLIBS += -lpcre
endif
ifneq ($(findstring -DHB_EXT_ZLIB, $(C_USR)),)
ifneq ($(findstring -DHB_EXT_ZLIB, $(HB_USER_CFLAGS)),)
LINKLIBS += -lz
endif
LINKLIBS += -lm
LDFLAGS = $(LINKPATHS)
LD_RULE = $(LD) $(CFLAGS) $(LD_OUT) $@ $(^F) $(LDFLAGS) $(L_USR) $(LINKLIBS) $(LINKLIBS)
LD_RULE = $(LD) $(CFLAGS) $(LD_OUT) $@ $(^F) $(LDFLAGS) $(HB_USER_LDFLAGS) $(LINKLIBS) $(LINKLIBS)
#AR = ar
#ARFLAGS = $(A_USR)
#ARFLAGS = $(HB_USER_AFLAGS)
#AR_RULE = $(AR) $(ARFLAGS) r $@ $(^F) || $(RM) $@
LIBTOOL = libtool
LIBTOOLFLAGS = $(LIBTOOL_USR)
LIBTOOLFLAGS = $(LIBTOOHB_USER_LDFLAGS)
AR_RULE = $(LIBTOOL) -static $(LIBTOOLFLAGS) -o $(LIB_DIR)/$@ $(^F) || ( $(RM) $(LIB_DIR)/$@ && false )
RANLIB = ranlib

6
harbour/config/dos/bcc16.cf
View File

@@ -28,7 +28,7 @@ CPPFLAGS = -I$($(HB_ARCHITECTURE)_$(HB_COMPILER)_GRANDP) -I$(_HB_INC_COMPILE)
CFLAGS = -i48 -O2 -mh -d -DHB_LONG_LONG_OFF
# BCC (at least version 3.1) requires that the output file be listed ahead of the input file
CC_RULE = $(CC) $(CPPFLAGS) $(CFLAGS) $(C_USR) $(CC_OUT)$(<F:.c=$(OBJ_EXT)) $(CC_IN) $<
CC_RULE = $(CC) $(CPPFLAGS) $(CFLAGS) $(HB_USER_CFLAGS) $(CC_OUT)$(<F:.c=$(OBJ_EXT)) $(CC_IN) $<
#Note: The empty line below HAVE TO exist!
@@ -46,7 +46,7 @@ $(foreach file, $(LINKLIBS), $(link_file))
endef
LD = bcc
LDFLAGS = -i48 -O2 -mh $(L_USR)
LDFLAGS = -i48 -O2 -mh $(HB_USER_LDFLAGS)
ifeq ($(HB_LIB_COMPILE),)
LINKLIBS += $(foreach lib, $(CONTRIBS), $(LIB_DIR)/$(lib)$(LIB_EXT))
LINKLIBS += $(foreach lib, $(LIBS), $(LIB_DIR)/$(lib)$(LIB_EXT))
@@ -86,7 +86,7 @@ del __lib__.tmp
endef
AR = tlib
ARFLAGS = /C $(A_USR)
ARFLAGS = /C $(HB_USER_AFLAGS)
AR_RULE = $(create_library)
include $(TOP)$(ROOT)config/rules.cf

4
harbour/config/dos/djgpp.cf
View File

@@ -62,7 +62,7 @@ echo. $(file) >> __link__.tmp
endef
define link_exe_file
echo. $(LDFLAGS) $(L_USR) $(LD_OUT)$@ > __link__.tmp
echo. $(LDFLAGS) $(HB_USER_LDFLAGS) $(LD_OUT)$@ > __link__.tmp
$(foreach file, $(^F), $(link_file))
$(foreach file, $(LINKPATHS), $(link_file))
echo. -Wl,--start-group >> __link__.tmp
@@ -73,7 +73,7 @@ echo. $(LDLIBS) >> __link__.tmp
endef
AR = ar
ARFLAGS = $(A_USR)
ARFLAGS = $(HB_USER_AFLAGS)
AR_RULE = $(create_library)
LD_RULE = $(link_exe_file)

2
harbour/config/dos/owatcom.cf
View File

@@ -111,7 +111,7 @@ endef
AR = wlib
ARFLAGS = -p=64 -c -n $(A_USR)
ARFLAGS = -p=64 -c -n $(HB_USER_AFLAGS)
AR_RULE = $(create_library)
include $(TOP)$(ROOT)config/rules.cf

2
harbour/config/dos/rsx32.cf
View File

@@ -53,7 +53,7 @@ endif
LDFLAGS += $(LINKPATHS)
AR = ar
ARFLAGS = $(A_USR)
ARFLAGS = $(HB_USER_AFLAGS)
AR_RULE = $(AR) $(ARFLAGS) r $(LIB_DIR)/$@ $(^F) || ( $(RM) $(LIB_DIR)/$@ && false )
include $(TOP)$(ROOT)config/rules.cf

6
harbour/config/hpux/gcc.cf
View File

@@ -70,11 +70,11 @@ endif
endif
ifneq ($(findstring -DHB_PCRE_REGEX, $(C_USR)),)
ifneq ($(findstring -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
LINKLIBS += -lpcre
endif
ifneq ($(findstring -DHB_EXT_ZLIB, $(C_USR)),)
ifneq ($(findstring -DHB_EXT_ZLIB, $(HB_USER_CFLAGS)),)
LINKLIBS += -lz
endif
@@ -83,7 +83,7 @@ LINKLIBS += -lm -lrt
LDFLAGS += $(LINKPATHS)
AR = ar
ARFLAGS = $(A_USR)
ARFLAGS = $(HB_USER_AFLAGS)
AR_RULE = $(AR) $(ARFLAGS) cr $(LIB_DIR)/$@ $(^F) || ( $(RM) $(LIB_DIR)/$@ && false )
include $(TOP)$(ROOT)config/rules.cf

2
harbour/config/lib.cf
View File

@@ -23,7 +23,7 @@ ALL_OBJS = $(ALL_C_OBJS) $(ALL_PRG_OBJS)
first:: dirbase descend
descend:: dirbase
+@$(MK) -C $(ARCH_DIR) -f $(GRANDP)Makefile TOP=$(GRANDP) $(LIB_NAME) $(MK_USR)
+@$(MK) -C $(ARCH_DIR) -f $(GRANDP)Makefile TOP=$(GRANDP) $(LIB_NAME) $(HB_USER_MAKEFLAGS)
vpath $(LIB_NAME) $(LIB_DIR)
$(LIB_NAME) : $(ALL_OBJS)

6
harbour/config/linux/gcc.cf
View File

@@ -76,11 +76,11 @@ endif
endif
ifneq ($(findstring -DHB_PCRE_REGEX, $(C_USR)),)
ifneq ($(findstring -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
LINKLIBS += -lpcre
endif
ifneq ($(findstring -DHB_EXT_ZLIB, $(C_USR)),)
ifneq ($(findstring -DHB_EXT_ZLIB, $(HB_USER_CFLAGS)),)
LINKLIBS += -lz
endif
@@ -89,7 +89,7 @@ LINKLIBS += -lm -lrt -ldl -Wl,--end-group
LDFLAGS = $(LINKPATHS)
AR = ar
ARFLAGS = $(A_USR)
ARFLAGS = $(HB_USER_AFLAGS)
AR_RULE = $(AR) $(ARFLAGS) cr $(LIB_DIR)/$@ $(^F) && $(RANLIB) $(LIB_DIR)/$@ || ( $(RM) $(LIB_DIR)/$@ && false )
include $(TOP)$(ROOT)config/rules.cf

4
harbour/config/linux/owatcom.cf
View File

@@ -70,8 +70,8 @@ ifneq ($(LDLIBS),)
endif
AR = wlib
# ARFLAGS = -c -n -fa $(A_USR)
ARFLAGS = -c -n $(A_USR)
# ARFLAGS = -c -n -fa $(HB_USER_AFLAGS)
ARFLAGS = -c -n $(HB_USER_AFLAGS)
AR_RULE = $(AR) $(ARFLAGS) $(LIB_DIR)/$@ $(foreach file, $(^F), -+$(file))
include $(TOP)$(ROOT)config/rules.cf

4
harbour/config/os2/gcc.cf
View File

@@ -68,7 +68,7 @@ LDFLAGS += $(LINKPATHS)
ifeq ($(C_MAIN),)
ifeq ($(HB_GT_LIB),os2pm)
# Override the default link rule in order to add a call to emxbind
LD_RULE = $(LD) $(CFLAGS) $(LD_OUT)$@ $(^F) $(LDFLAGS) $(L_USR) $(LINKLIBS) & emxbind -ep $@
LD_RULE = $(LD) $(CFLAGS) $(LD_OUT)$@ $(^F) $(LDFLAGS) $(HB_USER_LDFLAGS) $(LINKLIBS) & emxbind -ep $@
endif
endif
@@ -93,7 +93,7 @@ endef
# Under OS/2 || isn't a command separator (inside a shell, that is); correct separator is &
AR = ar
ARFLAGS = $(A_USR)
ARFLAGS = $(HB_USER_AFLAGS)
AR_RULE = $(create_library) & $(RM) __lib__.tmp
include $(TOP)$(ROOT)config/rules.cf

2
harbour/config/os2/icc.cf
View File

@@ -70,7 +70,7 @@ LINKLIBS += $(HB_SCREEN_LIB)
endif
AR = ilib
ARFLAGS = /NOE /NOIgnoreCase $(A_USR)
ARFLAGS = /NOE /NOIgnoreCase $(HB_USER_AFLAGS)
AROBJS = $(foreach file, $(^F), -+$(file))
AR_RULE = $(AR) $(ARFLAGS) $(LIB_DIR)/$@ $(AROBJS),,

8
harbour/config/rules.cf
View File

@@ -28,19 +28,19 @@ HB_FLAGS := -n -i$(HB_INC_COMPILE) -q0 -w3 -es2 -gc$(HB_GCMODE) -km -l
# The rule to link an executable.
ifeq ($(LD_RULE),)
# Use default rule if architecture/compiler specific rule is not defined
LD_RULE = $(LD) $(CFLAGS) $(LD_OUT)$@ $(^F) $(LDFLAGS) $(L_USR) $(LINKLIBS)
LD_RULE = $(LD) $(CFLAGS) $(LD_OUT)$@ $(^F) $(LDFLAGS) $(HB_USER_LDFLAGS) $(LINKLIBS)
endif
# The rule to compile a C source file.
ifeq ($(CC_RULE),)
# Use default rule if architecture/compiler specific rule is not defined
CC_RULE = $(CC) $(CPPFLAGS) $(CFLAGS) $(C_USR) $(CC_IN) $< $(CC_OUT)$(<F:.c=$(OBJ_EXT))
CC_RULE = $(CC) $(CPPFLAGS) $(CFLAGS) $(HB_USER_CFLAGS) $(CC_IN) $< $(CC_OUT)$(<F:.c=$(OBJ_EXT))
endif
# The rule to compile a C++ source file.
ifeq ($(CPP_RULE),)
# Use default rule if architecture/compiler specific rule is not defined
CPP_RULE = $(CC) $(CPPFLAGS) $(CFLAGS) $(C_USR) $(CC_IN) $< $(CC_OUT)$(<F:.cpp=$(OBJ_EXT))
CPP_RULE = $(CC) $(CPPFLAGS) $(CFLAGS) $(HB_USER_CFLAGS) $(CC_IN) $< $(CC_OUT)$(<F:.cpp=$(OBJ_EXT))
endif
@@ -80,7 +80,7 @@ endif
# Rule to generate a C file from a PRG file.
%.c : $(GRANDP)%.prg
$(HB) $? $(HB_FLAGS) $(PRG_USR)
$(HB) $? $(HB_FLAGS) $(HB_USER_PRGFLAGS)
ifeq ($(SHLVL),) # COMMAND.COM
# Do nothing. the $(hb_architecture)/global.cf will handle clean up.

6
harbour/config/sunos/gcc.cf
View File

@@ -66,11 +66,11 @@ endif
endif
ifneq ($(findstring -DHB_PCRE_REGEX, $(C_USR)),)
ifneq ($(findstring -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
LINKLIBS += -lpcre
endif
ifneq ($(findstring -DHB_EXT_ZLIB, $(C_USR)),)
ifneq ($(findstring -DHB_EXT_ZLIB, $(HB_USER_CFLAGS)),)
LINKLIBS += -lz
endif
@@ -80,7 +80,7 @@ LINKLIBS += -lsocket -lnsl -lresolv
LDFLAGS = $(LINKPATHS)
AR = ar
ARFLAGS = $(A_USR)
ARFLAGS = $(HB_USER_AFLAGS)
AR_RULE = $(AR) $(ARFLAGS) cr $(LIB_DIR)/$@ $(^F) || ( $(RM) $(LIB_DIR)/$@ && false )
include $(TOP)$(ROOT)config/rules.cf

2
harbour/config/win/bcc32.cf
View File

@@ -69,7 +69,7 @@ endif
LDFLAGS = $(LINKPATHS)
AR = tlib.exe
ARFLAGS = $(A_USR)
ARFLAGS = $(HB_USER_AFLAGS)
AROBJS = $(foreach file, $(^F), -+$(file))
AR_RULE = $(AR) $(ARFLAGS) "$(subst /,\,$(LIB_DIR)/$@)" $(AROBJS),,

4
harbour/config/win/dm.cf
View File

@@ -69,7 +69,7 @@ $(LD) $(LDFLAGS) @__link__.tmp
endef
LD = link.exe
LDFLAGS = /NOMAP /EXETYPE:NT /SUBSYSTEM:CONSOLE $(LINKPATHS) $(L_USR)
LDFLAGS = /NOMAP /EXETYPE:NT /SUBSYSTEM:CONSOLE $(LINKPATHS) $(HB_USER_LDFLAGS)
ifeq ($(SHLVL),)
LNKLIBS=$(subst /,\,$(LINKLIBS))
else
@@ -84,7 +84,7 @@ $(AR) $(ARFLAGS) @__lib__.tmp
endef
AR = lib.exe
ARFLAGS = -c $(A_USR)
ARFLAGS = -c $(HB_USER_AFLAGS)
AROBJS = $(foreach file, $(^F), $(file))
AR_RULE = $(AR) $(ARFLAGS) $(LIB_DIR)/$@ $(AROBJS)

2
harbour/config/win/gcc.cf
View File

@@ -71,7 +71,7 @@ endif
LDFLAGS = $(LINKPATHS)
AR = ar
ARFLAGS = $(A_USR)
ARFLAGS = $(HB_USER_AFLAGS)
AR_RULE = $(AR) $(ARFLAGS) r $(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@
include $(TOP)$(ROOT)config/rules.cf

2
harbour/config/win/icc.cf
View File

@@ -63,7 +63,7 @@ del __lib__.tmp
endef
AR = ilib
ARFLAGS = $(A_USR)
ARFLAGS = $(HB_USER_AFLAGS)
AR_RULE = $(create_library)
include $(TOP)$(ROOT)config/rules.cf

4
harbour/config/win/mingw.cf
View File

@@ -118,11 +118,11 @@ $(foreach file, $(subst -L,,$(LINKPATHS)), $(search_dir))
echo. GROUP( >> __link__.tmp
$(foreach file, $(SYSLIBS), $(link_file))
echo. ) >> __link__.tmp
-$(LD) $(LDFLAGS) $(L_USR) $(LD_OUT)$@ __link__.tmp
-$(LD) $(LDFLAGS) $(HB_USER_LDFLAGS) $(LD_OUT)$@ __link__.tmp
endef
AR = $(CCPREFIX)ar
ARFLAGS = $(A_USR)
ARFLAGS = $(HB_USER_AFLAGS)
RANLIB = $(CCPREFIX)ranlib

6
harbour/config/win/mingwce.cf
View File

@@ -113,18 +113,18 @@ $(foreach file, $(subst -L,,$(LINKPATHS)), $(search_dir))
echo. GROUP( >> __link__.tmp
$(foreach file, $(SYSLIBS), $(link_file))
echo. ) >> __link__.tmp
-$(LD) $(LDFLAGS) $(L_USR) $(LD_OUT)$@ __link__.tmp
-$(LD) $(LDFLAGS) $(HB_USER_LDFLAGS) $(LD_OUT)$@ __link__.tmp
endef
LDFLAGS =
AR = $(CCPREFIX)ar
ARFLAGS = $(A_USR)
ARFLAGS = $(HB_USER_AFLAGS)
RANLIB = $(CCPREFIX)ranlib
AR = $(CCPREFIX)ar
ARFLAGS = $(A_USR)
ARFLAGS = $(HB_USER_AFLAGS)
ifeq ($(SHLVL),) # COMMAND.COM - length of command line is limited
ifneq ($(OS),Windows_NT)

2
harbour/config/win/msvc.cf
View File

@@ -46,7 +46,7 @@ endif
LDFLAGS = $(LINKPATHS)
AR = lib.exe
ARFLAGS = $(A_USR)
ARFLAGS = $(HB_USER_AFLAGS)
AR_RULE = $(AR) $(ARFLAGS) /out:$(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@
include $(TOP)$(ROOT)config/rules.cf

2
harbour/config/win/msvcce.cf
View File

@@ -51,7 +51,7 @@ endif
LDFLAGS = $(LINKPATHS)
AR = lib.exe
ARFLAGS = $(A_USR)
ARFLAGS = $(HB_USER_AFLAGS)
AR_RULE = $(AR) $(ARFLAGS) /out:$(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@
include $(TOP)$(ROOT)config/rules.cf

4
harbour/config/win/owatcom.cf
View File

@@ -86,7 +86,7 @@ ifeq ($(findstring rtl,$(LIBS)),rtl)
endif
endif
LD_RULE = $(link_exe_file) $(L_USR)
LD_RULE = $(link_exe_file) $(HB_USER_LDFLAGS)
#Note: The empty line below HAVE TO exist!
define lib_object
@@ -101,7 +101,7 @@ $(AR) $(ARFLAGS) @__lib__.tmp
endef
AR = wlib
ARFLAGS = -p=64 -c -n $(A_USR)
ARFLAGS = -p=64 -c -n $(HB_USER_AFLAGS)
AR_RULE = $(create_library)
include $(TOP)$(ROOT)config/rules.cf

2
harbour/config/win/pocc.cf
View File

@@ -58,7 +58,7 @@ LDFLAGS += /SUBSYSTEM:WINDOWS
endif
AR = polib.exe
ARFLAGS = $(A_USR)
ARFLAGS = $(HB_USER_AFLAGS)
AR_RULE = $(AR) $(ARFLAGS) /out:$(LIB_DIR)/$@ $(^F)
include $(TOP)$(ROOT)config/rules.cf

2
harbour/config/win/pocc64.cf
View File

@@ -58,7 +58,7 @@ LDFLAGS += /SUBSYSTEM:WINDOWS
endif
AR = polib.exe
ARFLAGS = $(A_USR)
ARFLAGS = $(HB_USER_AFLAGS)
AR_RULE = $(AR) $(ARFLAGS) /out:$(LIB_DIR)/$@ $(^F)
include $(TOP)$(ROOT)config/rules.cf

2
harbour/config/win/poccce.cf
View File

@@ -63,7 +63,7 @@ LDFLAGS += /SUBSYSTEM:WINDOWS
endif
AR = polib.exe
ARFLAGS = $(A_USR)
ARFLAGS = $(HB_USER_AFLAGS)
AR_RULE = $(AR) $(ARFLAGS) /out:$(LIB_DIR)/$@ $(^F)
include $(TOP)$(ROOT)config/rules.cf

2
harbour/config/win/rsxnt.cf
View File

@@ -74,7 +74,7 @@ endif
LDFLAGS += $(LINKPATHS)
AR = ar
ARFLAGS = $(A_USR)
ARFLAGS = $(HB_USER_AFLAGS)
AR_RULE = $(AR) $(ARFLAGS) r $(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@
include $(TOP)$(ROOT)config/rules.cf

2
harbour/config/win/xcc.cf
View File

@@ -58,7 +58,7 @@ LDFLAGS += /SUBSYSTEM:WINDOWS
endif
AR = xlib.exe
ARFLAGS = $(A_USR)
ARFLAGS = $(HB_USER_AFLAGS)
AR_RULE = $(AR) $(ARFLAGS) /out:$(LIB_DIR)/$@ $(^F)
include $(TOP)$(ROOT)config/rules.cf

2
harbour/contrib/gtalleg/Makefile
View File

@@ -21,7 +21,7 @@ HB_INC_ALLEGRO_OK += $(foreach d, $(HB_INC_ALLEGRO), $(if $(wildcard $(d)/allegr
ifneq ($(strip $(HB_INC_ALLEGRO_OK)),)
C_USR += $(foreach d, $(HB_INC_ALLEGRO_OK), -I$(d))
HB_USER_CFLAGS += $(foreach d, $(HB_INC_ALLEGRO_OK), -I$(d))
C_SOURCES=\
gtalleg.c \

2
harbour/contrib/hbapollo/Makefile
View File

@@ -12,7 +12,7 @@ HB_INC_APOLLO_OK += $(foreach d, $(HB_INC_APOLLO), $(if $(wildcard $(d)/Sde61.h)
ifneq ($(strip $(HB_INC_APOLLO_OK)),)
C_USR += $(foreach d, $(HB_INC_APOLLO_OK), -I$(d))
HB_USER_CFLAGS += $(foreach d, $(HB_INC_APOLLO_OK), -I$(d))
C_SOURCES=\
apollo.c \

2
harbour/contrib/hbcurl/Makefile
View File

@@ -22,7 +22,7 @@ endif
ifneq ($(strip $(HB_INC_CURL_OK)),)
C_USR += $(foreach d, $(HB_INC_CURL_OK), -I$(d))
HB_USER_CFLAGS += $(foreach d, $(HB_INC_CURL_OK), -I$(d))
C_SOURCES=\
hbcurl.c \

2
harbour/contrib/hbfbird/Makefile
View File

@@ -16,7 +16,7 @@ HB_INC_FIREBIRD_OK += $(foreach d, $(HB_INC_FIREBIRD), $(if $(wildcard $(d)/ibas
ifneq ($(strip $(HB_INC_FIREBIRD_OK)),)
C_USR += $(foreach d, $(HB_INC_FIREBIRD_OK), -I$(d))
HB_USER_CFLAGS += $(foreach d, $(HB_INC_FIREBIRD_OK), -I$(d))
C_SOURCES=\
firebird.c \

2
harbour/contrib/hbfimage/Makefile
View File

@@ -21,7 +21,7 @@ endif
ifneq ($(strip $(HB_INC_FREEIMAGE_OK)),)
C_USR += $(foreach d, $(HB_INC_FREEIMAGE_OK), -I$(d))
HB_USER_CFLAGS += $(foreach d, $(HB_INC_FREEIMAGE_OK), -I$(d))
C_SOURCES = \
fi_winfu.c \

2
harbour/contrib/hbgd/Makefile
View File

@@ -16,7 +16,7 @@ HB_INC_GD_OK += $(foreach d, $(HB_INC_GD), $(if $(wildcard $(d)/gd.h),$(d),))
ifneq ($(strip $(HB_INC_GD_OK)),)
C_USR += $(foreach d, $(HB_INC_GD_OK), -I$(d))
HB_USER_CFLAGS += $(foreach d, $(HB_INC_GD_OK), -I$(d))
C_SOURCES=\
gdwrp.c \

2
harbour/contrib/hbgd/tests/hbmk_b32.bat
View File

@@ -11,6 +11,6 @@ set HB_ARCHITECTURE=win
set HB_COMPILER=bcc32
set HB_USER_LIBS=hbgd.lib bgd.lib hbct.lib
rem ; uncomment if needed
rem set C_USR=-tW
rem set HB_GUI=yes
call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9

2
harbour/contrib/hbgd/tests/hbmk_vc.bat
View File

@@ -10,5 +10,7 @@ if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include
set HB_ARCHITECTURE=win
set HB_COMPILER=msvc
set HB_USER_LIBS=hbgd.lib bgd.lib hbct.lib
rem ; uncomment if needed
rem set HB_GUI=yes
call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9

4
harbour/contrib/hbgf/hbgfgtk/Makefile
View File

@@ -19,8 +19,8 @@ endif
ifneq ($(strip $(HB_INC_GTK_OK)),)
C_USR += $(foreach d, $(HB_INC_GTK_OK), -I$(d))
C_USR += `pkg-config --cflags gtk+-2.0`
HB_USER_CFLAGS += $(foreach d, $(HB_INC_GTK_OK), -I$(d))
HB_USER_CFLAGS += `pkg-config --cflags gtk+-2.0`
C_SOURCES=\
creawin.c \

2
harbour/contrib/hbhpdf/Makefile
View File

@@ -18,7 +18,7 @@ HB_INC_LIBHARU_OK += $(foreach d, $(HB_INC_LIBHARU), $(if $(wildcard $(d)/hpdf.h
ifneq ($(strip $(HB_INC_LIBHARU_OK)),)
C_USR += $(foreach d, $(HB_INC_LIBHARU_OK), -I$(d))
HB_USER_CFLAGS += $(foreach d, $(HB_INC_LIBHARU_OK), -I$(d))
C_SOURCES=\
harupdf.c \

2
harbour/contrib/hbmysql/Makefile
View File

@@ -16,7 +16,7 @@ HB_INC_MYSQL_OK += $(foreach d, $(HB_INC_MYSQL), $(if $(wildcard $(d)/mysql.h),$
ifneq ($(strip $(HB_INC_MYSQL_OK)),)
C_USR += $(foreach d, $(HB_INC_MYSQL_OK), -I$(d))
HB_USER_CFLAGS += $(foreach d, $(HB_INC_MYSQL_OK), -I$(d))
C_SOURCES=\
mysql.c \

2
harbour/contrib/hbodbc/Makefile
View File

@@ -22,7 +22,7 @@ endif
HB_INC_ODBC_OK += $(foreach d, $(HB_INC_ODBC), $(if $(wildcard $(d)/sql.h),$(d),))
ifneq ($(strip $(HB_INC_ODBC_OK)),)
C_USR += $(foreach d, $(HB_INC_ODBC_OK), -I$(d))
HB_USER_CFLAGS += $(foreach d, $(HB_INC_ODBC_OK), -I$(d))
else
HB_WITHOUT_ODBC=yes
endif

2
harbour/contrib/hbpgsql/Makefile
View File

@@ -16,7 +16,7 @@ HB_INC_PGSQL_OK += $(foreach d, $(HB_INC_PGSQL), $(if $(wildcard $(d)/libpq-fe.h
ifneq ($(strip $(HB_INC_PGSQL_OK)),)
C_USR += $(foreach d, $(HB_INC_PGSQL_OK), -I$(d))
HB_USER_CFLAGS += $(foreach d, $(HB_INC_PGSQL_OK), -I$(d))
C_SOURCES=\
postgres.c \

2
harbour/contrib/hbssl/Makefile
View File

@@ -22,7 +22,7 @@ endif
ifneq ($(strip $(HB_INC_OPENSSL_OK)),)
C_USR += $(foreach d, $(HB_INC_OPENSSL_OK), -I$(d))
HB_USER_CFLAGS += $(foreach d, $(HB_INC_OPENSSL_OK), -I$(d))
C_SOURCES=\
ssl.c \

2
harbour/contrib/hbtip/ChangeLog
View File

@@ -201,7 +201,7 @@
2004-05-04 16:45 UTC+0200 Maurilio Longo <maurilio.longo@libero.it>
* Rules.make
+ added C_USR=-DTCPV40HDRS to use 16/32 tcp/ip stack on OS/2 (standard on OS/2 until eComStation and v5.x)
+ added HB_USER_CFLAGS=-DTCPV40HDRS to use 16/32 tcp/ip stack on OS/2 (standard on OS/2 until eComStation and v5.x)
* ticlientpop.prg
* changed the way a mail gets ::Retreived(), so much faster now.
+ Added Top(), Noop() and UIDL() methods

2
harbour/contrib/hbwhat/Makefile
View File

@@ -83,7 +83,7 @@ PRG_HEADERS= \
# This lib needs xhb headers to compile, and this is
# the hack to help Harbour find them.
PRG_USR += -I../../../xhb
HB_USER_PRGFLAGS += -I../../../xhb
include $(TOP)$(ROOT)config/header.cf
INSTALL_RULE_HEADERS := $(INSTALL_RULE)

2
harbour/contrib/hbwhat/tests/hbmk_b32.bat
View File

@@ -10,6 +10,6 @@ if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include
set HB_ARCHITECTURE=win
set HB_COMPILER=bcc32
set HB_USER_LIBS=hbwhat.lib gtwvg.lib xhb.lib
set C_USR=-tW
set HB_GUI=yes
call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9

1
harbour/contrib/hbwhat/tests/hbmk_vc.bat
View File

@@ -10,5 +10,6 @@ if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include
set HB_ARCHITECTURE=win
set HB_COMPILER=msvc
set HB_USER_LIBS=hbwhat.lib gtwvg.lib xhb.lib comdlg32.lib comctl32.lib shell32.lib ole32.lib oleaut32.lib
set HB_GUI=yes
call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9

8
harbour/contrib/mtpl_b32.bat
View File

@@ -12,7 +12,7 @@ rem this batch file from your customized one. [vszakats]
rem
rem Set any of the below settings to customize your build process:
rem set HB_MAKE_PROGRAM=
rem set MK_USR=
rem set HB_USER_MAKEFLAGS=
rem ---------------------------------------------------------------
set _HB_CC_NAME=%HB_CC_NAME%
@@ -37,14 +37,14 @@ if "%1" == "INSTALL" goto INSTALL
:BUILD
%_HB_MAKE_PROGRAM% %MK_USR% -f %_HB_MAKEFILE% %1 %2 %3 > %_HB_MAKELOG%
%_HB_MAKE_PROGRAM% %HB_USER_MAKEFLAGS% -f %_HB_MAKEFILE% %1 %2 %3 > %_HB_MAKELOG%
if errorlevel 1 set HB_EXIT_LEVEL=1
if errorlevel 1 if not "%HB_SHOW_ERRORS%" == "no" notepad %_HB_MAKELOG%
goto EXIT
:CLEAN
%_HB_MAKE_PROGRAM% %MK_USR% -f %_HB_MAKEFILE% CLEAN > %_HB_MAKELOG%
%_HB_MAKE_PROGRAM% %HB_USER_MAKEFLAGS% -f %_HB_MAKEFILE% CLEAN > %_HB_MAKELOG%
if errorlevel 1 set HB_EXIT_LEVEL=1
if errorlevel 1 goto EXIT
@@ -53,7 +53,7 @@ if "%1" == "INSTALL" goto INSTALL
:INSTALL
%_HB_MAKE_PROGRAM% %MK_USR% -f %_HB_MAKEFILE% INSTALL > nul
%_HB_MAKE_PROGRAM% %HB_USER_MAKEFLAGS% -f %_HB_MAKEFILE% INSTALL > nul
if errorlevel 1 set HB_EXIT_LEVEL=1
goto EXIT

12
harbour/contrib/mtpl_b32.mak
View File

@@ -14,8 +14,8 @@
# NOTE: You can use these optional envvars to configure the make process:
#
# C_USR - Extra C compiler options for libraries
# PRG_USR - Extra Harbour compiler options
# HB_USER_CFLAGS - Extra C compiler options for libraries
# HB_USER_PRGFLAGS - Extra Harbour compiler options
#
.AUTODEPEND
@@ -105,7 +105,7 @@ MKLIB = tlib.exe
#**********************************************************
CFLAGS = -I$(INCLUDE_DIR) $(C_USR) $(CFLAGS)
CFLAGS = -I$(INCLUDE_DIR) $(HB_USER_CFLAGS) $(CFLAGS)
#-----------
!if "$(HB_BUILD_DEBUG)" == "yes"
@@ -120,17 +120,17 @@ CFLAGS = -I$(INCLUDE_DIR) $(C_USR) $(CFLAGS)
#**********************************************************
CLIBFLAGS = -c -q -d -Q -w -w-sig- $(CFLAGS) $(CLIBFLAGS)
HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w3 -es2 -km -l $(PRG_USR) $(HARBOURFLAGS)
HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w3 -es2 -km -l $(HB_USER_PRGFLAGS) $(HARBOURFLAGS)
!if "$(HB_BUILD_DEBUG)" == "yes"
HARBOURFLAGS = $(HARBOURFLAGS) -l-
!endif
LDFLAGS = $(LDFLAGS) $(L_USR)
LDFLAGS = $(LDFLAGS) $(HB_USER_LDFLAGS)
#**********************************************************
# This is needed, otherwise the libs may overflow when
# debug info is requested with -v -y
ARFLAGS = /P64 $(A_USR)
ARFLAGS = /P64 $(HB_USER_AFLAGS)
#**********************************************************
# COMPILE Rules

8
harbour/contrib/mtpl_gcc.mak
View File

@@ -14,8 +14,8 @@
# NOTE: You can use these optional envvars to configure the make process:
#
# C_USR - Extra C compiler options for libraries
# PRG_USR - Extra Harbour compiler options
# HB_USER_CFLAGS - Extra C compiler options for libraries
# HB_USER_PRGFLAGS - Extra Harbour compiler options
#
#**********************************************************
@@ -121,9 +121,9 @@ endif
CFLAGS := -O3 $(CFLAGS)
endif
CFLAGS := -W -Wall -I$(INCLUDE_DIR) $(C_USR) $(CFLAGS)
CFLAGS := -W -Wall -I$(INCLUDE_DIR) $(HB_USER_CFLAGS) $(CFLAGS)
CLIBFLAGS := -c $(CFLAGS) $(CLIBFLAGS)
HARBOURFLAGS := -i$(INCLUDE_DIR) -n1 -q0 -w3 -es2 -km -l $(PRG_USR) $(HARBOURFLAGS)
HARBOURFLAGS := -i$(INCLUDE_DIR) -n1 -q0 -w3 -es2 -km -l $(HB_USER_PRGFLAGS) $(HARBOURFLAGS)
ifeq ($(HB_BUILD_DEBUG),yes)
HARBOURFLAGS := $(HARBOURFLAGS) -l-
endif

4
harbour/contrib/mtpl_gcc.sh
View File

@@ -21,7 +21,7 @@
#
# export any of the below settings to customize your build process:
# export HB_MAKE_PROGRAM=
# export MK_USR=
# export HB_USER_MAKEFLAGS=
# ---------------------------------------------------------------
if [ -z "$HB_ARCHITECTURE" ]; then
@@ -63,7 +63,7 @@ export HB_EXIT_LEVEL=
[ -z "$CC" ] && export CC="gcc"
[ -z "$LD" ] && export LD="gcc"
${_HB_MAKE_PROGRAM} ${MK_USR} -f ${_HB_MAKEFILE} $1 $2 $3 || export HB_EXIT_LEVEL=1
${_HB_MAKE_PROGRAM} ${HB_USER_MAKEFLAGS} -f ${_HB_MAKEFILE} $1 $2 $3 || export HB_EXIT_LEVEL=1
# ---------------------------------------------------------------

8
harbour/contrib/mtpl_vc.bat
View File

@@ -12,7 +12,7 @@ rem this batch file from your customized one. [vszakats]
rem
rem Set any of the below settings to customize your build process:
rem set HB_MAKE_PROGRAM=
rem set MK_USR=
rem set HB_USER_MAKEFLAGS=
rem ---------------------------------------------------------------
set _HB_CC_NAME=%HB_CC_NAME%
@@ -37,14 +37,14 @@ if "%1" == "INSTALL" goto INSTALL
:BUILD
%_HB_MAKE_PROGRAM% %MK_USR% -nologo -f %_HB_MAKEFILE% %1 %2 %3 > %_HB_MAKELOG%
%_HB_MAKE_PROGRAM% %HB_USER_MAKEFLAGS% -nologo -f %_HB_MAKEFILE% %1 %2 %3 > %_HB_MAKELOG%
if errorlevel 1 set HB_EXIT_LEVEL=1
if errorlevel 1 if not "%HB_SHOW_ERRORS%" == "no" notepad %_HB_MAKELOG%
goto EXIT
:CLEAN
%_HB_MAKE_PROGRAM% %MK_USR% -nologo -f %_HB_MAKEFILE% CLEAN > %_HB_MAKELOG%
%_HB_MAKE_PROGRAM% %HB_USER_MAKEFLAGS% -nologo -f %_HB_MAKEFILE% CLEAN > %_HB_MAKELOG%
if errorlevel 1 set HB_EXIT_LEVEL=1
if errorlevel 1 goto EXIT
@@ -53,7 +53,7 @@ if "%1" == "INSTALL" goto INSTALL
:INSTALL
%_HB_MAKE_PROGRAM% %MK_USR% -nologo -f %_HB_MAKEFILE% INSTALL > nul
%_HB_MAKE_PROGRAM% %HB_USER_MAKEFLAGS% -nologo -f %_HB_MAKEFILE% INSTALL > nul
if errorlevel 1 set HB_EXIT_LEVEL=1
goto EXIT

12
harbour/contrib/mtpl_vc.mak
View File

@@ -14,8 +14,8 @@
# NOTE: You can use these optional envvars to configure the make process:
#
# C_USR - Extra C compiler options for libraries
# PRG_USR - Extra Harbour compiler options
# HB_USER_CFLAGS - Extra C compiler options for libraries
# HB_USER_PRGFLAGS - Extra Harbour compiler options
#
#**********************************************************
@@ -107,7 +107,7 @@ MKLIB = lib.exe
HB_VISUALC_VER = 80
!endif
ARFLAGS = /nologo $(A_USR)
ARFLAGS = /nologo $(HB_USER_AFLAGS)
# C Compiler Flags
!if "$(HB_BUILD_OPTIM)" != "no"
@@ -120,7 +120,7 @@ CFLAGS_VER = -Ogt2yb1p -GX- -G6 -YX
#-----------
CFLAGS = -nologo -W4 -wd4127 -Gs -I$(INCLUDE_DIR) $(CFLAGS_VER) \
$(C_USR) $(CFLAGS)
$(HB_USER_CFLAGS) $(CFLAGS)
#-----------
!if "$(HB_BUILD_DEBUG)" == "yes"
@@ -131,11 +131,11 @@ CFLAGS = -Zi $(CFLAGS)
#**********************************************************
CLIBFLAGS = -c $(CFLAGS) $(CLIBFLAGS)
HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w3 -es2 -km -l $(PRG_USR) $(HARBOURFLAGS)
HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w3 -es2 -km -l $(HB_USER_PRGFLAGS) $(HARBOURFLAGS)
!if "$(HB_BUILD_DEBUG)" == "yes"
HARBOURFLAGS = $(HARBOURFLAGS) -l-
!endif
LDFLAGS = $(LDFLAGS) $(L_USR)
LDFLAGS = $(LDFLAGS) $(HB_USER_LDFLAGS)
#**********************************************************
# COMPILE Rules

2
harbour/contrib/rddads/Makefile
View File

@@ -16,7 +16,7 @@ HB_INC_ADS_OK += $(foreach d, $(HB_INC_ADS), $(if $(wildcard $(d)/ace.h),$(d),))
ifneq ($(strip $(HB_INC_ADS_OK)),)
C_USR += $(foreach d, $(HB_INC_ADS_OK), -I$(d))
HB_USER_CFLAGS += $(foreach d, $(HB_INC_ADS_OK), -I$(d))
C_SOURCES=\
ads1.c \

2
harbour/contrib/rddsql/sddfb/Makefile
View File

@@ -16,7 +16,7 @@ HB_INC_FIREBIRD_OK += $(foreach d, $(HB_INC_FIREBIRD), $(if $(wildcard $(d)/ibas
ifneq ($(strip $(HB_INC_FIREBIRD_OK)),)
C_USR += $(foreach d, $(HB_INC_FIREBIRD_OK), -I$(d))
HB_USER_CFLAGS += $(foreach d, $(HB_INC_FIREBIRD_OK), -I$(d))
C_SOURCES=\
fbirddd.c \

2
harbour/contrib/rddsql/sddmy/Makefile
View File

@@ -16,7 +16,7 @@ HB_INC_MYSQL_OK += $(foreach d, $(HB_INC_MYSQL), $(if $(wildcard $(d)/mysql.h),$
ifneq ($(strip $(HB_INC_MYSQL_OK)),)
C_USR += $(foreach d, $(HB_INC_MYSQL_OK), -I$(d))
HB_USER_CFLAGS += $(foreach d, $(HB_INC_MYSQL_OK), -I$(d))
C_SOURCES=\
mysqldd.c \

2
harbour/contrib/rddsql/sddpg/Makefile
View File

@@ -16,7 +16,7 @@ HB_INC_PGSQL_OK += $(foreach d, $(HB_INC_PGSQL), $(if $(wildcard $(d)/libpq-fe.h
ifneq ($(strip $(HB_INC_PGSQL_OK)),)
C_USR += $(foreach d, $(HB_INC_PGSQL_OK), -I$(d))
HB_USER_CFLAGS += $(foreach d, $(HB_INC_PGSQL_OK), -I$(d))
C_SOURCES=\
pgsqldd.c \

4
harbour/doc/es/tracing.txt
View File

@@ -101,9 +101,9 @@ HB_TR_WARNING HB_TR_INFO Todas las llamadaa con niveles HB_INFO y
compilado con un menor nivel de rastreo.
Por ejemplo, Yo compilo Harbour en WinNT con gcc (MINGW32), as¡
usualmente establezco la variable de entorno C_USR a algo as¡:
usualmente establezco la variable de entorno HB_USER_CFLAGS a algo as¡:
export C_USR="-DHARBOUR_USE_WIN_GTAPI -DHB_TR_LEVEL=HB_TR_INFO"
export HB_USER_CFLAGS="-DHARBOUR_USE_WIN_GTAPI -DHB_TR_LEVEL=HB_TR_INFO"
y me aseguro que tengo todo el seguimiento para los niveles INFO,
WARNING, ERROR, FATAL y ALWAYS. Si obtengo demasiada informaci¢n,

4
harbour/doc/gmake.txt
View File

@@ -143,8 +143,8 @@ For gcc on Win95/WinNT with the Cygwin library:
HB_COMPILER gcc
HB_GT_LIB gtwin
CYGWIN noglob
C_USR -mwin32
L_USR -mwin32
HB_USER_CFLAGS -mwin32
HB_USER_LDFLAGS -mwin32
For gcc on Win95/WinNT with the MinGW library:
HB_ARCHITECTURE win

6
harbour/doc/tracing.txt
View File

@@ -91,13 +91,13 @@ HB_TR_LEVEL_WARNING they have no performance effect; only
a lower tracing level.
For example, I compile Harbour on WinNT with gcc (MINGW32), so I
usually set the C_USR environment variable like this:
usually set the HB_USER_CFLAGS environment variable like this:
export C_USR='-DHARBOUR_USE_WIN_GTAPI -DHB_TR_LEVEL=HB_TR_INFO'
export HB_USER_CFLAGS='-DHARBOUR_USE_WIN_GTAPI -DHB_TR_LEVEL=HB_TR_INFO'
or for other OS (eg: DOS, WIN9x)
SET C_USR=-DHARBOUR_USR_WIN_GTAPI -DHB_TR_LEVEL_INFO
SET HB_USER_CFLAGS=-DHARBOUR_USR_WIN_GTAPI -DHB_TR_LEVEL_INFO
and make sure I have all the tracing for the INFO, WARNING, ERROR,
FATAL and ALWAYS levels. If I get too much information, at run-time I

22
harbour/harbour-wce-spec
View File

@@ -89,7 +89,7 @@ rm -fR $RPM_BUILD_ROOT
export HB_HOST_BUILD=yes
export HB_ARCHITECTURE=linux
export HB_COMPILER=gcc
export C_USR="-O2 -DHB_FM_STATISTICS_OFF"
export HB_USER_CFLAGS="-O2 -DHB_FM_STATISTICS_OFF"
make -r
export HB_HOST_BUILD=lib
@@ -101,11 +101,11 @@ ln -s ../../linux/gcc/hbpp source/pp/${HB_ARCHITECTURE}/${HB_COMPILER}/hbpp.exe
mkdir -p source/main/${HB_ARCHITECTURE}/${HB_COMPILER}
ln -s ../../linux/gcc/harbour source/main/${HB_ARCHITECTURE}/${HB_COMPILER}/harbour.exe
export CC_C_USR=""
export C_USR="$CC_C_USR -O2 -DHB_FM_STATISTICS_OFF"
export CC_PRG_USR="-D__PLATFORM__WINDOWS -D__PLATFORM__WINCE -undef:__PLATFORM__UNIX -undef:__PLATFORM__LINUX"
export PRG_USR="$CC_PRG_USR"
export L_USR="${CC_L_USR}"
export CC_HB_USER_CFLAGS=""
export HB_USER_CFLAGS="$CC_HB_USER_CFLAGS -O2 -DHB_FM_STATISTICS_OFF"
export CC_HB_USER_PRGFLAGS="-D__PLATFORM__WINDOWS -D__PLATFORM__WINCE -undef:__PLATFORM__UNIX -undef:__PLATFORM__LINUX"
export HB_USER_PRGFLAGS="$CC_HB_USER_PRGFLAGS"
export HB_USER_LDFLAGS="${CC_HB_USER_LDFLAGS}"
export CCPATH="%{hb_ccpath}:"
export CCPREFIX="%{hb_ccpref}"
@@ -127,11 +127,11 @@ make -r
# Install harbour itself.
export CC_C_USR=""
export C_USR="$CC_C_USR -O2 -DHB_FM_STATISTICS_OFF"
export CC_PRG_USR="-D__PLATFORM__WINDOWS -D__PLATFORM__WINCE -undef:__PLATFORM__UNIX -undef:__PLATFORM__LINUX"
export PRG_USR="$CC_PRG_USR"
export L_USR="${CC_L_USR}"
export CC_HB_USER_CFLAGS=""
export HB_USER_CFLAGS="$CC_HB_USER_CFLAGS -O2 -DHB_FM_STATISTICS_OFF"
export CC_HB_USER_PRGFLAGS="-D__PLATFORM__WINDOWS -D__PLATFORM__WINCE -undef:__PLATFORM__UNIX -undef:__PLATFORM__LINUX"
export HB_USER_PRGFLAGS="$CC_HB_USER_PRGFLAGS"
export HB_USER_LDFLAGS="${CC_HB_USER_LDFLAGS}"
export CCPATH="%{hb_ccpath}:"
export CCPREFIX="%{hb_ccpref}"

22
harbour/harbour-win-spec
View File

@@ -89,7 +89,7 @@ rm -fR $RPM_BUILD_ROOT
export HB_HOST_BUILD=yes
export HB_ARCHITECTURE=linux
export HB_COMPILER=gcc
export C_USR="-O2 -DHB_FM_STATISTICS_OFF"
export HB_USER_CFLAGS="-O2 -DHB_FM_STATISTICS_OFF"
make -r
export HB_HOST_BUILD=lib
@@ -101,11 +101,11 @@ ln -s ../../linux/gcc/hbpp source/pp/${HB_ARCHITECTURE}/${HB_COMPILER}/hbpp.exe
mkdir -p source/main/${HB_ARCHITECTURE}/${HB_COMPILER}
ln -s ../../linux/gcc/harbour source/main/${HB_ARCHITECTURE}/${HB_COMPILER}/harbour.exe
export CC_C_USR=""
export C_USR="$CC_C_USR -O2 -DHB_FM_STATISTICS_OFF"
export CC_PRG_USR="-D__PLATFORM__WINDOWS -undef:__PLATFORM__UNIX -undef:__PLATFORM__LINUX"
export PRG_USR="$CC_PRG_USR"
export L_USR="${CC_L_USR}"
export CC_HB_USER_CFLAGS=""
export HB_USER_CFLAGS="$CC_HB_USER_CFLAGS -O2 -DHB_FM_STATISTICS_OFF"
export CC_HB_USER_PRGFLAGS="-D__PLATFORM__WINDOWS -undef:__PLATFORM__UNIX -undef:__PLATFORM__LINUX"
export HB_USER_PRGFLAGS="$CC_HB_USER_PRGFLAGS"
export HB_USER_LDFLAGS="${CC_HB_USER_LDFLAGS}"
export CCPATH="%{hb_ccpath}:"
export CCPREFIX="%{hb_ccpref}"
@@ -127,11 +127,11 @@ make -r
# Install harbour itself.
export CC_C_USR=""
export C_USR="$CC_C_USR -O2 -DHB_FM_STATISTICS_OFF"
export CC_PRG_USR="-D__PLATFORM__WINDOWS -undef:__PLATFORM__UNIX -undef:__PLATFORM__LINUX"
export PRG_USR="$CC_PRG_USR"
export L_USR="${CC_L_USR}"
export CC_HB_USER_CFLAGS=""
export HB_USER_CFLAGS="$CC_HB_USER_CFLAGS -O2 -DHB_FM_STATISTICS_OFF"
export CC_HB_USER_PRGFLAGS="-D__PLATFORM__WINDOWS -undef:__PLATFORM__UNIX -undef:__PLATFORM__LINUX"
export HB_USER_PRGFLAGS="$CC_HB_USER_PRGFLAGS"
export HB_USER_LDFLAGS="${CC_HB_USER_LDFLAGS}"
export CCPATH="%{hb_ccpath}:"
export CCPREFIX="%{hb_ccpref}"

14
harbour/harbour.spec
View File

@@ -71,8 +71,8 @@
%define hb_pref hb
%define hb_arch export HB_ARCHITECTURE=linux
%define hb_cc export HB_COMPILER=gcc
%define hb_cflag export C_USR="-DHB_FM_STATISTICS_OFF"
%define hb_lflag export L_USR="${CC_L_USR} %{?_with_static:-static}"
%define hb_cflag export HB_USER_CFLAGS="-DHB_FM_STATISTICS_OFF"
%define hb_lflag export HB_USER_LDFLAGS="${CC_HB_USER_LDFLAGS} %{?_with_static:-static}"
%define hb_gpm export HB_GPM_MOUSE=%{!?_without_gpm:yes}
%define hb_crs export HB_WITHOUT_GTCRS=%{?_without_gtcrs:yes}
%define hb_sln export HB_WITHOUT_GTSLN=%{?_without_gtsln:yes}
@@ -380,7 +380,7 @@ rm -rf $RPM_BUILD_ROOT
%{hb_env}
case "`uname -m`" in
*[_@]64)
export C_USR="$C_USR -fPIC"
export HB_USER_CFLAGS="$HB_USER_CFLAGS -fPIC"
;;
esac
@@ -397,7 +397,7 @@ make -r
%{hb_env}
case "`uname -m`" in
*[_@]64)
export C_USR="$C_USR -fPIC"
export HB_USER_CFLAGS="$HB_USER_CFLAGS -fPIC"
;;
esac
@@ -438,8 +438,8 @@ EOF
# check if we should rebuild tools with shared libs
if [ "%{!?_with_static:1}" ]
then
export L_USR="${CC_L_USR} -L${HB_LIB_INSTALL} -l%{name} %{!?_without_gtcrs:-lncurses} %{!?_without_gtsln:-lslang} %{!?_without_gpm:-lgpm} %{!?_without_x11:-L/usr/X11R6/%{_lib} -lX11}"
export PRG_USR="\"-D_DEFAULT_INC_DIR='${_DEFAULT_INC_DIR}'\" ${PRG_USR}"
export HB_USER_LDFLAGS="${CC_HB_USER_LDFLAGS} -L${HB_LIB_INSTALL} -l%{name} %{!?_without_gtcrs:-lncurses} %{!?_without_gtsln:-lslang} %{!?_without_gpm:-lgpm} %{!?_without_x11:-L/usr/X11R6/%{_lib} -lX11}"
export HB_USER_PRGFLAGS="\"-D_DEFAULT_INC_DIR='${_DEFAULT_INC_DIR}'\" ${HB_USER_PRGFLAGS}"
for utl in hbmake hbrun hbi18n hbdoc
do
@@ -736,7 +736,7 @@ rm -rf $RPM_BUILD_ROOT
- removed bison and flex from dependences list
* Sat Aug 09 2003 Przemyslaw Czerpak <druzus@polbox.com>
- removed ${RPM_OPT_FLAGS} from C_USR
- removed ${RPM_OPT_FLAGS} from HB_USER_CFLAGS
* Wed Jul 23 2003 Przemyslaw Czerpak <druzus@polbox.com>
- fixed file (user and group) owner for RPMs builded from non root account

6
harbour/include/hbapi.h
View File

@@ -1027,9 +1027,9 @@ extern HB_EXPORT void hb_verBuildInfo( void ); /* display harbour,
extern HB_EXPORT int hb_verSvnID( void ); /* retrieves ChangeLog SVN revision number */
extern HB_EXPORT const char * hb_verSvnChangeLogID( void ); /* retrieves a static buffer containing ChangeLog ID string */
extern HB_EXPORT const char * hb_verSvnLastEntry( void ); /* retrieves a static buffer containing ChangeLog last entry string */
extern HB_EXPORT const char * hb_verFlagsC( void ); /* retrieves a static buffer containing build time C compiler flags in C_USR envvar */
extern HB_EXPORT const char * hb_verFlagsL( void ); /* retrieves a static buffer containing build time linker flags in L_USR envvar */
extern HB_EXPORT const char * hb_verFlagsPRG( void ); /* retrieves a static buffer containing build time Harbour compiler flags in PRG_USR envvar */
extern HB_EXPORT const char * hb_verFlagsC( void ); /* retrieves a static buffer containing build time C compiler flags in HB_USER_CFLAGS envvar */
extern HB_EXPORT const char * hb_verFlagsL( void ); /* retrieves a static buffer containing build time linker flags in HB_USER_LDFLAGS envvar */
extern HB_EXPORT const char * hb_verFlagsPRG( void ); /* retrieves a static buffer containing build time Harbour compiler flags in HB_USER_PRGFLAGS envvar */
extern HB_EXPORT BOOL hb_iswinnt( void ); /* return .T. if OS == Windows NT, 2000, XP */
extern HB_EXPORT BOOL hb_iswince( void ); /* return .T. if OS is Windows CE or Windows Mobile */

8
harbour/make_b32.bat
View File

@@ -18,7 +18,7 @@ rem set HB_BUILD_OPTIM=no
rem set HB_REBUILD_PARSER=yes
rem set HB_MAKE_PROGRAM=
rem set HB_SHOW_ERRORS=
rem set MK_USR=
rem set HB_USER_MAKEFLAGS=
rem ---------------------------------------------------------------
set _HB_CC_NAME=%HB_CC_NAME%
@@ -48,14 +48,14 @@ if "%1" == "INSTALL" goto INSTALL
:BUILD
%_HB_MAKE_PROGRAM% %MK_USR% -f %_HB_MAKEFILE% %1 %2 %3 > make_%_HB_CC_NAME%.log
%_HB_MAKE_PROGRAM% %HB_USER_MAKEFLAGS% -f %_HB_MAKEFILE% %1 %2 %3 > make_%_HB_CC_NAME%.log
if errorlevel 1 set HB_EXIT_LEVEL=1
if errorlevel 1 if not "%HB_SHOW_ERRORS%" == "no" notepad make_%_HB_CC_NAME%.log
goto EXIT
:CLEAN
%_HB_MAKE_PROGRAM% %MK_USR% -f %_HB_MAKEFILE% CLEAN > make_%_HB_CC_NAME%.log
%_HB_MAKE_PROGRAM% %HB_USER_MAKEFLAGS% -f %_HB_MAKEFILE% CLEAN > make_%_HB_CC_NAME%.log
if errorlevel 1 set HB_EXIT_LEVEL=1
if errorlevel 1 goto EXIT
if exist make_%_HB_CC_NAME%.log del make_%_HB_CC_NAME%.log > nul
@@ -64,7 +64,7 @@ if "%1" == "INSTALL" goto INSTALL
:INSTALL
%_HB_MAKE_PROGRAM% %MK_USR% -f %_HB_MAKEFILE% INSTALL > nul
%_HB_MAKE_PROGRAM% %HB_USER_MAKEFLAGS% -f %_HB_MAKEFILE% INSTALL > nul
if errorlevel 1 set HB_EXIT_LEVEL=1
goto EXIT

14
harbour/make_b32.mak
View File

@@ -21,9 +21,9 @@
# NOTE: You can use these envvars to configure the make process:
# (note that these are all optional)
#
# C_USR - Extra C compiler options for libraries and for executables
# L_USR - Extra linker options for libraries
# PRG_USR - Extra Harbour compiler options
# HB_USER_CFLAGS - Extra C compiler options for libraries and for executables
# HB_USER_LDFLAGS - Extra linker options for libraries
# HB_USER_PRGFLAGS - Extra Harbour compiler options
#
# HB_BUILD_DLL - If set to yes enables building harbour VM+RTL
# dll in addition to normal static build
@@ -82,7 +82,7 @@ MTDLL_OBJS = $(TMP_DLL_OBJS:$(OBJ_DIR)=$(DLL_OBJ_DIR)) $(VMMTDLL_LIB_OBJS)
#**********************************************************
# C Compiler Flags
CFLAGS = -I$(INCLUDE_DIR) -I$(OBJ_DIR) $(C_USR)
CFLAGS = -I$(INCLUDE_DIR) -I$(OBJ_DIR) $(HB_USER_CFLAGS)
CFLAGSMT = -DHB_MT_VM
#-----------
@@ -108,8 +108,8 @@ CEXEFLAGSDLL = $(HB_BCCDLL_DYNRT) $(CLIBFLAGS)
#**********************************************************
# Linker Flags
LDFLAGS = -Gn -C -ap -Tpe -L$(LIB_DIR) -L$(BIN_DIR) $(L_USR)
LDFLAGSDLL = -Gn -C -aa -Tpd -Gi -L$(LIB_DIR) $(L_USR)
LDFLAGS = -Gn -C -ap -Tpe -L$(LIB_DIR) -L$(BIN_DIR) $(HB_USER_LDFLAGS)
LDFLAGSDLL = -Gn -C -aa -Tpd -Gi -L$(LIB_DIR) $(HB_USER_LDFLAGS)
!if "$(HB_BUILD_DEBUG)" == "yes"
LDFLAGS = -v $(LDFLAGS)
LDFLAGSDLL = -v $(LDFLAGSDLL)
@@ -121,7 +121,7 @@ STANDARD_STATIC_CLIBS = cw32mt$(RTLIBSUFFIX).lib
# This is needed, otherwise the libs may overflow
# when debug info is requested with -v -y
ARFLAGS = /P64 $(A_USR)
ARFLAGS = /P64 $(HB_USER_AFLAGS)
#**********************************************************
#**********************************************************

16
harbour/make_gcc.mak
View File

@@ -21,9 +21,9 @@
# NOTE: You can use these envvars to configure the make process:
# (note that these are all optional)
#
# C_USR - Extra C compiler options for libraries and for executables
# L_USR - Extra linker options for libraries
# PRG_USR - Extra Harbour compiler options
# HB_USER_CFLAGS - Extra C compiler options for libraries and for executables
# HB_USER_LDFLAGS - Extra linker options for libraries
# HB_USER_PRGFLAGS - Extra Harbour compiler options
#
# HB_BUILD_DLL - If set to yes enables building harbour VM+RTL
# dll in addition to normal static build (currently not working)
@@ -130,7 +130,7 @@ VMMT_LIB_OBJS = $(subst $(OBJ_DIR),$(MT_OBJ_DIR),$(VM_LIB_OBJS))
# Do not perform an extra compilation phase for shared libraries
# if gcc -fPIC compilation flag is already passed to a makefile
ifneq ($(findstring -fPIC,$(C_USR)),)
ifneq ($(findstring -fPIC,$(HB_USER_CFLAGS)),)
DLL_OBJS = $(TMP_DLL_OBJS) $(VM_DLL_OBJS)
MTDLL_OBJS = $(TMP_DLL_OBJS) $(VM_DLL_OBJS:$(OBJ_DIR)/%=$(MT_OBJ_DIR)/%)
else
@@ -152,7 +152,7 @@ endif
# C compiler flags
#**********************************************************
CFLAGS := -W -Wall -I$(INCLUDE_DIR) $(C_USR) -I$(OBJ_DIR)
CFLAGS := -W -Wall -I$(INCLUDE_DIR) $(HB_USER_CFLAGS) -I$(OBJ_DIR)
CFLAGSMT := -DHB_MT_VM
#-----------
ifneq ($(HB_BUILD_OPTIM),no)
@@ -194,7 +194,7 @@ endif
endif
endif
LDFLAGS := $(L_USR) $(__GROUP_LIBS_BEG__) $(STANDARD_STATIC_HBLIBS)
LDFLAGS := $(HB_USER_LDFLAGS) $(__GROUP_LIBS_BEG__) $(STANDARD_STATIC_HBLIBS)
LDFLAGS += $(__GROUP_LIBS_END__)
@@ -221,13 +221,13 @@ endif
LDFLAGS += $(HB_OS_LIBS)
LDFLAGSDLL := -shared $(L_USR) -L$(LIB_DIR)
LDFLAGSDLL := -shared $(HB_USER_LDFLAGS) -L$(LIB_DIR)
#**********************************************************
# Library manager Flags
#**********************************************************
ARFLAGS = rc $(A_USR)
ARFLAGS = rc $(HB_USER_AFLAGS)
#**********************************************************
# COMPILE Rules

12
harbour/make_gcc.sh
View File

@@ -106,10 +106,10 @@ do
if [ "$GTSLN" != yes ]; then
if [ "$GTSLN" != no ]; then
if [ -f $dir/include/slang.h ]; then
[ $dir = /usr ] || C_USR="$C_USR -I$dir/include"
[ $dir = /usr ] || HB_USER_CFLAGS="$HB_USER_CFLAGS -I$dir/include"
GTSLN=yes
elif [ -f $dir/include/slang/slang.h ]; then
C_USR="$C_USR -I$dir/include/slang"
HB_USER_CFLAGS="$HB_USER_CFLAGS -I$dir/include/slang"
GTSLN=yes
fi
fi
@@ -117,10 +117,10 @@ do
if [ "$GTCRS" != yes ]; then
if [ "$GTCRS" != no ]; then
if [ -f ${dir}/include/curses.h ]; then
[ $dir = /usr ] || C_USR="$C_USR -I$dir/include"
[ $dir = /usr ] || HB_USER_CFLAGS="$HB_USER_CFLAGS -I$dir/include"
GTCRS=yes
elif [ -f ${dir}/include/${CRSLIB}/curses.h ]; then
C_USR="$C_USR -I$dir/include/${CRSLIB}"
HB_USER_CFLAGS="$HB_USER_CFLAGS -I$dir/include/${CRSLIB}"
GTCRS=yes
fi
fi
@@ -131,7 +131,7 @@ do
[ -f ${dir}/include/X11/Xcms.h ] && \
[ -f ${dir}/include/X11/Xutil.h ] && \
[ -f ${dir}/include/X11/keysym.h ]; then
[ $dir = /usr ] || C_USR="$C_USR -I$dir/include"
[ $dir = /usr ] || HB_USER_CFLAGS="$HB_USER_CFLAGS -I$dir/include"
GTXWC=yes
fi
fi
@@ -193,5 +193,5 @@ sed -e 's/;/ /g' \
-e 's/^!include/include/g' \
common.mak > common.cf
$MAKE -r -f make_gcc.mak $MK_USR $*
$MAKE -r -f make_gcc.mak $HB_USER_MAKEFLAGS $*
rm -f common.cf

14
harbour/make_gnu.bat
View File

@@ -25,9 +25,9 @@ rem ---------------------------------------------------------------
if "%HB_ARCHITECTURE%" == "" set HB_ARCHITECTURE=win
if "%HB_COMPILER%" == "" set HB_COMPILER=mingw
rem set PRG_USR=
rem set C_USR=
rem set L_USR=
rem set HB_USER_PRGFLAGS=
rem set HB_USER_CFLAGS=
rem set HB_USER_LDFLAGS=
rem Set to constant value to be consistent with the non-GNU make files.
@@ -86,9 +86,9 @@ if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%/include
echo - Use these optional envvars to configure the make process
echo when using the 'all' command:
echo.
echo PRG_USR - Extra Harbour compiler options
echo C_USR - Extra C compiler options
echo L_USR - Extra linker options
echo HB_USER_PRGFLAGS - Extra Harbour compiler options
echo HB_USER_CFLAGS - Extra C compiler options
echo HB_USER_LDFLAGS - Extra linker options
goto END
:BAD_ARCH
@@ -106,7 +106,7 @@ if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%/include
rem ---------------------------------------------------------------
rem Start the GNU make system
make -r %MK_USR% %1 %2 %3 %4 %5 %6 %7 %8 %9 > make_gnu.log
make -r %HB_USER_MAKEFLAGS% %1 %2 %3 %4 %5 %6 %7 %8 %9 > make_gnu.log
goto END
:END

22
harbour/make_gnu.sh
View File

@@ -96,18 +96,18 @@ then
export HB_WITHOUT_GTSLN=yes
fi
# export PRG_USR=
# export C_USR=
# export L_USR=
# export HB_USER_PRGFLAGS=
# export HB_USER_CFLAGS=
# export HB_USER_LDFLAGS=
if [ "$HB_ARCHITECTURE" = "linux" ]
then
if [ "${C_USR}" == "${C_USR//-fPIC/}" ]
if [ "${HB_USER_CFLAGS}" == "${HB_USER_CFLAGS//-fPIC/}" ]
then
HB_CPU=`uname -m`
case "$HB_CPU" in
*[@_]64)
export C_USR="$C_USR -fPIC"
export HB_USER_CFLAGS="$HB_USER_CFLAGS -fPIC"
HB_ARCH64="yes"
;;
*)
@@ -116,7 +116,7 @@ then
fi
elif [ "$HB_ARCHITECTURE" = "hpux" ] || [ "$HB_ARCHITECTURE" = "sunos" ]
then
export C_USR="$C_USR -fPIC"
export HB_USER_CFLAGS="$HB_USER_CFLAGS -fPIC"
fi
[ -z "$HB_INSTALL_PREFIX" ] && [ -n "$PREFIX" ] && export HB_INSTALL_PREFIX="$PREFIX"
@@ -193,9 +193,9 @@ if [ -z "$HB_ARCHITECTURE" ] || [ -z "$HB_COMPILER" ]; then
echo " - Use these optional envvars to configure the make process"
echo " when using the 'all' target:"
echo
echo " PRG_USR - Extra Harbour compiler options"
echo " C_USR - Extra C compiler options"
echo " L_USR - Extra linker options"
echo " HB_USER_PRGFLAGS - Extra Harbour compiler options"
echo " HB_USER_CFLAGS - Extra C compiler options"
echo " HB_USER_LDFLAGS - Extra linker options"
exit
else
@@ -205,9 +205,9 @@ else
if [ "$HB_ARCHITECTURE" = "bsd" ] || [ "$HB_ARCHITECTURE" = "hpux" ]
then
gmake $MK_USR $*
gmake $HB_USER_MAKEFLAGS $*
else
make $MK_USR $*
make $HB_USER_MAKEFLAGS $*
fi
if [ "$*" = "clean" ]; then

6
harbour/make_gnu_os2.cmd
View File

@@ -19,9 +19,9 @@ rem sure usr/lib/tcpipv4 is searched before usr/lib (this is to
rem get the right libsocket). It is recommended to use the -D
rem compiler option for the define and either the LIBRARY_PATH or
rem the -L compiler/linker option for the library.
rem For building Harbour you can also use L_USR environment variable,
rem For building Harbour you can also use HB_USER_LDFLAGS environment variable,
rem f.e.
rem SET L_USR=-Le:\usr\lib\tcpipv4
rem SET HB_USER_LDFLAGS=-Le:\usr\lib\tcpipv4
rem
rem If you are using newer OS2 version with tcp/ip stack >= 4.1
rem (eComStation, for example) and you do not need backward binary
@@ -31,7 +31,7 @@ rem SET HB_OS2_TCP32=yes
if "%HB_OS2_TCP32%" == "yes" goto tcp32
if "%HB_OS2_TCP32%" == "YES" goto tcp32
set C_USR=-DTCPV40HDRS %C_USR%
set HB_USER_CFLAGS=-DTCPV40HDRS %HB_USER_CFLAGS%
:tcp32
make -r %1 %2 %3 %4 %5 %6 %7 %8 %9 > make_gnu.log

12
harbour/make_gnu_xmingw.sh
View File

@@ -33,17 +33,17 @@ else
esac
fi
CC_PRG_USR=""
CC_HB_USER_PRGFLAGS=""
if [ "$HB_HOST_ARCH" != "win" ]; then
CC_PRG_USR="-D__PLATFORM__WINDOWS -undef:__PLATFORM__UNIX -undef:__PLATFORM__$UNAMEU"
CC_HB_USER_PRGFLAGS="-D__PLATFORM__WINDOWS -undef:__PLATFORM__UNIX -undef:__PLATFORM__$UNAMEU"
fi
[ -z "$HB_INSTALL_PREFIX" ] && \
export HB_INSTALL_PREFIX="/usr/local/mingw32-harbour"
export CC_C_USR=""
export C_USR="$CC_C_USR $C_USR"
export CC_PRG_USR
export PRG_USR="$CC_PRG_USR $PRG_USR"
export CC_HB_USER_CFLAGS=""
export HB_USER_CFLAGS="$CC_HB_USER_CFLAGS $HB_USER_CFLAGS"
export CC_HB_USER_PRGFLAGS
export HB_USER_PRGFLAGS="$CC_HB_USER_PRGFLAGS $HB_USER_PRGFLAGS"
# try to detect MinGW cross-compiler location
# using some default platform settings

12
harbour/make_gnu_xmingwce.sh
View File

@@ -33,17 +33,17 @@ else
esac
fi
CC_PRG_USR="-D__PLATFORM__WINCE"
CC_HB_USER_PRGFLAGS="-D__PLATFORM__WINCE"
if [ "$HB_HOST_ARCH" != "win" ]; then
CC_PRG_USR="$CC_PRG_USR -D__PLATFORM__WINDOWS -undef:__PLATFORM__UNIX -undef:__PLATFORM__$UNAMEU"
CC_HB_USER_PRGFLAGS="$CC_HB_USER_PRGFLAGS -D__PLATFORM__WINDOWS -undef:__PLATFORM__UNIX -undef:__PLATFORM__$UNAMEU"
fi
[ -z "$HB_INSTALL_PREFIX" ] && \
export HB_INSTALL_PREFIX="/usr/local/arm-wince-mingwce-harbour"
export CC_C_USR=""
export C_USR="$CC_C_USR $C_USR"
export CC_PRG_USR
export PRG_USR="$CC_PRG_USR $PRG_USR"
export CC_HB_USER_CFLAGS=""
export HB_USER_CFLAGS="$CC_HB_USER_CFLAGS $HB_USER_CFLAGS"
export CC_HB_USER_PRGFLAGS
export HB_USER_PRGFLAGS="$CC_HB_USER_PRGFLAGS $HB_USER_PRGFLAGS"
# default cegcc instalation path
[ -z "$CCPATH" ] && CCPATH="/opt/mingw32ce/bin"

8
harbour/make_vc.bat
View File

@@ -18,7 +18,7 @@ rem set HB_BUILD_OPTIM=no
rem set HB_REBUILD_PARSER=yes
rem set HB_MAKE_PROGRAM=
rem set HB_SHOW_ERRORS=
rem set MK_USR=
rem set HB_USER_MAKEFLAGS=
rem
rem To create a WinCE build, use the following settings:
rem set HB_BUILD_WINCE=yes
@@ -84,14 +84,14 @@ rem ---------------------------------------------------------------
:BUILD
%_HB_MAKE_PROGRAM% %MK_USR% -nologo -f %_HB_MAKEFILE% %1 %2 %3 > make_%_HB_CC_NAME%.log
%_HB_MAKE_PROGRAM% %HB_USER_MAKEFLAGS% -nologo -f %_HB_MAKEFILE% %1 %2 %3 > make_%_HB_CC_NAME%.log
if errorlevel 1 set HB_EXIT_LEVEL=1
if errorlevel 1 if not "%HB_SHOW_ERRORS%" == "no" notepad make_%_HB_CC_NAME%.log
goto EXIT
:CLEAN
%_HB_MAKE_PROGRAM% %MK_USR% -nologo -f %_HB_MAKEFILE% CLEAN > make_%_HB_CC_NAME%.log
%_HB_MAKE_PROGRAM% %HB_USER_MAKEFLAGS% -nologo -f %_HB_MAKEFILE% CLEAN > make_%_HB_CC_NAME%.log
if errorlevel 1 set HB_EXIT_LEVEL=1
if errorlevel 1 goto EXIT
if exist make_%_HB_CC_NAME%.log del make_%_HB_CC_NAME%.log > nul
@@ -100,7 +100,7 @@ rem ---------------------------------------------------------------
:INSTALL
%_HB_MAKE_PROGRAM% %MK_USR% -nologo -f %_HB_MAKEFILE% INSTALL > nul
%_HB_MAKE_PROGRAM% %HB_USER_MAKEFLAGS% -nologo -f %_HB_MAKEFILE% INSTALL > nul
if errorlevel 1 set HB_EXIT_LEVEL=1
goto EXIT

18
harbour/make_vc.mak
View File

@@ -21,9 +21,9 @@
# NOTE: You can use these envvars to configure the make process:
# (note that these are all optional)
#
# C_USR - Extra C compiler options for libraries and for executables
# L_USR - Extra linker options for libraries
# PRG_USR - Extra Harbour compiler options
# HB_USER_CFLAGS - Extra C compiler options for libraries and for executables
# HB_USER_LDFLAGS - Extra linker options for libraries
# HB_USER_PRGFLAGS - Extra Harbour compiler options
#
# HB_BUILD_DLL - If set to yes enables building harbour VM+RTL
# dll in addition to normal static build
@@ -98,7 +98,7 @@ MTDLL_OBJS = $(TMP_DLL_OBJS:obj\vc=obj\vc\dll) $(VMMTDLL_LIB_OBJS)
# C compiler, Harbour compiler and Linker flags.
#**********************************************************
ARFLAGS = /nologo $(A_USR)
ARFLAGS = /nologo $(HB_USER_AFLAGS)
# C Compiler Flags
!if "$(HB_BUILD_WINCE)" == "yes"
@@ -117,7 +117,7 @@ CFLAGS = -nologo -W3 -I$(INCLUDE_DIR) -I$(CFLAGS_VER) \
-D"_WIN32_WCE=0x420" -D"UNDER_CE=0x420" -DWIN32_PLATFORM_PSPC \
-DWINCE -D_WINCE -D_WINDOWS -DARM -D_ARM_ -DARMV4 \
-DPOCKETPC2003_UI_MODEL -D_M_ARM -DUNICODE -D_UNICODE \
$(C_USR) -D_UWIN -I$(OBJ_DIR)
$(HB_USER_CFLAGS) -D_UWIN -I$(OBJ_DIR)
#-----------
!ifndef HB_WINCE_COMPILE_WITH_GTWIN
@@ -141,7 +141,7 @@ CFLAGS_VER = -Ogt2yb1p -GX- -G6 -YX
!endif
CFLAGS = -nologo -W4 -wd4127 -Gs -I$(INCLUDE_DIR) $(CFLAGS_VER) \
$(C_USR) -I$(OBJ_DIR)
$(HB_USER_CFLAGS) -I$(OBJ_DIR)
#-----------
!if "$(HB_BUILD_DEBUG)" == "yes"
@@ -175,17 +175,17 @@ CEXEFLAGSDLL = $(CEXEFLAGSDLL) -MT$(DBGMARKER)
LDFLAGS = /nologo /subsystem:windowsce,4.20 /machine:arm /armpadcode \
/stack:65536,4096 /nodefaultlib:"oldnames.lib" \
/nodefaultlib:"kernel32.lib" /align:4096 /opt:ref /opt:icf \
/libpath:$(LIB_DIR) $(L_USR)
/libpath:$(LIB_DIR) $(HB_USER_LDFLAGS)
!if $(HB_VISUALC_VER) >= 80
LDFLAGS = $(LDFLAGS) /manifest:no
!endif
LDFLAGSDLL = /dll \
/nologo /subsystem:windowsce,4.20 /machine:arm /armpadcode \
/stack:65536,4096 /nodefaultlib:"oldnames.lib" \
/libpath:$(LIB_DIR) $(L_USR)
/libpath:$(LIB_DIR) $(HB_USER_LDFLAGS)
STANDARD_SYSLIBS = coredll.lib corelibc.lib winsock.lib ws2.lib
!else
LDFLAGS = /nologo /libpath:$(LIB_DIR) $(L_USR)
LDFLAGS = /nologo /libpath:$(LIB_DIR) $(HB_USER_LDFLAGS)
LDFLAGSDLL = /dll $(LDFLAGS)
!if $(HB_VISUALC_VER) >= 80
LDFLAGS = $(LDFLAGS) /nxcompat

10
harbour/mpkg_tgz.sh
View File

@@ -29,7 +29,7 @@ hb_pref="hb"
hb_contrib=""
hb_sysdir="yes"
hb_exesuf=""
export C_USR="$C_USR -DHB_FM_STATISTICS_OFF"
export HB_USER_CFLAGS="$HB_USER_CFLAGS -DHB_FM_STATISTICS_OFF"
[ -z "$HB_INSTALL_PREFIX" ] && [ -n "$PREFIX" ] && export HB_INSTALL_PREFIX="$PREFIX"
@@ -73,7 +73,7 @@ then
HB_CPU=`uname -m`
case "$HB_CPU" in
*[_@]64)
export C_USR="$C_USR -fPIC"
export HB_USER_CFLAGS="$HB_USER_CFLAGS -fPIC"
HB_ARCH64="yes"
;;
*)
@@ -81,7 +81,7 @@ then
esac
elif [ "$HB_ARCHITECTURE" = "hpux" ] || [ "$HB_ARCHITECTURE" = "sunos" ]
then
export C_USR="$C_USR -fPIC"
export HB_USER_CFLAGS="$HB_USER_CFLAGS -fPIC"
fi
# Select the platform-specific installation prefix and ownership
@@ -271,8 +271,8 @@ then
[ "${HB_WITHOUT_GTSLN}" != yes ] && ADD_LIBS="$ADD_LIBS -lslang"
[ "${HB_WITHOUT_X11}" != yes ] && ADD_LIBS="$ADD_LIBS -L/usr/X11R6/$HB_LIBDIRNAME -lX11"
export L_USR="-L${HB_LIB_INSTALL} -l${name} ${ADD_LIBS} ${L_USR}"
export PRG_USR="\"-D_DEFAULT_INC_DIR='${_DEFAULT_INC_DIR}'\" ${PRG_USR}"
export HB_USER_LDFLAGS="-L${HB_LIB_INSTALL} -l${name} ${ADD_LIBS} ${HB_USER_LDFLAGS}"
export HB_USER_PRGFLAGS="\"-D_DEFAULT_INC_DIR='${_DEFAULT_INC_DIR}'\" ${HB_USER_PRGFLAGS}"
for utl in hbmake hbrun hbi18n hbdoc hbtest
do

18
harbour/source/main/harbour.c
View File

@@ -580,31 +580,31 @@ const char * hb_verSvnLastEntry( void )
return HB_VER_LENTRY;
}
/* build time C compiler flags in C_USR envvar */
/* build time C compiler flags in HB_USER_CFLAGS envvar */
const char * hb_verFlagsC( void )
{
#ifdef HB_VER_C_USR
return HB_VER_C_USR;
#ifdef HB_VER_HB_USER_CFLAGS
return HB_VER_HB_USER_CFLAGS;
#else
return "";
#endif
}
/* build time linker flags in L_USR envvar */
/* build time linker flags in HB_USER_LDFLAGS envvar */
const char * hb_verFlagsL( void )
{
#ifdef HB_VER_L_USR
return HB_VER_L_USR;
#ifdef HB_VER_HB_USER_LDFLAGS
return HB_VER_HB_USER_LDFLAGS;
#else
return "";
#endif
}
/* build time Harbour compiler flags in PRG_USR envvar */
/* build time Harbour compiler flags in HB_USER_PRGFLAGS envvar */
const char * hb_verFlagsPRG( void )
{
#ifdef HB_VER_PRG_USR
return HB_VER_PRG_USR;
#ifdef HB_VER_HB_USER_PRGFLAGS
return HB_VER_HB_USER_PRGFLAGS;
#else
return "";
#endif

12
harbour/source/pp/hbpp.c
View File

@@ -382,29 +382,29 @@ static int hb_pp_generateVerInfo( char * szVerFile, int iSVNID, char * szChangeL
hb_xfree( pszEscaped );
}
pszEnv = hb_getenv( "C_USR" );
pszEnv = hb_getenv( "HB_USER_CFLAGS" );
if( pszEnv )
{
pszEscaped = hb_pp_escapeString( pszEnv );
fprintf( fout, "\n#define HB_VER_C_USR \"%s\"\n", pszEscaped );
fprintf( fout, "\n#define HB_VER_HB_USER_CFLAGS \"%s\"\n", pszEscaped );
hb_xfree( pszEscaped );
hb_xfree( pszEnv );
}
pszEnv = hb_getenv( "L_USR" );
pszEnv = hb_getenv( "HB_USER_LDFLAGS" );
if( pszEnv )
{
pszEscaped = hb_pp_escapeString( pszEnv );
fprintf( fout, "\n#define HB_VER_L_USR \"%s\"\n", pszEscaped );
fprintf( fout, "\n#define HB_VER_HB_USER_LDFLAGS \"%s\"\n", pszEscaped );
hb_xfree( pszEscaped );
hb_xfree( pszEnv );
}
pszEnv = hb_getenv( "PRG_USR" );
pszEnv = hb_getenv( "HB_USER_PRGFLAGS" );
if( pszEnv )
{
pszEscaped = hb_pp_escapeString( pszEnv );
fprintf( fout, "\n#define HB_VER_PRG_USR \"%s\"\n", pszEscaped );
fprintf( fout, "\n#define HB_VER_HB_USER_PRGFLAGS \"%s\"\n", pszEscaped );
hb_xfree( pszEscaped );
hb_xfree( pszEnv );
}

2
harbour/source/rdd/dbffpt/Makefile
View File

@@ -3,7 +3,7 @@
#
ifeq ($(HB_COMPILER),xcc)
C_USR:=$(subst -Ox,,$(subst -Ot,,$(C_USR)))
HB_USER_CFLAGS:=$(subst -Ox,,$(subst -Ot,,$(HB_USER_CFLAGS)))
endif
ROOT = ../../../

2
harbour/source/vm/Makefile
View File

@@ -68,7 +68,7 @@ LIBNAME=hbvm
ifeq ($(HB_MT),)
HB_MT=MT
C_USR:=$(subst -DHB_MT_VM,,$(C_USR))
HB_USER_CFLAGS:=$(subst -DHB_MT_VM,,$(HB_USER_CFLAGS))
endif
ifeq ($(HB_MT),MT)
ifneq ($(HB_ARCHITECTURE),dos)

18
harbour/source/vm/cmdarg.c
View File

@@ -505,31 +505,31 @@ const char * hb_verSvnLastEntry( void )
return HB_VER_LENTRY;
}
/* build time C compiler flags in C_USR envvar */
/* build time C compiler flags in HB_USER_CFLAGS envvar */
const char * hb_verFlagsC( void )
{
#ifdef HB_VER_C_USR
return HB_VER_C_USR;
#ifdef HB_VER_HB_USER_CFLAGS
return HB_VER_HB_USER_CFLAGS;
#else
return "";
#endif
}
/* build time linker flags in L_USR envvar */
/* build time linker flags in HB_USER_LDFLAGS envvar */
const char * hb_verFlagsL( void )
{
#ifdef HB_VER_L_USR
return HB_VER_L_USR;
#ifdef HB_VER_HB_USER_LDFLAGS
return HB_VER_HB_USER_LDFLAGS;
#else
return "";
#endif
}
/* build time Harbour compiler flags in PRG_USR envvar */
/* build time Harbour compiler flags in HB_USER_PRGFLAGS envvar */
const char * hb_verFlagsPRG( void )
{
#ifdef HB_VER_PRG_USR
return HB_VER_PRG_USR;
#ifdef HB_VER_HB_USER_PRGFLAGS
return HB_VER_HB_USER_PRGFLAGS;
#else
return "";
#endif

4
harbour/source/vm/vmmt/Makefile
View File

@@ -67,8 +67,8 @@ PRG_SOURCES=\
LIBNAME=hbvmmt
ifeq ($(C_USR),$(subst -DHB_MT_VM,,$(C_USR)))
C_USR += -DHB_MT_VM
ifeq ($(HB_USER_CFLAGS),$(subst -DHB_MT_VM,,$(HB_USER_CFLAGS)))
HB_USER_CFLAGS += -DHB_MT_VM
endif
include $(TOP)$(ROOT)config/lib.cf

12
harbour/tests/multifnc/Makefile
View File

@@ -3,22 +3,22 @@
#
ifeq ($(HB_COMPILER),gcc)
L_USR += -Wl,--allow-multiple-definition
HB_USER_LDFLAGS += -Wl,--allow-multiple-definition
else
ifeq ($(HB_COMPILER),gpp)
L_USR += -Wl,--allow-multiple-definition
HB_USER_LDFLAGS += -Wl,--allow-multiple-definition
else
ifeq ($(HB_COMPILER),djgpp)
L_USR += -Wl,--allow-multiple-definition
HB_USER_LDFLAGS += -Wl,--allow-multiple-definition
else
ifeq ($(HB_COMPILER),mingw)
L_USR += -Wl,--allow-multiple-definition
HB_USER_LDFLAGS += -Wl,--allow-multiple-definition
else
ifeq ($(HB_COMPILER),xcc)
L_USR += /FORCE:MULTIPLE
HB_USER_LDFLAGS += /FORCE:MULTIPLE
else
ifeq ($(HB_COMPILER),pocc)
L_USR += /FORCE:MULTIPLE
HB_USER_LDFLAGS += /FORCE:MULTIPLE
endif
endif
endif

2
harbour/tests/testid.prg
View File

@@ -20,7 +20,7 @@ function Main()
QOut( "Fine, you have just tested the /d compiler flag" )
#else
QOut( "Please change hb32.bat and include /dTEST compiler flag" )
QOut( "Or run 'SET PRG_USR=/dTEST' if you are using the GNU Make System" )
QOut( "Or run 'SET HB_USER_PRGFLAGS=/dTEST' if you are using the GNU Make System" )
#endif
#ifdef FIRST

2
harbour/utils/hbdoc/Makefile
View File

@@ -36,6 +36,6 @@ LIBS=\
hbmacro \
hbcommon \
PRG_USR += -gc0
HB_USER_PRGFLAGS += -gc0
include $(TOP)$(ROOT)config/bin.cf

2
harbour/utils/hbi18n/Makefile
View File

@@ -26,6 +26,6 @@ LIBS=\
hbcommon \
PRG_USR += -gc0
HB_USER_PRGFLAGS += -gc0
include $(TOP)$(ROOT)config/bin.cf

2
harbour/utils/hbmake/Makefile
View File

@@ -28,6 +28,6 @@ LIBS=\
hbmacro \
hbcommon \
PRG_USR += -gc0
HB_USER_PRGFLAGS += -gc0
include $(TOP)$(ROOT)config/bin.cf

6
harbour/utils/hbmake/hbmake.prg
View File

@@ -2710,7 +2710,7 @@ Endif // Create and compile
ELSEIF s_lMSVcc
FWrite( s_nMakeFileHandle, ;
"CFLAG1 = -I$(INCLUDE_DIR) -W3 -nologo $(C_USR) $(SHELL) $(CFLAGS)" +IIF( s_lMt, " -DHB_THREAD_SUPPORT " , "" ) + s_cEOL +;
"CFLAG1 = -I$(INCLUDE_DIR) -W3 -nologo $(HB_USER_CFLAGS) $(SHELL) $(CFLAGS)" +IIF( s_lMt, " -DHB_THREAD_SUPPORT " , "" ) + s_cEOL +;
"CFLAG2 = -c" +" -I" + ALLTRIM( s_cUserInclude ) + " " + s_cEOL +;
"RFLAGS = " + s_cEOL +;
"LFLAGS = /LIBPATH:$(CC_DIR)\lib /LIBPATH1:$(HB_DIR)\lib /LIBPATH2:$(C4W)\lib" +IIF(s_lMt, " /Nodefaultlib:LIBC "," /Nodefaultlib:LIBCMT " ) + s_cEOL +;
@@ -2724,7 +2724,7 @@ Endif // Create and compile
ELSEIF s_lPocc
FWrite( s_nMakeFileHandle, ;
"CFLAG1 = $(SHELL) /Ze /Go /Ot /Tx86-coff /I$(INCLUDE_DIR) $(C_USR) $(CFLAGS)" +IIF( s_lMt, ' /D"HB_THREAD_SUPPORT" /MT' , "" ) + s_cEOL +;
"CFLAG1 = $(SHELL) /Ze /Go /Ot /Tx86-coff /I$(INCLUDE_DIR) $(HB_USER_CFLAGS) $(CFLAGS)" +IIF( s_lMt, ' /D"HB_THREAD_SUPPORT" /MT' , "" ) + s_cEOL +;
"CFLAG2 = " + s_cEOL +;
"RFLAGS = " + s_cEOL +;
"LFLAGS = /LIBPATH:$(CC_DIR)\lib /LIBPATH:$(CC_DIR)\lib\win /LIBPATH:$(HB_DIR)\lib /MACHINE:IX86"+IIF(!s_lGui," /SUBSYSTEM:CONSOLE"," /SUBSYSTEM:WINDOWS") + s_cEOL +;
@@ -3883,7 +3883,7 @@ FUNCTION CreateLibMakeFile( cFile )
ELSEIF s_lMSVcc
FWrite( s_nMakeFileHandle, ;
"CFLAG1 = -I$(INCLUDE_DIR) -W3 -nologo $(C_USR) $(SHELL) $(CFLAGS)" + s_cEOL +;
"CFLAG1 = -I$(INCLUDE_DIR) -W3 -nologo $(HB_USER_CFLAGS) $(SHELL) $(CFLAGS)" + s_cEOL +;
"CFLAG2 = -c -I" + ALLTRIM( s_cUserInclude ) + s_cEOL +;
"RFLAGS = " + s_cEOL +;
"LFLAGS = " + s_cEOL +;

8
harbour/utils/hbrun/Makefile
View File

@@ -28,16 +28,16 @@ LIBS=\
hbcplr \
hbcommon \
ifeq ($(findstring -DHB_PCRE_REGEX, $(C_USR)),)
ifeq ($(findstring -DHB_POSIX_REGEX, $(C_USR)),)
ifeq ($(findstring -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
ifeq ($(findstring -DHB_POSIX_REGEX, $(HB_USER_CFLAGS)),)
LIBS += hbpcre
endif
endif
ifeq ($(findstring -DHB_EXT_ZLIB, $(C_USR)),)
ifeq ($(findstring -DHB_EXT_ZLIB, $(HB_USER_CFLAGS)),)
LIBS += hbzlib
endif
PRG_USR += -gc0
HB_USER_PRGFLAGS += -gc0
include $(TOP)$(ROOT)config/bin.cf

2
harbour/utils/hbtest/Makefile
View File

@@ -40,6 +40,6 @@ LIBS=\
hbpp \
hbcommon \
PRG_USR += -gc0
HB_USER_PRGFLAGS += -gc0
include $(TOP)$(ROOT)config/bin.cf