2007-11-10 05:50 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* make_b32.bat
+ make_b32.mak
- makefile.bc
* make_gcc.sh
+ make_gcc.mak
- makefile.gc
* make_vc.bat
+ make_vc.mak
- makefile.vc
* common.mak
- contrib/maketpl.b32
+ contrib/mtpl_b32.mak
- contrib/maketpl.vc
+ contrib/mtpl_vc.mak
- contrib/maketpl.mak
+ contrib/mtpl.mak
* contrib/libct/make_b32.bat
* contrib/libct/make_vc.bat
% Makefile name cleanup, batch file synchronization,
setting name cleanup. Some minor fixes.
Now all non-GNU makefiles have the .mak extension.
- contrib/xhb/makefile.vc
* contrib/xhb/make_b32.bat
+ contrib/xhb/common.mak
- contrib/xhb/makefile.bc
* contrib/xhb/make_vc.bat
- contrib/libmisc/makefile.vc
* contrib/libmisc/make_b32.bat
+ contrib/libmisc/common.mak
- contrib/libmisc/makefile.bc
* contrib/libmisc/make_vc.bat
+ contrib/apollo/common.mak
- contrib/apollo/makefile.bc
* contrib/apollo/make_b32.bat
+ contrib/apollo/make_vc.bat
- contrib/htmllib/makefile.vc
* contrib/htmllib/make_b32.bat
+ contrib/htmllib/common.mak
- contrib/htmllib/Makefile.bc
* contrib/htmllib/make_vc.bat
* contrib/libct/make_b32.bat
* contrib/libct/make_vc.bat
- contrib/libgt/makefile.vc
* contrib/libgt/make_b32.bat
+ contrib/libgt/common.mak
- contrib/libgt/makefile.bc
* contrib/libgt/make_vc.bat
* contrib/libnf/make_b32.bat
- contrib/libnf/makefile.vc
* contrib/libnf/make_vc.bat
+ contrib/libnf/common.mak
- contrib/libnf/makefile.bc
* contrib/gd/make_b32.bat
+ contrib/gd/common.mak
- contrib/gd/makefile.bc
+ contrib/gd/make_vc.bat
- contrib/tip/makefile.vc
* contrib/tip/make_b32.bat
+ contrib/tip/common.mak
- contrib/tip/makefile.bc
* contrib/tip/make_vc.bat
+ contrib/adordd/common.mak
- contrib/adordd/makefile.bc
* contrib/adordd/make_b32.bat
+ contrib/adordd/make_vc.bat
- contrib/rdd_ads/makefile.vc
* contrib/rdd_ads/make_b32.bat
+ contrib/rdd_ads/common.mak
- contrib/rdd_ads/makefile.bc
* contrib/rdd_ads/make_vc.bat
+ contrib/btree/common.mak
- contrib/btree/makefile.bc
* contrib/btree/make_b32.bat
+ contrib/btree/make_vc.bat
+ contrib/directx/common.mak
- contrib/directx/makefile.bc
- contrib/directx/makefile.vc
* contrib/directx/make_b32.bat
* contrib/directx/make_vc.bat
+ contrib/win32/common.mak
- contrib/win32/makefile.bc
- contrib/win32/makefile.vc
* contrib/win32/make_b32.bat
* contrib/win32/make_vc.bat
+ contrib/bmdbfcdx/common.mak
- contrib/bmdbfcdx/makefile.bc
* contrib/bmdbfcdx/make_b32.bat
+ contrib/bmdbfcdx/make_vc.bat
- contrib/samples/makefile.vc
* contrib/samples/make_b32.bat
+ contrib/samples/common.mak
- contrib/samples/makefile.bc
* contrib/samples/make_vc.bat
* contrib/mysql/common.mak
- contrib/mysql/makefile.bc
* contrib/mysql/make_b32.bat
+ contrib/mysql/make_vc.bat
* contrib/pgsql/common.mak
- contrib/pgsql/makefile.bc
* contrib/pgsql/make_b32.bat
+ contrib/pgsql/make_vc.bat
* Changed most libs to use the generic non-GNU makefiles.
+ Added support for MSVC for all above libs.
; directx won't build under MSVC with an error.
+ Added "implib" for rdd_ads. TOFIX: Doesn't work for MSVC.
; TOFIX: I couldn't compile pgsql using latest 8.2.5.
* contrib/samples/gauge.c
! Fixed MSVC warning.
+ odbc/test
+ odbc/test/bld_b32.bat
+ odbc/test/harbour.mdb
+ odbc/test/odbcdemo.prg
+ odbc/test/browodbc.prg
+ odbc/test/odbccall.prg
+ odbc/test/testodbc.prg
- odbc/bld_b32.bat
- odbc/harbour.mdb
- odbc/odbcdemo.prg
- odbc/browodbc.prg
- odbc/odbccall.prg
- odbc/testodbc.prg
- odbc/bldodbc.bat
+ odbc/make_b32.bat
+ odbc/make_vc.bat
- odbc/hbodbc.b32
+ odbc/common.mak
* Moved test functions to test fir.
! Fixed bld_b32.bat
! Renamed non-GNU BC make files to be in sync with the rest of contribs.
; TOFIX: There are some warnings under MSVC.
; TOFIX: .def -> .lib conversions fails under MSVC.
- contrib/ole
- contrib/delphi
- contrib/hb_struc
- contrib/dot
- contrib/tprepro
- Removed obsolete, incomplete or non-working contribs.
This commit is contained in:
18
harbour/contrib/pgsql/common.mak
Normal file
18
harbour/contrib/pgsql/common.mak
Normal file
@@ -0,0 +1,18 @@
|
||||
#
|
||||
# $Id$
|
||||
#
|
||||
|
||||
LIBNAME = libhbpg
|
||||
|
||||
LIB_PATH = $(LIB_DIR)\$(LIBNAME)$(LIBEXT)
|
||||
|
||||
#
|
||||
# LIB rules
|
||||
#
|
||||
|
||||
LIB_OBJS = \
|
||||
$(OBJ_DIR)\tpostgre.obj \
|
||||
$(OBJ_DIR)\postgres.obj
|
||||
|
||||
all: \
|
||||
$(LIB_PATH) \
|
||||
@@ -1,30 +1,62 @@
|
||||
@echo off
|
||||
rem
|
||||
rem $Id$
|
||||
rem
|
||||
|
||||
rem ---------------------------------------------------------------
|
||||
rem IMPORTANT: You'll need MySQL sources and this envvar
|
||||
rem to be set to successfully build this library:
|
||||
rem set C_USR=-IC:\postgresql-8.2.5\src\include
|
||||
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
|
||||
rem Set any of the below settings to customize your build process:
|
||||
rem set HB_MAKE_PROGRAM=
|
||||
rem set HB_MAKE_FLAGS=
|
||||
rem ---------------------------------------------------------------
|
||||
|
||||
if "%HB_CC_NAME%" == "" set HB_CC_NAME=b32
|
||||
if "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM=make.exe
|
||||
set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak
|
||||
|
||||
set C_USR=%C_USR% -DHB_OS_WIN_32_USED -DPG_DIAG_INTERNAL_POSITION
|
||||
|
||||
rem ---------------------------------------------------------------
|
||||
|
||||
if "%1" == "clean" goto CLEAN
|
||||
if "%1" == "CLEAN" goto CLEAN
|
||||
|
||||
if "%1" == "install" goto INSTALL
|
||||
if "%1" == "INSTALL" goto INSTALL
|
||||
|
||||
:BUILD
|
||||
|
||||
make -fmakefile.bc %1 %2 %3 > make_b32.log
|
||||
if errorlevel 1 goto BUILD_ERR
|
||||
|
||||
:BUILD_OK
|
||||
|
||||
copy ..\..\lib\b32\libhbpg.lib ..\..\lib\*.* > nul
|
||||
goto EXIT
|
||||
|
||||
:BUILD_ERR
|
||||
|
||||
notepad make_b32.log
|
||||
%HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% %1 %2 %3 > make_%HB_CC_NAME%.log
|
||||
if errorlevel 1 notepad make_%HB_CC_NAME%.log
|
||||
goto EXIT
|
||||
|
||||
:CLEAN
|
||||
|
||||
if exist ..\..\lib\b32\libhbpg.lib del ..\..\lib\b32\libhbpg.lib
|
||||
if exist ..\..\lib\b32\libhbpg.bak del ..\..\lib\b32\libhbpg.bak
|
||||
if exist ..\..\obj\b32\postgres.obj del ..\..\obj\b32\postgres.obj
|
||||
if exist ..\..\obj\b32\TPostgres.c del ..\..\obj\b32\TPostgres.c
|
||||
if exist ..\..\obj\b32\TPostgres.obj del ..\..\obj\b32\TPostgres.obj
|
||||
%HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% CLEAN > make_%HB_CC_NAME%.log
|
||||
if exist make_%HB_CC_NAME%.log del make_%HB_CC_NAME%.log > nul
|
||||
if exist inst_%HB_CC_NAME%.log del inst_%HB_CC_NAME%.log > nul
|
||||
goto EXIT
|
||||
|
||||
:INSTALL
|
||||
|
||||
if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\..
|
||||
|
||||
if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin
|
||||
if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include
|
||||
if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib
|
||||
|
||||
%HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul
|
||||
goto EXIT
|
||||
|
||||
:EXIT
|
||||
|
||||
62
harbour/contrib/pgsql/make_vc.bat
Normal file
62
harbour/contrib/pgsql/make_vc.bat
Normal file
@@ -0,0 +1,62 @@
|
||||
@echo off
|
||||
rem
|
||||
rem $Id$
|
||||
rem
|
||||
|
||||
rem ---------------------------------------------------------------
|
||||
rem IMPORTANT: You'll need MySQL sources and this envvar
|
||||
rem to be set to successfully build this library:
|
||||
rem set C_USR=-IC:\postgresql-8.2.5\src\include
|
||||
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
|
||||
rem Set any of the below settings to customize your build process:
|
||||
rem set HB_MAKE_PROGRAM=
|
||||
rem set HB_MAKE_FLAGS=
|
||||
rem ---------------------------------------------------------------
|
||||
|
||||
if "%HB_CC_NAME%" == "" set HB_CC_NAME=vc
|
||||
if "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM=nmake.exe
|
||||
set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak
|
||||
|
||||
set C_USR=%C_USR% -DHB_OS_WIN_32_USED -DPG_DIAG_INTERNAL_POSITION
|
||||
|
||||
rem ---------------------------------------------------------------
|
||||
|
||||
if "%1" == "clean" goto CLEAN
|
||||
if "%1" == "CLEAN" goto CLEAN
|
||||
|
||||
if "%1" == "install" goto INSTALL
|
||||
if "%1" == "INSTALL" goto INSTALL
|
||||
|
||||
:BUILD
|
||||
|
||||
%HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% %1 %2 %3 > make_%HB_CC_NAME%.log
|
||||
if errorlevel 1 notepad make_%HB_CC_NAME%.log
|
||||
goto EXIT
|
||||
|
||||
:CLEAN
|
||||
|
||||
%HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% CLEAN > make_%HB_CC_NAME%.log
|
||||
if exist make_%HB_CC_NAME%.log del make_%HB_CC_NAME%.log > nul
|
||||
if exist inst_%HB_CC_NAME%.log del inst_%HB_CC_NAME%.log > nul
|
||||
goto EXIT
|
||||
|
||||
:INSTALL
|
||||
|
||||
if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\..
|
||||
|
||||
if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin
|
||||
if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include
|
||||
if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib
|
||||
|
||||
%HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul
|
||||
goto EXIT
|
||||
|
||||
:EXIT
|
||||
@@ -1,31 +0,0 @@
|
||||
|
||||
# makefile for Borland C/C++ 32 bits
|
||||
# Building of libhbpg.lib - Harbour API to postgres
|
||||
|
||||
# Postgresql running under Cygwin/Windows, unmark the line bellow to compile.
|
||||
# PG_DIR = ..\..\..\cygwin\usr\src\postgresql-7.4.5
|
||||
|
||||
PG_DIR = C:\PostgreSQL
|
||||
|
||||
INCLUDE_DIR = ..\..\include
|
||||
INCLUDE_PQ = $(PG_DIR)\include
|
||||
|
||||
BIN_DIR = c:\xharbour\bin
|
||||
OBJ_DIR = ..\..\obj\b32
|
||||
LIB_DIR = ..\..\lib\b32
|
||||
|
||||
$(LIB_DIR)\libhbpg.lib : \
|
||||
$(OBJ_DIR)\TPostgres.obj \
|
||||
$(OBJ_DIR)\postgres.obj
|
||||
|
||||
$(OBJ_DIR)\TPostgres.c : TPostgres.prg
|
||||
$(OBJ_DIR)\TPostgres.obj : $(OBJ_DIR)\TPostgres.c
|
||||
$(OBJ_DIR)\postgres.obj : postgres.c
|
||||
|
||||
.c.obj:
|
||||
bcc32 $(CLIBFLAGS) -c -O2 -I$(INCLUDE_DIR) -I$(INCLUDE_PQ) -DHB_OS_WIN_32_USED -DPG_DIAG_INTERNAL_POSITION -o$@ $<
|
||||
tlib $(LIB_DIR)\libhbpg.lib -+$@,,
|
||||
|
||||
.prg.c:
|
||||
$(BIN_DIR)\harbour.exe $< -q0 -a -w -es2 -gc0 -n -i$(INCLUDE_DIR) -o$@
|
||||
|
||||
Reference in New Issue
Block a user