From 6bfdf01a178d11e5c50da69d888cfb158e42ea70 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 16 Aug 2008 14:23:37 +0000 Subject: [PATCH] 2008-08-16 16:16 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * make_b32.mak * make_gcc.mak * make_vc.mak * make_vcce.mak * include/hbdefs.h * source/vm/mainwin.c * source/vm/hvm.c * source/hbpcre/_hbconf.h * source/hbzlib/ChangeLog * source/hbzlib/zconf.h * utils/hbmake/hbmake.prg * __EXPORT__ -> HB_DYNLIB --- harbour/ChangeLog | 14 ++++++++++++++ harbour/include/hbdefs.h | 2 +- harbour/make_b32.mak | 2 +- harbour/make_gcc.mak | 2 +- harbour/make_vc.mak | 2 +- harbour/make_vcce.mak | 2 +- harbour/source/hbpcre/_hbconf.h | 2 +- harbour/source/hbzlib/ChangeLog | 2 +- harbour/source/hbzlib/zconf.h | 2 +- harbour/source/vm/hvm.c | 2 +- harbour/source/vm/mainwin.c | 2 +- harbour/utils/hbmake/hbmake.prg | 8 ++++---- 12 files changed, 28 insertions(+), 14 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 337a23444e..fa385a9aa4 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,20 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-08-16 16:16 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * make_b32.mak + * make_gcc.mak + * make_vc.mak + * make_vcce.mak + * include/hbdefs.h + * source/vm/mainwin.c + * source/vm/hvm.c + * source/hbpcre/_hbconf.h + * source/hbzlib/ChangeLog + * source/hbzlib/zconf.h + * utils/hbmake/hbmake.prg + * __EXPORT__ -> HB_DYNLIB + 2008-08-16 16:16 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * config/os2/gcc.cf % Cleaned include path for OS/2/GCC. diff --git a/harbour/include/hbdefs.h b/harbour/include/hbdefs.h index b00fb06dc1..584c39fe93 100644 --- a/harbour/include/hbdefs.h +++ b/harbour/include/hbdefs.h @@ -1169,7 +1169,7 @@ typedef unsigned long HB_COUNTER; typedef HARBOUR ( * PHB_FUNC )( void ); typedef PHB_FUNC HB_FUNC_PTR; -#if defined( __EXPORT__ ) +#if defined( HB_DYNLIB ) #if defined( __RSXNT__ ) /* RSXNT does not support any type of export keyword. Exported (i.e., public) names can be obtained via diff --git a/harbour/make_b32.mak b/harbour/make_b32.mak index 87d22827f4..f0a59f9b1e 100644 --- a/harbour/make_b32.mak +++ b/harbour/make_b32.mak @@ -139,7 +139,7 @@ CFLAGS = -I$(INCLUDE_DIR) $(C_USR) $(CFLAGS) -I$(OBJ_DIR) CLIBFLAGS = -c -q -d -w -w-sig- $(CFLAGS) $(CLIBFLAGS) CLIBFLAGSxxx = $(BCCDLL_WITH_DYNRT) $(CLIBFLAGS: -tWM= ) -CLIBFLAGSDLL = -D__EXPORT__ -tWM $(CLIBFLAGSxxx) $(CLIBFLAGSDLL) +CLIBFLAGSDLL = -DHB_DYNLIB -tWM $(CLIBFLAGSxxx) $(CLIBFLAGSDLL) CEXEFLAGSDLL = -tWM $(CLIBFLAGSxxx) $(CEXEFLAGSDLL) #********************************************************** diff --git a/harbour/make_gcc.mak b/harbour/make_gcc.mak index bf7e535160..9230b99f14 100644 --- a/harbour/make_gcc.mak +++ b/harbour/make_gcc.mak @@ -189,7 +189,7 @@ CFLAGS += -DHB_GT_LIB=$(HB_GT_LIB:gt%=%) endif #----------- CLIBFLAGS := -c $(CFLAGS) $(CLIBFLAGS) -CLIBFLAGSDLL := -D__EXPORT__ $(CLIBFLAGS) $(CLIBFLAGSDLL) +CLIBFLAGSDLL := -DHB_DYNLIB $(CLIBFLAGS) $(CLIBFLAGSDLL) CEXEFLAGSDLL := $(CFLAGS) $(CEXEFLAGSDLL) # Under architectures other than "DOS based" add -fPIC diff --git a/harbour/make_vc.mak b/harbour/make_vc.mak index 8dfb7c2804..915924945e 100644 --- a/harbour/make_vc.mak +++ b/harbour/make_vc.mak @@ -149,7 +149,7 @@ CFLAGS = -D"HB_GT_LIB=$(HB_GT_LIB:gt=)" $(CFLAGS) CLIBFLAGS = -c $(CFLAGS) $(CLIBFLAGS) CLIBFLAGSxxx = $(CLIBFLAGS: -MT= ) CLIBFLAGSxxx = $(CLIBFLAGSxxx: -MTd= ) -CLIBFLAGSDLL = -D__EXPORT__ -MT$(DBGMARKER) $(CLIBFLAGS) $(CLIBFLAGSDLL) +CLIBFLAGSDLL = -DHB_DYNLIB -MT$(DBGMARKER) $(CLIBFLAGS) $(CLIBFLAGSDLL) CEXEFLAGSDLL = -MT$(DBGMARKER) $(CLIBFLAGS) $(CEXEFLAGSDLL) #********************************************************** diff --git a/harbour/make_vcce.mak b/harbour/make_vcce.mak index 54a61ea8d2..474fb5f70d 100644 --- a/harbour/make_vcce.mak +++ b/harbour/make_vcce.mak @@ -164,7 +164,7 @@ CFLAGS = -D"HB_GT_LIB=$(HB_GT_LIB:gt=)" $(CFLAGS) #********************************************************** CLIBFLAGS = -c $(CFLAGS) $(CLIBFLAGS) -CLIBFLAGSDLL = -D__EXPORT__ $(CLIBFLAGS) $(CLIBFLAGSDLL) +CLIBFLAGSDLL = -DHB_DYNLIB $(CLIBFLAGS) $(CLIBFLAGSDLL) CEXEFLAGSDLL = $(CLIBFLAGS) $(CEXEFLAGSDLL) #********************************************************** diff --git a/harbour/source/hbpcre/_hbconf.h b/harbour/source/hbpcre/_hbconf.h index 19eeaddf91..584e1c3dfe 100644 --- a/harbour/source/hbpcre/_hbconf.h +++ b/harbour/source/hbpcre/_hbconf.h @@ -5,7 +5,7 @@ #ifndef HB_CONFIG_H #define HB_CONFIG_H -#if !defined(__EXPORT__) +#if !defined(HB_DYNLIB) #define PCRE_STATIC #endif diff --git a/harbour/source/hbzlib/ChangeLog b/harbour/source/hbzlib/ChangeLog index 62a07f72bd..059475b6a6 100644 --- a/harbour/source/hbzlib/ChangeLog +++ b/harbour/source/hbzlib/ChangeLog @@ -20,7 +20,7 @@ 2008-08-05 21:39 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * harbour/source/hbzlib/zconf.h - + Setting ZLIB_DLL if __EXPORT__ is defined. + + Setting ZLIB_DLL if HB_DYNLIB is defined. 2008-05-28 18:42 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/source/hbzlib/zutil.c diff --git a/harbour/source/hbzlib/zconf.h b/harbour/source/hbzlib/zconf.h index 0566351d34..10487f8496 100644 --- a/harbour/source/hbzlib/zconf.h +++ b/harbour/source/hbzlib/zconf.h @@ -10,7 +10,7 @@ /* Harbour addition */ #if 0 - #if defined(__EXPORT__) && !defined(ZLIB_DLL) + #if defined(HB_DYNLIB) && !defined(ZLIB_DLL) #define ZLIB_DLL #endif #endif diff --git a/harbour/source/vm/hvm.c b/harbour/source/vm/hvm.c index 88dc038334..824b452456 100644 --- a/harbour/source/vm/hvm.c +++ b/harbour/source/vm/hvm.c @@ -9781,7 +9781,7 @@ void hb_vmForceLink( void ) #undef HB_FORCE_LINK_MAIN -#if defined(HB_OS_WIN_32) && !defined(__EXPORT__) && \ +#if !defined(HB_DYNLIB) && defined(HB_OS_WIN_32) && \ ( defined(__DMC__) || defined(__WATCOMC__) || defined(__MINGW32__) ) # define HB_FORCE_LINK_MAIN hb_forceLinkMainWin diff --git a/harbour/source/vm/mainwin.c b/harbour/source/vm/mainwin.c index 89d2a7b680..8583a2550d 100644 --- a/harbour/source/vm/mainwin.c +++ b/harbour/source/vm/mainwin.c @@ -60,7 +60,7 @@ #define HB_VM_STARTUP #include "hbwmain.c" -#if ( defined(__DMC__) || defined(__WATCOMC__) || defined(__MINGW32__) ) && !defined(__EXPORT__) +#if !defined(HB_DYNLIB) && ( defined(__DMC__) || defined(__WATCOMC__) || defined(__MINGW32__) ) HB_EXTERN_BEGIN HB_EXPORT void hb_forceLinkMainWin( void ) {} HB_EXTERN_END diff --git a/harbour/utils/hbmake/hbmake.prg b/harbour/utils/hbmake/hbmake.prg index b09a7d50dd..076f52d92a 100644 --- a/harbour/utils/hbmake/hbmake.prg +++ b/harbour/utils/hbmake/hbmake.prg @@ -4913,7 +4913,7 @@ LOCAL nCfg FWrite( nCfg, "CC=BCC32" + CRLF ) // FWrite( nCfg, "CFLAGS= -c " + ReplaceMacros( "-I$(HB_DIR)\include -OS $(CFLAGS) -d -L$(HB_DIR)\lib" ) + CRLF ) - FWrite( nCfg, "CFLAGS= -c -D__EXPORT__ " + ReplaceMacros( "-I$(HB_DIR)\include $(CFLAGS) -d -L$(HB_DIR)\lib" ) + CRLF ) + FWrite( nCfg, "CFLAGS= -c -DHB_DYNLIB " + ReplaceMacros( "-I$(HB_DIR)\include $(CFLAGS) -d -L$(HB_DIR)\lib" ) + CRLF ) FWrite( nCfg, "VERBOSE=YES" + CRLF ) FWrite( nCfg, "DELTMP=YES" + CRLF ) FClose( nCfg ) @@ -4944,7 +4944,7 @@ FUNCTION BuildMscCfgFile() endif FWrite( nCfg, "CC=cl" + CRLF ) - FWrite( nCfg, "CFLAGS= -c -D__EXPORT__" + ReplaceMacros( "-I$(HB_DIR) -TP -W3 -nologo $(C_USR) $(CFLAGS)" ) + CRLF ) + FWrite( nCfg, "CFLAGS= -c -DHB_DYNLIB" + ReplaceMacros( "-I$(HB_DIR) -TP -W3 -nologo $(C_USR) $(CFLAGS)" ) + CRLF ) FWrite( nCfg, "VERBOSE=YES" + CRLF ) FWrite( nCfg, "DELTMP=YES" + CRLF ) FClose( nCfg ) @@ -4976,7 +4976,7 @@ FUNCTION BuildPccCfgFile() endif FWrite( nCfg, "CC=POCC" + CRLF ) - FWrite( nCfg, "CFLAGS= /Ze /Go /Ot /Tx86-coff /D__EXPORT__ " + ReplaceMacros( "-I$(HB_DIR)\include $(C_USR) $(CFLAGS)" ) + CRLF ) + FWrite( nCfg, "CFLAGS= /Ze /Go /Ot /Tx86-coff /DHB_DYNLIB " + ReplaceMacros( "-I$(HB_DIR)\include $(C_USR) $(CFLAGS)" ) + CRLF ) FWrite( nCfg, "VERBOSE=YES" + CRLF ) FWrite( nCfg, "DELTMP=YES" + CRLF ) FClose( nCfg ) @@ -5016,7 +5016,7 @@ FUNCTION BuildGccCfgFile() endif FWrite( nCfg, "CC=gcc" + CRLF ) - FWrite( nCfg, "CFLAGS= -c -D__EXPORT__ " + ReplaceMacros( "-I" + s_cHarbourDir + "/include $(C_USR) -L" + s_cHarbourDir + "/lib" ) + if(s_lmingw ," -mno-cygwin ","" )+ CRLF ) + FWrite( nCfg, "CFLAGS= -c -DHB_DYNLIB " + ReplaceMacros( "-I" + s_cHarbourDir + "/include $(C_USR) -L" + s_cHarbourDir + "/lib" ) + if(s_lmingw ," -mno-cygwin ","" )+ CRLF ) FWrite( nCfg, "VERBOSE=YES" + CRLF ) FWrite( nCfg, "DELTMP=YES" + CRLF ) FClose( nCfg )