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

2011-04-24 10:06 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* utils/hbmk2/hbmk2.prg
    ! fixed "cross-talk" in compiler options between C and C++
      build passes

  + contrib/hbqt/qtsql/doc/en
    ! add missing dir causing doc gen errors

  * contrib/hbmlzo/3rd/minilzo/README.LZO
  * contrib/hbmlzo/3rd/minilzo/lzoconf.h
  * contrib/hbmlzo/3rd/minilzo/minilzo.c
  * contrib/hbmlzo/3rd/minilzo/minilzo.h
  * contrib/hbmlzo/3rd/minilzo/COPYING
  * contrib/hbmlzo/3rd/minilzo/minilzo.hbp
  * contrib/hbmlzo/3rd/minilzo/lzodefs.h
    + update to 2.05 [Tamas Tevesz]

  * contrib/hbqt/qtsql/hbqtsql.hbc
    ! deleted GUI related settingd

  * contrib/hbqt/qtsql/qth/filelist.hbm
    * sorted

  * contrib/hbqt/qtsql/hbqtsql.hbm
  * contrib/hbqt/qtsql/qth/QSqlField.qth
  * contrib/hbqt/qtsql/qth/QSqlRelationalTableModel.qth
  * contrib/hbqt/qtsql/qth/QSqlDatabase.qth
  * contrib/hbqt/qtsql/qth/QSqlQuery.qth
  * contrib/hbqt/qtsql/qth/QSqlQueryModel.qth
  * contrib/hbqt/qtsql/qth/QSqlIndex.qth
  * contrib/hbqt/qtsql/qth/QSqlTableModel.qth
  * contrib/hbqt/qtsql/qth/QSqlError.qth
  * contrib/hbqt/qtsql/qth/QSqlDriver.qth
  * contrib/hbqt/qtsql/qth/QSqlRecord.qth
  * contrib/hbqt/qtsql/qth/QSqlResult.qth
    * deleted EOL/EOF spaces
This commit is contained in:
Viktor Szakats
2011-04-24 08:11:16 +00:00
parent 637be04fdf
commit de161a7262
23 changed files with 731 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
harbour/ChangeLog
View File

@@ -16,6 +16,43 @@
The license applies to all entries newer than 2009-04-28.
*/
2011-04-24 10:06 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* utils/hbmk2/hbmk2.prg
! fixed "cross-talk" in compiler options between C and C++
build passes
+ contrib/hbqt/qtsql/doc/en
! add missing dir causing doc gen errors
* contrib/hbmlzo/3rd/minilzo/README.LZO
* contrib/hbmlzo/3rd/minilzo/lzoconf.h
* contrib/hbmlzo/3rd/minilzo/minilzo.c
* contrib/hbmlzo/3rd/minilzo/minilzo.h
* contrib/hbmlzo/3rd/minilzo/COPYING
* contrib/hbmlzo/3rd/minilzo/minilzo.hbp
* contrib/hbmlzo/3rd/minilzo/lzodefs.h
+ update to 2.05 [Tamas Tevesz]
* contrib/hbqt/qtsql/hbqtsql.hbc
! deleted GUI related settingd
* contrib/hbqt/qtsql/qth/filelist.hbm
* sorted
* contrib/hbqt/qtsql/hbqtsql.hbm
* contrib/hbqt/qtsql/qth/QSqlField.qth
* contrib/hbqt/qtsql/qth/QSqlRelationalTableModel.qth
* contrib/hbqt/qtsql/qth/QSqlDatabase.qth
* contrib/hbqt/qtsql/qth/QSqlQuery.qth
* contrib/hbqt/qtsql/qth/QSqlQueryModel.qth
* contrib/hbqt/qtsql/qth/QSqlIndex.qth
* contrib/hbqt/qtsql/qth/QSqlTableModel.qth
* contrib/hbqt/qtsql/qth/QSqlError.qth
* contrib/hbqt/qtsql/qth/QSqlDriver.qth
* contrib/hbqt/qtsql/qth/QSqlRecord.qth
* contrib/hbqt/qtsql/qth/QSqlResult.qth
* deleted EOL/EOF spaces
2011-04-23 23:25 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbqt/gtqtc/gtqtc.cpp
* contrib/hbqt/gtqtc/gtqtc.h

29
harbour/contrib/hbmlzo/3rd/minilzo/COPYING
View File

