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

2008-11-11 00:39 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* make_b32.mak
  * make_vc.mak
    ! Fixed linking hbtest-dll.exe with tracing enabled.

  * bin/hbmk.bat
    + Added '-shared' option.
    ; TOFIX: - '-shared' won't work in binary installations.
             - '-shared' cannot create MT apps.
             - '-shared' only works for BCC32 yet.

  - tests/hbmk_b32_dll.bat
    - Removed. Use 'hbmk_b32 -shared' instead.

  * source/rtl/treport.prg
    * Minor formatting.

  * make_b32.bat
  * make_vc.bat
  * common.mak
    * Changed default of HB_BUILD_DLL to 'yes'.
This commit is contained in:
Viktor Szakats
2008-11-10 23:44:17 +00:00
parent d146d9bc50
commit 8f6aa8e802
9 changed files with 40 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
harbour/ChangeLog
View File

@@ -8,6 +8,28 @@
2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2008-11-11 00:39 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* make_b32.mak
* make_vc.mak
! Fixed linking hbtest-dll.exe with tracing enabled.
* bin/hbmk.bat
+ Added '-shared' option.
; TOFIX: - '-shared' won't work in binary installations.
- '-shared' cannot create MT apps.
- '-shared' only works for BCC32 yet.
- tests/hbmk_b32_dll.bat
- Removed. Use 'hbmk_b32 -shared' instead.
* source/rtl/treport.prg
* Minor formatting.
* make_b32.bat
* make_vc.bat
* common.mak
* Changed default of HB_BUILD_DLL to 'yes'.
2008-11-10 15:17 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* contrib/hbcurl/common.mak
* contrib/hbcurl/Makefile

14
harbour/bin/hbmk.bat
View File

@@ -33,6 +33,7 @@ set _HB_USR_L=
set _HB_MT=%HB_MT%
set _HB_GUI=%HB_GUI%
set _HB_SHARED=%HB_SHARED%
:REPEAT
@@ -48,6 +49,12 @@ if not "%1" == "-gui" goto NO_GUI
goto REPEAT
:NO_GUI
if not "%1" == "-shared" goto NO_SHARED
set _HB_SHARED=yes
shift
goto REPEAT
:NO_SHARED
set _HBVM_LIB=hbvm
if "%_HB_MT%" == "yes" set _HBVM_LIB=hbvmmt
if "%_HB_MT%" == "MT" set _HBVM_LIB=hbvmmt
@@ -62,7 +69,7 @@ if "%_HB_MT%" == "MT" set _HBVM_LIB=hbvmmt
:HELP
echo.
echo Usage: hbmk [-mt] [-gui] filename
echo Usage: hbmk [-mt] [-gui] [-shared] filename
echo.
echo Notes:
echo.
@@ -195,7 +202,9 @@ if "%_HB_MT%" == "MT" set _HBVM_LIB=hbvmmt
if "%_HB_GUI%" == "yes" set _HB_USR_C=-tW
bcc32 -q -tWM -O2 -OS -Ov -Oi -Oc -d %C_USR% %_HB_USR_C% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% %_HB_PRG_NAME%.c %HB_USER_LIBS% hbcpage.lib hbdebug.lib %_HBVM_LIB%.lib hbrtl.lib gtcgi.lib gtgui.lib gtpca.lib gtstd.lib gtwin.lib gtwvt.lib hblang.lib hbrdd.lib hbmacro.lib hbpp.lib rddfpt.lib rddntx.lib rddcdx.lib hbhsx.lib hbsix.lib hbcommon.lib hbpcre.lib hbzlib.lib
if not "%_HB_SHARED%" == "yes" bcc32 -q -tWM -O2 -OS -Ov -Oi -Oc -d %C_USR% %_HB_USR_C% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% %_HB_PRG_NAME%.c %HB_USER_LIBS% hbcpage.lib hbdebug.lib %_HBVM_LIB%.lib hbrtl.lib gtcgi.lib gtgui.lib gtpca.lib gtstd.lib gtwin.lib gtwvt.lib hblang.lib hbrdd.lib hbmacro.lib hbpp.lib rddfpt.lib rddntx.lib rddcdx.lib hbhsx.lib hbsix.lib hbcommon.lib hbpcre.lib hbzlib.lib
if "%_HB_SHARED%" == "yes" bcc32 -q -tWM -O2 -OS -Ov -Oi -Oc -d %C_USR% %_HB_USR_C% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% %_HB_PRG_NAME%.c ..\source\vm\mainstd.c ..\source\vm\mainwin.c %HB_USER_LIBS% harbour-11-b32.lib
goto CLEANUP
:A_WIN_BCC_NOT
@@ -270,6 +279,7 @@ if "%_HB_MT%" == "MT" set _HBVM_LIB=hbvmmt
set _HB_MT=
set _HB_GUI=
set _HB_SHARED=
set _HBVM_LIB=
set _HB_USR_C=
set _HB_USR_L=

