diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 6fc7af06c2..ce391a1c41 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,14 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-10-10 09:27 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * make_b32.mak + * bin/bld.bat + + -tWM BCC32 switch made the all-time default. + + * include/hbextern.ch + + Added new functions. + 2008-10-10 06:26 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/include/hbvm.h * harbour/source/vm/hvm.c diff --git a/harbour/bin/bld.bat b/harbour/bin/bld.bat index 420ba044a3..268fc18c1a 100644 --- a/harbour/bin/bld.bat +++ b/harbour/bin/bld.bat @@ -29,9 +29,7 @@ if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include if "%HB_MT%" == "MT" set _HBVM_LIB=hbvmmt -if "%HB_MT%" == "MT" set _c_MT=-tWM if not "%HB_MT%" == "MT" set _HBVM_LIB=hbvm -if not "%HB_MT%" == "MT" set _C_MT= :START @@ -171,7 +169,7 @@ if not "%HB_MT%" == "MT" set _C_MT= if not "%HB_ARCHITECTURE%" == "w32" goto A_OS2 - if "%HB_COMPILER%" == "bcc32" bcc32 -O2 -OS -Ov -Oi -Oc -d %_C_MT% %C_USR% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% %1.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_COMPILER%" == "bcc32" bcc32 -tWM -O2 -OS -Ov -Oi -Oc -d %C_USR% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% %1.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_COMPILER%" == "msvc" cl -TP -W3 %C_USR% -I%HB_INC_INSTALL% %1.c /link /subsystem:CONSOLE /LIBPATH:%HB_LIB_INSTALL% %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 rddntx.lib rddcdx.lib rddfpt.lib hbhsx.lib hbsix.lib hbcommon.lib hbpcre.lib hbzlib.lib user32.lib wsock32.lib advapi32.lib gdi32.lib if "%HB_COMPILER%" == "mingw" gcc %1.c -O3 -o%1.exe %C_USR% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -lhbcpage -lhbdebug -l%_HBVM_LIB% -lhbrtl -lgtcgi -lgtgui -lgtpca -lgtstd -lgtwin -lgtwvt -lhblang -lhbrdd -lhbrtl -l%_HBVM_LIB% -lhbmacro -lhbpp -lrddfpt -lrddntx -lrddcdx -lhbhsx -lhbsix -lhbcommon -lhbpcre -lhbzlib if "%HB_COMPILER%" == "gcc" gcc %1.c -O3 -o%1.exe %C_USR% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -lhbcpage -lhbdebug -l%_HBVM_LIB% -lhbrtl -lgtcgi -lgtgui -lgtpca -lgtstd -lgtwin -lgtwvt -lhblang -lhbrdd -lhbrtl -l%_HBVM_LIB% -lhbmacro -lhbpp -lrddfpt -lrddntx -lrddcdx -lhbhsx -lhbsix -lhbcommon -lhbpcre -lhbzlib diff --git a/harbour/include/hbextern.ch b/harbour/include/hbextern.ch index c5e21ef584..6f69e64640 100644 --- a/harbour/include/hbextern.ch +++ b/harbour/include/hbextern.ch @@ -778,6 +778,11 @@ EXTERNAL W2BIN EXTERNAL ORDWILDSEEK EXTERNAL _DBEXPORT EXTERNAL _TYPEFILE +EXTERNAL THREADID +EXTERNAL THREADWAIT +EXTERNAL THREADWAITALL +EXTERNAL THREADOBJECT +EXTERNAL TTHREAD #endif /* HB_COMPAT_XPP */ @@ -863,6 +868,7 @@ EXTERNAL HB_USERNAME EXTERNAL HB_RUN EXTERNAL HB_GETREADVAR EXTERNAL HB_DISABLEWAITLOCKS +EXTERNAL HB_DISPOUTAT EXTERNAL HB_INISETCOMMENT EXTERNAL HB_INIREAD diff --git a/harbour/make_b32.mak b/harbour/make_b32.mak index 0210c9abfa..e744195b07 100644 --- a/harbour/make_b32.mak +++ b/harbour/make_b32.mak @@ -100,7 +100,7 @@ INCLUDE_DIR = include # C Compiler Flags CFLAGS = -I$(INCLUDE_DIR) -I$(OBJ_DIR) $(C_USR) -CFLAGSMT = -tWM -DHB_MT_VM $(CFLAGSMT) +CFLAGSMT = -DHB_MT_VM $(CFLAGSMT) #----------- !ifndef BCC_NOOPTIM @@ -112,7 +112,6 @@ CFLAGSMT = -tWM -DHB_MT_VM $(CFLAGSMT) !endif #----------- !if "$(HB_BCCDLL_DYNRT)" == "-tWR" - HB_BCCDLL_DYNRT=$(HB_BCCDLL_DYNRT) RTLIBSUFFIX = i !endif #----------- @@ -129,10 +128,9 @@ CFLAGSMT = -tWM -DHB_MT_VM $(CFLAGSMT) #********************************************************** -CLIBFLAGS = -c -q -d -Q -w -w-sig- $(CFLAGS) -CLIBFLAGSxxx = $(HB_BCCDLL_DYNRT) $(CLIBFLAGS: -tWM= ) -CLIBFLAGSDLL = -tWM $(CLIBFLAGSxxx) $(CLIBFLAGSDLL) -DHB_DYNLIB -CEXEFLAGSDLL = -tWM $(CLIBFLAGSxxx) $(CEXEFLAGSDLL) +CLIBFLAGS = -c -q -d -Q -w -w-sig- -tWM $(CFLAGS) +CLIBFLAGSDLL = $(HB_BCCDLL_DYNRT) $(CLIBFLAGSDLL) -DHB_DYNLIB +CEXEFLAGSDLL = $(HB_BCCDLL_DYNRT) $(CEXEFLAGSDLL) #**********************************************************