@@ -1,8 +1,8 @@
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
the GNU Library General Public License instead.) You can apply it to
the GNU Lesser General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
@@ -55,7 +55,7 @@ patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
@@ -278,7 +278,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
@@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) 19yy <name of author>
Copyright (C) <year> <name of author>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found.
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
Gnomovision version 69, Copyright (C) 19yy name of author
Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
@@ -336,5 +335,5 @@ necessary. Here is a sample; alter the names:
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Library General
library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.

21
harbour/contrib/hbmlzo/3rd/minilzo/README.LZO
View File

@@ -6,8 +6,8 @@
Author : Markus Franz Xaver Johannes Oberhumer
<markus@oberhumer.com>
http://www.oberhumer.com/opensource/lzo/
Version : 2.04
Date : 31 Oct 2010
Version : 2.05
Date : 23 Apr 2011
I've created miniLZO for projects where it is inconvenient to
include (or require) the full LZO source code just because you
@@ -26,8 +26,8 @@
minilzo.c to your Makefile and #include minilzo.h from your program.
Note: you also must distribute this file ('README.LZO') with your project.
minilzo.o compiles to about 6 kB (using gcc or Visual C on a i386), and
the sources are about 30 kB when packed with zip - so there's no more
minilzo.o compiles to about 6 KiB (using gcc or Visual C on an i386), and
the sources are about 30 KiB when packed with zip - so there's no more
excuse that your application doesn't support data compression :-)
For more information, documentation, example programs and other support
@@ -50,14 +50,14 @@
If you are running on a very unusual architecture and lzo_init() fails then
you should first recompile with '-DLZO_DEBUG' to see what causes the failure.
The most probable case is something like 'sizeof(char *) != sizeof(long)'.
The most probable case is something like 'sizeof(void *) != sizeof(size_t)'.
After identifying the problem you can compile by adding some defines
like '-DSIZEOF_CHAR_P=8' to your Makefile.
like '-DSIZEOF_VOID_P=8' to your Makefile.
The best solution is (of course) using Autoconf - if your project uses
Autoconf anyway just add '-DMINILZO_HAVE_CONFIG_H' to your compiler
flags when compiling minilzo.c. See the LZO distribution for an example
how to set up configure.in.
how to set up configure.ac.
Appendix B: list of public functions available in miniLZO
@@ -87,7 +87,7 @@
lzo_memset()
Appendix C: suggested macros for 'configure.in' when using Autoconf
Appendix C: suggested macros for 'configure.ac' when using Autoconf
-------------------------------------------------------------------
Checks for typedefs and structures
AC_CHECK_TYPE(ptrdiff_t,long)
@@ -110,8 +110,9 @@
Appendix D: Copyright
---------------------
LZO and miniLZO are Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002,
2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Markus Franz Xaver Oberhumer
LZO and miniLZO are Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001,
2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
Markus Franz Xaver Oberhumer <markus@oberhumer.com>.
LZO and miniLZO are distributed under the terms of the GNU General
Public License (GPL). See the file COPYING.

37
harbour/contrib/hbmlzo/3rd/minilzo/lzoconf.h
View File

