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

2008-02-15 09:47 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl)

Browse Source 
* harbour/contrib/hbfimage/make_gcc.sh
    ! Fixed CFLAGS settings from a proper FREEIMAGE_INC envvar

  * harbour/contrib/hbziparch/make_vc.bat
    ! Disabled warnings about functions considered "depreciated" by MS

  * harbour/contrib/mtpl_gcc.mak
  * harbour/contrib/mtpl_gcc.sh
    ! Fixed HB_ARCHITECTIRE, CC and LD envvar settings

  * harbour/contrib/mtpl_vc.mak
    ! Forced CPP mode compilation for a ".cpp.obj" rule
This commit is contained in:
Marek Paliwoda
2008-02-15 08:47:48 +00:00
parent b4d574a3f9
commit 2c7e7230c8
6 changed files with 70 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
harbour/ChangeLog
View File

@@ -8,6 +8,20 @@
2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2008-02-15 09:47 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl)
* harbour/contrib/hbfimage/make_gcc.sh
! Fixed CFLAGS settings from a proper FREEIMAGE_INC envvar
* harbour/contrib/hbziparch/make_vc.bat
! Disabled warnings about functions considered "depreciated" by MS
* harbour/contrib/mtpl_gcc.mak
* harbour/contrib/mtpl_gcc.sh
! Fixed HB_ARCHITECTIRE, CC and LD envvar settings
* harbour/contrib/mtpl_vc.mak
! Forced CPP mode compilation for a ".cpp.obj" rule
2008-02-13 20:13 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl)
* harbour/contrib/mtpl_vc.mak
! Enable compilation in C++ mode using HB_BUILD_MODE envvar

2
harbour/contrib/hbfimage/make_gcc.sh
View File

@@ -17,7 +17,7 @@ then
fi
export CFLAGS=""
for I in ${APOLLO_INC}; do
for I in ${FREEIMAGE_INC}; do
CFLAGS="${CFLAGS} -I${I}"
done
../mtpl_gcc.sh $1 $2 $3 $4 $5 $6 $7 $8 $9

2
harbour/contrib/hbziparch/make_vc.bat
View File

@@ -3,7 +3,7 @@ rem
rem $Id$
rem
set CFLAGS=-Iinclude
set CFLAGS=-Iinclude -EHsc -D_CRT_NONSTDC_NO_DEPRECATE
call ..\mtpl_vc.bat %1 %2 %3 %4 %5 %6 %7 %8 %9

15
harbour/contrib/mtpl_gcc.mak
View File

@@ -104,10 +104,17 @@ HARBOUR_EXE = $(BIN_DIR)harbour
# C compiler definition and C flags. These should never have to change.
#**********************************************************
CC = gcc
CXX = g++
LINKER = gcc
MKLIB = ar
# CC and LD are set in make_gcc.sh
#ifeq ($(CC),)
#CC = gcc
#endif
#ifeq ($(LD),)
#LD = gcc
#endif
ifeq ($(MKLIB),)
MKLIB = ar
endif
#**********************************************************

31
harbour/contrib/mtpl_gcc.sh
View File

@@ -24,16 +24,32 @@
# export HB_MAKE_FLAGS=
# ---------------------------------------------------------------
if [ -z "$HB_ARCHITECTURE" ]; then
if [ "$OSTYPE" = "msdosdjgpp" ]; then
hb_arch="dos"
else
hb_arch=`uname -s | tr -d "[-]" | tr '[A-Z]' '[a-z]' 2>/dev/null`
case "$hb_arch" in
*windows*|*mingw32*|msys*) hb_arch="w32" ;;
*cygwin*) hb_arch="cyg" ;;
*dos) hb_arch="dos" ;;
*bsd) hb_arch="bsd" ;;
esac
fi
export HB_ARCHITECTURE="$hb_arch" _HB_ARCH_SAVED=1
fi
#**************************************************************
export _HB_CC_NAME=${HB_CC_NAME}
export _HB_MAKE_PROGRAM=${HB_MAKE_PROGRAM}
export _HB_MAKEFILE=${HB_MAKEFILE}
if [ -z "$_HB_CC_NAME" ]; then
hb_arch=`uname -s | tr -d "[-]" | tr '[A-Z]' '[a-z]' 2>/dev/null`
case "$hb_arch" in
*windows*|*mingw32*|msys*) _HB_CC_NAME="mingw" ;;
*dos) _HB_CC_NAME="djgpp" ;;
*) _HB_CC_NAME="gcc" ;;
case "$HB_ARCHITECTURE" in
w32) _HB_CC_NAME="mingw" ;;
dos) _HB_CC_NAME="djgpp" ;;
*) _HB_CC_NAME="gcc" ;;
esac
export _HB_CC_NAME
fi
@@ -45,6 +61,9 @@ export HB_EXIT_LEVEL=
# ---------------------------------------------------------------
[ -z "$CC" ] && export CC="gcc"
[ -z "$LD" ] && export LD="gcc"
${_HB_MAKE_PROGRAM} ${HB_MAKE_FLAGS} -f ${_HB_MAKEFILE} $1 $2 $3 || export HB_EXIT_LEVEL=1
# ---------------------------------------------------------------
@@ -52,3 +71,5 @@ ${_HB_MAKE_PROGRAM} ${HB_MAKE_FLAGS} -f ${_HB_MAKEFILE} $1 $2 $3 || export HB_EX
unset _HB_CC_NAME
unset _HB_MAKE_PROGRAM
unset _HB_MAKEFILE
if [ -n "$_HB_ARCH_SAVED" ]; then unset HB_ARCHITECTURE _HB_ARCH_SAVED; fi

20
harbour/contrib/mtpl_vc.mak
View File

@@ -20,6 +20,10 @@
#**********************************************************
HB_ARCHITECTURE = w32
#**********************************************************
!ifndef HB_ROOT
HB_ROOT = ..\..
!endif
@@ -105,17 +109,27 @@ HB_BUILD_MODE = C
# C Compiler Flags
!if $(HB_VISUALC_VER) >= 80
CFLAGS_VER = -Ot2b1 -EHs-c- -FD -Gs -D_CRT_SECURE_NO_DEPRECATE
CFLAGS_VER = -Ot2b1 -FD -Gs -D_CRT_SECURE_NO_DEPRECATE
!else
CFLAGS_VER = -Ogt2yb1p -GX- -G6 -YX -FD -Gs
!endif
#-----------
CFLAGS = -I$(INCLUDE_DIR) $(CFLAGS_VER) -W3 -nologo -T$(HB_BUILD_MODE) \
-D__WINDOWS__ -DWIN32 -D__WIN32__ $(C_USR) $(CFLAGS)
#-----------
!if "$(HB_BUILD_DEBUG)" == "yes"
CFLAGS = -Zi $(CFLAGS)
DBGMARKER = d
!endif
#-----------
CFLAGS = -MT$(DBGMARKER) $(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
@@ -128,7 +142,7 @@ LDFLAGS = $(LDFLAGS)
#**********************************************************
# General *.cpp --> *.obj COMPILE rule for STATIC Libraries
{.}.cpp{$(OBJ_DIR)}$(OBJEXT)::
$(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
$(CC) $(CLIBFLAGS: -TC= -TP) -Fo$(OBJ_DIR)\ $<
#**********************************************************
# General *.prg --> *.obj COMPILE rule for STATIC Libraries
{.}.prg{$(OBJ_DIR)}$(OBJEXT):