2008-08-07 14:58 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

* harbour/harbour-ce-spec
  * harbour/harbour-w32-spec
    ! set HB_XBUILD evvar
  * harbour/bin/hb-func.sh
    ! do not move harbour.dll to HB_BIN_INSTALL directory when
      HB_XBUILD envvar is set

  * harbour/source/hbzlib/deflate.c
    * pacified warning
This commit is contained in:
Przemyslaw Czerpak
2008-08-07 12:58:43 +00:00
parent ab53bda7b4
commit 3e94ca78ca
5 changed files with 20 additions and 3 deletions

View File

@@ -8,6 +8,17 @@
2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2008-08-07 14:58 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/harbour-ce-spec
* harbour/harbour-w32-spec
! set HB_XBUILD evvar
* harbour/bin/hb-func.sh
! do not move harbour.dll to HB_BIN_INSTALL directory when
HB_XBUILD envvar is set
* harbour/source/hbzlib/deflate.c
* pacified warning
2008-08-07 14:33 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* include/hbver.h
- Removed reference to hbverfix.

View File

@@ -704,8 +704,10 @@ mk_hblibso()
if [ -f $l ]
then
if [ "${HB_ARCHITECTURE}" = "w32" ]; then
(cd "$dir"
mv "${HB_LIB_INSTALL}/$l" "${HB_BIN_INSTALL}")
if [ "${HB_XBUILD}" = "" ]; then
(cd "$dir"
mv "${HB_LIB_INSTALL}/$l" "${HB_BIN_INSTALL}")
fi
else
if [ "${HB_ARCHITECTURE}" = "darwin" ]; then
ll=${l%.${hb_ver}${lib_ext}}${lib_ext}

View File

@@ -112,6 +112,7 @@ export CCPREFIX="%{hb_ccpref}"
export PATH="$CCPATH$PATH"
export HB_MT=no
export HB_XBUILD=wce
export HB_GT_LIB=gtwvt
export HB_BIN_INSTALL=%{_bindir}
export HB_INC_INSTALL=%{_includedir}/%{name}
@@ -143,6 +144,7 @@ export HB_HOST_BUILD=lib
export HB_ARCHITECTURE=w32
export HB_COMPILER=cemgw
export HB_MT=no
export HB_XBUILD=wce
export HB_GT_LIB=gtwvt
export HB_BIN_INSTALL=%{_bindir}
export HB_INC_INSTALL=%{_includedir}/%{name}

View File

@@ -112,6 +112,7 @@ export CCPREFIX="%{hb_ccpref}"
export PATH="$CCPATH$PATH"
export HB_MT=no
export HB_XBUILD=w32
export HB_GT_LIB=gtwin
export HB_BIN_INSTALL=%{_bindir}
export HB_INC_INSTALL=%{_includedir}/%{name}
@@ -143,6 +144,7 @@ export HB_HOST_BUILD=lib
export HB_ARCHITECTURE=w32
export HB_COMPILER=mingw32
export HB_MT=no
export HB_XBUILD=w32
export HB_GT_LIB=gtwin
export HB_BIN_INSTALL=%{_bindir}
export HB_INC_INSTALL=%{_includedir}/%{name}

View File

@@ -353,7 +353,7 @@ int ZEXPORT deflateSetDictionary (
for (n = 0; n <= length - MIN_MATCH; n++) {
INSERT_STRING(s, n, hash_head);
}
(void)(hash_head); /* to make compiler happy */
if (hash_head) {;} /* to make compiler happy */
return Z_OK;
}