This commit is contained in:
Marek Paliwoda
2007-11-21 20:47:05 +00:00
parent 2c434c3046
commit 49c1daf7d3
4 changed files with 59 additions and 38 deletions

View File

@@ -8,6 +8,12 @@
2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2007-11-21 21:45 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl)
* harbour/contrib/mtpl_defs.mak
* harbour/contrib/mtpl_b32.mak
* harbour/contrib/mtpl_vc.mak
* Resored Viktor's Copyright removed by mistake in my last commit
2007-11-21 21:10 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl)
- harbour/contrib/make_all.mak
- harbour/contrib/mtpl_ruls.mak

View File

@@ -7,17 +7,22 @@
# for Borland C/C++
# --------------------------------------------------------
# ---------------------------------------------------------------
# Copyright 1999-2001 Viktor Szakats <viktor.szakats@syenar.hu>
# See doc/license.txt for licensing terms.
# ---------------------------------------------------------------
# NOTE: You can use these envvars to configure the make process:
# (note that these are all optional)
# (note that these are all optional)
#
# CFLAGS - Extra C compiler options for libraries and for
# executables
# C_USR - Extra C compiler options for libraries and for
# executables (GNU make compatible envvar)
# CLIBFLAGS - Extra C compiler options for the libraries
# HARBOURFLAGS - Extra Harbour compiler options
# PRG_USR - Extra Harbour compiler options
# (GNU make compatible envvar)
# CFLAGS - Extra C compiler options for libraries and for
# executables
# C_USR - Extra C compiler options for libraries and for
# executables (GNU make compatible envvar)
# CLIBFLAGS - Extra C compiler options for the libraries
# HARBOURFLAGS - Extra Harbour compiler options
# PRG_USR - Extra Harbour compiler options
# (GNU make compatible envvar)
#.KEEP
.AUTODEPEND
@@ -45,11 +50,11 @@ MKLIB = tlib.exe
CFLAGS = -O2 $(CFLAGS)
!endif
CFLAGS = -I$(INCLUDE_DIR) -d $(C_USR) $(CFLAGS)
CFLAGS = -I$(INCLUDE_DIR) -d $(C_USR) $(CFLAGS)
CLIBFLAGS = -c $(CFLAGS) $(CLIBFLAGS)
CLIBFLAGSDEBUG = -v $(CLIBFLAGS)
HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w2 -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS)
LDFLAGS = $(LDFLAGS)
LDFLAGS = $(LDFLAGS)
# This is needed, otherwise the libs may overflow when
# debug info is requested with -v -y
@@ -109,12 +114,12 @@ CLEAN: doClean
doClean:
@if exist $(LIB_PATH) $(DEL) $(LIB_PATH) > nul
@$(ECHO) @echo off > delone.bat
@$(ECHO) set >>setenv >> delone.bat
@$(ECHO) @echo off > delone.bat
@$(ECHO) set >>setenv >> delone.bat
@$(ECHO) if """%%1""" == """""" goto skip >> delone.bat
@$(ECHO) if exist %%1.c $(DEL) %%1.c >> delone.bat
@$(ECHO) if exist %%1.obj $(DEL) %%1.obj >> delone.bat
@$(ECHO) :skip >> delone.bat
@$(ECHO) :skip >> delone.bat
@type &&!
@%%COMSPEC%% /c delone.bat $(LIB_OBJS:.obj=^
@%%COMSPEC%% /c delone.bat )
@@ -125,10 +130,10 @@ doClean:
!if "$(HB_INSTALL_PREFIX)" == "$(HB_ROOT)"
@if exist $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) $(DEL) $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) > nul
@$(ECHO) @echo off > delone.bat
@$(ECHO) @echo off > delone.bat
@$(ECHO) if """%%1""" == """""" goto skip >> delone.bat
@$(ECHO) if exist $(HB_INC_INSTALL)\%%1 $(DEL) $(HB_INC_INSTALL)\%%1 >> delone.bat
@$(ECHO) :skip >> delone.bat
@$(ECHO) :skip >> delone.bat
@type &&!
@%%COMSPEC%% /c delone.bat $(ALL_HEADERS: =^
@%%COMSPEC%% /c delone.bat )
@@ -148,10 +153,10 @@ INSTALL: doInstall
doInstall:
@if exist $(LIB_PATH) copy $(LIB_PATH) $(HB_LIB_INSTALL) > nul
@$(ECHO) @echo off > cpyone.bat
@$(ECHO) if """%%1""" == """""" goto skip >> cpyone.bat
@$(ECHO) @echo off > cpyone.bat
@$(ECHO) if """%%1""" == """""" goto skip >> cpyone.bat
@$(ECHO) if exist %%1 copy %%1 $(HB_INC_INSTALL) >> cpyone.bat
@$(ECHO) :skip >> cpyone.bat
@$(ECHO) :skip >> cpyone.bat
@<<cpyall.bat
@%%COMSPEC%% /c cpyone.bat $(ALL_HEADERS: =^
@%%COMSPEC%% /c cpyone.bat )

