From 42732bfe705f7be7f5107aec2460a83947a5aacb Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 9 Nov 2008 13:29:41 +0000 Subject: [PATCH] 2008-11-09 14:29 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * make_b32.mak * make_vc.mak + Added HBRUN_DLL. ; TOFIX: It doesn't work. Maybe more eyeballs will spot the problem more easily. --- harbour/ChangeLog | 7 +++++++ harbour/make_b32.mak | 6 ++++++ harbour/make_vc.mak | 11 +++++++++++ 3 files changed, 24 insertions(+) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 83977254fc..5218916dfb 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,13 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-11-09 14:29 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * make_b32.mak + * make_vc.mak + + Added HBRUN_DLL. + ; TOFIX: It doesn't work. Maybe more eyeballs will spot the + problem more easily. + 2008-11-09 14:23 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * tests/longstr.prg * contrib/hbole/oleauto.prg diff --git a/harbour/make_b32.mak b/harbour/make_b32.mak index c090cae115..19a146b2b7 100644 --- a/harbour/make_b32.mak +++ b/harbour/make_b32.mak @@ -521,6 +521,12 @@ $(HBTESTDLL_EXE) :: $(DLL_OBJ_DIR)\mainstd$(OBJEXT) $(HBTEST_EXE_OBJS:$(OBJ_DIR) $(LINKER) $(LDFLAGS) @&&! c0x32.obj $**, $@,,$(HARBOUR_DLL:$(DLLEXT)=$(LIBEXT)) cw32mt$(RTLIBSUFFIX).lib import32.lib ! +#********************************************************** +$(HBRUNDLL_EXE) :: BasicLibs BasicExes +$(HBRUNDLL_EXE) :: $(DLL_OBJ_DIR)\mainstd$(OBJEXT) $(HBRUN_EXE_OBJS:$(OBJ_DIR)=$(DLL_OBJ_DIR)) + $(LINKER) $(LDFLAGS) @&&! +c0x32.obj $**, $@,,$(HARBOUR_DLL:$(DLLEXT)=$(LIBEXT)) cw32mt$(RTLIBSUFFIX).lib import32.lib $(COMPILER_LIB) +! #---------------------------------------------------------- $(DLL_OBJ_DIR)\mainstd$(OBJEXT) : $(VM_DIR)\mainstd.c $(CC) $(CEXEFLAGSDLL) -o$@ $** diff --git a/harbour/make_vc.mak b/harbour/make_vc.mak index 942e16c0c9..5f0db499a5 100644 --- a/harbour/make_vc.mak +++ b/harbour/make_vc.mak @@ -901,6 +901,17 @@ $(HBTESTDLL_OBJS: = ^ ) $(HARBOUR_DLL:.dll=.lib) <<$(HB_KEEPSTATE) +#********************************************************** +HBRUNDLL_OBJS = $(DLL_OBJ_DIR)\mainstd$(OBJEXT) $(HBRUN_EXE_OBJS:obj\vc=obj\dll\vc) +$(HBRUNDLL_EXE) : $(HARBOUR_DLL) $(HBRUNDLL_OBJS) + $(LINKER) @<< +$(LDFLAGS) +/out:$(HBRUNDLL_EXE) +$(HBRUNDLL_OBJS: = ^ +) +$(HARBOUR_DLL:.dll=.lib) +$(COMPILER_LIB) +<<$(HB_KEEPSTATE) #---------------------------------------------------------- $(DLL_OBJ_DIR)\mainstd$(OBJEXT) : $(VM_DIR)\mainstd.c $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $**