diff --git a/harbour/ChangeLog b/harbour/ChangeLog index cdf85e62ad..07a53b0d14 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,15 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-12-04 17:04 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl) + * harbour/make_b32.mak + * harbour/make_vc.mak + * TABs converted to spaces. Minor formatting + + * harbour/make_gcc.mak + * harbour/make_vcce.mak + * Minor formatting + 2007-12-04 16:30 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl) * harbour/make_vcce.bat * Checking if HB and HBPPGEN envvars are set is moved diff --git a/harbour/make_b32.mak b/harbour/make_b32.mak index a4c5487e8c..ab2d5be74d 100644 --- a/harbour/make_b32.mak +++ b/harbour/make_b32.mak @@ -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. #********************************************************** #.KEEP @@ -100,27 +100,27 @@ DLL_OBJS = $(TMP_DLL_OBJS:$(OBJ_DIR)=$(DLL_OBJ_DIR)) INCLUDE_DIR = include # C Compiler Flags -CFLAGS = -I$(INCLUDE_DIR) $(C_USR) $(CFLAGS) -I$(OBJ_DIR) +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" - BCCDLL_WITH_DYNRT=$(BCCDLL_WITH_DYNRT) -DHB_NO_BCC_MAX_OPENFILES_HACK - RTLIBSUFFIX = i + BCCDLL_WITH_DYNRT=$(BCCDLL_WITH_DYNRT) -DHB_NO_BCC_MAX_OPENFILES_HACK + 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) @@ -130,17 +130,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 $(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 #********************************************************** @@ -160,36 +160,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 #********************************************************** #********************************************************** @@ -225,187 +225,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) @&&! +$(**: = &^ +) ! @@ -420,8 +420,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) $(**: = ^ @@ -435,8 +435,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) $(**: = ^ @@ -448,8 +448,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) $(**: = ^ @@ -461,8 +461,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) $(**: = ^ @@ -474,8 +474,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) $(**: = ^ @@ -487,8 +487,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) $(**: = ^ @@ -500,8 +500,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) $(**: = ^ @@ -514,8 +514,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) $(**: = ^ @@ -527,8 +527,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) $(**: = ^ @@ -540,8 +540,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) $(**: = ^ @@ -555,7 +555,7 @@ $(STANDARD_STATIC_HBLIBS) #********************************************************** $(HARBOUR_DLL) :: BasicLibs BasicExes $(HARBOUR_DLL) :: $(DLL_OBJS) - $(LINKER) $(LDFLAGSDLL) @&&! + $(LINKER) $(LDFLAGSDLL) @&&! c0d32.obj $**, $@,, cw32mt$(RTLIBSUFFIX).lib import32.lib ! #********************************************************** @@ -563,16 +563,12 @@ c0d32.obj $**, $@,, cw32mt$(RTLIBSUFFIX).lib import32.lib #********************************************************** $(HBTESTDLL_EXE) :: BasicLibs BasicExes $(HBTESTDLL_EXE) :: $(DLL_OBJ_DIR)\mainstd$(OBJEXT) $(HBTEST_EXE_OBJS:$(OBJ_DIR)=$(DLL_OBJ_DIR)) - $(LINKER) $(LDFLAGS) @&&! + $(LINKER) $(LDFLAGS) @&&! c0x32.obj $**, $@,,$(HARBOUR_DLL:$(DLLEXT)=$(LIBEXT)) cw32mt$(RTLIBSUFFIX).lib import32.lib ! #---------------------------------------------------------- -#$(DLL_OBJ_DIR)\hbtest.obj : $(HBTEST_DIR)\hbtest.prg -# $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $** -# $(CC) $(CLIBFLAGSDLL) -o$@ $(DLL_OBJ_DIR)\$&.c -#---------------------------------------------------------- $(DLL_OBJ_DIR)\mainstd$(OBJEXT) : $(VM_DIR)\mainstd.c - $(CC) $(CEXEFLAGSDLL) -o$@ $** + $(CC) $(CEXEFLAGSDLL) -o$@ $** #********************************************************** #********************************************************** @@ -586,47 +582,47 @@ $(DLL_OBJ_DIR)\mainstd$(OBJEXT) : $(VM_DIR)\mainstd.c $(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 +$(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 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 @@ -649,24 +645,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 @@ -677,14 +673,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 #********************************************************** diff --git a/harbour/make_gcc.mak b/harbour/make_gcc.mak index 3d06450f53..9ce7a4f6d8 100644 --- a/harbour/make_gcc.mak +++ b/harbour/make_gcc.mak @@ -87,6 +87,8 @@ endif #********************************************************** +# CC and LD are set in make_gcc.sh + #ifeq ($(CC),) #CC = gcc #endif @@ -153,7 +155,7 @@ VPATH := $(ALL_SRC_DIRS) $(LIB_DIR) $(BIN_DIR) $(OBJ_DIR) $(DLL_OBJ_DIR) DLL_OBJS := $(TMP_DLL_OBJS) # DLLs on Windows require IMPORT lib -# and additional compiler pass +# and an additional compiler pass ifeq ($(findstring $(HB_ARCHITECTURE),w32 cyg os2),w32) DLL_OBJS := $(patsubst $(OBJ_DIR)%,$(DLL_OBJ_DIR)%,$(TMP_DLL_OBJS)) @@ -188,12 +190,12 @@ endif #----------- CLIBFLAGS := -c $(CFLAGS) $(CLIBFLAGS) CLIBFLAGSDLL := -D__EXPORT__ $(CLIBFLAGS) $(CLIBFLAGSDLL) -CEXEFLAGSDLL := $(CFLAGS) $(CEXEFLAGSDLL) +CEXEFLAGSDLL := $(CFLAGS) $(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) @@ -216,10 +218,10 @@ endif LDFLAGS += -Wl,--end-group $(HB_OS_LIBS) LDFLAGSDLL := -shared $(L_USR) -L$(LIB_DIR) $(LDFLAGSDLL) +#********************************************************** +# Libbrarian Flags #********************************************************** -# This is needed, otherwise the libs may overflow -# when debug info is requested with -v -y ARFLAGS = rc $(A_USR) #********************************************************** @@ -244,10 +246,8 @@ $(DLL_OBJ_DIR)/%$(OBJEXT) : %.c $(CC) $(CLIBFLAGSDLL) -o$@ $< #********************************************************** # General *.o -> *.a LIBRARY CREATION rule -#%$(LIBEXT) : %$(OBJEXT) -#$(LIB_DIR)/%$(LIBEXT) : $(OBJ_DIR)/%$(OBJEXT) -$(LIB_DIR)/%$(LIBEXT) : %$(OBJEXT) - $(MKLIB) $(ARFLAGS) $@ $^ +#$(LIB_DIR)/%$(LIBEXT) : %$(OBJEXT) +# $(MKLIB) $(ARFLAGS) $@ $^ #********************************************************** @@ -419,13 +419,10 @@ $(HARBOUR_DLL) :: $(DLL_OBJS) # DLL EXECUTABLE Targets #********************************************************** $(HBTESTDLL_EXE) :: $(StdLibs) -$(HBTESTDLL_EXE) :: $(DLL_OBJ_DIR)/mainstd$(OBJEXT) $(HBTEST_EXE_OBJS:$(OBJ_DIR)=$(DLL_OBJ_DIR)) +$(HBTESTDLL_EXE) :: $(DLL_OBJ_DIR)/mainstd$(OBJEXT) \ + $(HBTEST_EXE_OBJS:$(OBJ_DIR)=$(DLL_OBJ_DIR)) $(CC) $(CEXEFLAGSDLL) -o$@ $^ $(HARBOUR_DLL) $(HB_OS_LIBS) #---------------------------------------------------------- -#$(DLL_OBJ_DIR)\hbtest.obj : $(HBTEST_DIR)\hbtest.prg -# $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $** -# $(CC) $(CLIBFLAGSDLL) -o$@ $(DLL_OBJ_DIR)\$&.c -#---------------------------------------------------------- $(DLL_OBJ_DIR)/mainstd$(OBJEXT) : $(VM_DIR)/mainstd.c $(CC) $(CLIBFLAGS) -o$@ $< #********************************************************** diff --git a/harbour/make_vc.mak b/harbour/make_vc.mak index 42e8cd8ce0..75fe5190c1 100644 --- a/harbour/make_vc.mak +++ b/harbour/make_vc.mak @@ -19,38 +19,38 @@ # # 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_MODE - If set to cpp causes to compile in C++ mode -# HB_BUILD_DEBUG - If set to yes causes to compile with debug info -# HB_BUILD_VERBOSE - enables echoing commands being executed -# HB_INSTALL_PREFIX - Path to instalation directory into which -# Harbour will be installed when the command -# "make_vc.bat install" is lauched. Defaults -# to current directory -# HB_VISUALC_VER - Version of Visual C++ compiler (defaults to 60). -# Possible values are : 60, 70, 71, 80 +# 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_MODE - If set to cpp causes to compile in C++ mode +# HB_BUILD_DEBUG - If set to yes causes to compile with debug info +# HB_BUILD_VERBOSE - enables echoing commands being executed +# HB_INSTALL_PREFIX - Path to instalation directory into which +# Harbour will be installed when the command +# "make_vc.bat install" is lauched. Defaults +# to current directory +# HB_VISUALC_VER - Version of Visual C++ compiler (defaults to 60). +# Possible values are : 60, 70, 71, 80 # -# 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. #********************************************************** @@ -121,26 +121,28 @@ CFLAGS_VER = -Ot2b1 -EHs-c- -FD -Gs -D_CRT_SECURE_NO_DEPRECATE CFLAGS_VER = -Ogt2yb1p -GX- -G6 -YX -FD -Gs !endif -CFLAGS = -I$(INCLUDE_DIR) $(CFLAGS_VER) -T$(HB_BUILD_MODE) -W3 -nologo -D__WINDOWS__ -DWIN32 -D__WIN32__ $(C_USR) $(CFLAGS) -I$(OBJ_DIR) +CFLAGS = -I$(INCLUDE_DIR) $(CFLAGS_VER) -T$(HB_BUILD_MODE) \ + -W3 -nologo -D__WINDOWS__ -DWIN32 -D__WIN32__ \ + $(C_USR) $(CFLAGS) -I$(OBJ_DIR) #----------- !if "$(HB_BUILD_DEBUG)" == "yes" -CFLAGS = -Zi $(CFLAGS) -DBGMARKER = d +CFLAGS = -Zi $(CFLAGS) +DBGMARKER = d !endif #----------- !if "$(HB_GT_DEFAULT)" != "" -CFLAGS = -D"HB_GT_DEFAULT=$(HB_GT_DEFAULT:gt=)" $(CFLAGS) +CFLAGS = -D"HB_GT_DEFAULT=$(HB_GT_DEFAULT:gt=)" $(CFLAGS) !endif #----------- !if "$(HB_GT_LIB)" != "" -CFLAGS = -D"HB_GT_LIB=$(HB_GT_LIB:gt=)" $(CFLAGS) +CFLAGS = -D"HB_GT_LIB=$(HB_GT_LIB:gt=)" $(CFLAGS) !endif #----------- -CFLAGS = -MT$(DBGMARKER) $(CFLAGS) +CFLAGS = -MT$(DBGMARKER) $(CFLAGS) CLIBFLAGS = -c $(CFLAGS) $(CLIBFLAGS) CLIBFLAGSDLL = -D__EXPORT__ $(CLIBFLAGS) $(CLIBFLAGSDLL) -CEXEFLAGSDLL = $(CLIBFLAGS) $(CEXEFLAGSDLL) +CEXEFLAGSDLL = $(CLIBFLAGS) $(CEXEFLAGSDLL) # Harbour Compiler Flags HBFLAGSCMN = -i$(INCLUDE_DIR) -q0 -w2 -es2 -gc0 -kM $(PRG_USR) @@ -151,10 +153,10 @@ HARBOURFLAGS = -n $(HBFLAGSCMN) $(HARBOURFLAGS) HARBOURFLAGSDLL= -D__EXPORT__ -n1 $(HBFLAGSCMN) $(HARBOURFLAGSDLL) # Linker Flags -LDFLAGS = /NOLOGO /SUBSYSTEM:console /OPT:WIN98 /LIBPATH:$(LIB_DIR) $(LDFLAGS) +LDFLAGS = /NOLOGO /SUBSYSTEM:console /OPT:WIN98 /LIBPATH:$(LIB_DIR) $(LDFLAGS) LDFLAGSDLL = /NOLOGO /DLL /OPT:WIN98 /LIBPATH:$(LIB_DIR) $(LDFLAGSDLL) !if "$(HB_BUILD_DEBUG)" == "yes" -LDFLAGS = /DEBUG $(LDFLAGS) +LDFLAGS = /DEBUG $(LDFLAGS) LDFLAGSDLL = /DEBUG $(LDFLAGSDLL) !endif @@ -166,327 +168,327 @@ LDFLAGSDLL = /DEBUG $(LDFLAGSDLL) # General *.c --> *.obj COMPILE rules for STATIC Libraries #******************************************************* {$(OBJ_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(MAIN_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(COMMON_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(COMPILER_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(PP_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(VM_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(RTL_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(MACRO_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(DEBUG_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(LANG_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(CODEPAGE_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(PCRE_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(RDD_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(NULSYS_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(DBFNTX_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(DBFCDX_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(DBFFPT_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(HBSIX_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(HSX_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(USRRDD_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(GTCGI_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(GTPCA_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(GTSTD_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(GTWIN_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(GTWVT_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(GTGUI_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(COMPILER_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(HBPP_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(HBPPTEST_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(HBRUN_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(HBDOT_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(HBTEST_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(HBDOC_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(HBMAKE_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(HBVER_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* #******************************************************* # General *.prg --> *.obj COMPILE rules for STATIC Libraries #******************************************************* {$(OBJ_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(COMMON_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(PP_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(VM_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(RTL_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(MACRO_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(DEBUG_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(LANG_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(CODEPAGE_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(PCRE_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(RDD_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(NULSYS_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(DBFNTX_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(DBFCDX_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(DBFFPT_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(HBSIX_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(HSX_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(USRRDD_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(GTCGI_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(GTPCA_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(GTSTD_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(GTWIN_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(GTWVT_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(GTGUI_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(COMPILER_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(HBPP_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(HBPPTEST_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) $< -o$(OBJ_DIR)\\ - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) $< -o$(OBJ_DIR)\\ + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(HBRUN_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(HBDOT_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(HBTEST_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(HBDOC_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(HBMAKE_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(HBVER_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* #******************************************************* # General *.c --> *.obj COMPILE rules for SHARED Libraries #******************************************************* {$(DLL_OBJ_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(MAIN_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(COMMON_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(COMPILER_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(PP_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(VM_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(RTL_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(MACRO_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(DEBUG_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(LANG_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(CODEPAGE_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(PCRE_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(RDD_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(NULSYS_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(DBFNTX_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(DBFCDX_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(DBFFPT_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(HBSIX_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(HSX_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(USRRDD_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(GTCGI_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(GTPCA_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(GTSTD_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(GTWIN_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(GTWVT_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(GTGUI_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* #******************************************************* @@ -500,125 +502,125 @@ LDFLAGSDLL = /DEBUG $(LDFLAGSDLL) # $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(HBPPTEST_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(HBRUN_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(HBDOT_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(HBTEST_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(HBDOC_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(HBMAKE_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(HBVER_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* #******************************************************* # General *.prg --> *.obj COMPILE rules for SHARED Libraries #******************************************************* {$(DLL_OBJ_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(COMMON_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(PP_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(VM_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(RTL_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(MACRO_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(DEBUG_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(LANG_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(PCRE_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(CODEPAGE_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(RDD_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(NULSYS_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(DBFNTX_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(DBFCDX_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(DBFFPT_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(HBSIX_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(HSX_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(USRRDD_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(GTCGI_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(GTPCA_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(GTSTD_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(GTWIN_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(GTWVT_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(GTGUI_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* #******************************************************* @@ -634,45 +636,32 @@ LDFLAGSDLL = /DEBUG $(LDFLAGSDLL) # $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(HBPPTEST_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(HBRUN_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(HBDOT_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(HBTEST_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(HBDOC_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(HBMAKE_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(HBVER_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c -#********************************************************** - -#********************************************************** -# General BUILD rules (not used !) -#********************************************************** -# General Library BUILD rule -#{$(OBJ_DIR)}$(OBJEXT){$(COMMON_DIR)}.lib: -# IF EXIST "$@" $(DEL) "$@" > nul -# $(MKLIB) /out:$@ << -#$** -#<< -#********************************************************** -#********************************************************** + $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #********************************************************** #********************************************************** @@ -692,87 +681,85 @@ all : $(HB_DEST_DIRS) $(HB_BUILD_TARGETS) #********************************************************** $(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) - $(MKLIB) /out:$@ $** + $(MKLIB) /out:$@ $** #********************************************************** -$(PP_LIB) : $(PP_LIB_OBJS) - $(MKLIB) /out:$@ $** +$(PP_LIB) : $(PP_LIB_OBJS) + $(MKLIB) /out:$@ $** #********************************************************** $(COMPILER_LIB) : $(COMPILER_LIB_OBJS) - $(MKLIB) /out:$@ $** + $(MKLIB) /out:$@ $** #********************************************************** -$(VM_LIB) : $(VM_LIB_OBJS) - $(MKLIB) /out:$@ $** +$(VM_LIB) : $(VM_LIB_OBJS) + $(MKLIB) /out:$@ $** #********************************************************** -$(RTL_LIB) : $(RTL_LIB_OBJS) - $(MKLIB) /out:$@ $** +$(RTL_LIB) : $(RTL_LIB_OBJS) + $(MKLIB) /out:$@ $** #********************************************************** -$(MACRO_LIB) : $(MACRO_LIB_OBJS) - $(MKLIB) /out:$@ $** +$(MACRO_LIB) : $(MACRO_LIB_OBJS) + $(MKLIB) /out:$@ $** #********************************************************** -$(DEBUG_LIB) : $(DEBUG_LIB_OBJS) - $(MKLIB) /out:$@ $** +$(DEBUG_LIB) : $(DEBUG_LIB_OBJS) + $(MKLIB) /out:$@ $** #********************************************************** -$(LANG_LIB) : $(LANG_LIB_OBJS) - $(MKLIB) /out:$@ $** +$(LANG_LIB) : $(LANG_LIB_OBJS) + $(MKLIB) /out:$@ $** #********************************************************** $(CODEPAGE_LIB) : $(CODEPAGE_LIB_OBJS) - $(MKLIB) /out:$@ $** + $(MKLIB) /out:$@ $** #********************************************************** -$(PCRE_LIB) : $(PCRE_LIB_OBJS) - $(MKLIB) /out:$@ $** +$(PCRE_LIB) : $(PCRE_LIB_OBJS) + $(MKLIB) /out:$@ $** #********************************************************** -$(RDD_LIB) : $(RDD_LIB_OBJS) - $(MKLIB) /out:$@ $** +$(RDD_LIB) : $(RDD_LIB_OBJS) + $(MKLIB) /out:$@ $** #********************************************************** $(NULSYS_LIB) : $(NULSYS_LIB_OBJS) - $(MKLIB) /out:$@ $** + $(MKLIB) /out:$@ $** #********************************************************** $(DBFNTX_LIB) : $(DBFNTX_LIB_OBJS) - $(MKLIB) /out:$@ $** + $(MKLIB) /out:$@ $** #********************************************************** $(DBFCDX_LIB) : $(DBFCDX_LIB_OBJS) - $(MKLIB) /out:$@ $** + $(MKLIB) /out:$@ $** #********************************************************** $(DBFFPT_LIB) : $(DBFFPT_LIB_OBJS) - $(MKLIB) /out:$@ $** + $(MKLIB) /out:$@ $** #********************************************************** -$(HBSIX_LIB) : $(HBSIX_LIB_OBJS) - $(MKLIB) /out:$@ $** +$(HBSIX_LIB) : $(HBSIX_LIB_OBJS) + $(MKLIB) /out:$@ $** #********************************************************** -$(HSX_LIB) : $(HSX_LIB_OBJS) - $(MKLIB) /out:$@ $** +$(HSX_LIB) : $(HSX_LIB_OBJS) + $(MKLIB) /out:$@ $** #********************************************************** $(USRRDD_LIB) : $(USRRDD_LIB_OBJS) - $(MKLIB) /out:$@ $** + $(MKLIB) /out:$@ $** #********************************************************** -$(GTCGI_LIB) : $(GTCGI_LIB_OBJS) - $(MKLIB) /out:$@ $** +$(GTCGI_LIB) : $(GTCGI_LIB_OBJS) + $(MKLIB) /out:$@ $** #********************************************************** -$(GTDOS_LIB) : $(GTDOS_LIB_OBJS) - $(MKLIB) /out:$@ $** +$(GTDOS_LIB) : $(GTDOS_LIB_OBJS) + $(MKLIB) /out:$@ $** #********************************************************** -$(GTPCA_LIB) : $(GTPCA_LIB_OBJS) - $(MKLIB) /out:$@ $** +$(GTPCA_LIB) : $(GTPCA_LIB_OBJS) + $(MKLIB) /out:$@ $** #********************************************************** -$(GTSTD_LIB) : $(GTSTD_LIB_OBJS) - $(MKLIB) /out:$@ $** +$(GTSTD_LIB) : $(GTSTD_LIB_OBJS) + $(MKLIB) /out:$@ $** #********************************************************** -$(GTWIN_LIB) : $(GTWIN_LIB_OBJS) - $(MKLIB) /out:$@ $** +$(GTWIN_LIB) : $(GTWIN_LIB_OBJS) + $(MKLIB) /out:$@ $** #********************************************************** -$(GTWVT_LIB) : $(GTWVT_LIB_OBJS) - $(MKLIB) /out:$@ $** +$(GTWVT_LIB) : $(GTWVT_LIB_OBJS) + $(MKLIB) /out:$@ $** #********************************************************** -$(GTGUI_LIB) : $(GTGUI_LIB_OBJS) - $(MKLIB) /out:$@ $** +$(GTGUI_LIB) : $(GTGUI_LIB_OBJS) + $(MKLIB) /out:$@ $** #********************************************************** #********************************************************** @@ -783,8 +770,8 @@ $(GTGUI_LIB) : $(GTGUI_LIB_OBJS) # HARBOUR build rule #********************************************************** $(HARBOUR_EXE) : $(HARBOUR_EXE_OBJS) - IF EXIST "$(HARBOUR_EXE)" $(DEL) "$(HARBOUR_EXE)" > nul - $(LINKER) @<< + IF EXIST "$(HARBOUR_EXE)" $(DEL) "$(HARBOUR_EXE)" > nul + $(LINKER) @<< $(LDFLAGS) /OUT:$(HARBOUR_EXE) $(**: = ^ @@ -797,8 +784,8 @@ $(PP_LIB) # HBPPGEN build rule #********************************************************** $(HBPPGEN_EXE) : $(HBPPGEN_EXE_OBJS) - IF EXIST "$(HBPPGEN_EXE)" $(DEL) "$(HBPPGEN_EXE)" > nul - $(LINKER) @<< + IF EXIST "$(HBPPGEN_EXE)" $(DEL) "$(HBPPGEN_EXE)" > nul + $(LINKER) @<< $(LDFLAGS) /OUT:$(HBPPGEN_EXE) $(**: = ^ @@ -809,8 +796,8 @@ $(COMMON_LIB) # HBPP build rule #********************************************************** $(HBPP_EXE) : $(HBPP_EXE_OBJS) - IF EXIST "$(HBPP_EXE)" $(DEL) "$(HBPP_EXE)" > nul - $(LINKER) @<< + IF EXIST "$(HBPP_EXE)" $(DEL) "$(HBPP_EXE)" > nul + $(LINKER) @<< $(LDFLAGS) /OUT:$(HBPP_EXE) $(**: = ^ @@ -821,8 +808,8 @@ $(COMMON_LIB) # HBRUN build rule #********************************************************** $(HBRUN_EXE) : $(HBRUN_EXE_OBJS) - IF EXIST "$(HBRUN_EXE)" $(DEL) "$(HBRUN_EXE)" > nul - $(LINKER) @<< + IF EXIST "$(HBRUN_EXE)" $(DEL) "$(HBRUN_EXE)" > nul + $(LINKER) @<< $(LDFLAGS) /OUT:$(HBRUN_EXE) $(**: = ^ @@ -834,8 +821,8 @@ user32.lib winspool.lib wsock32.lib advapi32.lib # HBDOT build rule #********************************************************** $(HBDOT_EXE) : $(HBDOT_EXE_OBJS) - IF EXIST "$(HBDOT_EXE)" $(DEL) "$(HBDOT_EXE)" > nul - $(LINKER) @<< + IF EXIST "$(HBDOT_EXE)" $(DEL) "$(HBDOT_EXE)" > nul + $(LINKER) @<< $(LDFLAGS) /OUT:$(HBDOT_EXE) $(**: = ^ @@ -847,8 +834,8 @@ user32.lib winspool.lib wsock32.lib advapi32.lib # HBTEST build rule #********************************************************** $(HBTEST_EXE) : $(HBTEST_EXE_OBJS) - IF EXIST "$(HBTEST_EXE)" $(DEL) "$(HBTEST_EXE)" > nul - $(LINKER) @<< + IF EXIST "$(HBTEST_EXE)" $(DEL) "$(HBTEST_EXE)" > nul + $(LINKER) @<< $(LDFLAGS) /OUT:$(HBTEST_EXE) $(**: = ^ @@ -860,8 +847,8 @@ user32.lib winspool.lib # HBPPTEST build rule #********************************************************** $(HBPPTEST_EXE) : $(HBPPTEST_EXE_OBJS) - IF EXIST "$(HBPPTEST_EXE)" $(DEL) "$(HBPPTEST_EXE)" > nul - $(LINKER) @<< + IF EXIST "$(HBPPTEST_EXE)" $(DEL) "$(HBPPTEST_EXE)" > nul + $(LINKER) @<< $(LDFLAGS) /OUT:$(HBPPTEST_EXE) $(**: = ^ @@ -874,8 +861,8 @@ user32.lib winspool.lib # HBDOC build rule #********************************************************** $(HBDOC_EXE) : $(HBDOC_EXE_OBJS) - IF EXIST "$(HBDOC_EXE)" $(DEL) "$(HBDOC_EXE)" > nul - $(LINKER) @<< + IF EXIST "$(HBDOC_EXE)" $(DEL) "$(HBDOC_EXE)" > nul + $(LINKER) @<< $(LDFLAGS) /OUT:$(HBDOC_EXE) $(**: = ^ @@ -887,8 +874,8 @@ user32.lib winspool.lib # HBMAKE build rule #********************************************************** $(HBMAKE_EXE) : $(HBMAKE_EXE_OBJS) - IF EXIST "$(HBMAKE_EXE)" $(DEL) "$(HBMAKE_EXE)" > nul - $(LINKER) @<< + IF EXIST "$(HBMAKE_EXE)" $(DEL) "$(HBMAKE_EXE)" > nul + $(LINKER) @<< $(LDFLAGS) /OUT:$(HBMAKE_EXE) $(**: = ^ @@ -900,8 +887,8 @@ user32.lib winspool.lib # HBVER build rule #********************************************************** $(HBVER_EXE) : $(HBVER_EXE_OBJS) - IF EXIST "$(HBVER_EXE)" $(DEL) "$(HBVER_EXE)" > nul - $(LINKER) @<< + IF EXIST "$(HBVER_EXE)" $(DEL) "$(HBVER_EXE)" > nul + $(LINKER) @<< $(LDFLAGS) /OUT:$(HBVER_EXE) $(**: = ^ @@ -916,7 +903,7 @@ user32.lib winspool.lib #********************************************************** #$(HARBOUR_DLL) : $(HARBOUR_EXE) $(DLL_OBJS) $(HARBOUR_DLL) : $(HB) $(DLL_OBJS) - $(LINKER) @<< + $(LINKER) @<< $(LDFLAGSDLL) /OUT:$(@) /IMPLIB:$(@:.dll=.lib) $(DLL_OBJS: = ^ @@ -928,7 +915,7 @@ advapi32.lib gdi32.lib user32.lib winspool.lib wsock32.lib #********************************************************** HBTESTDLL_OBJS = $(DLL_OBJ_DIR)\mainstd$(OBJEXT) $(HBTEST_EXE_OBJS:obj\vc=obj\dll\vc) $(HBTESTDLL_EXE) : $(HARBOUR_DLL) $(HBTESTDLL_OBJS) - $(LINKER) @<< + $(LINKER) @<< $(LDFLAGS) /OUT:$(HBTESTDLL_EXE) $(HBTESTDLL_OBJS: = ^ @@ -936,16 +923,9 @@ $(HBTESTDLL_OBJS: = ^ $(HARBOUR_DLL:.dll=.lib) <<$(KEEPSTATE) #---------------------------------------------------------- -#$(DLL_OBJ_DIR)\hbtest.obj : $(HBTEST_DIR)\hbtest.prg -# $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $** -# $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c -#---------------------------------------------------------- $(DLL_OBJ_DIR)\mainstd$(OBJEXT) : $(VM_DIR)\mainstd.c - $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $** + $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $** #********************************************************** -#********************************************************** -#********************************************************** - #********************************************************** # EXTRA Object's DEPENDENCIES @@ -956,47 +936,47 @@ $(DLL_OBJ_DIR)\mainstd$(OBJEXT) : $(VM_DIR)\mainstd.c $(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 +$(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 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 @@ -1018,27 +998,27 @@ Clean: doClean CLEAN: doClean doClean: - -if exist *.idb $(DEL) *.idb > nul - -if exist *.pch $(DEL) *.pch > nul - -if exist *.pdb $(DEL) *.pdb > 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 $(OBJ_DIR)\*.pch $(DEL) $(OBJ_DIR)\*.pch > nul - -if exist $(LIB_DIR)\*.lib $(DEL) $(LIB_DIR)\*.lib > nul - -if exist $(BIN_DIR)\*.exe $(DEL) $(BIN_DIR)\*.exe > nul - -if exist $(BIN_DIR)\*.pdb $(DEL) $(BIN_DIR)\*.pdb > nul - -if exist $(BIN_DIR)\*.ilk $(DEL) $(BIN_DIR)\*.ilk > 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 $(BIN_DIR)\*.exp $(DEL) $(BIN_DIR)\*.exp > 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 bin\*.exe $(DEL) bin\*.exe > nul - -if exist lib\*.lib $(DEL) lib\*.lib > nul + -if exist *.idb $(DEL) *.idb > nul + -if exist *.pch $(DEL) *.pch > nul + -if exist *.pdb $(DEL) *.pdb > 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 $(OBJ_DIR)\*.pch $(DEL) $(OBJ_DIR)\*.pch > nul + -if exist $(LIB_DIR)\*.lib $(DEL) $(LIB_DIR)\*.lib > nul + -if exist $(BIN_DIR)\*.exe $(DEL) $(BIN_DIR)\*.exe > nul + -if exist $(BIN_DIR)\*.pdb $(DEL) $(BIN_DIR)\*.pdb > nul + -if exist $(BIN_DIR)\*.ilk $(DEL) $(BIN_DIR)\*.ilk > 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 $(BIN_DIR)\*.exp $(DEL) $(BIN_DIR)\*.exp > 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 bin\*.exe $(DEL) bin\*.exe > nul + -if exist lib\*.lib $(DEL) lib\*.lib > nul #********************************************************** # INSTALL rules @@ -1049,14 +1029,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 #********************************************************** diff --git a/harbour/make_vcce.mak b/harbour/make_vcce.mak index 71b7a5a475..45e64e9cf8 100644 --- a/harbour/make_vcce.mak +++ b/harbour/make_vcce.mak @@ -157,12 +157,12 @@ CFLAGS = -MT$(DBGMARKER) $(CFLAGS) CLIBFLAGS = -c $(CFLAGS) $(CLIBFLAGS) CLIBFLAGSDLL = -D__EXPORT__ $(CLIBFLAGS) $(CLIBFLAGSDLL) -CEXEFLAGSDLL = $(CLIBFLAGS) $(CEXEFLAGSDLL) +CEXEFLAGSDLL = $(CLIBFLAGS) $(CEXEFLAGSDLL) # Harbour Compiler Flags HBFLAGSCMN = -DHB_WINCE -D__PLATFORM__WINCE -i$(INCLUDE_DIR) -q0 -w2 -es2 -gc1 $(PRG_USR) !ifdef HB_DOC_PDF -HBFLAGSCMN = $(HBFLAGSCMN) -dPDF +HBFLAGSCMN = $(HBFLAGSCMN) -dPDF !endif HARBOURFLAGS = -n $(HBFLAGSCMN) $(HARBOURFLAGS) HARBOURFLAGSDLL= -D__EXPORT__ -n1 $(HBFLAGSCMN) $(HARBOURFLAGSDLL) @@ -687,19 +687,6 @@ LDFLAGSDLL = /DEBUG $(LDFLAGSDLL) $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #********************************************************** -#********************************************************** -# General BUILD rules (not used !) -#********************************************************** -# General Library BUILD rule -#{$(OBJ_DIR)}$(OBJEXT){$(COMMON_DIR)}.lib: -# IF EXIST "$@" $(DEL) "$@" > nul -# $(MKLIB) /out:$@ << -#$** -#<< -#********************************************************** -#********************************************************** -#********************************************************** - #********************************************************** # TARGET dependencies #********************************************************** @@ -959,10 +946,6 @@ $(HBTESTDLL_OBJS: = ^ $(HARBOUR_DLL:.dll=.lib) << #---------------------------------------------------------- -#$(DLL_OBJ_DIR)\hbtest.obj : $(HBTEST_DIR)\hbtest.prg -# $(HARBOUR_EXE) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $** -# $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c -#---------------------------------------------------------- $(DLL_OBJ_DIR)\mainstd.obj : $(VM_DIR)\mainstd.c $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $** #**********************************************************