fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

20000313-13:20 GMT+1 Victor Szakats <info@szelvesz.hu>

Browse Source
This commit is contained in:
Viktor Szakats
2000-03-13 12:17:42 +00:00
parent ecebc826a1
commit 8b2a589dc2
4 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
harbour/ChangeLog
View File

@@ -1,3 +1,12 @@
20000313-13:20 GMT+1 Victor Szakats <info@szelvesz.hu>
* contrib/rdd_ads/adsfunc.c
! Two casts added for MSVC.
* contrib/rdd_ads/make_vc.bat
+ CVS ID added.
* contrib/rdd_ads/makefile.vc
% Streamlines and standardized. (use standard dir specs, create .c and
.obj files in central obj dir.)
20000313-12:40 GMT+1 Victor Szakats <info@szelvesz.hu>
* source/rtl/inkey.c
! Fixed to work with STD_GTAPI on Win32.

7
harbour/contrib/rdd_ads/adsfunc.c
View File

@@ -314,7 +314,7 @@ HARBOUR HB_ADSGETAOF( void )
{
ulRetVal = AdsGetAOF( pArea->hTable, pucFilter, &pusLen );
if ( ulRetVal == AE_SUCCESS )
hb_retc( pucFilter );
hb_retc( ( char * ) pucFilter );
else
hb_ret();
}
@@ -350,7 +350,7 @@ HARBOUR HB_ADSGETAOFNOOPT( void )
if( pArea )
{
AdsGetAOFOptLevel( pArea->hTable, &pusOptLevel, pucNonOpt, &pusLen );
hb_retc( pucNonOpt );
hb_retc( ( char * ) pucNonOpt );
}
else
hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, "ADSGETAOFNOOPT" );
@@ -412,4 +412,5 @@ HARBOUR HB_ADSSETAOF( void )
else
hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, "ADSSETAOF" );
}
}

5
harbour/contrib/rdd_ads/make_vc.bat
View File

@@ -1,4 +1,9 @@
@echo off
rem
rem $Id$
rem
:BUILD
nmake /f makefile.vc %1 %2 %3 > make_vc.log
if errorlevel 1 goto BUILD_ERR

28
harbour/contrib/rdd_ads/makefile.vc
View File

@@ -7,13 +7,16 @@
#
INCLUDE_DIR=..\..\include
OBJ_DIR=..\..\obj\vc
LIB_DIR=..\..\lib\vc
BIN_DIR=..\..\bin\vc
#
# C compiler definition and C flags. These should never have to change.
#
CC=cl
CFLAGS=-W1 -nologo -I$(INCLUDE_DIR) -D_Windows -DHARBOUR_USE_WIN_GTAPI
CFLAGS=-W1 -nologo -I$(INCLUDE_DIR) -D_Windows
CLIBFLAGS=$(CFLAGS) -c /TP
CLIBFLAGSDEBUG=$(CFLAGS) -c -Zi /TP
@@ -21,8 +24,8 @@ CLIBFLAGSDEBUG=$(CFLAGS) -c -Zi /TP
# Macros to access our library names
#
ADS_LIB=..\..\lib\vc\rddads.lib
HARBOUR_EXE=..\..\bin\harbour.exe
ADS_LIB=$(LIB_DIR)\rddads.lib
HARBOUR_EXE=$(BIN_DIR)\harbour.exe
HARBOURFLAGS=-iinclude -n -q0 -w -es2 -gc0
@@ -31,9 +34,9 @@ HARBOURFLAGS=-iinclude -n -q0 -w -es2 -gc0
#
ADS_LIB_OBJS = \
ads0.obj \
ads1.obj \
adsfunc.obj
$(OBJ_DIR)\ads0.obj \
$(OBJ_DIR)\ads1.obj \
$(OBJ_DIR)\adsfunc.obj
#
# Our default target
@@ -48,20 +51,17 @@ all: $(ADS_LIB)
$(ADS_LIB) : $(ADS_LIB_OBJS)
lib /OUT:$(ADS_LIB) $(ADS_LIB_OBJS)
#
# ADS dependencies
#
ads0.c : ads0.prg
$(HARBOUR_EXE) $** $(HARBOURFLAGS) -o$@
$(OBJ_DIR)\ads0.obj : ads0.prg
$(HARBOUR_EXE) $** $(HARBOURFLAGS) -o$*.c
$(CC) $(CLIBFLAGS) -Fo$@ $*.c
ads0.obj : ads0.c
$(OBJ_DIR)\adsfunc.obj : adsfunc.c
$(CC) $(CLIBFLAGS) -Fo$@ $**
adsfunc.obj : adsfunc.c
$(CC) $(CLIBFLAGS) -Fo$@ $**
ads1.obj : ads1.c
$(OBJ_DIR)\ads1.obj : ads1.c
$(CC) $(CLIBFLAGS) -Fo$@ $**