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

2011-02-13 13:43 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* config/global.mk
  * src/dynlib/Makefile
  + src/dynlib/2nd
  + src/dynlib/2nd/Makefile
    * Changed so that _HB_BUILD_DYN_ST=yes now creates a separate,
      secondary dll in ST mode, called harbourst/harbours.
This commit is contained in:
Viktor Szakats
2011-02-13 12:47:03 +00:00
parent aaa0d62317
commit 0703b5799d
4 changed files with 62 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
harbour/ChangeLog
View File

@@ -16,6 +16,14 @@
The license applies to all entries newer than 2009-04-28.
*/
2011-02-13 13:43 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* config/global.mk
* src/dynlib/Makefile
+ src/dynlib/2nd
+ src/dynlib/2nd/Makefile
* Changed so that _HB_BUILD_DYN_ST=yes now creates a separate,
secondary dll in ST mode, called harbourst/harbours.
2011-02-13 09:23 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbmzip/3rd/minizip/minizip.dif
* contrib/hbmzip/3rd/minizip/ioapi.h

26
harbour/config/global.mk
View File

@@ -1755,9 +1755,13 @@ ifeq ($(HB_INIT_DONE),)
ifeq ($(HB_PLATFORM),darwin)
DYNNAME_POST := .$(HB_DYN_VER)
else
ifneq ($(filter $(HB_PLATFORM),dos os2),)
DYNNAME_POST :=
else
DYNNAME_POST := -$(HB_DYN_VER)
endif
endif
ifeq ($(HB_PLATFORM),win)
ifeq ($(HB_COMPILER),bcc)
@@ -1793,18 +1797,22 @@ ifeq ($(HB_INIT_DONE),)
endif
HB_DYNLIB_BASE := harbour
ifeq ($(HB_PLATFORM),dos)
HB_DYNLIB_NAME := $(HB_DYNLIB_BASE)
else
ifeq ($(HB_PLATFORM),os2)
HB_DYNLIB_NAME := $(HB_DYNLIB_BASE)
else
HB_DYNLIB_NAME := $(HB_DYNLIB_BASE)$(DYNNAME_POST)
endif
endif
HB_DYNLIB_NAME := $(HB_DYNLIB_BASE)$(DYNNAME_POST)
export HB_DYNLIB_BASE
export HB_DYNLIB_NAME
ifeq ($(_HB_BUILD_DYN_ST),yes)
ifneq ($(filter $(HB_PLATFORM),dos os2),)
HB_DYNLIB_BASE_2ND := harbours
else
HB_DYNLIB_BASE_2ND := harbourst
endif
HB_DYNLIB_NAME_2ND := $(HB_DYNLIB_BASE_2ND)$(DYNNAME_POST)
export HB_DYNLIB_BASE_2ND
export HB_DYNLIB_NAME_2ND
endif
endif
endif

31
harbour/src/dynlib/2nd/Makefile Normal file
View File

@@ -0,0 +1,31 @@
#
# $Id$
#
ROOT := ../../../
include $(TOP)$(ROOT)config/global.mk
ifneq ($(DYNDIRLIST_BASE),)
DYNDIRLIST := $(DYNDIRLIST_BASE) src/vm
DYNNAME := $(HB_DYNLIB_NAME_2ND)
DYNNAME2 := $(HB_DYNLIB_BASE_2ND)
include $(TOP)$(ROOT)config/dyn.mk
ifneq ($(INSTALL_RULE_DYN),)
ifneq ($(HB_INSTALL_LIB),)
ifneq ($(IMP_FILE),)
INSTALL_FILES := $(IMP_FILE)
INSTALL_DIR := $(HB_INSTALL_LIB)
include $(TOP)$(ROOT)config/install.mk
endif
endif
else
include $(TOP)$(ROOT)config/none.mk
endif
else
$(warning ! Warning: Please run make from one level up)
include $(TOP)$(ROOT)config/none.mk
endif

11
harbour/src/dynlib/Makefile
View File

@@ -8,16 +8,17 @@ include $(TOP)$(ROOT)config/global.mk
ifneq ($(DYNDIRLIST_BASE),)
ifeq ($(_HB_BUILD_DYN_ST),yes)
DYNDIRLIST := $(DYNDIRLIST_BASE) src/vm
else
DYNDIRLIST := $(DYNDIRLIST_BASE) src/vm/vmmt
endif
DYNDIRLIST := $(DYNDIRLIST_BASE) src/vm/vmmt
DYNNAME := $(HB_DYNLIB_NAME)
DYNNAME2 := $(HB_DYNLIB_BASE)
include $(TOP)$(ROOT)config/dyn.mk
ifeq ($(_HB_BUILD_DYN_ST),yes)
DIRS := 2nd
include $(TOP)$(ROOT)config/dir.mk
endif
ifneq ($(INSTALL_RULE_DYN),)
ifneq ($(HB_INSTALL_LIB),)
ifneq ($(IMP_FILE),)