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

2009-09-22 18:51 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* utils/hbmk2/hbmk2.prg
  * config/global.mk
    ! Changed .dll names for OS/2 to be the same as in MS-DOS:
      harbour/harbourm. (.dll names in OS/2 are limited to 8.3)

  * config/dos/djgpp.mk
    ! Attempt to fix empty line problem when stripping isn't requested.
      Something better would be good here.

  * config/os2/gcc.mk
    ! Fixed empty line problem when stripping isn't requested.
This commit is contained in:
Viktor Szakats
2009-09-22 16:52:31 +00:00
parent a8fc3a28d2
commit e6399e45fd
5 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
harbour/ChangeLog
View File

@@ -17,6 +17,19 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-09-22 18:51 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* utils/hbmk2/hbmk2.prg
* config/global.mk
! Changed .dll names for OS/2 to be the same as in MS-DOS:
harbour/harbourm. (.dll names in OS/2 are limited to 8.3)
* config/dos/djgpp.mk
! Attempt to fix empty line problem when stripping isn't requested.
Something better would be good here.
* config/os2/gcc.mk
! Fixed empty line problem when stripping isn't requested.
2009-09-22 17:10 UTC+0300 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt)
* contrib/hbmemio/memio.c
+ added cleanup on application exit

2
harbour/config/dos/djgpp.mk
View File

@@ -34,6 +34,8 @@ endif
ifneq ($(filter $(HB_BUILD_STRIP),all lib),)
ARSTRIP = $(HB_CCPATH)$(HB_CCPREFIX)strip -S $(LIB_DIR)/$@
else
ARSTRIP := @$(ECHO) .
endif
ifneq ($(filter $(HB_BUILD_STRIP),all bin),)
LDSTRIP := -s

9
harbour/config/global.mk
View File

@@ -1362,10 +1362,6 @@ ifeq ($(HB_INIT_DONE),)
endif
endif
endif
else
ifeq ($(HB_PLATFORM),os2)
DYNNAME_POST := $(DYNNAME_POST)-os2
endif
endif
endif
@@ -1374,6 +1370,11 @@ ifeq ($(HB_INIT_DONE),)
HB_DYNLIB_BASE_MT := harbourm
HB_DYNLIB_ST := $(HB_DYNLIB_BASE_ST)
HB_DYNLIB_MT := $(HB_DYNLIB_BASE_MT)
ifeq ($(HB_PLATFORM),os2)
HB_DYNLIB_BASE_ST := harbour
HB_DYNLIB_BASE_MT := harbourm
HB_DYNLIB_ST := $(HB_DYNLIB_BASE_ST)
HB_DYNLIB_MT := $(HB_DYNLIB_BASE_MT)
else
HB_DYNLIB_BASE_ST := harbour
HB_DYNLIB_BASE_MT := harbourmt

5
harbour/config/os2/gcc.mk
View File

@@ -33,7 +33,7 @@ ifeq ($(HB_BUILD_DEBUG),yes)
endif
ifneq ($(filter $(HB_BUILD_STRIP),all lib),)
ARSTRIP = ${HB_CCPATH}${HB_CCPREFIX}strip -S $(LIB_DIR)/$@
ARSTRIP = & ${HB_CCPATH}${HB_CCPREFIX}strip -S $(LIB_DIR)/$@
endif
ifneq ($(filter $(HB_BUILD_STRIP),all bin),)
LDSTRIP := -s
@@ -71,13 +71,12 @@ define create_library
@$(ECHO) $(ECHOQUOTE)SAVE$(ECHOQUOTE) >> __lib__.tmp
@$(ECHO) $(ECHOQUOTE)END$(ECHOQUOTE) >> __lib__.tmp
$(AR) $(ARFLAGS) $(HB_USER_AFLAGS) -M < __lib__.tmp
$(ARSTRIP)
endef
# Under OS/2 || isn't a command separator (inside a shell, that is); correct separator is &
AR := $(HB_CCPATH)$(HB_CCPREFIX)ar
ARFLAGS :=
AR_RULE = $(create_library) & $(RM) __lib__.tmp
AR_RULE = $(create_library) $(ARSTRIP) & $(RM) __lib__.tmp
DY := $(CC)
DFLAGS := -shared $(LIBPATHS)

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

@@ -2464,8 +2464,8 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
ENDIF
l_aLIBSHAREDPOST := { "hbmainstd" }
l_aLIBSHARED := { iif( hbmk[ _HBMK_lMT ], "harbourmt" + cDL_Version_Alter + "-os2",;
"harbour" + cDL_Version_Alter + "-os2" ) }
l_aLIBSHARED := { iif( hbmk[ _HBMK_lMT ], "harbourm",;
"harbour" ) }
cBin_Res := hbmk[ _HBMK_cCCPREFIX ] + "windres" + cCCEXT
cResExt := ".reso"
@@ -2680,8 +2680,8 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
ENDIF
CASE hbmk[ _HBMK_cPLAT ] == "os2"
l_aLIBSYS := ArrayAJoin( { l_aLIBSYS, l_aLIBSYSCORE, l_aLIBSYSMISC } )
l_aLIBSHARED := { iif( hbmk[ _HBMK_lMT ], "harbourmt" + cDL_Version_Alter + "-os2" + cLibExt,;
"harbour" + cDL_Version_Alter + "-os2" + cLibExt ) }
l_aLIBSHARED := { iif( hbmk[ _HBMK_lMT ], "harbourm" + cLibExt,;
"harbour" + cLibExt ) }
IF hbmk[ _HBMK_lSHARED ]
/* TOFIX: This line is plain guessing. */