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

2009-11-17 00:36 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/config/win/bcc.mk
    ! always use \ in paths used as ilink32.exe parameters - ilink does not
      accept / as path delimiter and always use them as switch separators
    ! enclose parameters with paths into "" to avoid \ stripping by shell
    ! removed old hacks used for bcc32.exe and WINE
    Now BCC works again with POSIX shells and WINE.
    Please test these modifications in native MS-Windows environment.
This commit is contained in:
Przemyslaw Czerpak
2009-11-16 23:36:58 +00:00
parent 10efc37028
commit 0ae698e816
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
harbour/ChangeLog
View File

@@ -17,6 +17,15 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-11-17 00:36 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/config/win/bcc.mk
! always use \ in paths used as ilink32.exe parameters - ilink does not
accept / as path delimiter and always use them as switch separators
! enclose parameters with paths into "" to avoid \ stripping by shell
! removed old hacks used for bcc32.exe and WINE
Now BCC works again with POSIX shells and WINE.
Please test these modifications in native MS-Windows environment.
2009-11-17 00:10 UTC+0200 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt)
* harbour/contrib/rddsql/sddodbc/tests/test2.prg
! fixed minor error in last commit

16
harbour/config/win/bcc.mk
View File

@@ -42,21 +42,17 @@ endif
# Hack to autoconfig bcc, and not require properly set .cfg files in its bin dir.
# It only works if we know compiler location.
ifneq ($(HB_COMP_PATH_PUB),)
HB_CFLAGS += $(subst /,$(DIRSEP),-I"$(HB_COMP_PATH_PUB)../Include")
LDFLAGS += $(subst /,$(DIRSEP),-L"$(HB_COMP_PATH_PUB)../Lib" -L"$(HB_COMP_PATH_PUB)../Lib/PSDK")
DFLAGS += $(subst /,$(DIRSEP),-L"$(HB_COMP_PATH_PUB)../Lib" -L"$(HB_COMP_PATH_PUB)../Lib/PSDK")
HB_CFLAGS += $(subst /,\,-I"$(HB_COMP_PATH_PUB)../Include")
LDFLAGS += $(subst /,\,-L"$(HB_COMP_PATH_PUB)../Lib" -L"$(HB_COMP_PATH_PUB)../Lib/PSDK")
DFLAGS += $(subst /,\,-L"$(HB_COMP_PATH_PUB)../Lib" -L"$(HB_COMP_PATH_PUB)../Lib/PSDK")
endif
LD := ilink32.exe
LIBPATHS := "$(subst /,\,-L$(LIB_DIR))"
LDFLAGS += -Gn -Tpe $(LIBPATHS)
LD_RULE = $(LD) $(LDFLAGS) $(HB_LDFLAGS) $(HB_USER_LDFLAGS) c0x32.obj $(^F), $(subst /,$(DIRSEP),$(BIN_DIR)/$@), nul, $(subst /,$(DIRSEP),$(LDLIBS)) cw32mt.lib import32.lib $(LDSTRIP)
LD_RULE = $(LD) $(LDFLAGS) $(HB_LDFLAGS) $(HB_USER_LDFLAGS) c0x32.obj $(^F), "$(subst /,\,$(BIN_DIR)/$@)", nul, $(LDLIBS) cw32mt import32 $(LDSTRIP)
LIBPATHS := -L$(LIB_DIR)
# It's probably not necessary in native Windows but I need it
# for my Linux box because -L<path> seems to not work with WINE
LDLIBS := $(foreach lib,$(HB_USER_LIBS),$(lib)$(LIB_EXT))
LDLIBS += $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib)$(LIB_EXT))
LDLIBS += $(foreach lib,$(SYSLIBS),$(lib)$(LIB_EXT))
LDLIBS := $(strip $(HB_USER_LIBS) $(LIBS) $(SYSLIBS))
AR := tlib.exe
ARFLAGS := /P128