2009-10-06 18:57 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

* INSTALL
    - Deleted sudo from one pkg creation command.

  * config/global.mk
    + Added MSVS 10.0 compiler version autodetection.

  * config/os2/gcc.mk
    % Deleted OS/2 make bug workarounds from OMF specific code.
      Submitted by David Arturo Macias Corona.
      Please test/review.
This commit is contained in:
Viktor Szakats
2009-10-06 16:58:20 +00:00
parent 7f6a2eec43
commit ff92e5fb98
4 changed files with 30 additions and 9 deletions

View File

@@ -17,6 +17,18 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-10-06 18:57 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* INSTALL
- Deleted sudo from one pkg creation command.
* config/global.mk
+ Added MSVS 10.0 compiler version autodetection.
* config/os2/gcc.mk
% Deleted OS/2 make bug workarounds from OMF specific code.
Submitted by David Arturo Macias Corona.
Please test/review.
2009-10-06 18:34 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/harbour.spec
! fixed to build with postinst.prg executed by shared linked hbrun

View File

@@ -210,7 +210,7 @@ HARBOUR
Binary .tgz on *nixes
---------------------
$ sudo ./mpkg_tgz.sh
$ ./mpkg_tgz.sh
Binary .deb on Linux
--------------------

View File

@@ -756,6 +756,8 @@ ifeq ($(HB_COMPILER),)
HB_COMPILER_VER := 800
else ifneq ($(findstring 9.0,$(HB_COMP_PATH)),)
HB_COMPILER_VER := 900
else ifneq ($(findstring 10.0,$(HB_COMP_PATH)),)
HB_COMPILER_VER := 1000
endif
else
HB_COMP_PATH := $(call find_in_path,bcc32)

View File

@@ -69,19 +69,26 @@ LDLIBS := $(foreach lib,$(LIBS) $(SYSLIBS),-l$(lib))
LDFLAGS += $(LIBPATHS)
# NOTE: The empty line directly before 'endef' HAS TO exist!
# It causes that every command will be separated by LF
define lib_object
@$(ECHO) $(ECHOQUOTE)ADDMOD $(file)$(ECHOQUOTE) >> __lib__.tmp
endef
ifeq ($(HB_COMPILER),gccomf)
# NOTE: The empty line directly before 'endef' HAS TO exist!
# It causes that every command will be separated by LF
define lib_object
$(AR) $(ARFLAGS) $(HB_USER_AFLAGS) -p128 r $(LIB_DIR)/$@ $(file)$(ECHOQUOTE)
endef
define create_library
$(if $(wildcard $(subst /,$(DIRSEP),$(LIB_FILE))),@$(RM) $(subst /,$(DIRSEP),$(LIB_FILE)),)
for %i in ( *$(OBJ_EXT) ) do $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) -p128 r $(LIB_DIR)/$@ %i$(ECHOQUOTE)
$(foreach file,$^,$(lib_object))
endef
else
# NOTE: The empty line directly before 'endef' HAS TO exist!
# It causes that every command will be separated by LF
define lib_object
@$(ECHO) $(ECHOQUOTE)ADDMOD $(file)$(ECHOQUOTE) >> __lib__.tmp
endef
# We have to use a script to overcome the AR limit of max 850 characters
# in commmand line
define create_library