From d480014a483309bf2d582e0838ff7ff0c88016a5 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 14 May 2008 10:12:25 +0000 Subject: [PATCH] 2008-05-14 12:06 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + contrib/hbclipsm/tests/bld_b32.bat + contrib/hbclipsm/tests/bld_vc.bat + contrib/hbmisc/tests/bld_b32.bat + contrib/hbmisc/tests/bld_vc.bat + contrib/hbmysql/tests/bld_b32.bat + contrib/hbmysql/tests/bld_vc.bat + contrib/hbnf/tests/bld_b32.bat + contrib/hbnf/tests/bld_vc.bat + contrib/hbtpathy/tests/bld_b32.bat + contrib/hbtpathy/tests/bld_vc.bat + contrib/hbw32/tests/bld_b32.bat + contrib/hbw32/tests/bld_vc.bat + contrib/hbw32ddr/tests/bld_b32.bat + contrib/hbw32ddr/tests/bld_vc.bat + contrib/hbzlib/tests/bld_b32.bat + contrib/hbzlib/tests/bld_vc.bat + contrib/rddado/tests/bld_b32.bat + contrib/rddado/tests/bld_vc.bat + contrib/rddads/tests/bld_b32.bat + contrib/rddads/tests/bld_vc.bat + Added non-GNU make files to make it easy to build contrib tests. * contrib/hbw32ddr/make_b32.bat * contrib/hbw32ddr/make_vc.bat + Added automatic generation of ddraw.lib. * contrib/rddads/tests/testmg.prg ! _ADS -> ADS * contrib/rddads/ads1.c ! Fixed MSVC warning. * contrib/hbbtree/tests/test.prg * contrib/hbbtree/tests/ttest.prg * License moved to top of the files. * contrib/hbw32ddr/tests/testdx.prg ! SVN ID added. * Some formatting. --- harbour/ChangeLog | 42 ++++ harbour/contrib/hbbtree/tests/test.prg | 62 ++--- harbour/contrib/hbbtree/tests/ttest.prg | 63 +++-- harbour/contrib/hbclipsm/tests/bld_b32.bat | 22 ++ harbour/contrib/hbclipsm/tests/bld_vc.bat | 22 ++ harbour/contrib/hbmisc/tests/bld_b32.bat | 22 ++ harbour/contrib/hbmisc/tests/bld_vc.bat | 22 ++ harbour/contrib/hbmysql/tests/bld_b32.bat | 22 ++ harbour/contrib/hbmysql/tests/bld_vc.bat | 22 ++ harbour/contrib/hbnf/tests/bld_b32.bat | 22 ++ harbour/contrib/hbnf/tests/bld_vc.bat | 22 ++ harbour/contrib/hbtpathy/tests/bld_b32.bat | 22 ++ harbour/contrib/hbtpathy/tests/bld_vc.bat | 22 ++ harbour/contrib/hbw32/tests/bld_b32.bat | 22 ++ harbour/contrib/hbw32/tests/bld_vc.bat | 22 ++ harbour/contrib/hbw32ddr/make_b32.bat | 42 ++++ harbour/contrib/hbw32ddr/make_vc.bat | 61 ++++- harbour/contrib/hbw32ddr/tests/bld_b32.bat | 22 ++ harbour/contrib/hbw32ddr/tests/bld_vc.bat | 22 ++ harbour/contrib/hbw32ddr/tests/testdx.prg | 258 +++++++++++---------- harbour/contrib/hbzlib/tests/bld_b32.bat | 22 ++ harbour/contrib/hbzlib/tests/bld_vc.bat | 22 ++ harbour/contrib/rddado/tests/bld_b32.bat | 22 ++ harbour/contrib/rddado/tests/bld_vc.bat | 22 ++ harbour/contrib/rddads/ads1.c | 2 +- harbour/contrib/rddads/tests/bld_b32.bat | 22 ++ harbour/contrib/rddads/tests/bld_vc.bat | 22 ++ harbour/contrib/rddads/tests/testmg.prg | 2 +- 28 files changed, 776 insertions(+), 196 deletions(-) create mode 100644 harbour/contrib/hbclipsm/tests/bld_b32.bat create mode 100644 harbour/contrib/hbclipsm/tests/bld_vc.bat create mode 100644 harbour/contrib/hbmisc/tests/bld_b32.bat create mode 100644 harbour/contrib/hbmisc/tests/bld_vc.bat create mode 100644 harbour/contrib/hbmysql/tests/bld_b32.bat create mode 100644 harbour/contrib/hbmysql/tests/bld_vc.bat create mode 100644 harbour/contrib/hbnf/tests/bld_b32.bat create mode 100644 harbour/contrib/hbnf/tests/bld_vc.bat create mode 100644 harbour/contrib/hbtpathy/tests/bld_b32.bat create mode 100644 harbour/contrib/hbtpathy/tests/bld_vc.bat create mode 100644 harbour/contrib/hbw32/tests/bld_b32.bat create mode 100644 harbour/contrib/hbw32/tests/bld_vc.bat create mode 100644 harbour/contrib/hbw32ddr/tests/bld_b32.bat create mode 100644 harbour/contrib/hbw32ddr/tests/bld_vc.bat create mode 100644 harbour/contrib/hbzlib/tests/bld_b32.bat create mode 100644 harbour/contrib/hbzlib/tests/bld_vc.bat create mode 100644 harbour/contrib/rddado/tests/bld_b32.bat create mode 100644 harbour/contrib/rddado/tests/bld_vc.bat create mode 100644 harbour/contrib/rddads/tests/bld_b32.bat create mode 100644 harbour/contrib/rddads/tests/bld_vc.bat diff --git a/harbour/ChangeLog b/harbour/ChangeLog index e8dedcf213..95490b9447 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,48 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-05-14 12:06 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + + contrib/hbclipsm/tests/bld_b32.bat + + contrib/hbclipsm/tests/bld_vc.bat + + contrib/hbmisc/tests/bld_b32.bat + + contrib/hbmisc/tests/bld_vc.bat + + contrib/hbmysql/tests/bld_b32.bat + + contrib/hbmysql/tests/bld_vc.bat + + contrib/hbnf/tests/bld_b32.bat + + contrib/hbnf/tests/bld_vc.bat + + contrib/hbtpathy/tests/bld_b32.bat + + contrib/hbtpathy/tests/bld_vc.bat + + contrib/hbw32/tests/bld_b32.bat + + contrib/hbw32/tests/bld_vc.bat + + contrib/hbw32ddr/tests/bld_b32.bat + + contrib/hbw32ddr/tests/bld_vc.bat + + contrib/hbzlib/tests/bld_b32.bat + + contrib/hbzlib/tests/bld_vc.bat + + contrib/rddado/tests/bld_b32.bat + + contrib/rddado/tests/bld_vc.bat + + contrib/rddads/tests/bld_b32.bat + + contrib/rddads/tests/bld_vc.bat + + Added non-GNU make files to make it easy to build + contrib tests. + + * contrib/hbw32ddr/make_b32.bat + * contrib/hbw32ddr/make_vc.bat + + Added automatic generation of ddraw.lib. + + * contrib/rddads/tests/testmg.prg + ! _ADS -> ADS + + * contrib/rddads/ads1.c + ! Fixed MSVC warning. + + * contrib/hbbtree/tests/test.prg + * contrib/hbbtree/tests/ttest.prg + * License moved to top of the files. + + * contrib/hbw32ddr/tests/testdx.prg + ! SVN ID added. + * Some formatting. + 2008-05-14 11:38 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * contrib/rddads/rddads.h * contrib/rddads/adsfunc.c diff --git a/harbour/contrib/hbbtree/tests/test.prg b/harbour/contrib/hbbtree/tests/test.prg index 69aaf16a4d..4fb47dedef 100644 --- a/harbour/contrib/hbbtree/tests/test.prg +++ b/harbour/contrib/hbbtree/tests/test.prg @@ -2,6 +2,37 @@ * $Id$ */ +/* + * Harbour Project source code: + * hb_btree api test + * + * Copyright 2000 April White + * www - http://www.harbour-project.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version, with one exception: + * + * The exception is that if you link the Harbour Runtime Library (HRL) + * and/or the Harbour Virtual Machine (HVM) with other files to produce + * an executable, this does not by itself cause the resulting executable + * to be covered by the GNU General Public License. Your use of that + * executable is in no way restricted on account of linking the HRL + * and/or HVM code into it. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA (or visit + * their web site at http://www.gnu.org/). + * + */ + #include "simpleio.ch" #include "hb_btree.ch" #include "fileio.ch" @@ -280,34 +311,3 @@ static procedure insertdata( n, s ) hb_btreeinsert( n, "dmfmivqb", 79 / s ) hb_btreeinsert( n, "ewsxanon", 80 / s ) return - -/* - * Harbour Project source code: - * hb_btree api test - * - * Copyright 2000 April White - * www - http://www.harbour-project.org - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version, with one exception: - * - * The exception is that if you link the Harbour Runtime Library (HRL) - * and/or the Harbour Virtual Machine (HVM) with other files to produce - * an executable, this does not by itself cause the resulting executable - * to be covered by the GNU General Public License. Your use of that - * executable is in no way restricted on account of linking the HRL - * and/or HVM code into it. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA (or visit - * their web site at http://www.gnu.org/). - * - */ diff --git a/harbour/contrib/hbbtree/tests/ttest.prg b/harbour/contrib/hbbtree/tests/ttest.prg index f9ef040f46..07601e8e60 100644 --- a/harbour/contrib/hbbtree/tests/ttest.prg +++ b/harbour/contrib/hbbtree/tests/ttest.prg @@ -2,6 +2,37 @@ * $Id$ */ +/* + * Harbour Project source code: + * hb_btree api test + * + * Copyright 2000 April White + * www - http://www.harbour-project.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version, with one exception: + * + * The exception is that if you link the Harbour Runtime Library (HRL) + * and/or the Harbour Virtual Machine (HVM) with other files to produce + * an executable, this does not by itself cause the resulting executable + * to be covered by the GNU General Public License. Your use of that + * executable is in no way restricted on account of linking the HRL + * and/or HVM code into it. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA (or visit + * their web site at http://www.gnu.org/). + * + */ + #include "simpleio.ch" #include "hb_btree.ch" @@ -165,35 +196,3 @@ static procedure insertdata( n ) n:insert( "dmfmivqb", 79 ) n:insert( "ewsxanon", 80 ) return - -/* - * Harbour Project source code: - * hb_btree api test - * - * Copyright 2000 April White - * www - http://www.harbour-project.org - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version, with one exception: - * - * The exception is that if you link the Harbour Runtime Library (HRL) - * and/or the Harbour Virtual Machine (HVM) with other files to produce - * an executable, this does not by itself cause the resulting executable - * to be covered by the GNU General Public License. Your use of that - * executable is in no way restricted on account of linking the HRL - * and/or HVM code into it. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA (or visit - * their web site at http://www.gnu.org/). - * - */ - diff --git a/harbour/contrib/hbclipsm/tests/bld_b32.bat b/harbour/contrib/hbclipsm/tests/bld_b32.bat new file mode 100644 index 0000000000..517df82125 --- /dev/null +++ b/harbour/contrib/hbclipsm/tests/bld_b32.bat @@ -0,0 +1,22 @@ +@echo off +rem +rem $Id$ +rem + +rem --------------------------------------------------------------- +rem This is a generic template file, if it doesn't fit your own needs +rem please DON'T MODIFY IT. +rem +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 --------------------------------------------------------------- + +set HB_BIN_INSTALL=..\..\..\bin +set HB_INC_INSTALL=..\..\..\include +set HB_LIB_INSTALL=..\..\..\lib + +set HB_ARCHITECTURE=w32 +set HB_COMPILER=bcc32 +set HB_USER_LIBS=hbclipsm.lib + +call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/contrib/hbclipsm/tests/bld_vc.bat b/harbour/contrib/hbclipsm/tests/bld_vc.bat new file mode 100644 index 0000000000..965b8f76da --- /dev/null +++ b/harbour/contrib/hbclipsm/tests/bld_vc.bat @@ -0,0 +1,22 @@ +@echo off +rem +rem $Id$ +rem + +rem --------------------------------------------------------------- +rem This is a generic template file, if it doesn't fit your own needs +rem please DON'T MODIFY IT. +rem +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 --------------------------------------------------------------- + +set HB_BIN_INSTALL=..\..\..\bin +set HB_INC_INSTALL=..\..\..\include +set HB_LIB_INSTALL=..\..\..\lib + +set HB_ARCHITECTURE=w32 +set HB_COMPILER=msvc +set HB_USER_LIBS=hbclipsm.lib + +call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/contrib/hbmisc/tests/bld_b32.bat b/harbour/contrib/hbmisc/tests/bld_b32.bat new file mode 100644 index 0000000000..f1c019810d --- /dev/null +++ b/harbour/contrib/hbmisc/tests/bld_b32.bat @@ -0,0 +1,22 @@ +@echo off +rem +rem $Id$ +rem + +rem --------------------------------------------------------------- +rem This is a generic template file, if it doesn't fit your own needs +rem please DON'T MODIFY IT. +rem +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 --------------------------------------------------------------- + +set HB_BIN_INSTALL=..\..\..\bin +set HB_INC_INSTALL=..\..\..\include +set HB_LIB_INSTALL=..\..\..\lib + +set HB_ARCHITECTURE=w32 +set HB_COMPILER=bcc32 +set HB_USER_LIBS=hbmisc.lib + +call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/contrib/hbmisc/tests/bld_vc.bat b/harbour/contrib/hbmisc/tests/bld_vc.bat new file mode 100644 index 0000000000..24e49977c1 --- /dev/null +++ b/harbour/contrib/hbmisc/tests/bld_vc.bat @@ -0,0 +1,22 @@ +@echo off +rem +rem $Id$ +rem + +rem --------------------------------------------------------------- +rem This is a generic template file, if it doesn't fit your own needs +rem please DON'T MODIFY IT. +rem +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 --------------------------------------------------------------- + +set HB_BIN_INSTALL=..\..\..\bin +set HB_INC_INSTALL=..\..\..\include +set HB_LIB_INSTALL=..\..\..\lib + +set HB_ARCHITECTURE=w32 +set HB_COMPILER=msvc +set HB_USER_LIBS=hbmisc.lib + +call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/contrib/hbmysql/tests/bld_b32.bat b/harbour/contrib/hbmysql/tests/bld_b32.bat new file mode 100644 index 0000000000..351528f62e --- /dev/null +++ b/harbour/contrib/hbmysql/tests/bld_b32.bat @@ -0,0 +1,22 @@ +@echo off +rem +rem $Id$ +rem + +rem --------------------------------------------------------------- +rem This is a generic template file, if it doesn't fit your own needs +rem please DON'T MODIFY IT. +rem +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 --------------------------------------------------------------- + +set HB_BIN_INSTALL=..\..\..\bin +set HB_INC_INSTALL=..\..\..\include +set HB_LIB_INSTALL=..\..\..\lib + +set HB_ARCHITECTURE=w32 +set HB_COMPILER=bcc32 +set HB_USER_LIBS=hbmysql.lib libmysql.lib + +call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/contrib/hbmysql/tests/bld_vc.bat b/harbour/contrib/hbmysql/tests/bld_vc.bat new file mode 100644 index 0000000000..de1af6ca29 --- /dev/null +++ b/harbour/contrib/hbmysql/tests/bld_vc.bat @@ -0,0 +1,22 @@ +@echo off +rem +rem $Id$ +rem + +rem --------------------------------------------------------------- +rem This is a generic template file, if it doesn't fit your own needs +rem please DON'T MODIFY IT. +rem +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 --------------------------------------------------------------- + +set HB_BIN_INSTALL=..\..\..\bin +set HB_INC_INSTALL=..\..\..\include +set HB_LIB_INSTALL=..\..\..\lib + +set HB_ARCHITECTURE=w32 +set HB_COMPILER=msvc +set HB_USER_LIBS=hbmysql.lib libmysql.lib + +call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/contrib/hbnf/tests/bld_b32.bat b/harbour/contrib/hbnf/tests/bld_b32.bat new file mode 100644 index 0000000000..aee29748e2 --- /dev/null +++ b/harbour/contrib/hbnf/tests/bld_b32.bat @@ -0,0 +1,22 @@ +@echo off +rem +rem $Id$ +rem + +rem --------------------------------------------------------------- +rem This is a generic template file, if it doesn't fit your own needs +rem please DON'T MODIFY IT. +rem +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 --------------------------------------------------------------- + +set HB_BIN_INSTALL=..\..\..\bin +set HB_INC_INSTALL=..\..\..\include +set HB_LIB_INSTALL=..\..\..\lib + +set HB_ARCHITECTURE=w32 +set HB_COMPILER=bcc32 +set HB_USER_LIBS=hbnf.lib + +call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/contrib/hbnf/tests/bld_vc.bat b/harbour/contrib/hbnf/tests/bld_vc.bat new file mode 100644 index 0000000000..62e27750c4 --- /dev/null +++ b/harbour/contrib/hbnf/tests/bld_vc.bat @@ -0,0 +1,22 @@ +@echo off +rem +rem $Id$ +rem + +rem --------------------------------------------------------------- +rem This is a generic template file, if it doesn't fit your own needs +rem please DON'T MODIFY IT. +rem +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 --------------------------------------------------------------- + +set HB_BIN_INSTALL=..\..\..\bin +set HB_INC_INSTALL=..\..\..\include +set HB_LIB_INSTALL=..\..\..\lib + +set HB_ARCHITECTURE=w32 +set HB_COMPILER=msvc +set HB_USER_LIBS=hbnf.lib + +call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/contrib/hbtpathy/tests/bld_b32.bat b/harbour/contrib/hbtpathy/tests/bld_b32.bat new file mode 100644 index 0000000000..d8fb6e6bcf --- /dev/null +++ b/harbour/contrib/hbtpathy/tests/bld_b32.bat @@ -0,0 +1,22 @@ +@echo off +rem +rem $Id$ +rem + +rem --------------------------------------------------------------- +rem This is a generic template file, if it doesn't fit your own needs +rem please DON'T MODIFY IT. +rem +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 --------------------------------------------------------------- + +set HB_BIN_INSTALL=..\..\..\bin +set HB_INC_INSTALL=..\..\..\include +set HB_LIB_INSTALL=..\..\..\lib + +set HB_ARCHITECTURE=w32 +set HB_COMPILER=bcc32 +set HB_USER_LIBS=hbtpathy.lib + +call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/contrib/hbtpathy/tests/bld_vc.bat b/harbour/contrib/hbtpathy/tests/bld_vc.bat new file mode 100644 index 0000000000..b4c1d30ead --- /dev/null +++ b/harbour/contrib/hbtpathy/tests/bld_vc.bat @@ -0,0 +1,22 @@ +@echo off +rem +rem $Id$ +rem + +rem --------------------------------------------------------------- +rem This is a generic template file, if it doesn't fit your own needs +rem please DON'T MODIFY IT. +rem +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 --------------------------------------------------------------- + +set HB_BIN_INSTALL=..\..\..\bin +set HB_INC_INSTALL=..\..\..\include +set HB_LIB_INSTALL=..\..\..\lib + +set HB_ARCHITECTURE=w32 +set HB_COMPILER=msvc +set HB_USER_LIBS=hbtpathy.lib + +call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/contrib/hbw32/tests/bld_b32.bat b/harbour/contrib/hbw32/tests/bld_b32.bat new file mode 100644 index 0000000000..6ac9d49b23 --- /dev/null +++ b/harbour/contrib/hbw32/tests/bld_b32.bat @@ -0,0 +1,22 @@ +@echo off +rem +rem $Id$ +rem + +rem --------------------------------------------------------------- +rem This is a generic template file, if it doesn't fit your own needs +rem please DON'T MODIFY IT. +rem +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 --------------------------------------------------------------- + +set HB_BIN_INSTALL=..\..\..\bin +set HB_INC_INSTALL=..\..\..\include +set HB_LIB_INSTALL=..\..\..\lib + +set HB_ARCHITECTURE=w32 +set HB_COMPILER=bcc32 +set HB_USER_LIBS=hbw32.lib + +call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/contrib/hbw32/tests/bld_vc.bat b/harbour/contrib/hbw32/tests/bld_vc.bat new file mode 100644 index 0000000000..aefad0ac54 --- /dev/null +++ b/harbour/contrib/hbw32/tests/bld_vc.bat @@ -0,0 +1,22 @@ +@echo off +rem +rem $Id$ +rem + +rem --------------------------------------------------------------- +rem This is a generic template file, if it doesn't fit your own needs +rem please DON'T MODIFY IT. +rem +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 --------------------------------------------------------------- + +set HB_BIN_INSTALL=..\..\..\bin +set HB_INC_INSTALL=..\..\..\include +set HB_LIB_INSTALL=..\..\..\lib + +set HB_ARCHITECTURE=w32 +set HB_COMPILER=msvc +set HB_USER_LIBS=hbw32.lib + +call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/contrib/hbw32ddr/make_b32.bat b/harbour/contrib/hbw32ddr/make_b32.bat index 1aa6813d7d..2c55dfde3d 100644 --- a/harbour/contrib/hbw32ddr/make_b32.bat +++ b/harbour/contrib/hbw32ddr/make_b32.bat @@ -9,4 +9,46 @@ rem set, to build this library: rem set INCLUDE="C:\Program Files\Microsoft SDKs\Windows\v6.0\include" rem --------------------------------------------------------------- +set HB_DLL_NAME=ddraw +set HB_DLL_DIR=%SystemRoot%\system32 + +rem --------------------------------------------------------------- + call ..\mtpl_b32.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 + +rem --------------------------------------------------------------- + +set _HB_INSTALL_PREFIX=%HB_INSTALL_PREFIX% +if "%_HB_INSTALL_PREFIX%" == "" set _HB_INSTALL_PREFIX=..\.. +set _HB_LIB_INSTALL=%HB_LIB_INSTALL% +if "%_HB_LIB_INSTALL%" == "" set _HB_LIB_INSTALL=%_HB_INSTALL_PREFIX%\lib + +if "%1" == "clean" goto POST_CLEAN +if "%1" == "Clean" goto POST_CLEAN +if "%1" == "CLEAN" goto POST_CLEAN +if "%1" == "install" goto POST_INSTALL +if "%1" == "Install" goto POST_INSTALL +if "%1" == "INSTALL" goto POST_INSTALL + +:POST_BUILD + + implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %HB_DLL_DIR%\%HB_DLL_NAME%.dll + goto POST_EXIT + +:POST_CLEAN + + if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul + if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul + if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul + goto POST_EXIT + +:POST_INSTALL + + if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib + if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL% + goto POST_EXIT + +:POST_EXIT + +set HB_DLL_NAME= +set HB_DLL_DIR= diff --git a/harbour/contrib/hbw32ddr/make_vc.bat b/harbour/contrib/hbw32ddr/make_vc.bat index c1fb7b4b96..d9e23ed9ef 100644 --- a/harbour/contrib/hbw32ddr/make_vc.bat +++ b/harbour/contrib/hbw32ddr/make_vc.bat @@ -3,10 +3,63 @@ rem rem $Id$ rem -rem --------------------------------------------------------------- -rem IMPORTANT: You'll need MS SDK installed and this envvar to be -rem set, to build this library: -rem set INCLUDE="C:\Program Files\Microsoft SDKs\Windows\v6.0\include" +set HB_DLL_NAME=ddraw +set HB_DLL_DIR=%SystemRoot%\system32 + rem --------------------------------------------------------------- call ..\mtpl_vc.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 + +rem --------------------------------------------------------------- + +set _HB_INSTALL_PREFIX=%HB_INSTALL_PREFIX% +if "%_HB_INSTALL_PREFIX%" == "" set _HB_INSTALL_PREFIX=..\.. +set _HB_LIB_INSTALL=%HB_LIB_INSTALL% +if "%_HB_LIB_INSTALL%" == "" set _HB_LIB_INSTALL=%_HB_INSTALL_PREFIX%\lib + +if "%1" == "clean" goto POST_CLEAN +if "%1" == "Clean" goto POST_CLEAN +if "%1" == "CLEAN" goto POST_CLEAN +if "%1" == "install" goto POST_INSTALL +if "%1" == "Install" goto POST_INSTALL +if "%1" == "INSTALL" goto POST_INSTALL + +:POST_BUILD + + rem --------------------------------------------------------------- + rem This .dll to .lib conversion needs GNU sed.exe in the path + rem --------------------------------------------------------------- + echo./[ \t]*ordinal hint/,/^^[ \t]*Summary/{> _temp.sed + echo. /^^[ \t]\+[0-9]\+/{>> _temp.sed + echo. s/^^[ \t]\+[0-9]\+[ \t]\+[0-9A-Fa-f]\+[ \t]\+[0-9A-Fa-f]\+[ \t]\+\(.*\)/\1/p>> _temp.sed + echo. }>> _temp.sed + echo.}>> _temp.sed + DUMPBIN /EXPORTS %HB_DLL_DIR%\%HB_DLL_NAME%.dll > _dump.tmp + echo.LIBRARY %HB_DLL_DIR%\%HB_DLL_NAME%.dll > _temp.def + echo.EXPORTS >> _temp.def + sed -nf _temp.sed < _dump.tmp >> _temp.def + LIB /MACHINE:X86 /DEF:_temp.def /OUT:..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib + del _dump.tmp + del _temp.def + del _temp.sed + rem --------------------------------------------------------------- + + goto POST_EXIT + +:POST_CLEAN + + if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul + if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul + if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul + goto POST_EXIT + +:POST_INSTALL + + if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib + if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL% + goto POST_EXIT + +:POST_EXIT + +set HB_DLL_NAME= +set HB_DLL_DIR= diff --git a/harbour/contrib/hbw32ddr/tests/bld_b32.bat b/harbour/contrib/hbw32ddr/tests/bld_b32.bat new file mode 100644 index 0000000000..ef88395ab1 --- /dev/null +++ b/harbour/contrib/hbw32ddr/tests/bld_b32.bat @@ -0,0 +1,22 @@ +@echo off +rem +rem $Id$ +rem + +rem --------------------------------------------------------------- +rem This is a generic template file, if it doesn't fit your own needs +rem please DON'T MODIFY IT. +rem +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 --------------------------------------------------------------- + +set HB_BIN_INSTALL=..\..\..\bin +set HB_INC_INSTALL=..\..\..\include +set HB_LIB_INSTALL=..\..\..\lib + +set HB_ARCHITECTURE=w32 +set HB_COMPILER=bcc32 +set HB_USER_LIBS=hbw32ddr.lib ddraw.lib + +call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/contrib/hbw32ddr/tests/bld_vc.bat b/harbour/contrib/hbw32ddr/tests/bld_vc.bat new file mode 100644 index 0000000000..789b2d985f --- /dev/null +++ b/harbour/contrib/hbw32ddr/tests/bld_vc.bat @@ -0,0 +1,22 @@ +@echo off +rem +rem $Id$ +rem + +rem --------------------------------------------------------------- +rem This is a generic template file, if it doesn't fit your own needs +rem please DON'T MODIFY IT. +rem +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 --------------------------------------------------------------- + +set HB_BIN_INSTALL=..\..\..\bin +set HB_INC_INSTALL=..\..\..\include +set HB_LIB_INSTALL=..\..\..\lib + +set HB_ARCHITECTURE=w32 +set HB_COMPILER=msvc +set HB_USER_LIBS=hbw32ddr.lib ddraw.lib + +call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/contrib/hbw32ddr/tests/testdx.prg b/harbour/contrib/hbw32ddr/tests/testdx.prg index cff245432d..de26e8ae07 100644 --- a/harbour/contrib/hbw32ddr/tests/testdx.prg +++ b/harbour/contrib/hbw32ddr/tests/testdx.prg @@ -1,174 +1,178 @@ - Static spBunny - Static spShots - Static nShotsActive - Static spaBreaks - Static spTorretShot - Static spTorretShot2 - Static spTorretShot3 - Static spTorretShot4 - Static spTorretShot5 - Static spTorretSequencer - Static spBunnyLife - Static spOuch - Static sppq - Static spzan +/* + * $Id$ + */ - Function Main() +Static spBunny +Static spShots +Static nShotsActive +Static spaBreaks +Static spTorretShot +Static spTorretShot2 +Static spTorretShot3 +Static spTorretShot4 +Static spTorretShot5 +Static spTorretSequencer +Static spBunnyLife +Static spOuch +Static sppq +Static spzan - m_hWnd = dd_CreateWindow() +Function Main() - // Background........... + m_hWnd = dd_CreateWindow() - sfBack = dd_CreateOffScreenBitmap(NIL,NIL) - dd_LoadBmpIntoSurface( sfBack, "black.bmp", 0 , 0, 640, 480 ) - spBack = dd_CreateSprite( sfBack, "background", 640, 480, 1, 101, .t., 240 ) - dd_SPSetXY( spBack, 0,0) + // Background........... + + sfBack = dd_CreateOffScreenBitmap(NIL,NIL) + dd_LoadBmpIntoSurface( sfBack, "black.bmp", 0 , 0, 640, 480 ) + spBack = dd_CreateSprite( sfBack, "background", 640, 480, 1, 101, .t., 240 ) + dd_SPSetXY( spBack, 0,0) - // Bricks...... + // Bricks...... - sfBreak1 = dd_CreateOffScreenBitmap(NIL,NIL) - dd_LoadBmpIntoSurface( sfBreak1, "brick1.bmp", 0 , 0, 640, 480 ) + sfBreak1 = dd_CreateOffScreenBitmap(NIL,NIL) + dd_LoadBmpIntoSurface( sfBreak1, "brick1.bmp", 0 , 0, 640, 480 ) - sfBreak2 = dd_CreateOffScreenBitmap(NIL,NIL) - dd_LoadBmpIntoSurface( sfBreak2, "brick2.bmp", 0 , 0, 640, 480 ) + sfBreak2 = dd_CreateOffScreenBitmap(NIL,NIL) + dd_LoadBmpIntoSurface( sfBreak2, "brick2.bmp", 0 , 0, 640, 480 ) - sfBreak3 = dd_CreateOffScreenBitmap(NIL,NIL) - dd_LoadBmpIntoSurface( sfBreak3, "brick3.bmp", 0 , 0, 640, 480 ) + sfBreak3 = dd_CreateOffScreenBitmap(NIL,NIL) + dd_LoadBmpIntoSurface( sfBreak3, "brick3.bmp", 0 , 0, 640, 480 ) - spaBreaks = Array(80) - nCont = 1 - for t=1 to 80 - if nCont = 3 - spaBreaks[t] = dd_CreateSprite( sfBreak3, "Break", 30, 15, 6, 100, .f., 240 ) - nCont = 1 + spaBreaks = Array(80) + nCont = 1 + for t=1 to 80 + if nCont = 3 + spaBreaks[t] = dd_CreateSprite( sfBreak3, "Break", 30, 15, 6, 100, .f., 240 ) + nCont = 1 + else + if nCont = 2 + spaBreaks[t] = dd_CreateSprite( sfBreak2, "Break", 30, 15, 6, 100, .f., 240 ) + nCont = 3 else - if nCont = 2 - spaBreaks[t] = dd_CreateSprite( sfBreak2, "Break", 30, 15, 6, 100, .f., 240 ) - nCont = 3 - else - if nCont = 1 - spaBreaks[t] = dd_CreateSprite( sfBreak1, "Break", 30, 15, 6, 100, .f., 240 ) - nCont = 2 - end if - end if + if nCont = 1 + spaBreaks[t] = dd_CreateSprite( sfBreak1, "Break", 30, 15, 6, 100, .f., 240 ) + nCont = 2 + end if end if + end if - dd_SPSetSolid( spaBreaks[t], .t. ) - dd_SPSetVisible( spaBreaks[t], .t. ) - dd_SPOnCollision( spaBreaks[t], "BRICK_ONCOLLISION" ) - next + dd_SPSetSolid( spaBreaks[t], .t. ) + dd_SPSetVisible( spaBreaks[t], .t. ) + dd_SPOnCollision( spaBreaks[t], "BRICK_ONCOLLISION" ) + next - for t=1 to 20 - dd_SPSetXY( spaBreaks[t], t*30 + 5,10 ) - next - for t=21 to 40 - dd_SPSetXY( spaBreaks[t], ( t - 20 ) * 30 + 12,25 ) - next - for t=41 to 60 - dd_SPSetXY( spaBreaks[t], ( t - 40 ) * 30+ 5 ,40 ) - next - for t=61 to 80 - dd_SPSetXY( spaBreaks[t], ( t - 60 ) * 30 + 12,55 ) - next + for t=1 to 20 + dd_SPSetXY( spaBreaks[t], t*30 + 5,10 ) + next + for t=21 to 40 + dd_SPSetXY( spaBreaks[t], ( t - 20 ) * 30 + 12,25 ) + next + for t=41 to 60 + dd_SPSetXY( spaBreaks[t], ( t - 40 ) * 30+ 5 ,40 ) + next + for t=61 to 80 + dd_SPSetXY( spaBreaks[t], ( t - 60 ) * 30 + 12,55 ) + next - // Shots...... + // Shots...... - sfShot = dd_CreateOffScreenBitmap(NIL,NIL) - dd_LoadBmpIntoSurface( sfShot, "shot.bmp", 0 , 0, 640, 480 ) - spShots = Array( 10 ) - nShotsActive = 1 + sfShot = dd_CreateOffScreenBitmap(NIL,NIL) + dd_LoadBmpIntoSurface( sfShot, "shot.bmp", 0 , 0, 640, 480 ) + spShots = Array( 10 ) + nShotsActive = 1 - for t=1 to 10 - spShots[t] = dd_CreateSprite( sfShot, "Shot", 10, 20, 3, 100, .f., 240 ) - dd_SPSetSolid( spShots[ t ], .t. ) - dd_SPSetMasked( spShots[ t ], .t. ) - dd_SPOnOutScreen( spShots[ t ], "SHOT_OUTOFBOUND" ) - next + for t=1 to 10 + spShots[t] = dd_CreateSprite( sfShot, "Shot", 10, 20, 3, 100, .f., 240 ) + dd_SPSetSolid( spShots[ t ], .t. ) + dd_SPSetMasked( spShots[ t ], .t. ) + dd_SPOnOutScreen( spShots[ t ], "SHOT_OUTOFBOUND" ) + next - // Bunny.......... + // Bunny.......... - sfBunny = dd_CreateOffScreenBitmap(NIL,NIL) - dd_LoadBmpIntoSurface( sfBunny, "anima2.bmp", 0 , 0, 640, 480 ) - spBunny = dd_CreateSprite( sfBunny, "bunny",70,52 , 6, 101, .t., 240 ) + sfBunny = dd_CreateOffScreenBitmap(NIL,NIL) + dd_LoadBmpIntoSurface( sfBunny, "anima2.bmp", 0 , 0, 640, 480 ) + spBunny = dd_CreateSprite( sfBunny, "bunny",70,52 , 6, 101, .t., 240 ) - dd_SPSetMasked( spBunny, .t. ) - dd_SPSetXY( spBunny, 0, 420 ) - dd_SPOnFirstFrame( spBunny, "BUNNY_ONFIRSTFRAME" ) - dd_SPSetVisible( spBunny , .t. ) + dd_SPSetMasked( spBunny, .t. ) + dd_SPSetXY( spBunny, 0, 420 ) + dd_SPOnFirstFrame( spBunny, "BUNNY_ONFIRSTFRAME" ) + dd_SPSetVisible( spBunny , .t. ) - spBunnyLife = 4 + spBunnyLife = 4 - dd_StartWindow( m_hWnd ) + dd_StartWindow( m_hWnd ) - return +return //-------------------------------------------------------------// - function Brick_OnCollision( nMe, nCollided ) - lOk = .f. - for t=1 to 10 - if nCollided = spShots[t] - lOk = .t. - end if - next - if lOk - dd_SPSetVisible( nCollided, .f. ) - dd_SPSetVisible( nMe, .f. ) - end if - return +function Brick_OnCollision( nMe, nCollided ) + lOk = .f. + for t=1 to 10 + if nCollided = spShots[t] + lOk = .t. + end if + next + if lOk + dd_SPSetVisible( nCollided, .f. ) + dd_SPSetVisible( nMe, .f. ) + end if +return //-------------------------------------------------------------// - function Shot_OutOfBound( nShot ) - dd_SPSetVisible( nShot, .f. ) - return +function Shot_OutOfBound( nShot ) + dd_SPSetVisible( nShot, .f. ) +return //-------------------------------------------------------------// - function Bunny_OnFirstFrame( ) +function Bunny_OnFirstFrame( ) - if dd_isKeyPressed( 16 ) - plusVelo = 2 - else - plusVelo = 1 - end if + if dd_isKeyPressed( 16 ) + plusVelo = 2 + else + plusVelo = 1 + end if - dd_SPClearDirection( spBunny ) + dd_SPClearDirection( spBunny ) - if dd_isKeyPressed( 39 ) - dd_SPSetDirection( spBunny, 6, 8 * plusVelo , 0 ) - end if + if dd_isKeyPressed( 39 ) + dd_SPSetDirection( spBunny, 6, 8 * plusVelo , 0 ) + end if - if dd_isKeyPressed( 37 ) - dd_SPSetDirection( spBunny, 4, -8 * plusVelo , 0 ) - end if + if dd_isKeyPressed( 37 ) + dd_SPSetDirection( spBunny, 4, -8 * plusVelo , 0 ) + end if - return +return //-------------------------------------------------------------// - function ddOnRender() +function ddOnRender() - if dd_isKeyPressed( 32 ) - if spBunnyLife > 0 - dd_SPClearDirection( spShots[ nShotsActive ] ) - dd_SPSetDirection( spShots[nShotsActive] , 6 , 0 , (-15) ) + if dd_isKeyPressed( 32 ) + if spBunnyLife > 0 + dd_SPClearDirection( spShots[ nShotsActive ] ) + dd_SPSetDirection( spShots[nShotsActive] , 6 , 0 , (-15) ) - x = dd_SPGetX( spBunny ) - y = dd_SPGetY( spBunny ) + x = dd_SPGetX( spBunny ) + y = dd_SPGetY( spBunny ) - dd_SPSetXY( spShots[nShotsActive], x, y - 20 ) - dd_SPSetVisible( spShots[nShotsActive], .t. ) - nShotsActive += 1 - if nShotsActive > 10 - nShotsActive = 1 - end if - end if - end if - return + dd_SPSetXY( spShots[nShotsActive], x, y - 20 ) + dd_SPSetVisible( spShots[nShotsActive], .t. ) + nShotsActive += 1 + if nShotsActive > 10 + nShotsActive = 1 + end if + end if + end if +return -//-------------------------------------------------------------// \ No newline at end of file +//-------------------------------------------------------------// diff --git a/harbour/contrib/hbzlib/tests/bld_b32.bat b/harbour/contrib/hbzlib/tests/bld_b32.bat new file mode 100644 index 0000000000..99e4751b33 --- /dev/null +++ b/harbour/contrib/hbzlib/tests/bld_b32.bat @@ -0,0 +1,22 @@ +@echo off +rem +rem $Id$ +rem + +rem --------------------------------------------------------------- +rem This is a generic template file, if it doesn't fit your own needs +rem please DON'T MODIFY IT. +rem +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 --------------------------------------------------------------- + +set HB_BIN_INSTALL=..\..\..\bin +set HB_INC_INSTALL=..\..\..\include +set HB_LIB_INSTALL=..\..\..\lib + +set HB_ARCHITECTURE=w32 +set HB_COMPILER=bcc32 +set HB_USER_LIBS=hbzlib.lib zlib1.lib + +call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/contrib/hbzlib/tests/bld_vc.bat b/harbour/contrib/hbzlib/tests/bld_vc.bat new file mode 100644 index 0000000000..0250b048d9 --- /dev/null +++ b/harbour/contrib/hbzlib/tests/bld_vc.bat @@ -0,0 +1,22 @@ +@echo off +rem +rem $Id$ +rem + +rem --------------------------------------------------------------- +rem This is a generic template file, if it doesn't fit your own needs +rem please DON'T MODIFY IT. +rem +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 --------------------------------------------------------------- + +set HB_BIN_INSTALL=..\..\..\bin +set HB_INC_INSTALL=..\..\..\include +set HB_LIB_INSTALL=..\..\..\lib + +set HB_ARCHITECTURE=w32 +set HB_COMPILER=msvc +set HB_USER_LIBS=hbzlib.lib zlib1.lib + +call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/contrib/rddado/tests/bld_b32.bat b/harbour/contrib/rddado/tests/bld_b32.bat new file mode 100644 index 0000000000..16d3834407 --- /dev/null +++ b/harbour/contrib/rddado/tests/bld_b32.bat @@ -0,0 +1,22 @@ +@echo off +rem +rem $Id$ +rem + +rem --------------------------------------------------------------- +rem This is a generic template file, if it doesn't fit your own needs +rem please DON'T MODIFY IT. +rem +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 --------------------------------------------------------------- + +set HB_BIN_INSTALL=..\..\..\bin +set HB_INC_INSTALL=..\..\..\include +set HB_LIB_INSTALL=..\..\..\lib + +set HB_ARCHITECTURE=w32 +set HB_COMPILER=bcc32 +set HB_USER_LIBS=rddado.lib hbusrrdd.lib hbw32.lib + +call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/contrib/rddado/tests/bld_vc.bat b/harbour/contrib/rddado/tests/bld_vc.bat new file mode 100644 index 0000000000..8c9afeb0d7 --- /dev/null +++ b/harbour/contrib/rddado/tests/bld_vc.bat @@ -0,0 +1,22 @@ +@echo off +rem +rem $Id$ +rem + +rem --------------------------------------------------------------- +rem This is a generic template file, if it doesn't fit your own needs +rem please DON'T MODIFY IT. +rem +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 --------------------------------------------------------------- + +set HB_BIN_INSTALL=..\..\..\bin +set HB_INC_INSTALL=..\..\..\include +set HB_LIB_INSTALL=..\..\..\lib + +set HB_ARCHITECTURE=w32 +set HB_COMPILER=msvc +set HB_USER_LIBS=rddado.lib hbusrrdd.lib hbw32.lib + +call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/contrib/rddads/ads1.c b/harbour/contrib/rddads/ads1.c index 422277408f..2bfe2c7d68 100644 --- a/harbour/contrib/rddads/ads1.c +++ b/harbour/contrib/rddads/ads1.c @@ -2704,7 +2704,7 @@ static ERRCODE adsCreate( ADSAREAP pArea, LPDBOPENINFO pCreateInfo ) uRetVal = AdsCreateTable( hConnection, pCreateInfo->abName, pCreateInfo->atomAlias, pArea->iFileType, hb_ads_iCharType, hb_ads_iLockType, hb_ads_iCheckRights, - hb_setGetNL( HB_SET_MBLOCKSIZE ), + hb_setGetNI( HB_SET_MBLOCKSIZE ), ucfieldDefs, &hTable ); hb_xfree( ucfieldDefs ); diff --git a/harbour/contrib/rddads/tests/bld_b32.bat b/harbour/contrib/rddads/tests/bld_b32.bat new file mode 100644 index 0000000000..1ccc7e860b --- /dev/null +++ b/harbour/contrib/rddads/tests/bld_b32.bat @@ -0,0 +1,22 @@ +@echo off +rem +rem $Id$ +rem + +rem --------------------------------------------------------------- +rem This is a generic template file, if it doesn't fit your own needs +rem please DON'T MODIFY IT. +rem +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 --------------------------------------------------------------- + +set HB_BIN_INSTALL=..\..\..\bin +set HB_INC_INSTALL=..\..\..\include +set HB_LIB_INSTALL=..\..\..\lib + +set HB_ARCHITECTURE=w32 +set HB_COMPILER=bcc32 +set HB_USER_LIBS=rddads.lib ace32.lib + +call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/contrib/rddads/tests/bld_vc.bat b/harbour/contrib/rddads/tests/bld_vc.bat new file mode 100644 index 0000000000..9a60dc9852 --- /dev/null +++ b/harbour/contrib/rddads/tests/bld_vc.bat @@ -0,0 +1,22 @@ +@echo off +rem +rem $Id$ +rem + +rem --------------------------------------------------------------- +rem This is a generic template file, if it doesn't fit your own needs +rem please DON'T MODIFY IT. +rem +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 --------------------------------------------------------------- + +set HB_BIN_INSTALL=..\..\..\bin +set HB_INC_INSTALL=..\..\..\include +set HB_LIB_INSTALL=..\..\..\lib + +set HB_ARCHITECTURE=w32 +set HB_COMPILER=msvc +set HB_USER_LIBS=rddads.lib ace32.lib + +call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/contrib/rddads/tests/testmg.prg b/harbour/contrib/rddads/tests/testmg.prg index a0202fc6b8..b544de9ea6 100644 --- a/harbour/contrib/rddads/tests/testmg.prg +++ b/harbour/contrib/rddads/tests/testmg.prg @@ -59,7 +59,7 @@ function Main() local i - REQUEST _ADS + REQUEST ADS rddRegister( "ADS", 1 ) rddsetdefault( "ADS" ) SET SERVER LOCAL // REMOTE