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

2007-11-26 18:50 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl)

Browse Source 
* harbour/contrib/mtpl_b32.mak
  * harbour/contrib/mtpl_vc.mak
    ! Fixed "hardcoded" definitions for OBJ_DIR, LIB_DIR, BIN_DIR
This commit is contained in:
Marek Paliwoda
2007-11-26 17:50:56 +00:00
parent f9d9a888dc
commit 298efc4ac1
3 changed files with 97 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
harbour/ChangeLog
View File

@@ -8,6 +8,11 @@
2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2007-11-26 18:50 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl)
* harbour/contrib/mtpl_b32.mak
* harbour/contrib/mtpl_vc.mak
! Fixed "hardcoded" definitions for OBJ_DIR, LIB_DIR, BIN_DIR
2007-11-26 08:00 UTC+0800 Pritpal Bedi (pritpal@vouchcac.com)
+ harbour/contrib/gtwvg/test
+ demowvg.prg
@@ -79,17 +84,17 @@
* contrib/what32/wintabs.prg
* contrib/what32/wintbar.prg
! Fixes to make them compile with Harbour.
Pritpal, could you please check this, because it's
not exactly clear what is the intent in the source code,
Pritpal, could you please check this, because it's
not exactly clear what is the intent in the source code,
so these might be the wrong fixes.
* contrib/mtpl_b32.mak
* contrib/mtpl_vc.mak
! Using a neutral character instead of double quote
in hacked DOS "if %1 ==" commands to avoid the
situation where the quote is filtered, replaced
in hacked DOS "if %1 ==" commands to avoid the
situation where the quote is filtered, replaced
under certain (not defined) Windows/BCC
environments. Same change done for VC to stay in
environments. Same change done for VC to stay in
sync.
2007-11-26 06:15 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl)

90
harbour/contrib/mtpl_b32.mak
View File

