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

2009-06-11 13:04 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* external/libpng/Makefile
    ! Fixed to properly link with DJGPP.

  * utils/hbmk2/hbmk2.prg
    ! Fixed ${hb_cpu} macro for dos/os2 platforms.

  * contrib/hbhpdf/Makefile
  * utils/hbmk2/examples/contribf.hbc
    + Enabled for DOS platform.

  ; I could back port my app to DOS after these changes, with
    only inet stuff not linked in.
This commit is contained in:
Viktor Szakats
2009-06-11 11:05:16 +00:00
parent 4259e6ca3d
commit cd67076cf6
5 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
harbour/ChangeLog
View File

@@ -17,6 +17,20 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-06-11 13:04 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* external/libpng/Makefile
! Fixed to properly link with DJGPP.
* utils/hbmk2/hbmk2.prg
! Fixed ${hb_cpu} macro for dos/os2 platforms.
* contrib/hbhpdf/Makefile
* utils/hbmk2/examples/contribf.hbc
+ Enabled for DOS platform.
; I could back port my app to DOS after these changes, with
only inet stuff not linked in.
2009-06-11 11:05 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* INSTALL
* Further cleanups in pocc examples.

5
harbour/contrib/hbhpdf/Makefile
View File

@@ -6,8 +6,6 @@ ROOT = ../../
LIBNAME=hbhpdf
ifneq ($(HB_ARCHITECTURE),dos)
ifeq ($(HB_INC_LIBHARU),)
ifeq ($(HB_XBUILD),)
HB_INC_LIBHARU = /usr/include /usr/local/include $(TOP)$(ROOT)external/libhpdf
@@ -38,6 +36,3 @@ install::
else
include $(TOP)$(ROOT)config/none.cf
endif
else
include $(TOP)$(ROOT)config/none.cf
endif

4
harbour/external/libpng/Makefile vendored
View File

@@ -5,6 +5,10 @@
HB_BUILD_WARN = no
HB_USER_CFLAGS += -I$(TOP)$(ROOT)source/hbzlib
ifeq ($(HB_COMPILER),djgpp)
HB_USER_CFLAGS += -DPNG_NO_SNPRINTF
endif
ROOT = ../../
LIBNAME=libpng

4
harbour/utils/hbmk2/examples/contribf.hbc
View File

@@ -9,11 +9,11 @@
libs=hbbmcdx hbbtree hbclipsm hbcrypt hbct hbgt hbmisc hbmzip hbnf hbvpdf hbziparc rddsql xhb
# contribs portable, with external dependencies:
libs=hbcurl hbfbird hbgd hbmsql hbmysql hbpgsql hbqt sddfb sddmy sddpg
libs=hbcurl hbfbird hbgd hbhpdf hbmsql hbmysql hbpgsql hbqt sddfb sddmy sddpg
# contribs with limited availability (some with external dependencies):
{!pocc&!xcc&!dmc&!owatcom}libs=gtalleg
{!dos}libs=hbapollo hbfimage hbhpdf hbssl hbtip rddads
{!dos}libs=hbapollo hbfimage hbssl hbtip rddads
{linux|win|os2}libs=hbtpathy
{win}libs=gtwvg hbblat hbgfwin hbwin rddado
{win&!dmc}libs=hbwhat

3
harbour/utils/hbmk2/hbmk2.prg
View File

@@ -5989,7 +5989,8 @@ FUNCTION hbmk_COMP( hbmk )
FUNCTION hbmk_CPU( hbmk )
DO CASE
CASE hbmk[ _HBMK_cCOMP ] $ "gcc|gpp|cygwin|owatcom|bcc|icc|xcc" .OR. ;
CASE hbmk[ _HBMK_cARCH ] $ "dos|os2" .OR. ;
hbmk[ _HBMK_cCOMP ] $ "gcc|gpp|cygwin|owatcom|bcc|icc|xcc" .OR. ;
hbmk[ _HBMK_cCOMP ] == "mingw" .OR. ;
hbmk[ _HBMK_cCOMP ] == "msvc" .OR. ;
hbmk[ _HBMK_cCOMP ] == "pocc"