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

2008-11-09 14:20 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/common.mak
  * harbour/make_gcc.mak
    ! fixed hbtest-dll linking - the path to used harbour shared library
      was hardcoded in final binaries
    + added hbrun-dll. Please update make_b32.mak and make_vc.mak
This commit is contained in:
Przemyslaw Czerpak
2008-11-09 13:19:14 +00:00
parent 642efdc827
commit f5188233ef
3 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
harbour/ChangeLog
View File

@@ -8,6 +8,13 @@
2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2008-11-09 14:20 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/common.mak
* harbour/make_gcc.mak
! fixed hbtest-dll linking - the path to used harbour shared library
was hardcoded in final binaries
+ added hbrun-dll. Please update make_b32.mak and make_vc.mak
2008-11-09 14:02 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* make_vc.mak
+ Added /nxcompat linker flag for non-WinCE, non-DLL,

3
harbour/common.mak
View File

@@ -276,6 +276,7 @@ HBMAKE_EXE = $(BIN_DIR)\hbmake$(EXEEXT)
HB_DLLVER = 11
HARBOUR_DLL = $(BIN_DIR)\$(LIBPREF)harbour-$(HB_DLLVER)-$(HB_CC_NAME)$(DLLEXT)
HBTESTDLL_EXE= $(BIN_DIR)\hbtest-dll$(EXEEXT)
HBRUNDLL_EXE = $(BIN_DIR)\hbrun-dll$(EXEEXT)
#**********************************************************
@@ -1259,7 +1260,7 @@ HB_BUILD_TARGETS = \
# variable HB_BUILD_DLL to yes
!if "$(HB_BUILD_DLL)" == "yes"
HB_BUILD_TARGETS = $(HB_BUILD_TARGETS) $(HARBOUR_DLL) $(HBTESTDLL_EXE)
HB_BUILD_TARGETS = $(HB_BUILD_TARGETS) $(HARBOUR_DLL) $(HBTESTDLL_EXE) $(HBRUNDLL_EXE)
!endif
#**********************************************************

13
harbour/make_gcc.mak
View File

@@ -423,10 +423,15 @@ $(HARBOUR_DLL) :: $(DLL_OBJS)
#**********************************************************
# DLL EXECUTABLE Targets
#**********************************************************
$(HBTESTDLL_EXE) : $(HARBOUR_DLL)
$(HBTESTDLL_EXE) : $(DLL_OBJ_DIR)/mainstd$(OBJEXT) \
$(HBTEST_EXE_OBJS:$(OBJ_DIR)=$(DLL_OBJ_DIR))
$(CC) $(CEXEFLAGSDLL) -o$@ $^ $(HARBOUR_DLL) $(HB_OS_LIBS)
$(HBTESTDLL_EXE) :: $(HARBOUR_DLL)
$(HBTESTDLL_EXE) :: $(DLL_OBJ_DIR)/mainstd$(OBJEXT) \
$(HBTEST_EXE_OBJS:$(OBJ_DIR)/%=$(DLL_OBJ_DIR)/%)
$(CC) $(CEXEFLAGSDLL) -o$@ $^ -L$(BIN_DIR) -l$(HARBOUR_DLL:$(BIN_DIR)/lib%.so=%) $(HB_OS_LIBS)
#**********************************************************
$(HBRUNDLL_EXE) :: $(HARBOUR_DLL)
$(HBRUNDLL_EXE) :: $(DLL_OBJ_DIR)/mainstd$(OBJEXT) \
$(HBRUN_EXE_OBJS:$(OBJ_DIR)/%=$(DLL_OBJ_DIR)/%)
$(CC) $(CEXEFLAGSDLL) -o$@ $^ -L$(BIN_DIR) -l$(HARBOUR_DLL:$(BIN_DIR)/lib%.so=%) $(COMPILER_LIB) $(HB_OS_LIBS)
#----------------------------------------------------------
$(DLL_OBJ_DIR)/mainstd$(OBJEXT) : $(VM_DIR)/mainstd.c
$(CC) $(CLIBFLAGS) -o$@ $<