@@ -14,8 +14,8 @@
# NOTE: You can use these optional envvars to configure the make process:
#
# C_USR - Extra C compiler options for libraries
# PRG_USR - Extra Harbour compiler options
# C_USR - Extra C compiler options for libraries
# PRG_USR - Extra Harbour compiler options
#
.AUTODEPEND
@@ -30,7 +30,7 @@ HB_ROOT = ..\..
#**********************************************************
!ifndef ECHO
ECHO = echo
ECHO = echo.
!endif
!ifndef DEL
DEL = del
@@ -73,9 +73,9 @@ HB_LIB_INSTALL = $(HB_INSTALL_PREFIX)\lib
# Directory macros. These should never have to change.
#**********************************************************
OBJ_DIR = $(HB_ROOT)\obj\b32
LIB_DIR = $(HB_ROOT)\lib\b32
BIN_DIR = $(HB_ROOT)\bin\b32
OBJ_DIR = $(HB_ROOT)\obj\$(HB_CC_NAME)
LIB_DIR = $(HB_ROOT)\lib\$(HB_CC_NAME)
BIN_DIR = $(HB_ROOT)\bin\$(HB_CC_NAME)
INCLUDE_DIR = $(HB_ROOT)\include
@@ -99,11 +99,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
@@ -120,16 +120,16 @@ $(OBJ_DIR);\
#**********************************************************
# General *.c --> *.obj COMPILE rule for STATIC Libraries
{$(ALL_LIB_SRC_DIRS)}.c{$(OBJ_DIR)}$(OBJEXT):
$(CC) $(CLIBFLAGS) -o$@ $<
$(CC) $(CLIBFLAGS) -o$@ $<
#**********************************************************
# General *.cpp --> *.obj COMPILE rule for STATIC Libraries
{$(ALL_LIB_SRC_DIRS)}.cpp{$(OBJ_DIR)}$(OBJEXT):
$(CC) $(CLIBFLAGS) -o$@ $<
$(CC) $(CLIBFLAGS) -o$@ $<
#**********************************************************
# General *.prg --> *.obj COMPILE rule for STATIC Libraries
{$(ALL_LIB_SRC_DIRS)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT):
$(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $**
$(CC) $(CLIBFLAGS) -o$@ $(OBJ_DIR)\$&.c
$(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $**
$(CC) $(CLIBFLAGS) -o$@ $(OBJ_DIR)\$&.c
#**********************************************************
# General Library BUILD rule - does not work
#{$(OBJ_DIR)}.obj{$(LIB_DIR)}.lib:
@@ -146,8 +146,8 @@ ALL_HEADERS = $(PRG_HEADERS) $(C_HEADERS)
#**********************************************************
$(LIB_PATH) : $(LIB_OBJS)
if exist "$(LIB_PATH)" $(DEL) "$(LIB_PATH)" > NUL
$(MKLIB) "$(LIB_PATH)" $(ARFLAGS) @&&!
if exist "$(LIB_PATH)" $(DEL) "$(LIB_PATH)" > NUL
$(MKLIB) "$(LIB_PATH)" $(ARFLAGS) @&&!
+$(**: = &^
+)
!
@@ -160,33 +160,33 @@ Clean: doClean
CLEAN: doClean
doClean:
@if exist $(LIB_PATH) $(DEL) $(LIB_PATH) > nul
@$(ECHO) @echo off > _hbdeloo.bat
@$(ECHO) if %1x == x goto SKIP >> _hbdeloo.bat
@$(ECHO) if exist %1.c $(DEL) %1.c >> _hbdeloo.bat
@$(ECHO) if exist %1.obj $(DEL) %1.obj >> _hbdeloo.bat
@$(ECHO) :SKIP >> _hbdeloo.bat
@type &&!
@if exist $(LIB_PATH) $(DEL) $(LIB_PATH) > nul
@$(ECHO) @echo off > _hbdeloo.bat
@$(ECHO) if %1x == x goto SKIP >> _hbdeloo.bat
@$(ECHO) if exist %1.c $(DEL) %1.c >> _hbdeloo.bat
@$(ECHO) if exist %1.obj $(DEL) %1.obj >> _hbdeloo.bat
@$(ECHO) :SKIP >> _hbdeloo.bat
@type &&!
@call _hbdeloo.bat $(LIB_OBJS:.obj=^
@call _hbdeloo.bat )
! > _hbdeloa.bat
@_hbdeloa.bat
@if exist _hbdeloa.bat $(DEL) _hbdeloa.bat > nul
@if exist _hbdeloo.bat $(DEL) _hbdeloo.bat > nul
@_hbdeloa.bat
@if exist _hbdeloa.bat $(DEL) _hbdeloa.bat > nul
@if exist _hbdeloo.bat $(DEL) _hbdeloo.bat > nul
!if "$(HB_INSTALL_PREFIX)" == "$(HB_ROOT)"
@if exist $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) $(DEL) $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) > nul
@$(ECHO) @echo off > _hbdelho.bat
@$(ECHO) if %1x == x goto SKIP >> _hbdelho.bat
@$(ECHO) if exist $(HB_INC_INSTALL)\%1 $(DEL) $(HB_INC_INSTALL)\%1 >> _hbdelho.bat
@$(ECHO) :SKIP >> _hbdelho.bat
@type &&!
@if exist $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) $(DEL) $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) > nul
@$(ECHO) @echo off > _hbdelho.bat
@$(ECHO) if %1x == x goto SKIP >> _hbdelho.bat
@$(ECHO) if exist $(HB_INC_INSTALL)\%1 $(DEL) $(HB_INC_INSTALL)\%1 >> _hbdelho.bat
@$(ECHO) :SKIP >> _hbdelho.bat
@type &&!
@call _hbdelho.bat $(ALL_HEADERS: =^
@call _hbdelho.bat )
! > _hbdelha.bat
@_hbdelha.bat
@if exist _hbdelha.bat $(DEL) _hbdelha.bat > nul
@if exist _hbdelho.bat $(DEL) _hbdelho.bat > nul
@_hbdelha.bat
@if exist _hbdelha.bat $(DEL) _hbdelha.bat > nul
@if exist _hbdelho.bat $(DEL) _hbdelho.bat > nul
!endif
#**********************************************************
@@ -198,26 +198,26 @@ Install: doInstall
INSTALL: doInstall
doInstall:
@type &&!
@type &&!
@echo off
if not exist $(LIB_PATH) goto SKIP
if exist $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) $(DEL) $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) > nul
copy $(LIB_PATH) $(HB_LIB_INSTALL) > nul
:SKIP
! > _hbcpyla.bat
@_hbcpyla.bat
@if exist _hbcpyla.bat $(DEL) _hbcpyla.bat > nul
@$(ECHO) @echo off > _hbcpyho.bat
@$(ECHO) if %1x == x goto SKIP >> _hbcpyho.bat
@$(ECHO) if exist $(HB_INC_INSTALL)\%1 $(DEL) $(HB_INC_INSTALL)\%1 >> _hbcpyho.bat
@$(ECHO) if exist %1 copy %1 $(HB_INC_INSTALL) >> _hbcpyho.bat
@$(ECHO) :SKIP >> _hbcpyho.bat
@type &&!
@_hbcpyla.bat
@if exist _hbcpyla.bat $(DEL) _hbcpyla.bat > nul
@$(ECHO) @echo off > _hbcpyho.bat
@$(ECHO) if %1x == x goto SKIP >> _hbcpyho.bat
@$(ECHO) if exist $(HB_INC_INSTALL)\%1 $(DEL) $(HB_INC_INSTALL)\%1 >> _hbcpyho.bat
@$(ECHO) if exist %1 copy %1 $(HB_INC_INSTALL) >> _hbcpyho.bat
@$(ECHO) :SKIP >> _hbcpyho.bat
@type &&!
@call _hbcpyho.bat $(ALL_HEADERS: =^
@call _hbcpyho.bat )
! > _hbcpyha.bat
@_hbcpyha.bat
@if exist _hbcpyha.bat $(DEL) _hbcpyha.bat > nul
@if exist _hbcpyho.bat $(DEL) _hbcpyho.bat > nul
@_hbcpyha.bat
@if exist _hbcpyha.bat $(DEL) _hbcpyha.bat > nul
@if exist _hbcpyho.bat $(DEL) _hbcpyho.bat > nul
#**********************************************************

