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

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

Browse Source 
* config/os2/gcc.mk
    % Minor sync of internal libpath/liblist forming logic 
      with other platforms.
This commit is contained in:
Viktor Szakats
2009-09-18 12:10:36 +00:00
parent 7fc1bb8e59
commit 67393356c1
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
harbour/ChangeLog
View File

@@ -17,6 +17,11 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-09-18 14:09 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* config/os2/gcc.mk
% Minor sync of internal libpath/liblist forming logic
with other platforms.
2009-09-18 13:09 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/contrib/hbwin/win_com.c
! fixed unicode translation - trailing 0 was not set

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

@@ -32,9 +32,6 @@ ifeq ($(HB_BUILD_DEBUG),yes)
CFLAGS += -g
endif
LD := $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
LD_OUT := -o$(subst x,x, )
ifeq ($(C_MAIN),)
ifeq ($(HB_GT_LIB),os2pm)
# If building a PM program, override the main object.
@@ -42,24 +39,28 @@ ifeq ($(C_MAIN),)
endif
endif
SYSLIBS := socket
LIBPATHS := -L$(LIB_DIR)
LDLIBS := $(foreach lib,$(LIBS),-l$(lib))
SYSLIBS :=
SYSLIBPATHS :=
ifneq ($(HB_LINKING_RTL),)
ifeq ($(C_MAIN),)
ifeq ($(filter os2pm,$(HB_GT_LIB)),os2pm)
# Special handling for PM mode
LDLIBS += -l$(HB_GT_LIB)
LDLIBS += -lgtos2
LIBS += $(HB_GT_LIB)
LIBS += gtos2
endif
endif
LDLIBS += $(foreach lib,$(SYSLIBS),-l$(lib))
SYSLIBS += socket
endif
# statical linking with GCC 3.2.2 libc as not require its presence on user system
LD := $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
LD_OUT := -o$(subst x,x, )
LIBPATHS := $(foreach dir,$(LIB_DIR) $(SYSLIBPATHS),-L$(dir))
LDLIBS := $(foreach lib,$(LIBS) $(SYSLIBS),-l$(lib))
# static linking with GCC 3.2.2 libc as not require its presence on user system
LDFLAGS += $(LIBPATHS)
ifeq ($(C_MAIN),)
@@ -95,7 +96,7 @@ AR_RULE = $(create_library) & $(RM) __lib__.tmp
#DY := $(CC)
#DFLAGS := -shared $(LIBPATHS)
#DY_OUT := $(LD_OUT)
#DLIBS := $(foreach lib,$(LIBS) $(SYSLIBS),-l$(lib))
#DLIBS := $(foreach lib,$(SYSLIBS),-l$(lib))
#
# NOTE: The empty line directly before 'endef' HAVE TO exist!
#define dyn_object