2007-11-25 20:20 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl)
* harbour/common.mak
* harbour/make_b32.mak
* harbour/make_gcc.mak
* harbour/make_vc.mak
* harbour/make_vcce.mak
* Moved HB and HBPPGEN definitions to common.mak
to reduce unnecesary redundancy
* harbour/contrib/make_b32.bat
* harbour/contrib/make_vc.bat
* Enclosed "help usage message" in double quotes
due to special meaning of "<>" symbols in command
processor.
This commit is contained in:
@@ -8,6 +8,21 @@
|
||||
2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
|
||||
*/
|
||||
|
||||
2007-11-25 20:20 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl)
|
||||
* harbour/common.mak
|
||||
* harbour/make_b32.mak
|
||||
* harbour/make_gcc.mak
|
||||
* harbour/make_vc.mak
|
||||
* harbour/make_vcce.mak
|
||||
* Moved HB and HBPPGEN definitions to common.mak
|
||||
to reduce unnecesary redundancy
|
||||
|
||||
* harbour/contrib/make_b32.bat
|
||||
* harbour/contrib/make_vc.bat
|
||||
* Enclosed "help usage message" in double quotes
|
||||
due to special meaning of "<>" symbols in command
|
||||
processor.
|
||||
|
||||
2007-11-25 11:00 UTC+0800 Pritpal Bedi (pritpal@vouchcac.com)
|
||||
+ harbour/contrib/what32
|
||||
+ _winbmp.c
|
||||
@@ -159,7 +174,7 @@
|
||||
* source/rtl/gtsln/gtsln.h
|
||||
* source/rtl/gttrm/gttrm.c
|
||||
* source/rtl/gtwvt/gtwvt.h
|
||||
+ #defining xhb compatible K_SH_* keyboard codes only if
|
||||
+ #defining xhb compatible K_SH_* keyboard codes only if
|
||||
they were not already defined.
|
||||
|
||||
* utils/hbdoc/genasc.prg
|
||||
@@ -173,7 +188,7 @@
|
||||
* contrib/msql/msql.h
|
||||
* contrib/msql/tmsql.prg
|
||||
! Fixed to compile with non-GNU BC/VC makefiles.
|
||||
(short-term fixes, there may be better / more generic
|
||||
(short-term fixes, there may be better / more generic
|
||||
ways to fix it)
|
||||
! C warnings fixed.
|
||||
! Harbour warnings fixed.
|
||||
@@ -199,9 +214,9 @@
|
||||
|
||||
* contrib/make_b32_all.bat
|
||||
* contrib/make_vc_all.bat
|
||||
! Batch file calling method reset to Marek's version
|
||||
('%COMSPEC% /c' as opposed to 'call') to avoid
|
||||
any unwanted "crosstalk" between contrib build
|
||||
! Batch file calling method reset to Marek's version
|
||||
('%COMSPEC% /c' as opposed to 'call') to avoid
|
||||
any unwanted "crosstalk" between contrib build
|
||||
procedures through the CFLAGS envvar.
|
||||
|
||||
2007-11-23 21:14 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
|
||||
@@ -225,7 +240,7 @@
|
||||
|
||||
2007-11-23 18:55 UTC+0200 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt)
|
||||
* harbour/source/include/hbexprb.c
|
||||
* changed HB_i18nGettext() to hb_i18n_gettext(), to respect
|
||||
* changed HB_i18nGettext() to hb_i18n_gettext(), to respect
|
||||
original gettext lowercase function name convention
|
||||
|
||||
2007-11-23 06:57 UTC+0800 Pritpal Bedi (pritpal@vouchcac.com)
|
||||
@@ -268,13 +283,13 @@
|
||||
* harbour/contrib/gtwvg/wvtcore.c
|
||||
! Fixes for UNICODE Support.
|
||||
? Przem, please review. I suspect about like these fixes:
|
||||
|
||||
|
||||
|
||||
|
||||
DrawText( _s->hGuiDC, hb_parcx( 6 ), strlen( hb_parcx( 6 ) ), &rc, iAlignH | DT_WORDBREAK | DT_TOP );
|
||||
=>
|
||||
LPTSTR text = HB_TCHAR_CONVTO( hb_parc( 6 ) );
|
||||
DrawText( _s->hGuiDC, text, strlen( hb_parc( 6 ) ), &rc, iAlignH | DT_WORDBREAK | DT_TOP );
|
||||
^--------------------^ OK | How to compute length of "text"
|
||||
^--------------------^ OK | How to compute length of "text"
|
||||
|
||||
|
||||
2007-11-22 21:45 UTC+0800 Pritpal Bedi (pritpal@vouchcac.com)
|
||||
@@ -330,17 +345,17 @@
|
||||
(so no need for COMPSPEC trick to call another copy of command com)
|
||||
! Some other smaller fixes.
|
||||
! Fixed rdd_ads in make_*_all.bats.
|
||||
* Removed the simple common part for BC/VC to consistently
|
||||
separate the BC/VC make file system. The only common
|
||||
part now is common.mak in each contrib. (Marek I hope you don't
|
||||
mind, I promise to update them in case of changes. We have quite
|
||||
some reduancy between BC/VC anyway, so this won't hurt much overall,
|
||||
but they are now nicely separated and maybe bit easier to oversee
|
||||
* Removed the simple common part for BC/VC to consistently
|
||||
separate the BC/VC make file system. The only common
|
||||
part now is common.mak in each contrib. (Marek I hope you don't
|
||||
mind, I promise to update them in case of changes. We have quite
|
||||
some reduancy between BC/VC anyway, so this won't hurt much overall,
|
||||
but they are now nicely separated and maybe bit easier to oversee
|
||||
for someone new to the project.
|
||||
! Avoiding 'exit' command, as it stops all batch file
|
||||
execution, and as a bad side-effect can force to exit
|
||||
! Avoiding 'exit' command, as it stops all batch file
|
||||
execution, and as a bad side-effect can force to exit
|
||||
shells too.
|
||||
- CFLAGS, CLIBFLAGS, HARBOURFLAGS not advertised anymore as
|
||||
- CFLAGS, CLIBFLAGS, HARBOURFLAGS not advertised anymore as
|
||||
official public vars to set compiler flags.
|
||||
C_USR, PRG_USR should be used, which are also GNU make system compatible.
|
||||
! Fixed copyrights.
|
||||
@@ -373,9 +388,9 @@
|
||||
! Restored some lost changes.
|
||||
! Not directly modifying C_USR, instead use CFLAGS internally.
|
||||
+ Now rddads will find ace32.dll in system32 dir too.
|
||||
; It's not possible to set HB_DLL_DIR directly now,
|
||||
just through the <LIBNAME>_DIR envvar. Some contribs
|
||||
may try to "autodetect" the exact location of the .dll
|
||||
; It's not possible to set HB_DLL_DIR directly now,
|
||||
just through the <LIBNAME>_DIR envvar. Some contribs
|
||||
may try to "autodetect" the exact location of the .dll
|
||||
(currently rddads).
|
||||
|
||||
2007-11-23 03:03 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
|
||||
@@ -386,7 +401,7 @@
|
||||
* common.mak
|
||||
! Fixed copyrights.
|
||||
! Tabs converted to spaces.
|
||||
- CFLAGS not advertised anymore as an official public var to set
|
||||
- CFLAGS not advertised anymore as an official public var to set
|
||||
compiler flags.
|
||||
C_USR should be used, which is also GNU make system compatible.
|
||||
|
||||
@@ -483,9 +498,9 @@
|
||||
* contrib/libmisc/common.mak
|
||||
* contrib/libmisc/Makefile
|
||||
* contrib/mysql/common.mak
|
||||
! Library names synced between GNU and non-GNU
|
||||
! Library names synced between GNU and non-GNU
|
||||
make systems.
|
||||
! Some libraries renamed to not have a too common
|
||||
! Some libraries renamed to not have a too common
|
||||
or non-descriptive name, like "misc".
|
||||
non-GNU hb_btree -> hbbtree (synced with GNU)
|
||||
non-GNU fi_lib -> hbfreeimage
|
||||
@@ -517,7 +532,7 @@
|
||||
! Added EOLs to the last line.
|
||||
|
||||
* utils/hbmake/hbmutils.prg
|
||||
* Lib names fixed and changed to reflect the recent
|
||||
* Lib names fixed and changed to reflect the recent
|
||||
changes in contrib.
|
||||
|
||||
* contrib/rdd_ads/rddads.h
|
||||
@@ -526,7 +541,7 @@
|
||||
* include/hbextern.ch
|
||||
* source/rtl/memofile.c
|
||||
! MEMOWRIT() 3rd parameter marked as extension.
|
||||
+ HB_MEMOWRIT() function added, which never writes the
|
||||
+ HB_MEMOWRIT() function added, which never writes the
|
||||
obsolete EOF char at the end of the file.
|
||||
|
||||
2007-11-23 03:55 UTC+0200 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt)
|
||||
@@ -536,14 +551,14 @@
|
||||
* harbour/source/compiler/cmdcheck.c
|
||||
* harbour/source/compiler/hbmain.c
|
||||
+ added i18n support
|
||||
Implemented -j[filename] switch to indicate output filename.
|
||||
Default filename is <sourcefilename>.pot. If switch -o is used,
|
||||
this file is created in specified output path. Output file
|
||||
Implemented -j[filename] switch to indicate output filename.
|
||||
Default filename is <sourcefilename>.pot. If switch -o is used,
|
||||
this file is created in specified output path. Output file
|
||||
format is compatible with 'gettext' utils, but not all
|
||||
available features are implemented.
|
||||
Harbour level function HB_i18nGettext( cText [, cContext ] )
|
||||
Harbour level function HB_i18nGettext( cText [, cContext ] )
|
||||
should be used to indicate translatable strings.
|
||||
All this commit is commented using #ifdef HB_I18N_SUPPORT and
|
||||
All this commit is commented using #ifdef HB_I18N_SUPPORT and
|
||||
is in development stage. Please, do not use it yet.
|
||||
|
||||
2007-11-23 01:28 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
|
||||
@@ -551,7 +566,7 @@
|
||||
+ gtwvg/make_b32.bat
|
||||
+ gtwvg/make_vc.bat
|
||||
+ Added non-GNU make files.
|
||||
; TOFIX: gtwvt.obj will clash with the core file with this
|
||||
; TOFIX: gtwvt.obj will clash with the core file with this
|
||||
name, so this won't properly work yet.
|
||||
|
||||
* gtwvg/wvtpaint.prg
|
||||
@@ -573,7 +588,7 @@
|
||||
I still suggest to use pointers ITEMs instead of converting
|
||||
handles to numbers but I'm leaving such modifications to library
|
||||
authors - using hb_vmPushNumInt() is a workaround for striping
|
||||
highest 32 bit from handles by hb_vmPushLong() in XP64
|
||||
highest 32 bit from handles by hb_vmPushLong() in XP64
|
||||
- use hb_vmRequestReenter() / hb_vmRequestRestore() to avoid crash
|
||||
when function/codeblock is executed during HVM has been serving
|
||||
an exception (f.e. BREAK/QUIT/RETURN)
|
||||
|
||||
1357
harbour/common.mak
1357
harbour/common.mak
File diff suppressed because it is too large
Load Diff
@@ -15,7 +15,7 @@ goto EXIT
|
||||
|
||||
:ERROR
|
||||
echo ----------------------------------------
|
||||
echo Usage: make_b32.bat <dirname>
|
||||
echo Usage: "make_b32.bat <dirname>"
|
||||
echo ----------------------------------------
|
||||
|
||||
:EXIT
|
||||
|
||||
@@ -15,7 +15,7 @@ goto EXIT
|
||||
|
||||
:ERROR
|
||||
echo ----------------------------------------
|
||||
echo Usage: make_vc.bat <dirname>
|
||||
echo Usage: "make_vc.bat <dirname>"
|
||||
echo ----------------------------------------
|
||||
|
||||
:EXIT
|
||||
|
||||
@@ -19,39 +19,39 @@
|
||||
|
||||
#
|
||||
# NOTE: You can use these envvars to configure the make process:
|
||||
# (note that these are all optional)
|
||||
# (note that these are all optional)
|
||||
#
|
||||
# C_USR - Extra C compiler options for libraries and for
|
||||
# executables (GNU make compatible envvar)
|
||||
# CLIBFLAGS - Extra C compiler options for the static libraries
|
||||
# CLIBFLAGSDLL - Extra C compiler options for the shared libraries
|
||||
# C_USR - Extra C compiler options for libraries and for
|
||||
# executables (GNU make compatible envvar)
|
||||
# CLIBFLAGS - Extra C compiler options for the static libraries
|
||||
# CLIBFLAGSDLL - Extra C compiler options for the shared libraries
|
||||
#
|
||||
# LDFLAGS - Extra linker options for the static libraries
|
||||
# LDFLAGSDLL - Extra linker options for the shared libraries
|
||||
# LDFLAGS - Extra linker options for the static libraries
|
||||
# LDFLAGSDLL - Extra linker options for the shared libraries
|
||||
#
|
||||
# HARBOURFLAGS - Extra Harbour compiler options for static libs/exes
|
||||
# HARBOURFLAGSDLL - Extra Harbour compiler options for shared libraries
|
||||
# PRG_USR - Extra Harbour compiler options
|
||||
# (GNU make compatible envvar)
|
||||
# HB_GT_DEFAULT - The default GT driver, Choose between:
|
||||
# gtstd (default),gtcgi,gtwin,gtwvt
|
||||
# HB_GT_LIB - To override the default GT driver
|
||||
# (search for HB_GT_LIBS for a list of values)
|
||||
# HB_BUILD_DLL - If set to yes enables building harbour VM+RTL
|
||||
# dll in addition to normal static build
|
||||
# HB_BUILD_DEBUG - If set to yes causes to compile with debug info
|
||||
# HB_BUILD_VERBOSE - enables echoing commands being executed
|
||||
# HB_REBUILD_PARSER - If set to yes force preprocessing new rules by
|
||||
# bison (you must use bison 2.3 or later)
|
||||
# BCCDLL_WITH_DYNRT - If set to -tWR causes that harbour-bc.dll
|
||||
# will use dynamic runtime library (recommended)
|
||||
# HB_INSTALL_PREFIX - Path to instalation directory into which
|
||||
# Harbour will be installed when the command
|
||||
# "make_bc.bat install" is lauched. Defaults
|
||||
# to current directory
|
||||
# HARBOURFLAGS - Extra Harbour compiler options for static libs/exes
|
||||
# HARBOURFLAGSDLL - Extra Harbour compiler options for shared libraries
|
||||
# PRG_USR - Extra Harbour compiler options
|
||||
# (GNU make compatible envvar)
|
||||
# HB_GT_DEFAULT - The default GT driver, Choose between:
|
||||
# gtstd (default),gtcgi,gtwin,gtwvt
|
||||
# HB_GT_LIB - To override the default GT driver
|
||||
# (search for HB_GT_LIBS for a list of values)
|
||||
# HB_BUILD_DLL - If set to yes enables building harbour VM+RTL
|
||||
# dll in addition to normal static build
|
||||
# HB_BUILD_DEBUG - If set to yes causes to compile with debug info
|
||||
# HB_BUILD_VERBOSE - enables echoing commands being executed
|
||||
# HB_REBUILD_PARSER - If set to yes force preprocessing new rules by
|
||||
# bison (you must use bison 2.3 or later)
|
||||
# BCCDLL_WITH_DYNRT - If set to -tWR causes that harbour-bc.dll
|
||||
# will use dynamic runtime library (recommended)
|
||||
# HB_INSTALL_PREFIX - Path to instalation directory into which
|
||||
# Harbour will be installed when the command
|
||||
# "make_bc.bat install" is lauched. Defaults
|
||||
# to current directory
|
||||
#
|
||||
# HB_DOC_PDF - Turns on the .PDF file support in the HBDOC utility.
|
||||
# Note that this will require the pdflib contrib.
|
||||
# HB_DOC_PDF - Turns on the .PDF file support in the HBDOC utility.
|
||||
# Note that this will require the pdflib contrib.
|
||||
|
||||
# ---------------------------------------------------------------
|
||||
# "echo." intentionally used instead of "echo", to avoid conflicts
|
||||
@@ -72,10 +72,10 @@
|
||||
#**********************************************************
|
||||
|
||||
!ifndef ECHO
|
||||
ECHO = echo.
|
||||
ECHO = echo.
|
||||
!endif
|
||||
!ifndef DEL
|
||||
DEL = del
|
||||
DEL = del
|
||||
!endif
|
||||
|
||||
#**********************************************************
|
||||
@@ -102,24 +102,6 @@ MKLIB = tlib.exe
|
||||
|
||||
DLL_OBJS = $(TMP_DLL_OBJS:$(OBJ_DIR)=$(DLL_OBJ_DIR))
|
||||
|
||||
#**********************************************************
|
||||
#**********************************************************
|
||||
#**********************************************************
|
||||
|
||||
# allows to do cross-compiling if neccesary.
|
||||
!ifndef HB
|
||||
HB = $(HARBOUR_EXE)
|
||||
!endif
|
||||
|
||||
# allows to do cross-compiling if neccesary.
|
||||
!ifndef HBPPGEN
|
||||
HBPPGEN = $(HBPPGEN_EXE)
|
||||
!endif
|
||||
|
||||
#**********************************************************
|
||||
#**********************************************************
|
||||
#**********************************************************
|
||||
|
||||
#**********************************************************
|
||||
# C compiler, Harbour compiler and Linker flags.
|
||||
#**********************************************************
|
||||
@@ -128,26 +110,26 @@ DLL_OBJS = $(TMP_DLL_OBJS:$(OBJ_DIR)=$(DLL_OBJ_DIR))
|
||||
INCLUDE_DIR = include
|
||||
|
||||
# C Compiler Flags
|
||||
CFLAGS = -I$(INCLUDE_DIR) $(C_USR) $(CFLAGS) -Iobj\$(HB_CC_NAME)
|
||||
CFLAGS = -I$(INCLUDE_DIR) $(C_USR) $(CFLAGS) -Iobj\$(HB_CC_NAME)
|
||||
#-----------
|
||||
!ifndef BCC_NOOPTIM
|
||||
CFLAGS = -O2 $(CFLAGS)
|
||||
CFLAGS = -O2 $(CFLAGS)
|
||||
!endif
|
||||
#-----------
|
||||
!if "$(HB_BUILD_DEBUG)" == "yes"
|
||||
CFLAGS = -y -v $(CFLAGS)
|
||||
CFLAGS = -y -v $(CFLAGS)
|
||||
!endif
|
||||
#-----------
|
||||
!if "$(BCCDLL_WITH_DYNRT)" == "-tWR"
|
||||
RTLIBSUFFIX = i
|
||||
RTLIBSUFFIX = i
|
||||
!endif
|
||||
#-----------
|
||||
!if "$(HB_GT_DEFAULT)" != ""
|
||||
CFLAGS = -DHB_GT_DEFAULT=$(HB_GT_DEFAULT:gt=) $(CFLAGS)
|
||||
CFLAGS = -DHB_GT_DEFAULT=$(HB_GT_DEFAULT:gt=) $(CFLAGS)
|
||||
!endif
|
||||
#-----------
|
||||
!if "$(HB_GT_LIB)" != ""
|
||||
CFLAGS = -DHB_GT_LIB=$(HB_GT_LIB:gt=) $(CFLAGS)
|
||||
CFLAGS = -DHB_GT_LIB=$(HB_GT_LIB:gt=) $(CFLAGS)
|
||||
!endif
|
||||
#-----------
|
||||
CLIBFLAGS = -c -q $(CFLAGS) $(CLIBFLAGS)
|
||||
@@ -157,17 +139,17 @@ CEXEFLAGSDLL = -tWM $(BCCDLL_WITH_DYNRT) $(CLIBFLAGS) $(CEXEFLAGSDLL)
|
||||
# Harbour Compiler Flags
|
||||
HBFLAGSCMN = -i$(INCLUDE_DIR) -q0 -w2 -es2 -gc0 -kM $(PRG_USR)
|
||||
!ifdef HB_DOC_PDF
|
||||
HBFLAGSCMN = $(HBFLAGSCMN) -dPDF
|
||||
HBFLAGSCMN = $(HBFLAGSCMN) -dPDF
|
||||
!endif
|
||||
HARBOURFLAGS = -n $(HBFLAGSCMN) $(HARBOURFLAGS)
|
||||
HARBOURFLAGSDLL= -D__EXPORT__ -n1 -l $(HBFLAGSCMN) $(HARBOURFLAGSDLL)
|
||||
|
||||
# Linker Flags
|
||||
LDFLAGS = -ap -Tpe -Gn -C -L$(LIB_DIR) -L$(BIN_DIR) $(LDFLAGS)
|
||||
LDFLAGS = -ap -Tpe -Gn -C -L$(LIB_DIR) -L$(BIN_DIR) $(LDFLAGS)
|
||||
LDFLAGSDLL = -aa -Gn -C -Tpd -Gi -L$(LIB_DIR) $(LDFLAGSDLL)
|
||||
!if "$(HB_BUILD_DEBUG)" == "yes"
|
||||
LDFLAGS = -v $(LDFLAGS)
|
||||
LDFLAGSDLL = -v $(LDFLAGSDLL)
|
||||
LDFLAGS = -v $(LDFLAGS)
|
||||
LDFLAGSDLL = -v $(LDFLAGSDLL)
|
||||
!endif
|
||||
|
||||
#**********************************************************
|
||||
@@ -187,36 +169,36 @@ ARFLAGS = /P32
|
||||
#**********************************************************
|
||||
# General *.c --> *.obj COMPILE rule for STATIC Libraries
|
||||
{$(ALL_SRC_DIRS)}.c{$(OBJ_DIR)}$(OBJEXT):
|
||||
$(CC) $(CLIBFLAGS) -o$@ $<
|
||||
$(CC) $(CLIBFLAGS) -o$@ $<
|
||||
#**********************************************************
|
||||
# General *.prg --> *.obj COMPILE rule for STATIC Libraries
|
||||
{$(ALL_SRC_DIRS)}.prg{$(OBJ_DIR)}$(OBJEXT):
|
||||
$(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $**
|
||||
$(CC) $(CLIBFLAGS) -o$@ $(OBJ_DIR)\$&.c
|
||||
$(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $**
|
||||
$(CC) $(CLIBFLAGS) -o$@ $(OBJ_DIR)\$&.c
|
||||
#**********************************************************
|
||||
|
||||
#**********************************************************
|
||||
# General *.c --> *.obj COMPILE rule for SHARED Libraries
|
||||
{$(ALL_LIB_SRC_DIRS)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):
|
||||
$(CC) $(CLIBFLAGSDLL) -o$@ $<
|
||||
$(CC) $(CLIBFLAGSDLL) -o$@ $<
|
||||
#**********************************************************
|
||||
# General *.prg --> *.obj COMPILE rule for SHARED Libraries
|
||||
{$(ALL_LIB_SRC_DIRS)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT):
|
||||
$(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $**
|
||||
$(CC) $(CLIBFLAGSDLL) -o$@ $(DLL_OBJ_DIR)\$&.c
|
||||
$(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $**
|
||||
$(CC) $(CLIBFLAGSDLL) -o$@ $(DLL_OBJ_DIR)\$&.c
|
||||
#**********************************************************
|
||||
|
||||
#**********************************************************
|
||||
# General *.c --> *.obj COMPILE rules for EXECUTABLES,
|
||||
# which use Harbour SHARED Library compiled as DLL
|
||||
{$(ALL_EXE_SRC_DIRS)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):
|
||||
$(CC) $(CEXEFLAGSDLL) -o$@ $<
|
||||
$(CC) $(CEXEFLAGSDLL) -o$@ $<
|
||||
#**********************************************************
|
||||
# General *.prg --> *.obj COMPILE rules for EXECUTABLES,
|
||||
# which use Harbour SHARED Library compiled as DLL
|
||||
{$(ALL_EXE_SRC_DIRS)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT):
|
||||
$(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $**
|
||||
$(CC) $(CEXEFLAGSDLL) -o$@ $(DLL_OBJ_DIR)\$&.c
|
||||
$(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $**
|
||||
$(CC) $(CEXEFLAGSDLL) -o$@ $(DLL_OBJ_DIR)\$&.c
|
||||
#**********************************************************
|
||||
|
||||
#**********************************************************
|
||||
@@ -252,187 +234,187 @@ StdLibs : $(STANDARD_STATIC_HBLIBS)
|
||||
#**********************************************************
|
||||
|
||||
$(HB_DEST_DIRS) $(HB_BIN_INSTALL) $(HB_LIB_INSTALL) $(HB_INC_INSTALL):
|
||||
!if not exist $@\nul mkdir $@
|
||||
!if not exist $@\nul mkdir $@
|
||||
|
||||
#**********************************************************
|
||||
# LIBRARY Targets BUILD rules
|
||||
#**********************************************************
|
||||
$(COMMON_LIB) : $(COMMON_LIB_OBJS)
|
||||
IF EXIST "$(COMMON_LIB)" $(DEL) "$(COMMON_LIB)" > NUL
|
||||
$(MKLIB) "$(COMMON_LIB)" $(ARFLAGS) @&&!
|
||||
IF EXIST "$(COMMON_LIB)" $(DEL) "$(COMMON_LIB)" > NUL
|
||||
$(MKLIB) "$(COMMON_LIB)" $(ARFLAGS) @&&!
|
||||
+$(**: = &^
|
||||
+)
|
||||
!
|
||||
#**********************************************************
|
||||
$(PP_LIB) : $(PP_LIB_OBJS)
|
||||
IF EXIST "$(PP_LIB)" $(DEL) "$(PP_LIB)" > NUL
|
||||
$(MKLIB) "$(PP_LIB)" $(ARFLAGS) @&&!
|
||||
$(PP_LIB) : $(PP_LIB_OBJS)
|
||||
IF EXIST "$(PP_LIB)" $(DEL) "$(PP_LIB)" > NUL
|
||||
$(MKLIB) "$(PP_LIB)" $(ARFLAGS) @&&!
|
||||
+$(**: = &^
|
||||
+)
|
||||
!
|
||||
#**********************************************************
|
||||
$(COMPILER_LIB) : $(COMPILER_LIB_OBJS)
|
||||
IF EXIST "$(COMPILER_LIB)" $(DEL) "$(COMPILER_LIB)" > NUL
|
||||
$(MKLIB) "$(COMPILER_LIB)" $(ARFLAGS) @&&!
|
||||
IF EXIST "$(COMPILER_LIB)" $(DEL) "$(COMPILER_LIB)" > NUL
|
||||
$(MKLIB) "$(COMPILER_LIB)" $(ARFLAGS) @&&!
|
||||
+$(**: = &^
|
||||
+)
|
||||
!
|
||||
#**********************************************************
|
||||
$(VM_LIB) :: BasicExes
|
||||
$(VM_LIB) :: $(VM_LIB_OBJS)
|
||||
IF EXIST "$(VM_LIB)" $(DEL) "$(VM_LIB)" > NUL
|
||||
$(MKLIB) "$(VM_LIB)" $(ARFLAGS) @&&!
|
||||
$(VM_LIB) :: BasicExes
|
||||
$(VM_LIB) :: $(VM_LIB_OBJS)
|
||||
IF EXIST "$(VM_LIB)" $(DEL) "$(VM_LIB)" > NUL
|
||||
$(MKLIB) "$(VM_LIB)" $(ARFLAGS) @&&!
|
||||
+$(**: = &^
|
||||
+)
|
||||
!
|
||||
#**********************************************************
|
||||
$(RTL_LIB) :: BasicExes
|
||||
$(RTL_LIB) :: $(RTL_LIB_OBJS)
|
||||
IF EXIST "$(RTL_LIB)" $(DEL) "$(RTL_LIB)" > NUL
|
||||
$(MKLIB) "$(RTL_LIB)" $(ARFLAGS) @&&!
|
||||
$(RTL_LIB) :: BasicExes
|
||||
$(RTL_LIB) :: $(RTL_LIB_OBJS)
|
||||
IF EXIST "$(RTL_LIB)" $(DEL) "$(RTL_LIB)" > NUL
|
||||
$(MKLIB) "$(RTL_LIB)" $(ARFLAGS) @&&!
|
||||
+$(**: = &^
|
||||
+)
|
||||
!
|
||||
#**********************************************************
|
||||
$(MACRO_LIB) : $(MACRO_LIB_OBJS)
|
||||
IF EXIST "$(MACRO_LIB)" $(DEL) "$(MACRO_LIB)" > NUL
|
||||
$(MKLIB) "$(MACRO_LIB)" $(ARFLAGS) @&&!
|
||||
$(MACRO_LIB) : $(MACRO_LIB_OBJS)
|
||||
IF EXIST "$(MACRO_LIB)" $(DEL) "$(MACRO_LIB)" > NUL
|
||||
$(MKLIB) "$(MACRO_LIB)" $(ARFLAGS) @&&!
|
||||
+$(**: = &^
|
||||
+)
|
||||
!
|
||||
#**********************************************************
|
||||
$(DEBUG_LIB) :: BasicExes
|
||||
$(DEBUG_LIB) :: $(DEBUG_LIB_OBJS)
|
||||
IF EXIST "$(DEBUG_LIB)" $(DEL) "$(DEBUG_LIB)" > NUL
|
||||
$(MKLIB) "$(DEBUG_LIB)" $(ARFLAGS) @&&!
|
||||
$(DEBUG_LIB) :: BasicExes
|
||||
$(DEBUG_LIB) :: $(DEBUG_LIB_OBJS)
|
||||
IF EXIST "$(DEBUG_LIB)" $(DEL) "$(DEBUG_LIB)" > NUL
|
||||
$(MKLIB) "$(DEBUG_LIB)" $(ARFLAGS) @&&!
|
||||
+$(**: = &^
|
||||
+)
|
||||
!
|
||||
#**********************************************************
|
||||
$(LANG_LIB) : $(LANG_LIB_OBJS)
|
||||
IF EXIST "$(LANG_LIB)" $(DEL) "$(LANG_LIB)" > NUL
|
||||
$(MKLIB) "$(LANG_LIB)" $(ARFLAGS) @&&!
|
||||
$(LANG_LIB) : $(LANG_LIB_OBJS)
|
||||
IF EXIST "$(LANG_LIB)" $(DEL) "$(LANG_LIB)" > NUL
|
||||
$(MKLIB) "$(LANG_LIB)" $(ARFLAGS) @&&!
|
||||
+$(**: = &^
|
||||
+)
|
||||
!
|
||||
#**********************************************************
|
||||
$(CODEPAGE_LIB) : $(CODEPAGE_LIB_OBJS)
|
||||
IF EXIST "$(CODEPAGE_LIB)" $(DEL) "$(CODEPAGE_LIB)" > NUL
|
||||
$(MKLIB) "$(CODEPAGE_LIB)" $(ARFLAGS) @&&!
|
||||
IF EXIST "$(CODEPAGE_LIB)" $(DEL) "$(CODEPAGE_LIB)" > NUL
|
||||
$(MKLIB) "$(CODEPAGE_LIB)" $(ARFLAGS) @&&!
|
||||
+$(**: = &^
|
||||
+)
|
||||
!
|
||||
#**********************************************************
|
||||
$(PCRE_LIB) : $(PCRE_LIB_OBJS)
|
||||
IF EXIST "$(PCRE_LIB)" $(DEL) "$(PCRE_LIB)" > NUL
|
||||
$(MKLIB) "$(PCRE_LIB)" $(ARFLAGS) @&&!
|
||||
$(PCRE_LIB) : $(PCRE_LIB_OBJS)
|
||||
IF EXIST "$(PCRE_LIB)" $(DEL) "$(PCRE_LIB)" > NUL
|
||||
$(MKLIB) "$(PCRE_LIB)" $(ARFLAGS) @&&!
|
||||
+$(**: = &^
|
||||
+)
|
||||
!
|
||||
#**********************************************************
|
||||
$(RDD_LIB) :: BasicExes
|
||||
$(RDD_LIB) :: $(RDD_LIB_OBJS)
|
||||
IF EXIST "$(RDD_LIB)" $(DEL) "$(RDD_LIB)" > NUL
|
||||
$(MKLIB) "$(RDD_LIB)" $(ARFLAGS) @&&!
|
||||
$(RDD_LIB) :: BasicExes
|
||||
$(RDD_LIB) :: $(RDD_LIB_OBJS)
|
||||
IF EXIST "$(RDD_LIB)" $(DEL) "$(RDD_LIB)" > NUL
|
||||
$(MKLIB) "$(RDD_LIB)" $(ARFLAGS) @&&!
|
||||
+$(**: = &^
|
||||
+)
|
||||
!
|
||||
#**********************************************************
|
||||
$(NULSYS_LIB) : $(NULSYS_LIB_OBJS)
|
||||
IF EXIST "$(NULSYS_LIB)" $(DEL) "$(NULSYS_LIB)" > NUL
|
||||
$(MKLIB) "$(NULSYS_LIB)" $(ARFLAGS) @&&!
|
||||
IF EXIST "$(NULSYS_LIB)" $(DEL) "$(NULSYS_LIB)" > NUL
|
||||
$(MKLIB) "$(NULSYS_LIB)" $(ARFLAGS) @&&!
|
||||
+$(**: = &^
|
||||
+)
|
||||
!
|
||||
#**********************************************************
|
||||
$(DBFNTX_LIB) :: BasicExes
|
||||
$(DBFNTX_LIB) :: $(DBFNTX_LIB_OBJS)
|
||||
IF EXIST "$(DBFNTX_LIB)" $(DEL) "$(DBFNTX_LIB)" > NUL
|
||||
$(MKLIB) "$(DBFNTX_LIB)" $(ARFLAGS) @&&!
|
||||
IF EXIST "$(DBFNTX_LIB)" $(DEL) "$(DBFNTX_LIB)" > NUL
|
||||
$(MKLIB) "$(DBFNTX_LIB)" $(ARFLAGS) @&&!
|
||||
+$(**: = &^
|
||||
+)
|
||||
!
|
||||
#**********************************************************
|
||||
$(DBFCDX_LIB) : $(DBFCDX_LIB_OBJS)
|
||||
IF EXIST "$(DBFCDX_LIB)" $(DEL) "$(DBFCDX_LIB)" > NUL
|
||||
$(MKLIB) "$(DBFCDX_LIB)" $(ARFLAGS) @&&!
|
||||
IF EXIST "$(DBFCDX_LIB)" $(DEL) "$(DBFCDX_LIB)" > NUL
|
||||
$(MKLIB) "$(DBFCDX_LIB)" $(ARFLAGS) @&&!
|
||||
+$(**: = &^
|
||||
+)
|
||||
!
|
||||
#**********************************************************
|
||||
$(DBFFPT_LIB) : $(DBFFPT_LIB_OBJS)
|
||||
IF EXIST "$(DBFFPT_LIB)" $(DEL) "$(DBFFPT_LIB)" > NUL
|
||||
$(MKLIB) "$(DBFFPT_LIB)" $(ARFLAGS) @&&!
|
||||
IF EXIST "$(DBFFPT_LIB)" $(DEL) "$(DBFFPT_LIB)" > NUL
|
||||
$(MKLIB) "$(DBFFPT_LIB)" $(ARFLAGS) @&&!
|
||||
+$(**: = &^
|
||||
+)
|
||||
!
|
||||
#**********************************************************
|
||||
$(HBSIX_LIB) : $(HBSIX_LIB_OBJS)
|
||||
IF EXIST "$(HBSIX_LIB)" $(DEL) "$(HBSIX_LIB)" > NUL
|
||||
$(MKLIB) "$(HBSIX_LIB)" $(ARFLAGS) @&&!
|
||||
$(HBSIX_LIB) : $(HBSIX_LIB_OBJS)
|
||||
IF EXIST "$(HBSIX_LIB)" $(DEL) "$(HBSIX_LIB)" > NUL
|
||||
$(MKLIB) "$(HBSIX_LIB)" $(ARFLAGS) @&&!
|
||||
+$(**: = &^
|
||||
+)
|
||||
!
|
||||
#**********************************************************
|
||||
$(HSX_LIB) : $(HSX_LIB_OBJS)
|
||||
IF EXIST "$(HSX_LIB)" $(DEL) "$(HSX_LIB)" > NUL
|
||||
$(MKLIB) "$(HSX_LIB)" $(ARFLAGS) @&&!
|
||||
$(HSX_LIB) : $(HSX_LIB_OBJS)
|
||||
IF EXIST "$(HSX_LIB)" $(DEL) "$(HSX_LIB)" > NUL
|
||||
$(MKLIB) "$(HSX_LIB)" $(ARFLAGS) @&&!
|
||||
+$(**: = &^
|
||||
+)
|
||||
!
|
||||
#**********************************************************
|
||||
$(USRRDD_LIB) : $(USRRDD_LIB_OBJS)
|
||||
IF EXIST "$(USRRDD_LIB)" $(DEL) "$(USRRDD_LIB)" > NUL
|
||||
$(MKLIB) "$(USRRDD_LIB)" $(ARFLAGS) @&&!
|
||||
IF EXIST "$(USRRDD_LIB)" $(DEL) "$(USRRDD_LIB)" > NUL
|
||||
$(MKLIB) "$(USRRDD_LIB)" $(ARFLAGS) @&&!
|
||||
+$(**: = &^
|
||||
+)
|
||||
!
|
||||
#**********************************************************
|
||||
$(GTCGI_LIB) : $(GTCGI_LIB_OBJS)
|
||||
IF EXIST "$(GTCGI_LIB)" $(DEL) "$(GTCGI_LIB)" > NUL
|
||||
$(MKLIB) "$(GTCGI_LIB)" $(ARFLAGS) @&&!
|
||||
$(GTCGI_LIB) : $(GTCGI_LIB_OBJS)
|
||||
IF EXIST "$(GTCGI_LIB)" $(DEL) "$(GTCGI_LIB)" > NUL
|
||||
$(MKLIB) "$(GTCGI_LIB)" $(ARFLAGS) @&&!
|
||||
+$(**: = &^
|
||||
+)
|
||||
!
|
||||
#**********************************************************
|
||||
$(GTDOS_LIB) : $(GTDOS_LIB_OBJS)
|
||||
IF EXIST "$(GTDOS_LIB)" $(DEL) "$(GTDOS_LIB)" > NUL
|
||||
$(MKLIB) "$(GTDOS_LIB)" $(ARFLAGS) @&&!
|
||||
$(GTDOS_LIB) : $(GTDOS_LIB_OBJS)
|
||||
IF EXIST "$(GTDOS_LIB)" $(DEL) "$(GTDOS_LIB)" > NUL
|
||||
$(MKLIB) "$(GTDOS_LIB)" $(ARFLAGS) @&&!
|
||||
+$(**: = &^
|
||||
+)
|
||||
!
|
||||
#**********************************************************
|
||||
$(GTPCA_LIB) : $(GTPCA_LIB_OBJS)
|
||||
IF EXIST "$(GTPCA_LIB)" $(DEL) "$(GTPCA_LIB)" > NUL
|
||||
$(MKLIB) "$(GTPCA_LIB)" $(ARFLAGS) @&&!
|
||||
$(GTPCA_LIB) : $(GTPCA_LIB_OBJS)
|
||||
IF EXIST "$(GTPCA_LIB)" $(DEL) "$(GTPCA_LIB)" > NUL
|
||||
$(MKLIB) "$(GTPCA_LIB)" $(ARFLAGS) @&&!
|
||||
+$(**: = &^
|
||||
+)
|
||||
!
|
||||
#**********************************************************
|
||||
$(GTSTD_LIB) : $(GTSTD_LIB_OBJS)
|
||||
IF EXIST "$(GTSTD_LIB)" $(DEL) "$(GTSTD_LIB)" > NUL
|
||||
$(MKLIB) "$(GTSTD_LIB)" $(ARFLAGS) @&&!
|
||||
$(GTSTD_LIB) : $(GTSTD_LIB_OBJS)
|
||||
IF EXIST "$(GTSTD_LIB)" $(DEL) "$(GTSTD_LIB)" > NUL
|
||||
$(MKLIB) "$(GTSTD_LIB)" $(ARFLAGS) @&&!
|
||||
+$(**: = &^
|
||||
+)
|
||||
!
|
||||
#**********************************************************
|
||||
$(GTWIN_LIB) : $(GTWIN_LIB_OBJS)
|
||||
IF EXIST "$(GTWIN_LIB)" $(DEL) "$(GTWIN_LIB)" > NUL
|
||||
$(MKLIB) "$(GTWIN_LIB)" $(ARFLAGS) @&&!
|
||||
$(GTWIN_LIB) : $(GTWIN_LIB_OBJS)
|
||||
IF EXIST "$(GTWIN_LIB)" $(DEL) "$(GTWIN_LIB)" > NUL
|
||||
$(MKLIB) "$(GTWIN_LIB)" $(ARFLAGS) @&&!
|
||||
+$(**: = &^
|
||||
+)
|
||||
!
|
||||
#**********************************************************
|
||||
$(GTWVT_LIB) : $(GTWVT_LIB_OBJS)
|
||||
IF EXIST "$(GTWVT_LIB)" $(DEL) "$(GTWVT_LIB)" > NUL
|
||||
$(MKLIB) "$(GTWVT_LIB)" $(ARFLAGS) @&&!
|
||||
$(GTWVT_LIB) : $(GTWVT_LIB_OBJS)
|
||||
IF EXIST "$(GTWVT_LIB)" $(DEL) "$(GTWVT_LIB)" > NUL
|
||||
$(MKLIB) "$(GTWVT_LIB)" $(ARFLAGS) @&&!
|
||||
+$(**: = &^
|
||||
+)
|
||||
!
|
||||
#**********************************************************
|
||||
$(GTGUI_LIB) : $(GTGUI_LIB_OBJS)
|
||||
IF EXIST "$(GTGUI_LIB)" $(DEL) "$(GTGUI_LIB)" > NUL
|
||||
$(MKLIB) "$(GTGUI_LIB)" $(ARFLAGS) @&&!
|
||||
$(GTGUI_LIB) : $(GTGUI_LIB_OBJS)
|
||||
IF EXIST "$(GTGUI_LIB)" $(DEL) "$(GTGUI_LIB)" > NUL
|
||||
$(MKLIB) "$(GTGUI_LIB)" $(ARFLAGS) @&&!
|
||||
+$(**: = &^
|
||||
+)
|
||||
!
|
||||
@@ -447,8 +429,8 @@ $(GTGUI_LIB) : $(GTGUI_LIB_OBJS)
|
||||
#**********************************************************
|
||||
$(HARBOUR_EXE) :: BasicLibs
|
||||
$(HARBOUR_EXE) :: $(HARBOUR_EXE_OBJS)
|
||||
IF EXIST "$(HARBOUR_EXE)" $(DEL) "$(HARBOUR_EXE)" > NUL
|
||||
$(CC) @&&!
|
||||
IF EXIST "$(HARBOUR_EXE)" $(DEL) "$(HARBOUR_EXE)" > NUL
|
||||
$(CC) @&&!
|
||||
$(CFLAGS)
|
||||
-e$(HARBOUR_EXE)
|
||||
$(**: = ^
|
||||
@@ -462,8 +444,8 @@ $(PP_LIB)
|
||||
#**********************************************************
|
||||
$(HBPPGEN_EXE) :: $(COMMON_LIB)
|
||||
$(HBPPGEN_EXE) :: $(HBPPGEN_EXE_OBJS)
|
||||
IF EXIST "$(HBPPGEN_EXE)" $(DEL) "$(HBPPGEN_EXE)" > NUL
|
||||
$(CC) @&&!
|
||||
IF EXIST "$(HBPPGEN_EXE)" $(DEL) "$(HBPPGEN_EXE)" > NUL
|
||||
$(CC) @&&!
|
||||
$(CFLAGS)
|
||||
-e$(HBPPGEN_EXE)
|
||||
$(**: = ^
|
||||
@@ -475,8 +457,8 @@ $(COMMON_LIB)
|
||||
#**********************************************************
|
||||
$(HBPP_EXE) :: BasicLibs
|
||||
$(HBPP_EXE) :: $(HBPP_EXE_OBJS)
|
||||
IF EXIST "$(HBPP_EXE)" $(DEL) "$(HBPP_EXE)" > NUL
|
||||
$(CC) @&&!
|
||||
IF EXIST "$(HBPP_EXE)" $(DEL) "$(HBPP_EXE)" > NUL
|
||||
$(CC) @&&!
|
||||
$(CFLAGS)
|
||||
-e$(HBPP_EXE)
|
||||
$(**: = ^
|
||||
@@ -488,8 +470,8 @@ $(COMMON_LIB)
|
||||
#**********************************************************
|
||||
$(HBRUN_EXE) :: BasicLibs BasicExes StdLibs
|
||||
$(HBRUN_EXE) :: $(HBRUN_EXE_OBJS)
|
||||
IF EXIST "$(HBRUN_EXE)" $(DEL) "$(HBRUN_EXE)" > NUL
|
||||
$(CC) @&&!
|
||||
IF EXIST "$(HBRUN_EXE)" $(DEL) "$(HBRUN_EXE)" > NUL
|
||||
$(CC) @&&!
|
||||
$(CFLAGS)
|
||||
-e$(HBRUN_EXE)
|
||||
$(**: = ^
|
||||
@@ -501,8 +483,8 @@ $(STANDARD_STATIC_HBLIBS)
|
||||
#**********************************************************
|
||||
$(HBDOT_EXE) :: BasicLibs BasicExes StdLibs
|
||||
$(HBDOT_EXE) :: $(HBDOT_EXE_OBJS)
|
||||
IF EXIST "$(HBDOT_EXE)" $(DEL) "$(HBDOT_EXE)" > NUL
|
||||
$(CC) @&&!
|
||||
IF EXIST "$(HBDOT_EXE)" $(DEL) "$(HBDOT_EXE)" > NUL
|
||||
$(CC) @&&!
|
||||
$(CFLAGS)
|
||||
-e$(HBDOT_EXE)
|
||||
$(**: = ^
|
||||
@@ -514,8 +496,8 @@ $(STANDARD_STATIC_HBLIBS)
|
||||
#**********************************************************
|
||||
$(HBTEST_EXE) :: BasicLibs BasicExes StdLibs
|
||||
$(HBTEST_EXE) :: $(HBTEST_EXE_OBJS)
|
||||
IF EXIST "$(HBTEST_EXE)" $(DEL) "$(HBTEST_EXE)" > NUL
|
||||
$(CC) @&&!
|
||||
IF EXIST "$(HBTEST_EXE)" $(DEL) "$(HBTEST_EXE)" > NUL
|
||||
$(CC) @&&!
|
||||
$(CFLAGS)
|
||||
-e$(HBTEST_EXE)
|
||||
$(**: = ^
|
||||
@@ -527,8 +509,8 @@ $(STANDARD_STATIC_HBLIBS)
|
||||
#**********************************************************
|
||||
$(HBPPTEST_EXE) :: BasicLibs BasicExes StdLibs
|
||||
$(HBPPTEST_EXE) :: $(HBPPTEST_EXE_OBJS)
|
||||
IF EXIST "$(HBPPTEST_EXE)" $(DEL) "$(HBPPTEST_EXE)" > NUL
|
||||
$(CC) @&&!
|
||||
IF EXIST "$(HBPPTEST_EXE)" $(DEL) "$(HBPPTEST_EXE)" > NUL
|
||||
$(CC) @&&!
|
||||
$(CFLAGS)
|
||||
-e$(HBPPTEST_EXE)
|
||||
$(**: = ^
|
||||
@@ -541,8 +523,8 @@ $(PP_LIB)
|
||||
#**********************************************************
|
||||
$(HBDOC_EXE) :: BasicLibs BasicExes StdLibs
|
||||
$(HBDOC_EXE) :: $(HBDOC_EXE_OBJS)
|
||||
IF EXIST "$(HBDOC_EXE)" $(DEL) "$(HBDOC_EXE)" > NUL
|
||||
$(CC) @&&!
|
||||
IF EXIST "$(HBDOC_EXE)" $(DEL) "$(HBDOC_EXE)" > NUL
|
||||
$(CC) @&&!
|
||||
$(CFLAGS)
|
||||
-e$(HBDOC_EXE)
|
||||
$(**: = ^
|
||||
@@ -554,8 +536,8 @@ $(STANDARD_STATIC_HBLIBS)
|
||||
#**********************************************************
|
||||
$(HBMAKE_EXE) :: BasicLibs BasicExes StdLibs
|
||||
$(HBMAKE_EXE) :: $(HBMAKE_EXE_OBJS)
|
||||
IF EXIST "$(HBMAKE_EXE)" $(DEL) "$(HBMAKE_EXE)" > NUL
|
||||
$(CC) @&&!
|
||||
IF EXIST "$(HBMAKE_EXE)" $(DEL) "$(HBMAKE_EXE)" > NUL
|
||||
$(CC) @&&!
|
||||
$(CFLAGS)
|
||||
-e$(HBMAKE_EXE)
|
||||
$(**: = ^
|
||||
@@ -567,8 +549,8 @@ $(STANDARD_STATIC_HBLIBS)
|
||||
#**********************************************************
|
||||
$(HBVER_EXE) :: BasicLibs BasicExes StdLibs
|
||||
$(HBVER_EXE) :: $(HBVER_EXE_OBJS)
|
||||
IF EXIST "$(HBVER_EXE)" $(DEL) "$(HBVER_EXE)" > NUL
|
||||
$(CC) @&&!
|
||||
IF EXIST "$(HBVER_EXE)" $(DEL) "$(HBVER_EXE)" > NUL
|
||||
$(CC) @&&!
|
||||
$(CFLAGS)
|
||||
-e$(HBVER_EXE)
|
||||
$(**: = ^
|
||||
@@ -582,7 +564,7 @@ $(STANDARD_STATIC_HBLIBS)
|
||||
#**********************************************************
|
||||
$(HARBOUR_DLL) :: BasicLibs BasicExes
|
||||
$(HARBOUR_DLL) :: $(DLL_OBJS)
|
||||
$(LINKER) $(LDFLAGSDLL) @&&!
|
||||
$(LINKER) $(LDFLAGSDLL) @&&!
|
||||
c0d32.obj $**, $@,, cw32mt$(RTLIBSUFFIX).lib import32.lib
|
||||
!
|
||||
#**********************************************************
|
||||
@@ -590,7 +572,7 @@ c0d32.obj $**, $@,, cw32mt$(RTLIBSUFFIX).lib import32.lib
|
||||
#**********************************************************
|
||||
$(HBTESTDLL_EXE) :: BasicLibs BasicExes
|
||||
$(HBTESTDLL_EXE) :: $(DLL_OBJ_DIR)\mainstd.obj $(HBTEST_EXE_OBJS:$(OBJ_DIR)=$(DLL_OBJ_DIR))
|
||||
$(LINKER) $(LDFLAGS) @&&!
|
||||
$(LINKER) $(LDFLAGS) @&&!
|
||||
c0x32.obj $**, $@,,$(HARBOUR_DLL:.dll=.lib) cw32mt$(RTLIBSUFFIX).lib import32.lib
|
||||
!
|
||||
#----------------------------------------------------------
|
||||
@@ -599,7 +581,7 @@ c0x32.obj $**, $@,,$(HARBOUR_DLL:.dll=.lib) cw32mt$(RTLIBSUFFIX).lib import32.li
|
||||
# $(CC) $(CLIBFLAGSDLL) -o$@ $(DLL_OBJ_DIR)\$&.c
|
||||
#----------------------------------------------------------
|
||||
$(DLL_OBJ_DIR)\mainstd.obj : $(VM_DIR)\mainstd.c
|
||||
$(CC) $(CEXEFLAGSDLL) -o$@ $**
|
||||
$(CC) $(CEXEFLAGSDLL) -o$@ $**
|
||||
#**********************************************************
|
||||
|
||||
#**********************************************************
|
||||
@@ -616,41 +598,41 @@ $(DLL_OBJ_DIR)\mainstd.obj : $(VM_DIR)\mainstd.c
|
||||
# built at the initial phase of build process
|
||||
$(OBJ_DIR)\pptable.obj : $(OBJ_DIR)\pptable.c
|
||||
$(OBJ_DIR)\pptable.c : include\hbstdgen.ch include\std.ch $(PP_DIR)\ppcore.c $(PP_DIR)\hbppgen.c
|
||||
IF EXIST "$(OBJ_DIR)\pptable.c" $(DEL) "$(OBJ_DIR)\pptable.c" > nul
|
||||
$(HBPPGEN) include/hbstdgen.ch -o$(OBJ_DIR)/pptable.c -q
|
||||
IF EXIST "$(OBJ_DIR)\pptable.c" $(DEL) "$(OBJ_DIR)\pptable.c" > nul
|
||||
$(HBPPGEN) include/hbstdgen.ch -o$(OBJ_DIR)/pptable.c -q
|
||||
#**********************************************************
|
||||
|
||||
!if "$(HB_REBUILD_PARSER)" == "yes"
|
||||
|
||||
$(OBJ_DIR)\harboury.c : $(COMPILER_DIR)\harbour.y
|
||||
bison --no-line -d $** -o$@
|
||||
bison --no-line -d $** -o$@
|
||||
|
||||
$(OBJ_DIR)\macroy.c : $(MACRO_DIR)\macro.y
|
||||
bison --no-line -d $** -o$@
|
||||
bison --no-line -d $** -o$@
|
||||
|
||||
$(DLL_OBJ_DIR)\harboury.c : $(COMPILER_DIR)\harbour.y
|
||||
bison --no-line -d $** -o$@
|
||||
bison --no-line -d $** -o$@
|
||||
|
||||
$(DLL_OBJ_DIR)\macroy.c : $(MACRO_DIR)\macro.y
|
||||
bison --no-line -d $** -o$@
|
||||
bison --no-line -d $** -o$@
|
||||
|
||||
!else
|
||||
|
||||
$(OBJ_DIR)\harboury.c : $(COMPILER_DIR)\harbour.yyc
|
||||
copy /A $** $@
|
||||
copy /A $(**:.yyc=.yyh) $(@:.c=.h)
|
||||
copy /A $** $@
|
||||
copy /A $(**:.yyc=.yyh) $(@:.c=.h)
|
||||
|
||||
$(OBJ_DIR)\macroy.c : $(MACRO_DIR)\macro.yyc
|
||||
copy /A $** $@
|
||||
copy /A $(**:.yyc=.yyh) $(@:.c=.h)
|
||||
copy /A $** $@
|
||||
copy /A $(**:.yyc=.yyh) $(@:.c=.h)
|
||||
|
||||
$(DLL_OBJ_DIR)\harboury.c : $(COMPILER_DIR)\harbour.yyc
|
||||
copy /A $** $@
|
||||
copy /A $(**:.yyc=.yyh) $(@:.c=.h)
|
||||
copy /A $** $@
|
||||
copy /A $(**:.yyc=.yyh) $(@:.c=.h)
|
||||
|
||||
$(DLL_OBJ_DIR)\macroy.c : $(MACRO_DIR)\macro.yyc
|
||||
copy /A $** $@
|
||||
copy /A $(**:.yyc=.yyh) $(@:.c=.h)
|
||||
copy /A $** $@
|
||||
copy /A $(**:.yyc=.yyh) $(@:.c=.h)
|
||||
|
||||
!endif
|
||||
|
||||
@@ -673,24 +655,24 @@ Clean: doClean
|
||||
CLEAN: doClean
|
||||
|
||||
doClean:
|
||||
-if exist $(BIN_DIR)\*.exe $(DEL) $(BIN_DIR)\*.exe > nul
|
||||
-if exist $(BIN_DIR)\*.tds $(DEL) $(BIN_DIR)\*.tds > nul
|
||||
-if exist $(BIN_DIR)\*.tr? $(DEL) $(BIN_DIR)\*.tr? > nul
|
||||
-if exist $(BIN_DIR)\*.map $(DEL) $(BIN_DIR)\*.map > nul
|
||||
-if exist $(BIN_DIR)\*.dll $(DEL) $(BIN_DIR)\*.dll > nul
|
||||
-if exist $(BIN_DIR)\*.lib $(DEL) $(BIN_DIR)\*.lib > nul
|
||||
-if exist $(LIB_DIR)\*.lib $(DEL) $(LIB_DIR)\*.lib > nul
|
||||
-if exist $(LIB_DIR)\*.bak $(DEL) $(LIB_DIR)\*.bak > nul
|
||||
-if exist $(OBJ_DIR)\*.obj $(DEL) $(OBJ_DIR)\*.obj > nul
|
||||
-if exist $(OBJ_DIR)\*.c $(DEL) $(OBJ_DIR)\*.c > nul
|
||||
-if exist $(OBJ_DIR)\*.h $(DEL) $(OBJ_DIR)\*.h > nul
|
||||
-if exist $(DLL_OBJ_DIR)\*.obj $(DEL) $(DLL_OBJ_DIR)\*.obj > nul
|
||||
-if exist $(DLL_OBJ_DIR)\*.c $(DEL) $(DLL_OBJ_DIR)\*.c > nul
|
||||
-if exist $(DLL_OBJ_DIR)\*.h $(DEL) $(DLL_OBJ_DIR)\*.h > nul
|
||||
-if exist inst_$(HB_CC_NAME).log $(DEL) inst_$(HB_CC_NAME).log > nul
|
||||
-if exist gtlibs.mak $(DEL) gtlibs.mak > nul
|
||||
-if exist bin\*.exe $(DEL) bin\*.exe > nul
|
||||
-if exist lib\*.lib $(DEL) lib\*.lib > nul
|
||||
-if exist $(BIN_DIR)\*.exe $(DEL) $(BIN_DIR)\*.exe > nul
|
||||
-if exist $(BIN_DIR)\*.tds $(DEL) $(BIN_DIR)\*.tds > nul
|
||||
-if exist $(BIN_DIR)\*.tr? $(DEL) $(BIN_DIR)\*.tr? > nul
|
||||
-if exist $(BIN_DIR)\*.map $(DEL) $(BIN_DIR)\*.map > nul
|
||||
-if exist $(BIN_DIR)\*.dll $(DEL) $(BIN_DIR)\*.dll > nul
|
||||
-if exist $(BIN_DIR)\*.lib $(DEL) $(BIN_DIR)\*.lib > nul
|
||||
-if exist $(LIB_DIR)\*.lib $(DEL) $(LIB_DIR)\*.lib > nul
|
||||
-if exist $(LIB_DIR)\*.bak $(DEL) $(LIB_DIR)\*.bak > nul
|
||||
-if exist $(OBJ_DIR)\*.obj $(DEL) $(OBJ_DIR)\*.obj > nul
|
||||
-if exist $(OBJ_DIR)\*.c $(DEL) $(OBJ_DIR)\*.c > nul
|
||||
-if exist $(OBJ_DIR)\*.h $(DEL) $(OBJ_DIR)\*.h > nul
|
||||
-if exist $(DLL_OBJ_DIR)\*.obj $(DEL) $(DLL_OBJ_DIR)\*.obj > nul
|
||||
-if exist $(DLL_OBJ_DIR)\*.c $(DEL) $(DLL_OBJ_DIR)\*.c > nul
|
||||
-if exist $(DLL_OBJ_DIR)\*.h $(DEL) $(DLL_OBJ_DIR)\*.h > nul
|
||||
-if exist inst_$(HB_CC_NAME).log $(DEL) inst_$(HB_CC_NAME).log > nul
|
||||
-if exist gtlibs.mak $(DEL) gtlibs.mak > nul
|
||||
-if exist bin\*.exe $(DEL) bin\*.exe > nul
|
||||
-if exist lib\*.lib $(DEL) lib\*.lib > nul
|
||||
|
||||
#**********************************************************
|
||||
# INSTALL rules
|
||||
@@ -701,14 +683,14 @@ Install : doInstall
|
||||
INSTALL : doInstall
|
||||
|
||||
doInstall: $(HB_BIN_INSTALL) $(HB_LIB_INSTALL) $(HB_INC_INSTALL)
|
||||
-if exist $(HB_BIN_INSTALL)\nul if exist $(BIN_DIR)\*.exe copy /B $(BIN_DIR)\*.exe $(HB_BIN_INSTALL) > inst_$(HB_CC_NAME).log
|
||||
-if exist $(HB_BIN_INSTALL)\nul if exist $(BIN_DIR)\*.dll copy /B $(BIN_DIR)\*.dll $(HB_BIN_INSTALL) >> inst_$(HB_CC_NAME).log
|
||||
-if exist $(HB_LIB_INSTALL)\nul if exist $(BIN_DIR)\*.lib copy /B $(BIN_DIR)\*.lib $(HB_LIB_INSTALL) >> inst_$(HB_CC_NAME).log
|
||||
-if exist $(HB_LIB_INSTALL)\nul if exist $(LIB_DIR)\*.lib copy /B $(LIB_DIR)\*.lib $(HB_LIB_INSTALL) >> inst_$(HB_CC_NAME).log
|
||||
-if exist $(HB_BIN_INSTALL)\nul if exist $(BIN_DIR)\*.exe copy /B $(BIN_DIR)\*.exe $(HB_BIN_INSTALL) > inst_$(HB_CC_NAME).log
|
||||
-if exist $(HB_BIN_INSTALL)\nul if exist $(BIN_DIR)\*.dll copy /B $(BIN_DIR)\*.dll $(HB_BIN_INSTALL) >> inst_$(HB_CC_NAME).log
|
||||
-if exist $(HB_LIB_INSTALL)\nul if exist $(BIN_DIR)\*.lib copy /B $(BIN_DIR)\*.lib $(HB_LIB_INSTALL) >> inst_$(HB_CC_NAME).log
|
||||
-if exist $(HB_LIB_INSTALL)\nul if exist $(LIB_DIR)\*.lib copy /B $(LIB_DIR)\*.lib $(HB_LIB_INSTALL) >> inst_$(HB_CC_NAME).log
|
||||
!if "$(HB_INSTALL_PREFIX)" != "."
|
||||
-if exist $(HB_INC_INSTALL)\nul copy /A include\*.api $(HB_INC_INSTALL) >> inst_$(HB_CC_NAME).log
|
||||
-if exist $(HB_INC_INSTALL)\nul copy /A include\*.ch $(HB_INC_INSTALL) >> inst_$(HB_CC_NAME).log
|
||||
-if exist $(HB_INC_INSTALL)\nul copy /A include\*.h $(HB_INC_INSTALL) >> inst_$(HB_CC_NAME).log
|
||||
-if exist $(HB_INC_INSTALL)\nul copy /A include\*.api $(HB_INC_INSTALL) >> inst_$(HB_CC_NAME).log
|
||||
-if exist $(HB_INC_INSTALL)\nul copy /A include\*.ch $(HB_INC_INSTALL) >> inst_$(HB_CC_NAME).log
|
||||
-if exist $(HB_INC_INSTALL)\nul copy /A include\*.h $(HB_INC_INSTALL) >> inst_$(HB_CC_NAME).log
|
||||
!endif
|
||||
|
||||
#**********************************************************
|
||||
|
||||
@@ -131,24 +131,6 @@ VPATH := $(ALL_SRC_DIRS) $(LIB_DIR) $(BIN_DIR) $(OBJ_DIR)
|
||||
# due to serious limitations of Microsoft Nmake
|
||||
DLL_OBJS = $(TMP_DLL_OBJS:$(OBJ_DIR)=$(DLL_OBJ_DIR))
|
||||
|
||||
#**********************************************************
|
||||
#**********************************************************
|
||||
#**********************************************************
|
||||
|
||||
# allows to do cross-compiling if neccesary.
|
||||
ifndef HB
|
||||
HB = $(HARBOUR_EXE)
|
||||
endif
|
||||
|
||||
# allows to do cross-compiling if neccesary.
|
||||
ifndef HBPPGEN
|
||||
HBPPGEN = $(HBPPGEN_EXE)
|
||||
endif
|
||||
|
||||
#**********************************************************
|
||||
#**********************************************************
|
||||
#**********************************************************
|
||||
|
||||
#**********************************************************
|
||||
# C compiler flags and Harbour compiler flags.
|
||||
#**********************************************************
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user