View File

@@ -7,6 +7,11 @@
# for Microsoft Visual C/Borland C/C++ - definitions
# -----------------------------------------------------------------
# ---------------------------------------------------------------
# Copyright 1999-2001 Viktor Szakats <viktor.szakats@syenar.hu>
# See doc/license.txt for licensing terms.
# ---------------------------------------------------------------
#**********************************************************
!ifndef ECHO

View File

@@ -7,17 +7,22 @@
# for Microsoft Visual C
# --------------------------------------------------------
# ---------------------------------------------------------------
# Copyright 1999-2001 Viktor Szakats <viktor.szakats@syenar.hu>
# See doc/license.txt for licensing terms.
# ---------------------------------------------------------------
# NOTE: You can use these envvars to configure the make process:
# (note that these are all optional)
# (note that these are all optional)
#
# CFLAGS - Extra C compiler options for libraries and for
# executables
# C_USR - Extra C compiler options for libraries and for
# executables (GNU make compatible envvar)
# CLIBFLAGS - Extra C compiler options for the libraries
# HARBOURFLAGS - Extra Harbour compiler options
# PRG_USR - Extra Harbour compiler options
# (GNU make compatible envvar)
# CFLAGS - Extra C compiler options for libraries and for
# executables
# C_USR - Extra C compiler options for libraries and for
# executables (GNU make compatible envvar)
# CLIBFLAGS - Extra C compiler options for the libraries
# HARBOURFLAGS - Extra Harbour compiler options
# PRG_USR - Extra Harbour compiler options
# (GNU make compatible envvar)
# Visual C++ version
!ifndef HB_VISUALC_VER
@@ -42,11 +47,11 @@ MKLIB = lib.exe
#**********************************************************
CFLAGS = -I$(INCLUDE_DIR) -W3 -nologo $(C_USR) $(CFLAGS)
CFLAGS = -I$(INCLUDE_DIR) -W3 -nologo $(C_USR) $(CFLAGS)
CLIBFLAGS = -c $(CFLAGS) $(CLIBFLAGS)
CLIBFLAGSDEBUG = -Zi $(CLIBFLAGS)
HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w2 -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS)
LDFLAGS = $(LDFLAGS)
LDFLAGS = $(LDFLAGS)
#**********************************************************
# COMPILE Rules
@@ -94,12 +99,12 @@ CLEAN: doClean
doClean:
@if exist $(LIB_PATH) $(DEL) $(LIB_PATH) > nul
@$(ECHO) @echo off > delone.bat
@$(ECHO) set >>setenv >> delone.bat
@$(ECHO) @echo off > delone.bat
@$(ECHO) set >>setenv >> delone.bat
@$(ECHO) if """%%1""" == """""" goto skip >> delone.bat
@$(ECHO) if exist %%1.c $(DEL) %%1.c >> delone.bat
@$(ECHO) if exist %%1.obj $(DEL) %%1.obj >> delone.bat
@$(ECHO) :skip >> delone.bat
@$(ECHO) :skip >> delone.bat
@<<delall.bat
@%COMSPEC% /c delone.bat $(LIB_OBJS:.obj=^
@%COMSPEC% /c delone.bat )
@@ -110,10 +115,10 @@ doClean:
!if "$(HB_INSTALL_PREFIX)" == "$(HB_ROOT)"
@if exist $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) $(DEL) $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) > nul
@$(ECHO) @echo off > delone.bat
@$(ECHO) @echo off > delone.bat
@$(ECHO) if """%%1""" == """""" goto skip >> delone.bat
@$(ECHO) if exist $(HB_INC_INSTALL)\%%1 $(DEL) $(HB_INC_INSTALL)\%%1 >> delone.bat
@$(ECHO) :skip >> delone.bat
@$(ECHO) :skip >> delone.bat
@<<delall.bat
@%COMSPEC% /c delone.bat $(ALL_HEADERS: =^
@%COMSPEC% /c delone.bat )
@@ -133,10 +138,10 @@ INSTALL: doInstall
doInstall:
@if exist $(LIB_PATH) copy $(LIB_PATH) $(HB_LIB_INSTALL) > nul
@$(ECHO) @echo off > cpyone.bat
@$(ECHO) if """%%1""" == """""" goto skip >> cpyone.bat
@$(ECHO) @echo off > cpyone.bat
@$(ECHO) if """%%1""" == """""" goto skip >> cpyone.bat
@$(ECHO) if exist %%1 copy %%1 $(HB_INC_INSTALL) >> cpyone.bat
@$(ECHO) :skip >> cpyone.bat
@$(ECHO) :skip >> cpyone.bat
@<<cpyall.bat
@%COMSPEC% /c cpyone.bat $(ALL_HEADERS: =^
@%COMSPEC% /c cpyone.bat )