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

2008-08-06 17:31 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/bin/hb-func.sh
  * harbour/bin/postinst.sh
    * changed FM lib name to HBFM

  * harbour/bin/hb-mkslib.sh
    * respect L_USR also in Windows builds
This commit is contained in:
Przemyslaw Czerpak
2008-08-06 15:31:35 +00:00
parent 5324c3c429
commit 5375c51c2d
4 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
harbour/ChangeLog
View File

@@ -8,6 +8,14 @@
2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2008-08-06 17:31 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/bin/hb-func.sh
* harbour/bin/postinst.sh
* changed FM lib name to HBFM
* harbour/bin/hb-mkslib.sh
* respect L_USR also in Windows builds
2008-08-06 16:14 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* contrib/hbapollo/Makefile
* contrib/hbapollo/apollo.c

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

@@ -488,7 +488,7 @@ l="mainwin"
[ "\${HB_MT}" = "MT" ] && [ -f "\${HB_LIB_INSTALL}/lib\${l}mt.a" ] && l="\${l}mt"
[ -f "\${HB_LIB_INSTALL}/lib\${l}.a" ] && HARBOUR_LIBS="\${HARBOUR_LIBS} -l\${l}"
l="fm"
l="hbfm"
[ "\${HB_MT}" = "MT" ] && [ -f "\${HB_LIB_INSTALL}/lib\${l}mt.a" ] && l="\${l}mt"
if [ -f "\${HB_LIB_INSTALL}/lib\${l}.a" ] && \\
( [ -n "\${HB_FM_REQ}" ] || [ "\${HB_STATIC}" = "yes" ] ) && \\
@@ -641,7 +641,7 @@ mk_hblibso()
for l in ${hb_libs}
do
case $l in
hbdebug|profiler|fm|hbodbc|gtalleg|rddads) ;;
hbdebug|profiler|hbfm|hbodbc|gtalleg|rddads) ;;
*)
ls="lib${l}.a"
if [ -f lib${l}mt.a ]

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

@@ -132,7 +132,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} ${SYSLIBS} ${HB_DLLIBS} && \
${CCPREFIX}gcc -shared -o "${FULLNAME}" $OBJLST ${linker_options} ${L_USR} ${SYSLIBS} ${HB_DLLIBS} && \
cd "${dir}" && \
rm -f "${DSTDIR}${FULLNAME}" && \
mv -f "${OTMPDIR}/${FULLNAME}" "${DSTDIR}${FULLNAME}"

10
harbour/bin/postinst.sh
View File

@@ -78,18 +78,18 @@ then
[ "$HB_COMPILER" = "mingw32" ] || [ "$HB_COMPILER" = "cemgw" ]; then
mk_hblibso "${hb_root}"
fi
# build fm lib with memory statistic
# build hbfm lib with memory statistic
(cd ${hb_root}/source/vm
C_USR=${C_USR//-DHB_FM_STATISTICS_OFF/}
rm -f fm.o
${MAKE} -r fm.o
${AR} ${HB_LIB_INSTALL}/libfm.a fm.o
[ -n "${RANLIB}" ] && ${RANLIB} ${HB_LIB_INSTALL}/libfm.a
${AR} ${HB_LIB_INSTALL}/libhbfm.a fm.o
[ -n "${RANLIB}" ] && ${RANLIB} ${HB_LIB_INSTALL}/libhbfm.a
rm -f fm.o
if [ "${HB_MT}" = "MT" ]; then
${MAKE} -r fm.o 'HB_LIBCOMP_MT=YES'
${AR} ${HB_LIB_INSTALL}/libfmmt.a fm.o
[ -n "${RANLIB}" ] && ${RANLIB} ${HB_LIB_INSTALL}/libfmmt.a
${AR} ${HB_LIB_INSTALL}/libhbfmmt.a fm.o
[ -n "${RANLIB}" ] && ${RANLIB} ${HB_LIB_INSTALL}/libhbfmmt.a
rm -f fm.o
fi
)