2007-11-26 06:15 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl)
* harbour/make_b32.mak
* harbour/make_gcc.mak
* harbour/make_vc.mak
* harbour/make_vcce.mak
! Fixed generation of pptable.c for dll build
(I am amazed how it used to work before)
* Changed -Iobj\$(HB_CC_NAME) to -I$(OBJ_DIR)
This commit is contained in:
Marek Paliwoda
@@ -8,6 +8,15 @@
|
||||
2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
|
||||
*/
|
||||
|
||||
2007-11-26 06:15 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl)
|
||||
* harbour/make_b32.mak
|
||||
* harbour/make_gcc.mak
|
||||
* harbour/make_vc.mak
|
||||
* harbour/make_vcce.mak
|
||||
! Fixed generation of pptable.c for dll build
|
||||
(I am amazed how it used to work before)
|
||||
* Changed -Iobj\$(HB_CC_NAME) to -I$(OBJ_DIR)
|
||||
|
||||
2007-11-26 09:46 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
|
||||
* harbour/bin/hb-func.sh
|
||||
! fixed typo
|
||||
|
||||
@@ -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
|
||||
|
||||
#**********************************************************
|
||||
@@ -110,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) -I$(OBJ_DIR)
|
||||
#-----------
|
||||
!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)
|
||||
@@ -139,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
|
||||
|
||||
#**********************************************************
|
||||
@@ -169,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
|
||||
#**********************************************************
|
||||
|
||||
#**********************************************************
|
||||
@@ -234,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) @&&!
|
||||
+$(**: = &^
|
||||
+)
|
||||
!
|
||||
@@ -429,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)
|
||||
$(**: = ^
|
||||
@@ -444,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)
|
||||
$(**: = ^
|
||||
@@ -457,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)
|
||||
$(**: = ^
|
||||
@@ -470,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)
|
||||
$(**: = ^
|
||||
@@ -483,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)
|
||||
$(**: = ^
|
||||
@@ -496,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)
|
||||
$(**: = ^
|
||||
@@ -509,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)
|
||||
$(**: = ^
|
||||
@@ -523,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)
|
||||
$(**: = ^
|
||||
@@ -536,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)
|
||||
$(**: = ^
|
||||
@@ -549,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)
|
||||
$(**: = ^
|
||||
@@ -564,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
|
||||
!
|
||||
#**********************************************************
|
||||
@@ -572,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
|
||||
!
|
||||
#----------------------------------------------------------
|
||||
@@ -581,58 +581,61 @@ 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$@ $**
|
||||
#**********************************************************
|
||||
|
||||
#**********************************************************
|
||||
#**********************************************************
|
||||
#**********************************************************
|
||||
|
||||
|
||||
#**********************************************************
|
||||
# EXTRA Object's DEPENDENCIES
|
||||
#**********************************************************
|
||||
|
||||
#**********************************************************
|
||||
|
||||
# Generated by an intermediate utility hbppgen.exe
|
||||
# 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
|
||||
$(OBJ_DIR)\pptable.obj : $(OBJ_DIR)\pptable.c
|
||||
$(DLL_OBJ_DIR)\pptable.obj : $(DLL_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
|
||||
|
||||
$(DLL_OBJ_DIR)\pptable.c : include\hbstdgen.ch include\std.ch $(PP_DIR)\ppcore.c $(PP_DIR)\hbppgen.c
|
||||
IF EXIST "$(DLL_OBJ_DIR)\pptable.c" $(DEL) "$(DLL_OBJ_DIR)\pptable.c" > nul
|
||||
$(HBPPGEN) include/hbstdgen.ch -o$(DLL_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
|
||||
|
||||
@@ -655,24 +658,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
|
||||
@@ -683,14 +686,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
|
||||
|
||||
#**********************************************************
|
||||
|
||||
@@ -138,7 +138,7 @@ DLL_OBJS = $(TMP_DLL_OBJS:$(OBJ_DIR)=$(DLL_OBJ_DIR))
|
||||
# Main "Include" directory
|
||||
INCLUDE_DIR := include
|
||||
|
||||
CFLAGS := -W -Wall -I$(INCLUDE_DIR) $(C_USR) $(CFLAGS) -Iobj/$(HB_CC_NAME)
|
||||
CFLAGS := -W -Wall -I$(INCLUDE_DIR) $(C_USR) $(CFLAGS) -I$(OBJ_DIR)
|
||||
#-----------
|
||||
ifndef GCC_NOOPTIM
|
||||
CFLAGS := -O3 $(CFLAGS)
|
||||
@@ -387,7 +387,12 @@ $(HBVER_EXE) :: $(HBVER_EXE_OBJS)
|
||||
# Generated by an intermediate utility hbppgen.exe
|
||||
# built at the initial phase of build process
|
||||
$(OBJ_DIR)/pptable$(OBJEXT) : $(OBJ_DIR)/pptable.c
|
||||
$(OBJ_DIR)/pptable.c : $(HBPPGEN) include/hbstdgen.ch include/std.ch $(PP_DIR)/ppcore.c $(PP_DIR)/hbppgen.c
|
||||
$(DLL_OBJ_DIR)/pptable$(OBJEXT) : $(DLL_OBJ_DIR)/pptable.c
|
||||
|
||||
$(OBJ_DIR)/pptable.c : $(HBPPGEN) include/hbstdgen.ch include/std.ch $(PP_DIR)/ppcore.c $(PP_DIR)/hbppgen.c
|
||||
$< include/hbstdgen.ch -o$@ -q
|
||||
|
||||
$(DLL_OBJ_DIR)/pptable.c : $(HBPPGEN) include/hbstdgen.ch include/std.ch $(PP_DIR)/ppcore.c $(PP_DIR)/hbppgen.c
|
||||
$< include/hbstdgen.ch -o$@ -q
|
||||
|
||||
#**********************************************************
|
||||
|
||||
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