From e5a5dc08015404843511281f7067ef4920bf74f2 Mon Sep 17 00:00:00 2001 From: "Alexander S.Kresin" Date: Sat, 30 Sep 2000 14:23:41 +0000 Subject: [PATCH] 2000-09-30 09:50 GMT+3 Alexander Kresin --- harbour/ChangeLog | 7 +++++++ harbour/contrib/mysql/make_b32.bat | 26 +++++++++++++++++++++++++ harbour/contrib/mysql/makefile.bc | 31 ++++++++++++++++++++++++++++++ harbour/contrib/mysql/mysql.c | 3 +++ 4 files changed, 67 insertions(+) create mode 100644 harbour/contrib/mysql/make_b32.bat create mode 100644 harbour/contrib/mysql/makefile.bc diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 8bee196fcc..b842232f53 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,10 @@ +2000-09-30 09:50 GMT+3 Alexander Kresin + * contrib/mysql/mysql.c + * minor change for support of Win32 + + contrib/mysql/make_b32.bat + + contrib/mysql/makefile.bc + + makefiles added for Borland C + 2000-09-30 13:28 GMT+2 Maurilio Longo *source/rtl/tbrowse.prg * moved browse init to New() method. TBrowseNew() function is now empty and simply returns diff --git a/harbour/contrib/mysql/make_b32.bat b/harbour/contrib/mysql/make_b32.bat new file mode 100644 index 0000000000..de9ab321da --- /dev/null +++ b/harbour/contrib/mysql/make_b32.bat @@ -0,0 +1,26 @@ +@echo off + +if "%1" == "clean" goto CLEAN +if "%1" == "CLEAN" goto CLEAN + +:BUILD + + make -fmakefile.bc %1 %2 %3 > make_b32.log + if errorlevel 1 goto BUILD_ERR + +:BUILD_OK + + copy ..\..\lib\b32\mysql.lib ..\..\lib\*.* > nul + goto EXIT + +:BUILD_ERR + + notepad make_b32.log + goto EXIT + +:CLEAN + + goto EXIT + +:EXIT + diff --git a/harbour/contrib/mysql/makefile.bc b/harbour/contrib/mysql/makefile.bc new file mode 100644 index 0000000000..26db7cd253 --- /dev/null +++ b/harbour/contrib/mysql/makefile.bc @@ -0,0 +1,31 @@ +# +# $Id$ +# + +# makefile for Borland C/C++ 32 bits +# Building of mysql.lib - Harbour API to mySQL + +INCLUDE_DIR = ..\..\include + +BIN_DIR = ..\..\bin\b32 +OBJ_DIR = ..\..\obj\b32 +LIB_DIR = ..\..\lib\b32 + +$(LIB_DIR)\mysql.lib : \ + $(OBJ_DIR)\tmysql.obj \ + $(OBJ_DIR)\tsqlbrw.obj \ + $(OBJ_DIR)\mysql.obj + +$(OBJ_DIR)\tmysql.c : tmysql.prg +$(OBJ_DIR)\tmysql.obj : $(OBJ_DIR)\tmysql.c +$(OBJ_DIR)\tsqlbrw.c : tsqlbrw.prg +$(OBJ_DIR)\tsqlbrw.obj : $(OBJ_DIR)\tsqlbrw.c +$(OBJ_DIR)\mysql.obj : mysql.c + +.c.obj: + bcc32 $(CLIBFLAGS) -c -O2 -I$(INCLUDE_DIR) -DHB_OS_WIN_32_USED -o$@ $< + tlib $(LIB_DIR)\mysql.lib -+$@,, + +.prg.c: + $(BIN_DIR)\harbour.exe $< -q0 -w -es2 -gc0 -n -i$(INCLUDE_DIR) -o$@ + diff --git a/harbour/contrib/mysql/mysql.c b/harbour/contrib/mysql/mysql.c index 8310d44454..7f217756b7 100644 --- a/harbour/contrib/mysql/mysql.c +++ b/harbour/contrib/mysql/mysql.c @@ -37,6 +37,9 @@ /* NOTE: we need this to prevent base types redefinition */ #define _CLIPDEFS_H +#if defined(HB_OS_WIN_32_USED) + #include +#endif #include "extend.api" #include "item.api"