2
harbour/common.mak
View File

@@ -1259,7 +1259,7 @@ HB_BUILD_TARGETS = \
# It can be enabled by setting env
# variable HB_BUILD_DLL to yes
!if "$(HB_BUILD_DLL)" == "yes"
!if "$(HB_BUILD_DLL)" != "no"
HB_BUILD_TARGETS = $(HB_BUILD_TARGETS) $(HARBOUR_DLL) $(HBTESTDLL_EXE) $(HBRUNDLL_EXE)
!endif

2
harbour/make_b32.bat
View File

@@ -11,7 +11,7 @@ rem Instead, make a local copy and modify that one, or make a call to
rem this batch file from your customized one. [vszakats]
rem
rem Set any of the below settings to customize your build process:
rem set HB_BUILD_DLL=yes
rem set HB_BUILD_DLL=no
rem set HB_BUILD_DEBUG=yes
rem set HB_BUILD_VERBOSE=no
rem set HB_REBUILD_PARSER=yes

2
harbour/make_b32.mak
View File

@@ -519,7 +519,7 @@ c0d32.obj $**, $@,, cw32mt$(RTLIBSUFFIX).lib import32.lib
$(HBTESTDLL_EXE) :: BasicLibs BasicExes
$(HBTESTDLL_EXE) :: $(DLL_OBJ_DIR)\mainstd$(OBJEXT) $(HBTEST_EXE_OBJS:$(OBJ_DIR)=$(DLL_OBJ_DIR))
$(LINKER) $(LDFLAGS) @&&!
c0x32.obj $**, $@,,$(HARBOUR_DLL:$(DLLEXT)=$(LIBEXT)) cw32mt$(RTLIBSUFFIX).lib import32.lib
c0x32.obj $**, $@,,$(HARBOUR_DLL:$(DLLEXT)=$(LIBEXT)) cw32mt$(RTLIBSUFFIX).lib import32.lib $(COMMON_LIB)
!
#**********************************************************
$(HBRUNDLL_EXE) :: BasicLibs BasicExes

2
harbour/make_vc.bat
View File

@@ -11,7 +11,7 @@ rem Instead, make a local copy and modify that one, or make a call to
rem this batch file from your customized one. [vszakats]
rem
rem Set any of the below settings to customize your build process:
rem set HB_BUILD_DLL=yes
rem set HB_BUILD_DLL=no
rem set HB_BUILD_DEBUG=yes
rem set HB_BUILD_VERBOSE=no
rem set HB_REBUILD_PARSER=yes

1
harbour/make_vc.mak
View File

@@ -905,6 +905,7 @@ $(LDFLAGS)
$(HBTESTDLL_OBJS: = ^
)
$(HARBOUR_DLL:.dll=.lib)
$(COMMON_LIB)
<<$(HB_KEEPSTATE)
#**********************************************************
HBRUNDLL_OBJS = $(DLL_OBJ_DIR)\mainstd$(OBJEXT) $(HBRUN_EXE_OBJS:obj\vc=obj\dll\vc)

2
harbour/source/rtl/treport.prg
View File

@@ -173,7 +173,7 @@ CREATE CLASS HBReportForm
nNext AS NUMERIC,;
nRecord AS NUMERIC,;
lRest AS LOGICAL,;
lPlain AS LOGICAL, ;
lPlain AS LOGICAL,;
cHeading AS STRING,;
lBEject AS LOGICAL,;
lSummary AS LOGICAL )

32
harbour/tests/hbmk_b32_dll.bat
View File

@@ -1,32 +0,0 @@
@echo off
rem
rem $Id$
rem
rem ---------------------------------------------------------------
rem This file is intended to build a program, which uses harbour-b32.dll
rem The main function must be called _AppMain.
rem To run the program, you need to have harbour-b32.dll in your path.
rem ---------------------------------------------------------------
..\bin\harbour %1.prg -n -i..\include %2 %3
bcc32 -c -O2 -d -I..\include %1.c ..\source\vm\mainwin.c
@echo c0w32.obj + > _hbmk_b32_dll.tmp
@echo %1.obj + >> _hbmk_b32_dll.tmp
@echo mainwin.obj, + >> _hbmk_b32_dll.tmp
@echo %1.exe, + >> _hbmk_b32_dll.tmp
@echo , + >> _hbmk_b32_dll.tmp
@echo ..\lib\harbour-11-b32.lib + >> _hbmk_b32_dll.tmp
@echo cw32.lib + >> _hbmk_b32_dll.tmp
@echo import32.lib, >> _hbmk_b32_dll.tmp
ilink32 -Tpe -Gn @_hbmk_b32_dll.tmp
del %1.obj
del mainwin.obj
del %1.c
del *.tds
del _hbmk_b32_dll.tmp