84
harbour/contrib/mtpl_vc.mak
View File

@@ -14,8 +14,8 @@
# NOTE: You can use these optional envvars to configure the make process:
#
# C_USR - Extra C compiler options for libraries
# PRG_USR - Extra Harbour compiler options
# C_USR - Extra C compiler options for libraries
# PRG_USR - Extra Harbour compiler options
#
#**********************************************************
@@ -27,7 +27,7 @@ HB_ROOT = ..\..
#**********************************************************
!ifndef ECHO
ECHO = echo
ECHO = echo.
!endif
!ifndef DEL
DEL = del
@@ -70,9 +70,9 @@ HB_LIB_INSTALL = $(HB_INSTALL_PREFIX)\lib
# Directory macros. These should never have to change.
#**********************************************************
OBJ_DIR = $(HB_ROOT)\obj\vc
LIB_DIR = $(HB_ROOT)\lib\vc
BIN_DIR = $(HB_ROOT)\bin\vc
OBJ_DIR = $(HB_ROOT)\obj\$(HB_CC_NAME)
LIB_DIR = $(HB_ROOT)\lib\$(HB_CC_NAME)
BIN_DIR = $(HB_ROOT)\bin\$(HB_CC_NAME)
INCLUDE_DIR = $(HB_ROOT)\include
@@ -92,11 +92,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
@@ -105,16 +105,16 @@ LDFLAGS = $(LDFLAGS)
#**********************************************************
# General *.c --> *.obj COMPILE rule for STATIC Libraries
{.}.c{$(OBJ_DIR)}$(OBJEXT)::
$(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
$(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
#**********************************************************
# General *.cpp --> *.obj COMPILE rule for STATIC Libraries
{.}.cpp{$(OBJ_DIR)}$(OBJEXT)::
$(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
$(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
#**********************************************************
# General *.prg --> *.obj COMPILE rule for STATIC Libraries
{.}.prg{$(OBJ_DIR)}$(OBJEXT):
$(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
$(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
$(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
$(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
#**********************************************************
# General Library BUILD rule - does not work
#{$(OBJ_DIR)}$(OBJEXT){$(LIB_PATH)}.lib:
@@ -130,8 +130,8 @@ ALL_HEADERS = $(PRG_HEADERS) $(C_HEADERS)
#**********************************************************
$(LIB_PATH) : $(LIB_OBJS)
if exist "$@" $(DEL) "$@" > nul
$(MKLIB) /out:$@ @<<
if exist "$@" $(DEL) "$@" > nul
$(MKLIB) /out:$@ @<<
$**
<<$(KEEPSTATE)
#**********************************************************
@@ -143,31 +143,31 @@ Clean: doClean
CLEAN: doClean
doClean:
@if exist $(LIB_PATH) $(DEL) $(LIB_PATH) > nul
@$(ECHO) @echo off > _hbdeloo.bat
@$(ECHO) if %%1x == x goto SKIP >> _hbdeloo.bat
@$(ECHO) if exist %%1.c $(DEL) %%1.c >> _hbdeloo.bat
@$(ECHO) if exist %%1.obj $(DEL) %%1.obj >> _hbdeloo.bat
@$(ECHO) :SKIP >> _hbdeloo.bat
<<_hbdeloa.bat
@if exist $(LIB_PATH) $(DEL) $(LIB_PATH) > nul
@$(ECHO) @echo off > _hbdeloo.bat
@$(ECHO) if %%1x == x goto SKIP >> _hbdeloo.bat
@$(ECHO) if exist %%1.c $(DEL) %%1.c >> _hbdeloo.bat
@$(ECHO) if exist %%1.obj $(DEL) %%1.obj >> _hbdeloo.bat
@$(ECHO) :SKIP >> _hbdeloo.bat
<<_hbdeloa.bat
@call _hbdeloo.bat $(LIB_OBJS:.obj=^
@call _hbdeloo.bat )
<<KEEP
@if exist _hbdeloa.bat $(DEL) _hbdeloa.bat > nul
@if exist _hbdeloo.bat $(DEL) _hbdeloo.bat > nul
@if exist _hbdeloa.bat $(DEL) _hbdeloa.bat > nul
@if exist _hbdeloo.bat $(DEL) _hbdeloo.bat > nul
!if "$(HB_INSTALL_PREFIX)" == "$(HB_ROOT)"
@if exist $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) $(DEL) $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) > nul
@$(ECHO) @echo off > _hbdelho.bat
@$(ECHO) if %%1x == x goto SKIP >> _hbdelho.bat
@$(ECHO) if exist $(HB_INC_INSTALL)\%%1 $(DEL) $(HB_INC_INSTALL)\%%1 >> _hbdelho.bat
@$(ECHO) :SKIP >> _hbdelho.bat
<<_hbdelha.bat
@if exist $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) $(DEL) $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) > nul
@$(ECHO) @echo off > _hbdelho.bat
@$(ECHO) if %%1x == x goto SKIP >> _hbdelho.bat
@$(ECHO) if exist $(HB_INC_INSTALL)\%%1 $(DEL) $(HB_INC_INSTALL)\%%1 >> _hbdelho.bat
@$(ECHO) :SKIP >> _hbdelho.bat
<<_hbdelha.bat
@call _hbdelho.bat $(ALL_HEADERS: =^
@call _hbdelho.bat )
<<KEEP
@if exist _hbdelha.bat $(DEL) _hbdelha.bat > nul
@if exist _hbdelho.bat $(DEL) _hbdelho.bat > nul
@if exist _hbdelha.bat $(DEL) _hbdelha.bat > nul
@if exist _hbdelho.bat $(DEL) _hbdelho.bat > nul
!endif
#**********************************************************
@@ -179,25 +179,25 @@ Install: doInstall
INSTALL: doInstall
doInstall:
<<_hbcpyla.bat
<<_hbcpyla.bat
@echo off
if not exist $(LIB_PATH) goto SKIP
if exist $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) $(DEL) $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) > nul
copy $(LIB_PATH) $(HB_LIB_INSTALL) > nul
:SKIP
<<KEEP
@_hbcpyla.bat
@if exist _hbcpyla.bat $(DEL) _hbcpyla.bat > nul
@$(ECHO) @echo off > _hbcpyho.bat
@$(ECHO) if %%1x == x goto SKIP >> _hbcpyho.bat
@$(ECHO) if exist $(HB_INC_INSTALL)\%%1 $(DEL) $(HB_INC_INSTALL)\%%1 >> _hbcpyho.bat
@$(ECHO) if exist %%1 copy %%1 $(HB_INC_INSTALL) >> _hbcpyho.bat
@$(ECHO) :SKIP >> _hbcpyho.bat
<<_hbcpyha.bat
@_hbcpyla.bat
@if exist _hbcpyla.bat $(DEL) _hbcpyla.bat > nul
@$(ECHO) @echo off > _hbcpyho.bat
@$(ECHO) if %%1x == x goto SKIP >> _hbcpyho.bat
@$(ECHO) if exist $(HB_INC_INSTALL)\%%1 $(DEL) $(HB_INC_INSTALL)\%%1 >> _hbcpyho.bat
@$(ECHO) if exist %%1 copy %%1 $(HB_INC_INSTALL) >> _hbcpyho.bat
@$(ECHO) :SKIP >> _hbcpyho.bat
<<_hbcpyha.bat
@call _hbcpyho.bat $(ALL_HEADERS: =^
@call _hbcpyho.bat )
<<KEEP
@if exist _hbcpyha.bat $(DEL) _hbcpyha.bat > nul
@if exist _hbcpyho.bat $(DEL) _hbcpyho.bat > nul
@if exist _hbcpyha.bat $(DEL) _hbcpyha.bat > nul
@if exist _hbcpyho.bat $(DEL) _hbcpyho.bat > nul
#**********************************************************