@@ -1,7 +1,8 @@
/* lzoconf.h -- configuration for the LZO real-time data compression library
/* lzoconf.h -- configuration of the LZO data compression library
This file is part of the LZO real-time data compression library.
Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
@@ -43,9 +44,9 @@
#ifndef __LZOCONF_H_INCLUDED
#define __LZOCONF_H_INCLUDED 1
#define LZO_VERSION 0x2040
#define LZO_VERSION_STRING "2.04"
#define LZO_VERSION_DATE "Oct 31 2010"
#define LZO_VERSION 0x2050
#define LZO_VERSION_STRING "2.05"
#define LZO_VERSION_DATE "Apr 23 2011"
/* internal Autoconf configuration file - only used when building LZO */
#if defined(LZO_HAVE_CONFIG_H)
@@ -159,6 +160,27 @@ extern "C" {
# endif
#endif
/* Integral types with exactly 64 bits. */
#if !defined(LZO_UINT64_MAX)
# if (LZO_UINT_MAX >= LZO_0xffffffffL)
# if ((((LZO_UINT_MAX) >> 31) >> 31) == 3)
# define lzo_uint64 lzo_uint
# define lzo_int64 lzo_int
# define LZO_UINT64_MAX LZO_UINT_MAX
# define LZO_INT64_MAX LZO_INT_MAX
# define LZO_INT64_MIN LZO_INT_MIN
# endif
# elif (ULONG_MAX >= LZO_0xffffffffL)
# if ((((ULONG_MAX) >> 31) >> 31) == 3)
typedef unsigned long lzo_uint64;
typedef long lzo_int64;
# define LZO_UINT64_MAX ULONG_MAX
# define LZO_INT64_MAX LONG_MAX
# define LZO_INT64_MIN LONG_MIN
# endif
# endif
#endif
/* The larger type of lzo_uint and lzo_uint32. */
#if (LZO_UINT_MAX >= LZO_UINT32_MAX)
# define lzo_xint lzo_uint
@@ -186,6 +208,10 @@ extern "C" {
#define lzo_ushortp unsigned short __LZO_MMODEL *
#define lzo_uint32p lzo_uint32 __LZO_MMODEL *
#define lzo_int32p lzo_int32 __LZO_MMODEL *
#if defined(LZO_UINT64_MAX)
#define lzo_uint64p lzo_uint64 __LZO_MMODEL *
#define lzo_int64p lzo_int64 __LZO_MMODEL *
#endif
#define lzo_uintp lzo_uint __LZO_MMODEL *
#define lzo_intp lzo_int __LZO_MMODEL *
#define lzo_xintp lzo_xint __LZO_MMODEL *
@@ -308,7 +334,7 @@ struct lzo_callback_t
*/
#define LZO_E_OK 0
#define LZO_E_ERROR (-1)
#define LZO_E_OUT_OF_MEMORY (-2) /* [not used right now] */
#define LZO_E_OUT_OF_MEMORY (-2) /* [lzo_alloc_func_t failure] */
#define LZO_E_NOT_COMPRESSIBLE (-3) /* [not used right now] */
#define LZO_E_INPUT_OVERRUN (-4)
#define LZO_E_OUTPUT_OVERRUN (-5)
@@ -316,6 +342,7 @@ struct lzo_callback_t
#define LZO_E_EOF_NOT_FOUND (-7)
#define LZO_E_INPUT_NOT_CONSUMED (-8)
#define LZO_E_NOT_YET_IMPLEMENTED (-9) /* [not used right now] */
#define LZO_E_INVALID_ARGUMENT (-10)
#ifndef lzo_sizeof_dict_t

3
harbour/contrib/hbmlzo/3rd/minilzo/lzodefs.h
View File

@@ -2,6 +2,7 @@
This file is part of the LZO real-time data compression library.
Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
@@ -487,7 +488,7 @@
# if defined(__clang_major__) && defined(__clang_minor__) && defined(__clang_patchlevel__)
# define LZO_CC_CLANG_CLANG (__clang_major__ * 0x10000L + __clang_minor__ * 0x100 + __clang_patchlevel__)
# else
# define LZO_CC_CLANG_CLANG 0x020700L
# define LZO_CC_CLANG_CLANG 0x010000L
# endif
# define LZO_CC_CLANG LZO_CC_CLANG_GNUC
# define LZO_INFO_CC "clang"

780
harbour/contrib/hbmlzo/3rd/minilzo/minilzo.c
View File

File diff suppressed because it is too large Load Diff

3
harbour/contrib/hbmlzo/3rd/minilzo/minilzo.h
View File

@@ -2,6 +2,7 @@
This file is part of the LZO real-time data compression library.
Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
@@ -49,7 +50,7 @@
#ifndef __MINILZO_H
#define __MINILZO_H 1
#define MINILZO_VERSION 0x2040
#define MINILZO_VERSION 0x2050
#ifdef __LZOCONF_H
# error "you cannot use both LZO and miniLZO"

4
harbour/contrib/hbmlzo/3rd/minilzo/minilzo.hbp
View File

@@ -13,8 +13,8 @@
minilzo.c
# ORIGIN http://www.oberhumer.com/opensource/lzo/
# VER 2.04
# URL http://www.oberhumer.com/opensource/lzo/download/minilzo-2.04.tar.gz
# VER 2.05
# URL http://www.oberhumer.com/opensource/lzo/download/minilzo-2.05.tar.gz
# DIFF
#
# MAP COPYING

3
harbour/contrib/hbqt/qtsql/hbqtsql.hbc
View File

@@ -18,6 +18,3 @@ libs=../qtcore/hbqtcore.hbc
{HB_STATIC_QT&allwin}libs=${_HB_DYNPREF}${hb_name}s${_HB_DYNSUFF}
{HB_STATIC_QT&linux|beos}libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
{HB_STATIC_QT&(allwin|linux|beos)}libs=QtSql
gui=yes
gt=gtnul

1
harbour/contrib/hbqt/qtsql/hbqtsql.hbm
View File

@@ -8,5 +8,4 @@ qth/filelist.hbm
hbqtsql.hbx
../qtcore/hbqtcore.hbc

9
harbour/contrib/hbqt/qtsql/qth/QSqlDatabase.qth
View File

@@ -56,9 +56,9 @@
<CLASS>
QObject = no
Inherit =
Type =
New =
Inherit =
Type =
New =
</CLASS>
<CODE>
@@ -133,6 +133,3 @@ void removeDatabase ( const QString & connectionName )
<VARIABLES>
</VARIABLES>

9
harbour/contrib/hbqt/qtsql/qth/QSqlDriver.qth
View File

@@ -55,10 +55,10 @@
;
<CLASS>
QObject =
QObject =
Inherit = QObject
Type =
New =
Type =
New =
</CLASS>
<CODE>
@@ -117,6 +117,3 @@ void notification ( const QString & name )
<VARIABLES>
</VARIABLES>

9
harbour/contrib/hbqt/qtsql/qth/QSqlError.qth
View File

@@ -56,9 +56,9 @@
<CLASS>
QObject = no
Inherit =
Type =
New =
Inherit =
Type =
New =
</CLASS>
<CODE>
@@ -101,6 +101,3 @@ ErrorType type () const
<VARIABLES>
</VARIABLES>

9
harbour/contrib/hbqt/qtsql/qth/QSqlField.qth
View File

@@ -56,9 +56,9 @@
<CLASS>
QObject = no
Inherit =
Type =
New =
Inherit =
Type =
New =
</CLASS>
<CODE>
@@ -115,6 +115,3 @@ QVariant value () cons
<VARIABLES>
</VARIABLES>

7
harbour/contrib/hbqt/qtsql/qth/QSqlIndex.qth
View File

@@ -57,8 +57,8 @@
<CLASS>
QObject = no
Inherit = QSqlRecord
Type =
New =
Type =
New =
</CLASS>
<CODE>
@@ -98,6 +98,3 @@ void setName ( const QString & name )
<VARIABLES>
</VARIABLES>

9
harbour/contrib/hbqt/qtsql/qth/QSqlQuery.qth
View File

@@ -56,9 +56,9 @@
<CLASS>
QObject = no
Inherit =
Type =
New =
Inherit =
Type =
New =
</CLASS>
<CODE>
@@ -147,6 +147,3 @@ QVariant value ( int index ) const
<VARIABLES>
</VARIABLES>

11
harbour/contrib/hbqt/qtsql/qth/QSqlQueryModel.qth
View File

@@ -55,10 +55,10 @@
;
<CLASS>
QObject =
QObject =
Inherit = QAbstractTableModel
Type =
New =
Type =
New =
</CLASS>
<CODE>
@@ -71,7 +71,7 @@ New =
/*
* QSqlQueryModel ( QObject * parent = 0 )
* virtual ~QSqlQueryModel ()
*
*
*/
HB_FUNC( QT_QSQLQUERYMODEL )
{
@@ -108,6 +108,3 @@ void setQuery ( const QString & query, const QSqlDatabase & db = QSqlDatabase()
<VARIABLES>
</VARIABLES>

9
harbour/contrib/hbqt/qtsql/qth/QSqlRecord.qth
View File

@@ -56,9 +56,9 @@
<CLASS>
QObject = no
Inherit =
Type =
New =
Inherit =
Type =
New =
</CLASS>
<CODE>
@@ -115,6 +115,3 @@ QVariant value ( const QString & name ) const
<VARIABLES>
</VARIABLES>

9
harbour/contrib/hbqt/qtsql/qth/QSqlRelationalTableModel.qth
View File

@@ -55,10 +55,10 @@
;
<CLASS>
QObject =
QObject =
Inherit = QSqlTableModel
Type =
New =
Type =
New =
</CLASS>
<CODE>
@@ -94,6 +94,3 @@ virtual void setRelation ( int column, const QSqlRelation & relation )
<VARIABLES>
</VARIABLES>

11
harbour/contrib/hbqt/qtsql/qth/QSqlResult.qth
View File

@@ -56,9 +56,9 @@
<CLASS>
QObject = no
Inherit =
Type =
New =
Inherit =
Type =
New =
</CLASS>
<CODE>
@@ -66,7 +66,7 @@ New =
/*
*
*
*/
HB_FUNC( QT_QSQLRESULT )
{
@@ -89,6 +89,3 @@ virtual QVariant handle () const
<VARIABLES>
</VARIABLES>

9
harbour/contrib/hbqt/qtsql/qth/QSqlTableModel.qth
View File

@@ -55,10 +55,10 @@
;
<CLASS>
QObject =
QObject =
Inherit = QSqlQueryModel
Type =
New =
Type =
New =
</CLASS>
<CODE>
@@ -119,6 +119,3 @@ void primeInsert ( int row, QSqlRecord & record )
<VARIABLES>
</VARIABLES>

15
harbour/contrib/hbqt/qtsql/qth/filelist.hbm
View File

@@ -7,16 +7,13 @@
-pflag=-qthdocdir=../doc/
QSqlDatabase.qth
QSqlQuery.qth
QSqlError.qth
QSqlIndex.qth
QSqlRecord.qth
QSqlDriver.qth
QSqlResult.qth
QSqlError.qth
QSqlField.qth
QSqlIndex.qth
QSqlQuery.qth
QSqlQueryModel.qth
QSqlTableModel.qth
QSqlRecord.qth
QSqlRelationalTableModel.qth
QSqlResult.qth
QSqlTableModel.qth

30
harbour/utils/hbmk2/hbmk2.prg
View File

@@ -863,6 +863,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
LOCAL cCommand
LOCAL aCommand
LOCAL cOpt_CompC
LOCAL cOpt_CompCPass
LOCAL cOpt_CompCLoop
LOCAL cOpt_Link
LOCAL cOpt_Res
@@ -5919,22 +5920,23 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
/* Order is significant */
tmp4 := iif( tmp3 == _CCOMP_PASS_C .AND. ( hbmk[ _HBMK_lCPP ] == NIL .OR. ! hbmk[ _HBMK_lCPP ] ), hbmk[ _HBMK_aOPTCX ], hbmk[ _HBMK_aOPTCPPX ] )
cOpt_CompC := StrTran( cOpt_CompC, "{FC}" , iif( hbmk[ _HBMK_lBLDFLGC ], hb_Version( HB_VERSION_FLAG_C ) + " ", "" ) +;
GetEnv( "HB_USER_CFLAGS" ) +;
iif( ! Empty( hbmk[ _HBMK_aOPTC ] ), " " + ArrayToList( hbmk[ _HBMK_aOPTC ] ), "" ) +;
iif( ! Empty( tmp4 ), " " + ArrayToList( tmp4 ), "" ) +;
iif( ! Empty( hbmk[ _HBMK_aOPTCUSER ] ), " " + ArrayToList( hbmk[ _HBMK_aOPTCUSER ] ), "" ) )
cOpt_CompC := StrTran( cOpt_CompC, "{OD}" , FNameEscape( hb_FNameDir( hbmk[ _HBMK_cPROGNAME ] ), nOpt_Esc, nOpt_FNF ) )
cOpt_CompC := StrTran( cOpt_CompC, "{DI}" , FNameEscape( l_cHB_INSTALL_INC, nOpt_Esc, nOpt_FNF ) )
cOpt_CompCPass := cOpt_CompC
cOpt_CompCPass := StrTran( cOpt_CompCPass, "{FC}" , iif( hbmk[ _HBMK_lBLDFLGC ], hb_Version( HB_VERSION_FLAG_C ) + " ", "" ) +;
GetEnv( "HB_USER_CFLAGS" ) +;
iif( ! Empty( hbmk[ _HBMK_aOPTC ] ), " " + ArrayToList( hbmk[ _HBMK_aOPTC ] ), "" ) +;
iif( ! Empty( tmp4 ), " " + ArrayToList( tmp4 ), "" ) +;
iif( ! Empty( hbmk[ _HBMK_aOPTCUSER ] ), " " + ArrayToList( hbmk[ _HBMK_aOPTCUSER ] ), "" ) )
cOpt_CompCPass := StrTran( cOpt_CompCPass, "{OD}" , FNameEscape( hb_FNameDir( hbmk[ _HBMK_cPROGNAME ] ), nOpt_Esc, nOpt_FNF ) )
cOpt_CompCPass := StrTran( cOpt_CompCPass, "{DI}" , FNameEscape( l_cHB_INSTALL_INC, nOpt_Esc, nOpt_FNF ) )
IF "{IC}" $ cOpt_CompC
IF "{IC}" $ cOpt_CompCPass
aThreads := {}
FOR EACH aTO_DO IN ArraySplit( l_aCGEN_TO_DO, l_nJOBS )
IF hb_mtvm() .AND. Len( aTO_DO:__enumBase() ) > 1
AAdd( aThreads, hb_threadStart( @CompileCLoop(), hbmk, aTO_DO, cBin_CompCGEN, cOpt_CompC, cObjExt, nOpt_Esc, nOpt_FNF, aTO_DO:__enumIndex(), Len( aTO_DO:__enumBase() ) ) )
AAdd( aThreads, hb_threadStart( @CompileCLoop(), hbmk, aTO_DO, cBin_CompCGEN, cOpt_CompCPass, cObjExt, nOpt_Esc, nOpt_FNF, aTO_DO:__enumIndex(), Len( aTO_DO:__enumBase() ) ) )
ELSE
IF ! CompileCLoop( hbmk, aTO_DO, cBin_CompCGEN, cOpt_CompC, cObjExt, nOpt_Esc, nOpt_FNF, 0, 0 )
IF ! CompileCLoop( hbmk, aTO_DO, cBin_CompCGEN, cOpt_CompCPass, cObjExt, nOpt_Esc, nOpt_FNF, 0, 0 )
IF ! hbmk[ _HBMK_lIGNOREERROR ]
hbmk[ _HBMK_nErrorLevel ] := _ERRLEV_COMPC
EXIT
@@ -5954,8 +5956,8 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
NEXT
ENDIF
ELSE
cOpt_CompC := StrTran( cOpt_CompC, "{OO}" , FNameEscape( hb_FNameExtSet( hbmk[ _HBMK_cPROGNAME ], cObjExt ), nOpt_Esc, nOpt_FNF ) )
cOpt_CompC := StrTran( cOpt_CompC, "{OW}" , FNameEscape( hbmk[ _HBMK_cWorkDir ], nOpt_Esc, nOpt_FNF ) )
cOpt_CompCPass := StrTran( cOpt_CompCPass, "{OO}" , FNameEscape( hb_FNameExtSet( hbmk[ _HBMK_cPROGNAME ], cObjExt ), nOpt_Esc, nOpt_FNF ) )
cOpt_CompCPass := StrTran( cOpt_CompCPass, "{OW}" , FNameEscape( hbmk[ _HBMK_cWorkDir ], nOpt_Esc, nOpt_FNF ) )
IF lCHD_Comp
tmp2 := hb_DirSepAdd( hb_PathRelativize( hb_PathNormalize( PathMakeAbsolute( hbmk[ _HBMK_cWorkDir ], hb_cwd() ) ), hb_cwd(), .T. ) )
@@ -5979,9 +5981,9 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
FOR EACH tmp1 IN tmp
tmp1 := hb_PathNormalize( PathMakeAbsolute( tmp1, tmp2 ) )
NEXT
cOpt_CompCLoop := AllTrim( StrTran( cOpt_CompC, "{LC}" , ArrayToList( tmp,, nOpt_Esc, nOpt_FNF ) ) )
cOpt_CompCLoop := AllTrim( StrTran( cOpt_CompCPass, "{LC}" , ArrayToList( tmp,, nOpt_Esc, nOpt_FNF ) ) )
ELSE
cOpt_CompCLoop := AllTrim( StrTran( cOpt_CompC, "{LC}" , ArrayToList( aTO_DO,, nOpt_Esc, nOpt_FNF ) ) )
cOpt_CompCLoop := AllTrim( StrTran( cOpt_CompCPass, "{LC}" , ArrayToList( aTO_DO,, nOpt_Esc, nOpt_FNF ) ) )
ENDIF
/* Handle moving the whole command line to a script, if requested. */