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

* config/global.mk
  * config/win/bcc.mk
    + Added hack to hack so that bcc autoconfiguration works 
      even when bcc is explicitly selected.
      Now I wonder what will be the next corner case bcc users 
      will come up with.
This commit is contained in:
Viktor Szakats
2009-11-15 03:23:21 +00:00
parent 3f1f0600c6
commit 007c3be271
3 changed files with 19 additions and 1 deletions

View File

@@ -17,6 +17,14 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-11-15 04:23 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* config/global.mk
* config/win/bcc.mk
+ Added hack to hack so that bcc autoconfiguration works
even when bcc is explicitly selected.
Now I wonder what will be the next corner case bcc users
will come up with.
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

View File

@@ -931,6 +931,16 @@ ifneq ($(HB_COMP_PATH),)
export HB_COMP_PATH_PUB := $(HB_COMP_PATH)
endif
# Always autodetect bcc location (hack)
ifeq ($(HB_PLATFORM)-$(HB_COMPILER),win-bcc)
ifeq ($(HB_COMP_PATH_PUB),)
HB_COMP_PATH := $(call find_in_path,bcc32)
ifneq ($(HB_COMP_PATH),)
export HB_COMP_PATH_PUB := $(subst $(substpat), ,$(dir $(firstword $(subst $(subst x, ,x),$(substpat),$(HB_COMP_PATH)))))
endif
endif
endif
ifneq ($(filter $(HB_HOST_PLAT),win wce dos os2),)
HB_HOST_PLAT_UNIX :=
else

View File

@@ -40,7 +40,7 @@ ifeq ($(HB_BUILD_DEBUG),yes)
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.
# 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")