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

2009-11-15 03:50 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* config/win/bcc.mk
    + Changed to use ilink32 directly to link executables instead of 
      relying on bcc32.
      This changed synced this details with hbmk2.
      Please test, especially on Linux+Wine.
      Also please don't hesitate to make adjustments to this change 
      if needed. BCC isn't my bread and butter and I didn't make 
      extensive tests.
This commit is contained in:
Viktor Szakats
2009-11-15 02:52:43 +00:00
parent 6340b87373
commit 3f1f0600c6
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
harbour/ChangeLog
View File

@@ -17,6 +17,16 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-11-15 03:50 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* config/win/bcc.mk
+ Changed to use ilink32 directly to link executables instead of
relying on bcc32.
This changed synced this details with hbmk2.
Please test, especially on Linux+Wine.
Also please don't hesitate to make adjustments to this change
if needed. BCC isn't my bread and butter and I didn't make
extensive tests.
2009-11-14 23:16 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbqt/hbqt.ch
* contrib/hbqt/tests/demoqt.prg
@@ -622,7 +632,7 @@
+ codepage/cpno865.c
+ codepage/cppt860.c
+ Added CPs generated via cpinfo.prg from ntx*.obj (C5.2e).
For these language, I've only 'guessed' the CP assigment:
For these languages, I've only 'guessed' the CP assigment:
cpdk865
cpfi850
cpnl850

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

@@ -42,13 +42,14 @@ endif
# Hack to autoconfig bcc, and not require properly set .cfg files in its bin dir.
# It only works if compiler autodetection is being used.
ifneq ($(HB_COMP_PATH_PUB),)
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")
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")
endif
LD := bcc32.exe
LD_OUT := -e
LD := ilink32.exe
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)
LIBPATHS := -L$(LIB_DIR)
# It's probably not necessary in native Windows but I need it
@@ -56,8 +57,6 @@ LIBPATHS := -L$(LIB_DIR)
LDLIBS := $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib)$(LIB_EXT))
LDLIBS += $(foreach lib,$(SYSLIBS),$(lib)$(LIB_EXT))
LDFLAGS += $(LIBPATHS)
AR := tlib.exe
ARFLAGS := /P128
AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) "$(subst /,\,$(LIB_DIR)/$@)" $(foreach file,$(?F),-+$(file))