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

2007-11-27 01:12 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* make_b32.mak
     ! Removed -l flag from .dll creation to be in sync with the 
       rest of Harbour.

   * contrib/mtpl_b32.mak
   * contrib/mtpl_vc.mak
     ! Synced with core flags (VC mainly).

   * contrib/freeimage/fi_winfu.c
   * contrib/freeimage/fi_wrp.c
   * contrib/freeimage/make_b32.bat
   * contrib/freeimage/make_vc.bat
   * contrib/firebird/firebird.c
   * contrib/firebird/make_b32.bat
   * contrib/firebird/make_vc.bat
   * contrib/pdflib/make_b32.bat
   * contrib/pdflib/make_vc.bat
   * contrib/pdflib/pdfhbdoc.c
   * contrib/pgsql/postgres.c
   * contrib/pgsql/make_b32.bat
   * contrib/pgsql/make_vc.bat
   * contrib/mysql/mysql.c
   * contrib/mysql/make_b32.bat
   * contrib/mysql/make_vc.bat
     ! Some extra lib-level custom C flags fixed to be 
       in sync with rest of Harbour. (mainly HB_OS_WIN_32_USED)

   * contrib/hbzlib/make_b32.bat
   * contrib/hbzlib/make_vc.bat
     ! hbziparch extra switches removed (all of them). 
       This made surface a whole lot of warnings.
       If someone wants to create a .dll from this, 
       -DZLIB_DLL will need to be added to C_USR.
       -a8 switch was also removed from the BCC build.
       If someone know that it's necessary, pls shout.
This commit is contained in:
Viktor Szakats
2007-11-27 00:26:23 +00:00
parent dbf69c2c15
commit 3307b6f37e
22 changed files with 74 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
harbour/ChangeLog
View File

@@ -8,6 +8,43 @@
2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2007-11-27 01:12 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* make_b32.mak
! Removed -l flag from .dll creation to be in sync with the
rest of Harbour.
* contrib/mtpl_b32.mak
* contrib/mtpl_vc.mak
! Synced with core flags (VC mainly).
* contrib/freeimage/fi_winfu.c
* contrib/freeimage/fi_wrp.c
* contrib/freeimage/make_b32.bat
* contrib/freeimage/make_vc.bat
* contrib/firebird/firebird.c
* contrib/firebird/make_b32.bat
* contrib/firebird/make_vc.bat
* contrib/pdflib/make_b32.bat
* contrib/pdflib/make_vc.bat
* contrib/pdflib/pdfhbdoc.c
* contrib/pgsql/postgres.c
* contrib/pgsql/make_b32.bat
* contrib/pgsql/make_vc.bat
* contrib/mysql/mysql.c
* contrib/mysql/make_b32.bat
* contrib/mysql/make_vc.bat
! Some extra lib-level custom C flags fixed to be
in sync with rest of Harbour. (mainly HB_OS_WIN_32_USED)
* contrib/hbzlib/make_b32.bat
* contrib/hbzlib/make_vc.bat
! hbziparch extra switches removed (all of them).
This made surface a whole lot of warnings.
If someone wants to create a .dll from this,
-DZLIB_DLL will need to be added to C_USR.
-a8 switch was also removed from the BCC build.
If someone know that it's necessary, pls shout.
2007-11-27 00:12 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/bin/pack_src.sh
* updated for recent file name modifications

6
harbour/contrib/firebird/firebird.c
View File

@@ -53,15 +53,15 @@
*/
#define _CLIPDEFS_H
#if defined(HB_OS_WIN_32_USED)
#include <windows.h>
#endif
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <time.h>
#define HB_OS_WIN_32_USED
#include "hbapi.h"
#include "extend.api"
#include "item.api"
#include "hbapiitm.h"

2
harbour/contrib/firebird/make_b32.bat
View File

@@ -14,7 +14,7 @@ goto POST_EXIT
:DIR_OK
set CFLAGS=-I%FIREBIRD_DIR%\include -DHB_OS_WIN_32_USED
set CFLAGS=-I%FIREBIRD_DIR%\include
set HB_DLL_NAME=fbclient
set HB_DLL_DIR=%FIREBIRD_DIR%\bin

2
harbour/contrib/firebird/make_vc.bat
View File

