diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 9122b09a4f..bd3e83ab7f 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,22 @@ +20000415-13:01 GMT+1 Victor Szakats + + * bin/bld.bat + ! djgpp and bcc uses build scripts to avoid long command lines. + + * bin/bld_b16.bat + * bin/bld_b32.bat + * bin/bld_vc.bat + + Now calls bld.bat to do the real work. + + * bin/bld.* + + Now use HARBOURFLAGS and CFLAGS + + - bin/bld_b32o.bat + - bin/bld_b32w.bat + - Removed. Use SET CFLAGS=-tW and call bld_b32.bat for the bld_b32w.bat + functionality, if you need it. + bld_b32o.bat was specific and not working anyway. + 20000415-12:38 GMT+1 Victor Szakats * source/rtl/net.c diff --git a/harbour/bin/bld.bat b/harbour/bin/bld.bat index 50a9edd797..e95a68e867 100644 --- a/harbour/bin/bld.bat +++ b/harbour/bin/bld.bat @@ -99,7 +99,7 @@ rem if "%HB_GT_LIB%" == "" set HB_GT_LIB= :COMPILE - harbour %1.prg -n -i..\include + harbour %1.prg -n -i..\include %2 %3 %HARBOURFLAGS% :A_DOS @@ -107,11 +107,31 @@ rem if "%HB_GT_LIB%" == "" set HB_GT_LIB= if "%HB_GT_LIB%" == "" set HB_GT_LIB=gtdos - if "%HB_COMPILER%" == "bcc16" bcc -O2 -mh -I..\include -L..\lib %1.c tools.lib debug.lib vm.lib rtl.lib %HB_GT_LIB%.lib lang.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib + if not "%HB_COMPILER%" == "bcc16" goto A_DOS_BCC16_NOT - if not "%HB_COMPILER%" == "djgpp" goto A_DOS_NOTDJGPP + echo -O2 -mh %CFLAGS% -I..\include -L..\lib > build.tmp + echo -e%1.exe %1.c >> build.tmp + echo tools.lib >> build.tmp + echo debug.lib >> build.tmp + echo vm.lib >> build.tmp + echo rtl.lib >> build.tmp + echo gtdos.lib >> build.tmp + echo lang.lib >> build.tmp + echo rdd.lib >> build.tmp + echo macro.lib >> build.tmp + echo pp.lib >> build.tmp + echo dbfntx.lib >> build.tmp + echo dbfcdx.lib >> build.tmp + echo common.lib >> build.tmp + bcc @build.tmp + del build.tmp + goto END - echo %1.c -o%1.exe -I..\include -L..\lib > build.tmp +:A_DOS_BCC16_NOT + + if not "%HB_COMPILER%" == "djgpp" goto A_DOS_DJGPP_NOT + + echo %1.c -o%1.exe %CFLAGS% -I..\include -L..\lib > build.tmp echo -ltools >> build.tmp echo -ldebug >> build.tmp echo -lvm >> build.tmp @@ -130,9 +150,9 @@ rem if "%HB_GT_LIB%" == "" set HB_GT_LIB= del build.tmp goto END -:A_DOS_NOTDJGPP +:A_DOS_DJGPP_NOT - if "%HB_COMPILER%" == "rsx32" gcc %1.c -Zrsx32 -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l%HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon + if "%HB_COMPILER%" == "rsx32" gcc %1.c -Zrsx32 %CFLAGS% -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l%HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon goto END :A_W32 @@ -141,11 +161,11 @@ rem if "%HB_GT_LIB%" == "" set HB_GT_LIB= if "%HB_GT_LIB%" == "" set HB_GT_LIB=gtwin - if "%HB_COMPILER%" == "bcc32" bcc32 -O2 -I..\include -L..\lib %1.c tools.lib debug.lib vm.lib rtl.lib %HB_GT_LIB%.lib lang.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib - if "%HB_COMPILER%" == "gcc" gcc %1.c -o%1.exe -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l%HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon - if "%HB_COMPILER%" == "mingw32" gcc %1.c -o%1.exe -mno-cygwin -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l%HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon - if "%HB_COMPILER%" == "rsxnt" gcc %1.c -Zwin32 -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l%HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon - if "%HB_COMPILER%" == "msvc" cl -Fd..\bin\harbour -w -Zi -TP -GZ -GA -I..\include %1.c /link /subsystem:CONSOLE ..\lib\tools.lib ..\lib\debug.lib ..\lib\vm.lib ..\lib\rtl.lib ..\lib\%HB_GT_LIB%.lib ..\lib\lang.lib ..\lib\rdd.lib ..\lib\macro.lib ..\lib\pp.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib user32.lib + if "%HB_COMPILER%" == "bcc32" bcc32 -O2 %CFLAGS% -I..\include -L..\lib %1.c tools.lib debug.lib vm.lib rtl.lib %HB_GT_LIB%.lib lang.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib + if "%HB_COMPILER%" == "gcc" gcc %1.c -o%1.exe %CFLAGS% -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l%HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon + if "%HB_COMPILER%" == "mingw32" gcc %1.c -o%1.exe %CFLAGS% -mno-cygwin -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l%HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon + if "%HB_COMPILER%" == "rsxnt" gcc %1.c -Zwin32 %CFLAGS% -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l%HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon + if "%HB_COMPILER%" == "msvc" cl -Fd..\bin\harbour -w -Zi -TP -GZ -GA %CFLAGS% -I..\include %1.c /link /subsystem:CONSOLE ..\lib\tools.lib ..\lib\debug.lib ..\lib\vm.lib ..\lib\rtl.lib ..\lib\%HB_GT_LIB%.lib ..\lib\lang.lib ..\lib\rdd.lib ..\lib\macro.lib ..\lib\pp.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib user32.lib if "%HB_COMPILER%" == "msvc" echo Ignore LNK4033 warning goto END @@ -155,8 +175,8 @@ rem if "%HB_GT_LIB%" == "" set HB_GT_LIB= if "%HB_GT_LIB%" == "" set HB_GT_LIB=gtos2 - if "%HB_COMPILER%" == "gcc" gcc %1.c -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l%HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon - if "%HB_COMPILER%" == "icc" icc /Gs+ /W2 /Se /Sd+ /Ti+ -I..\include /C- /Tp %1.c ..\lib\tools.lib ..\lib\debug.lib ..\lib\vm.lib ..\lib\rtl.lib ..\lib\%HB_GT_LIB%.lib ..\lib\lang.lib ..\lib\rdd.lib ..\lib\rtl.lib ..\lib\vm.lib ..\lib\macro.lib ..\lib\pp.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib + if "%HB_COMPILER%" == "gcc" gcc %1.c %CFLAGS% -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l%HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon + if "%HB_COMPILER%" == "icc" icc /Gs+ /W2 /Se /Sd+ /Ti+ /C- /Tp %CFLAGS% -I..\include %1.c ..\lib\tools.lib ..\lib\debug.lib ..\lib\vm.lib ..\lib\rtl.lib ..\lib\%HB_GT_LIB%.lib ..\lib\lang.lib ..\lib\rdd.lib ..\lib\rtl.lib ..\lib\vm.lib ..\lib\macro.lib ..\lib\pp.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib goto END :A_LINUX @@ -165,7 +185,7 @@ rem if "%HB_GT_LIB%" == "" set HB_GT_LIB= if "%HB_GT_LIB%" == "" set HB_GT_LIB=gtstd - if "%HB_COMPILER%" == "gcc" gcc %1.c -I../include -L../lib -ltools -ldebug -lvm -lrtl -l%HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon + if "%HB_COMPILER%" == "gcc" gcc %1.c %CFLAGS% -I../include -L../lib -ltools -ldebug -lvm -lrtl -l%HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon goto END :CLEANUP diff --git a/harbour/bin/bld.cmd b/harbour/bin/bld.cmd index 2c2a54b4fc..ad74094c88 100644 --- a/harbour/bin/bld.cmd +++ b/harbour/bin/bld.cmd @@ -99,7 +99,7 @@ rem if "%HB_GT_LIB%" == "" set HB_GT_LIB= :COMPILE - harbour %1.prg -n -i..\include + harbour %1.prg -n -i..\include %2 %3 %HARBOURFLAGS% :A_DOS @@ -107,9 +107,52 @@ rem if "%HB_GT_LIB%" == "" set HB_GT_LIB= if "%HB_GT_LIB%" == "" set HB_GT_LIB=gtdos - if "%HB_COMPILER%" == "bcc16" bcc -O2 -mh -I..\include -L..\lib %1.c tools.lib debug.lib vm.lib rtl.lib %HB_GT_LIB%.lib lang.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib - if "%HB_COMPILER%" == "djgpp" gcc %1.c -o%1.exe -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l%HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfnt -ldbfcd -lcommo - if "%HB_COMPILER%" == "rsx32" gcc %1.c -Zrsx32 -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l%HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon + if not "%HB_COMPILER%" == "bcc16" goto A_DOS_BCC16_NOT + + echo -O2 -mh %CFLAGS% -I..\include -L..\lib > build.tmp + echo -e%1.exe %1.c >> build.tmp + echo tools.lib >> build.tmp + echo debug.lib >> build.tmp + echo vm.lib >> build.tmp + echo rtl.lib >> build.tmp + echo gtdos.lib >> build.tmp + echo lang.lib >> build.tmp + echo rdd.lib >> build.tmp + echo macro.lib >> build.tmp + echo pp.lib >> build.tmp + echo dbfntx.lib >> build.tmp + echo dbfcdx.lib >> build.tmp + echo common.lib >> build.tmp + bcc @build.tmp + del build.tmp + goto END + +:A_DOS_BCC16_NOT + + if not "%HB_COMPILER%" == "djgpp" goto A_DOS_DJGPP_NOT + + echo %1.c -o%1.exe %CFLAGS% -I..\include -L..\lib > build.tmp + echo -ltools >> build.tmp + echo -ldebug >> build.tmp + echo -lvm >> build.tmp + echo -lrtl >> build.tmp + echo -l%HB_GT_LIB% >> build.tmp + echo -llang >> build.tmp + echo -lrdd >> build.tmp + echo -lrtl >> build.tmp + echo -lvm >> build.tmp + echo -lmacro >> build.tmp + echo -lpp >> build.tmp + echo -ldbfnt >> build.tmp + echo -ldbfcd >> build.tmp + echo -lcommo >> build.tmp + gcc @build.tmp + del build.tmp + goto END + +:A_DOS_DJGPP_NOT + + if "%HB_COMPILER%" == "rsx32" gcc %1.c -Zrsx32 %CFLAGS% -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l%HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon goto END :A_W32 @@ -118,11 +161,11 @@ rem if "%HB_GT_LIB%" == "" set HB_GT_LIB= if "%HB_GT_LIB%" == "" set HB_GT_LIB=gtwin - if "%HB_COMPILER%" == "bcc32" bcc32 -O2 -I..\include -L..\lib %1.c tools.lib debug.lib vm.lib rtl.lib %HB_GT_LIB%.lib lang.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib - if "%HB_COMPILER%" == "gcc" gcc %1.c -o%1.exe -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l%HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon - if "%HB_COMPILER%" == "mingw32" gcc %1.c -o%1.exe -mno-cygwin -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l%HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon - if "%HB_COMPILER%" == "rsxnt" gcc %1.c -Zwin32 -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l%HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon - if "%HB_COMPILER%" == "msvc" cl -Fd..\bin\harbour -w -Zi -TP -GZ -GA -I..\include %1.c /link /subsystem:CONSOLE ..\lib\tools.lib ..\lib\debug.lib ..\lib\vm.lib ..\lib\rtl.lib ..\lib\%HB_GT_LIB%.lib ..\lib\lang.lib ..\lib\rdd.lib ..\lib\macro.lib ..\lib\pp.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib user32.lib + if "%HB_COMPILER%" == "bcc32" bcc32 -O2 %CFLAGS% -I..\include -L..\lib %1.c tools.lib debug.lib vm.lib rtl.lib %HB_GT_LIB%.lib lang.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib + if "%HB_COMPILER%" == "gcc" gcc %1.c -o%1.exe %CFLAGS% -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l%HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon + if "%HB_COMPILER%" == "mingw32" gcc %1.c -o%1.exe %CFLAGS% -mno-cygwin -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l%HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon + if "%HB_COMPILER%" == "rsxnt" gcc %1.c -Zwin32 %CFLAGS% -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l%HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon + if "%HB_COMPILER%" == "msvc" cl -Fd..\bin\harbour -w -Zi -TP -GZ -GA %CFLAGS% -I..\include %1.c /link /subsystem:CONSOLE ..\lib\tools.lib ..\lib\debug.lib ..\lib\vm.lib ..\lib\rtl.lib ..\lib\%HB_GT_LIB%.lib ..\lib\lang.lib ..\lib\rdd.lib ..\lib\macro.lib ..\lib\pp.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib user32.lib if "%HB_COMPILER%" == "msvc" echo Ignore LNK4033 warning goto END @@ -132,8 +175,8 @@ rem if "%HB_GT_LIB%" == "" set HB_GT_LIB= if "%HB_GT_LIB%" == "" set HB_GT_LIB=gtos2 - if "%HB_COMPILER%" == "gcc" gcc %1.c -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l%HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon - if "%HB_COMPILER%" == "icc" icc /Gs+ /W2 /Se /Sd+ /Ti+ -I..\include /C- /Tp %1.c ..\lib\tools.lib ..\lib\debug.lib ..\lib\vm.lib ..\lib\rtl.lib ..\lib\%HB_GT_LIB%.lib ..\lib\lang.lib ..\lib\rdd.lib ..\lib\rtl.lib ..\lib\vm.lib ..\lib\macro.lib ..\lib\pp.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib + if "%HB_COMPILER%" == "gcc" gcc %1.c %CFLAGS% -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l%HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon + if "%HB_COMPILER%" == "icc" icc /Gs+ /W2 /Se /Sd+ /Ti+ /C- /Tp %CFLAGS% -I..\include %1.c ..\lib\tools.lib ..\lib\debug.lib ..\lib\vm.lib ..\lib\rtl.lib ..\lib\%HB_GT_LIB%.lib ..\lib\lang.lib ..\lib\rdd.lib ..\lib\rtl.lib ..\lib\vm.lib ..\lib\macro.lib ..\lib\pp.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib goto END :A_LINUX @@ -142,7 +185,7 @@ rem if "%HB_GT_LIB%" == "" set HB_GT_LIB= if "%HB_GT_LIB%" == "" set HB_GT_LIB=gtstd - if "%HB_COMPILER%" == "gcc" gcc %1.c -I../include -L../lib -ltools -ldebug -lvm -lrtl -l%HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon + if "%HB_COMPILER%" == "gcc" gcc %1.c %CFLAGS% -I../include -L../lib -ltools -ldebug -lvm -lrtl -l%HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon goto END :CLEANUP diff --git a/harbour/bin/bld.sh b/harbour/bin/bld.sh index ee2f1812e9..5e7b8447dd 100644 --- a/harbour/bin/bld.sh +++ b/harbour/bin/bld.sh @@ -79,18 +79,18 @@ if [ -z "$1" ] || [ -z "$HB_ARCHITECTURE" ] || [ -z "$HB_COMPILER" ]; then else - harbour $1.prg -n -i../include + harbour $1.prg -n -i../include $2 $3 $HARBOURFLAGS if [ "$HB_ARCHITECTURE" == "dos" ]; then if [ -z "$HB_GT_LIB" ]; then export HB_GT_LIB=gtdos; fi if [ "$HB_COMPILER" == "bcc16" ]; then - bcc -O2 -mh -I..\include -L..\lib $1.c tools.lib debug.lib vm.lib rtl.lib $HB_GT_LIB.lib lang.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib + bcc -O2 -mh $CFLAGS -I..\include -L..\lib $1.c tools.lib debug.lib vm.lib rtl.lib $HB_GT_LIB.lib lang.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib elif [ "$HB_COMPILER" == "djgpp" ]; then - gcc $1.c -o$1.exe -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l$HB_GT_LIB -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfnt -ldbfcd -lcommo + gcc $1.c -o$1.exe $CFLAGS -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l$HB_GT_LIB -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfnt -ldbfcd -lcommo elif [ "$HB_COMPILER" == "rsx32" ]; then - gcc $1.c -Zrsx32 -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l$HB_GT_LIB -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon + gcc $1.c -Zrsx32 $CFLAGS -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l$HB_GT_LIB -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon else echo Error: HB_COMPILER value is unsupported. fi @@ -100,15 +100,15 @@ else if [ -z "$HB_GT_LIB" ]; then export HB_GT_LIB=gtwin; fi if [ "$HB_COMPILER" == "bcc32" ]; then - bcc32 -O2 -I..\include -L..\lib $1.c tools.lib debug.lib vm.lib rtl.lib $HB_GT_LIB.lib lang.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib + bcc32 -O2 $CFLAGS -I..\include -L..\lib $1.c tools.lib debug.lib vm.lib rtl.lib $HB_GT_LIB.lib lang.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib elif [ "$HB_COMPILER" == "gcc" ]; then - gcc $1.c -o$1.exe -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l$HB_GT_LIB -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon + gcc $1.c -o$1.exe $CFLAGS -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l$HB_GT_LIB -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon elif [ "$HB_COMPILER" == "mingw32" ]; then - gcc $1.c -o$1.exe -mno-cygwin -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l$HB_GT_LIB -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon + gcc $1.c -o$1.exe $CFLAGS -mno-cygwin -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l$HB_GT_LIB -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon elif [ "$HB_COMPILER" == "rsxnt" ]; then - gcc $1.c -Zwin32 -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l$HB_GT_LIB -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon + gcc $1.c -Zwin32 $CFLAGS -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l$HB_GT_LIB -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon elif [ "$HB_COMPILER" == "msvc" ]; then - cl -Fd..\bin\harbour -w -Zi -TP -GZ -GA -I..\include $1.c /link /subsystem:CONSOLE ..\lib\tools.lib ..\lib\debug.lib ..\lib\vm.lib ..\lib\rtl.lib ..\lib\$HB_GT_LIB.lib ..\lib\lang.lib ..\lib\rdd.lib ..\lib\macro.lib ..\lib\pp.lib ..\lib\dbfntx.lib ..\lib\dbfcdx. + cl -Fd..\bin\harbour -w -Zi -TP -GZ -GA $CFLAGS -I..\include $1.c /link /subsystem:CONSOLE ..\lib\tools.lib ..\lib\debug.lib ..\lib\vm.lib ..\lib\rtl.lib ..\lib\$HB_GT_LIB.lib ..\lib\lang.lib ..\lib\rdd.lib ..\lib\macro.lib ..\lib\pp.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib echo Ignore LNK4033 warning else echo Error: HB_COMPILER value is unsupported. @@ -119,9 +119,9 @@ else if [ -z "$HB_GT_LIB" ]; then export HB_GT_LIB=gtos2; fi if [ "$HB_COMPILER" == "gcc" ]; then - gcc $1.c -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l$HB_GT_LIB -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon + gcc $1.c $CFLAGS -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l$HB_GT_LIB -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon elif [ "$HB_COMPILER" == "icc" ]; then - icc /Gs+ /W2 /Se /Sd+ /Ti+ -I..\include /C- /Tp $1.c ..\lib\tools.lib ..\lib\debug.lib ..\lib\vm.lib ..\lib\rtl.lib ..\lib\$HB_GT_LIB.lib ..\lib\lang.lib ..\lib\rdd.lib ..\lib\rtl.lib ..\lib\vm.lib ..\lib\macro.lib ..\lib\pp.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.l + icc /Gs+ /W2 /Se /Sd+ /Ti+ /C- /Tp $CFLAGS -I..\include $1.c ..\lib\tools.lib ..\lib\debug.lib ..\lib\vm.lib ..\lib\rtl.lib ..\lib\$HB_GT_LIB.lib ..\lib\lang.lib ..\lib\rdd.lib ..\lib\rtl.lib ..\lib\vm.lib ..\lib\macro.lib ..\lib\pp.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.l else echo Error: HB_COMPILER value is unsupported. fi @@ -131,7 +131,7 @@ else if [ -z "$HB_GT_LIB" ]; then export HB_GT_LIB=gtstd; fi if [ "$HB_COMPILER" == "gcc" ]; then - gcc $1.c -I../include -L../lib -ltools -ldebug -lvm -lrtl -l$HB_GT_LIB -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon + gcc $1.c $CFLAGS -I../include -L../lib -ltools -ldebug -lvm -lrtl -l$HB_GT_LIB -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon else echo Error: HB_COMPILER value is unsupported. fi diff --git a/harbour/bin/bld_b16.bat b/harbour/bin/bld_b16.bat index 74836a9514..75966a7eab 100644 --- a/harbour/bin/bld_b16.bat +++ b/harbour/bin/bld_b16.bat @@ -3,22 +3,8 @@ rem rem $Id$ rem -..\bin\harbour %1 %2 %3 /n /i..\include -echo -O2 -mh -I..\include -L..\lib > build.tmp -echo -e%1.exe %1.c >> build.tmp -echo tools.lib >> build.tmp -echo debug.lib >> build.tmp -echo vm.lib >> build.tmp -echo rtl.lib >> build.tmp -echo gtdos.lib >> build.tmp -echo lang.lib >> build.tmp -echo rdd.lib >> build.tmp -echo macro.lib >> build.tmp -echo pp.lib >> build.tmp -echo dbfntx.lib >> build.tmp -echo dbfcdx.lib >> build.tmp -echo common.lib >> build.tmp -bcc @build.tmp -del build.tmp -rem del %1.c +set HB_ARCHITECTURE=dos +set HB_COMPILER=bcc16 + +call bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/bin/bld_b32.bat b/harbour/bin/bld_b32.bat index 9fb34e8834..e6eaf86a6e 100644 --- a/harbour/bin/bld_b32.bat +++ b/harbour/bin/bld_b32.bat @@ -3,7 +3,7 @@ rem rem $Id$ rem -..\bin\harbour %1 %2 %3 /n /i..\include -bcc32 -O2 -I..\include -L..\lib -e%1.exe %1.c tools.lib debug.lib vm.lib rtl.lib gtwin.lib lang.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib -rem del %1.c +set HB_ARCHITECTURE=w32 +set HB_COMPILER=bcc32 +call bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/bin/bld_b32o.bat b/harbour/bin/bld_b32o.bat deleted file mode 100644 index 2b64e3d016..0000000000 --- a/harbour/bin/bld_b32o.bat +++ /dev/null @@ -1,11 +0,0 @@ -@echo off -rem -rem $Id$ -rem - -rem NOTE: Experimental - -..\bin\harbour %1 %2 %3 /n /i..\include /gf -tlink32 -L..\lib c0x32.obj %1.obj hvm.obj,%1.exe,, import32.lib cw32mt.lib tools.lib debug.lib vm.lib rtl.lib gtwin.lib lang.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib -del %1.obj - diff --git a/harbour/bin/bld_b32w.bat b/harbour/bin/bld_b32w.bat deleted file mode 100644 index d9f46d21ca..0000000000 --- a/harbour/bin/bld_b32w.bat +++ /dev/null @@ -1,9 +0,0 @@ -@echo off -rem -rem $Id$ -rem - -..\bin\harbour %1 %2 %3 /n /i..\include -bcc32 -O2 -tW -I..\include -L..\lib -e%1.exe %1.c tools.lib debug.lib vm.lib rtl.lib gtwin.lib lang.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib -rem del %1.c - diff --git a/harbour/bin/bld_vc.bat b/harbour/bin/bld_vc.bat index a4dc177607..b2146f9ba8 100644 --- a/harbour/bin/bld_vc.bat +++ b/harbour/bin/bld_vc.bat @@ -3,7 +3,7 @@ rem rem $Id$ rem -..\bin\harbour %1 %2 %3 /n /i..\include -cl -Fd..\bin\harbour -w -Zi -TP -GZ -GA -I..\include %1.c /link /subsystem:CONSOLE ..\lib\tools.lib ..\lib\debug.lib ..\lib\vm.lib ..\lib\rtl.lib ..\lib\gtwin.lib ..\lib\lang.lib ..\lib\rdd.lib ..\lib\macro.lib ..\lib\pp.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib user32.lib -rem del %1.c +set HB_ARCHITECTURE=w32 +set HB_COMPILER=msvc +call bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9