@@ -14,7 +14,7 @@ goto POST_EXIT
:DIR_OK
set CFLAGS=-I%FIREBIRD_DIR%\include -DHB_OS_WIN_32_USED
set CFLAGS=-I%FIREBIRD_DIR%\include
set HB_DLL_NAME=fbclient
set HB_DLL_DIR=%FIREBIRD_DIR%\bin

5
harbour/contrib/freeimage/fi_winfu.c
View File

@@ -58,9 +58,8 @@
/* NOTE: we need this to prevent base types redefinition */
#define _CLIPDEFS_H
#if defined(HB_OS_WIN_32_USED)
#include <windows.h>
#endif
#define HB_OS_WIN_32_USED
#include "hbapi.h"
#include "hbapiitm.h"

2
harbour/contrib/freeimage/fi_wrp.c
View File

@@ -53,6 +53,8 @@
/* NOTE: we need this to prevent base types redefinition */
#define _CLIPDEFS_H
#define HB_OS_WIN_32_USED
#include "hbapi.h"
#include "hbapiitm.h"
#include "hbstack.h"

2
harbour/contrib/freeimage/make_b32.bat
View File

@@ -15,7 +15,7 @@ goto POST_EXIT
:DIR_OK
set CFLAGS=-I%FREEIMAGE_DIR%\source -DHB_OS_WIN_32_USED
set CFLAGS=-I%FREEIMAGE_DIR%\source
set HB_DLL_NAME=FreeImage
set HB_DLL_DIR=%FREEIMAGE_DIR%\Dist

2
harbour/contrib/freeimage/make_vc.bat
View File

@@ -15,7 +15,7 @@ goto POST_EXIT
:DIR_OK
set CFLAGS=-I%FREEIMAGE_DIR%\source -DHB_OS_WIN_32_USED
set CFLAGS=-I%FREEIMAGE_DIR%\source
set HB_DLL_NAME=FreeImage
set HB_DLL_DIR=%FREEIMAGE_DIR%\Dist

2
harbour/contrib/hbzlib/make_b32.bat
View File

@@ -3,6 +3,6 @@ rem
rem $Id$
rem
set CFLAGS=-Iinclude -DZLIB_DLL;WIN32;ASSERT -vi -Ve -6 -R- -H- -5 -OS -w- -X- -a8 -b -k-
set CFLAGS=-Iinclude
call ..\mtpl_b32.bat %1 %2 %3 %4 %5 %6 %7 %8 %9

2
harbour/contrib/hbzlib/make_vc.bat
View File

@@ -3,6 +3,6 @@ rem
rem $Id$
rem
set CFLAGS=-Iinclude -DZLIB_DLL;WIN32;ASSERT
set CFLAGS=-Iinclude
call ..\mtpl_vc.bat %1 %2 %3 %4 %5 %6 %7 %8 %9

2
harbour/contrib/mtpl_b32.mak
View File

@@ -100,7 +100,7 @@ CFLAGS = -O2 $(CFLAGS)
!endif
CFLAGS = -I$(INCLUDE_DIR) -d $(C_USR) $(CFLAGS)
CLIBFLAGS = -c $(CFLAGS) $(CLIBFLAGS)
CLIBFLAGS = -c -q $(CFLAGS) $(CLIBFLAGS)
CLIBFLAGSDEBUG = -v $(CLIBFLAGS)
HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w2 -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS)
LDFLAGS = $(LDFLAGS)

9
harbour/contrib/mtpl_vc.mak
View File

@@ -92,7 +92,14 @@ MKLIB = lib.exe
#**********************************************************
CFLAGS = -I$(INCLUDE_DIR) -W3 -nologo $(C_USR) $(CFLAGS)
# C Compiler Flags
!if $(HB_VISUALC_VER) >= 80
CFLAGS_VER = -Ot2b1 -EHs-c- -FD -Gs -D_CRT_SECURE_NO_DEPRECATE
!else
CFLAGS_VER = -Ogt2yb1p -GX- -G6 -YX -FD -Gs
!endif
CFLAGS = -I$(INCLUDE_DIR) $(CFLAGS_VER) -W3 -nologo -D__WINDOWS__ -DWIN32 -D__WIN32__ $(C_USR) $(CFLAGS)
CLIBFLAGS = -c $(CFLAGS) $(CLIBFLAGS)
CLIBFLAGSDEBUG = -Zi $(CLIBFLAGS)
HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w2 -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS)

2
harbour/contrib/mysql/make_b32.bat
View File

@@ -14,7 +14,7 @@ goto POST_EXIT
:DIR_OK
set CFLAGS=-I%MYSQL_DIR%\include -DHB_OS_WIN_32_USED
set CFLAGS=-I%MYSQL_DIR%\include
set HB_DLL_NAME=libmySQL
set HB_DLL_DIR=%MYSQL_DIR%\bin

2
harbour/contrib/mysql/make_vc.bat
View File

@@ -14,7 +14,7 @@ goto POST_EXIT
:DIR_OK
set CFLAGS=-I%MYSQL_DIR%\include -DHB_OS_WIN_32_USED
set CFLAGS=-I%MYSQL_DIR%\include
set HB_DLL_NAME=libmySQL
set HB_DLL_DIR=%MYSQL_DIR%\bin

3
harbour/contrib/mysql/mysql.c
View File

@@ -61,6 +61,9 @@
*
*/
#ifdef __WIN32__
#define HB_OS_WIN_32_USED
#endif
/* NOTE: we need this to prevent base types redefinition */
#define _CLIPDEFS_H

2
harbour/contrib/pdflib/make_b32.bat
View File

@@ -14,6 +14,6 @@ exit 1
:DIR_OK
set CFLAGS=-I%PDFLIB_DIR%\src\pdflib -DHB_OS_WIN_32_USED
set CFLAGS=-I%PDFLIB_DIR%\src\pdflib
call ..\mtpl_b32.bat %1 %2 %3 %4 %5 %6 %7 %8 %9

2
harbour/contrib/pdflib/make_vc.bat
View File

@@ -14,6 +14,6 @@ exit 1
:DIR_OK
set CFLAGS=-I%PDFLIB_DIR%\src\pdflib -DHB_OS_WIN_32_USED
set CFLAGS=-I%PDFLIB_DIR%\src\pdflib
call ..\mtpl_vc.bat %1 %2 %3 %4 %5 %6 %7 %8 %9

1
harbour/contrib/pdflib/pdfhbdoc.c
View File

@@ -50,6 +50,7 @@
*
*/
#define HB_OS_WIN_32_USED
#include <hbapi.h>
#include <hbapiitm.h>

2
harbour/contrib/pgsql/make_b32.bat
View File

@@ -14,7 +14,7 @@ goto POST_EXIT
:DIR_OK
set CFLAGS=-I%PGSQL_DIR%\include -DHB_OS_WIN_32_USED
set CFLAGS=-I%PGSQL_DIR%\include
rem .exe
set HB_DLL_NAME=postgres
set HB_DLL_DIR=%PGSQL_DIR%\bin

2
harbour/contrib/pgsql/make_vc.bat
View File

@@ -14,7 +14,7 @@ goto POST_EXIT
:DIR_OK
set CFLAGS=-I%PGSQL_DIR%\include -DHB_OS_WIN_32_USED
set CFLAGS=-I%PGSQL_DIR%\include
rem .exe
set HB_DLL_NAME=postgres
set HB_DLL_DIR=%PGSQL_DIR%\bin

9
harbour/contrib/pgsql/postgres.c
View File

@@ -50,15 +50,14 @@
*
*/
#define _CLIPDEFS_H
#define HB_OS_WIN_32_USED
#include "hbapi.h"
#include "hbapiitm.h"
#include "libpq-fe.h"
#define _CLIPDEFS_H
#if defined(HB_OS_WIN_32_USED)
#include <windows.h>
#endif
#define VARHDRSZ 4
#define BOOLOID 16
#define INT8OID 20

2
harbour/make_b32.mak
View File

@@ -142,7 +142,7 @@ HBFLAGSCMN = -i$(INCLUDE_DIR) -q0 -w2 -es2 -gc0 -kM $(PRG_USR)
HBFLAGSCMN = $(HBFLAGSCMN) -dPDF
!endif
HARBOURFLAGS = -n $(HBFLAGSCMN) $(HARBOURFLAGS)
HARBOURFLAGSDLL= -D__EXPORT__ -n1 -l $(HBFLAGSCMN) $(HARBOURFLAGSDLL)
HARBOURFLAGSDLL= -D__EXPORT__ -n1 $(HBFLAGSCMN) $(HARBOURFLAGSDLL)
# Linker Flags
LDFLAGS = -ap -Tpe -Gn -C -L$(LIB_DIR) -L$(BIN_DIR) $(LDFLAGS)