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

2008-11-12 19:11 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* make_b32.bat
  * make_b32.mak
  * make_vc.bat
  * make_vc.mak
  * make_gcc.mak
  * contrib/mtpl_b32.mak
  * contrib/mtpl_gcc.mak
  * contrib/mtpl_vc.mak
    + Added 'set HB_BUILD_OPTIM=no' option to disable 
      all C compiler optimization for all compilers in 
      non-GNU make system. This replaces old envvars 
      BCC_NOOPTIM and GCC_NOOPTIM and add MSVC support 
      for this option.

  * common.mak
    * Formatting.
This commit is contained in:
Viktor Szakats
2008-11-12 18:12:56 +00:00
parent 030b68ec73
commit 7c7756a853
10 changed files with 44 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
harbour/ChangeLog
View File

@@ -8,6 +8,24 @@
2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2008-11-12 19:11 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* make_b32.bat
* make_b32.mak
* make_vc.bat
* make_vc.mak
* make_gcc.mak
* contrib/mtpl_b32.mak
* contrib/mtpl_gcc.mak
* contrib/mtpl_vc.mak
+ Added 'set HB_BUILD_OPTIM=no' option to disable
all C compiler optimization for all compilers in
non-GNU make system. This replaces old envvars
BCC_NOOPTIM and GCC_NOOPTIM and add MSVC support
for this option.
* common.mak
* Formatting.
2008-11-12 18:20 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* source/common/hbverdsp.c
* Don't show '(C mode)', only C++.

4
harbour/common.mak
View File

@@ -114,9 +114,9 @@ BIN_DIR = bin\$(HB_CC_NAME)
OBJ_DIR = obj\$(HB_CC_NAME)
LIB_DIR = lib\$(HB_CC_NAME)
MT_OBJ_DIR = $(OBJ_DIR)\mt
MT_OBJ_DIR = $(OBJ_DIR)\mt
MTDLL_OBJ_DIR = $(OBJ_DIR)\mt_dll
DLL_OBJ_DIR = $(OBJ_DIR)\dll
DLL_OBJ_DIR = $(OBJ_DIR)\dll
# Targets Destination Directories
HB_DEST_DIRS = \

2
harbour/contrib/mtpl_b32.mak
View File

@@ -112,7 +112,7 @@ CFLAGS = -I$(INCLUDE_DIR) $(C_USR) $(CFLAGS)
CFLAGS = -y -v $(CFLAGS)
!endif
#-----------
!if !$d(BCC_NOOPTIM)
!if "$(HB_BUILD_OPTIM)" != "no"
CFLAGS = -4 -O2 -OS -Ov -Oi -Oc $(CFLAGS)
!endif
#-----------

2
harbour/contrib/mtpl_gcc.mak
View File

@@ -114,7 +114,7 @@ endif
# C Compiler Flags
ifndef GCC_NOOPTIM
ifneq ($(HB_BUILD_OPTIM),no)
ifeq ($(HB_ARCHITECTURE),w32)
CFLAGS := -march=i586 $(CFLAGS)
endif

2
harbour/contrib/mtpl_vc.mak
View File

@@ -108,11 +108,13 @@ HB_VISUALC_VER = 80
!endif
# C Compiler Flags
!if "$(HB_BUILD_OPTIM)" != "no"
!if $(HB_VISUALC_VER) >= 80
CFLAGS_VER = -Ot2b1 -EHs-c-
!else
CFLAGS_VER = -Ogt2yb1p -GX- -G6 -YX
!endif
!endif
#-----------
CFLAGS = -nologo -W4 -wd4127 -Gs -I$(INCLUDE_DIR) $(CFLAGS_VER) \

1
harbour/make_b32.bat
View File

@@ -14,6 +14,7 @@ rem Set any of the below settings to customize your build process:
rem set HB_BUILD_DLL=no
rem set HB_BUILD_DEBUG=yes
rem set HB_BUILD_VERBOSE=no
rem set HB_BUILD_OPTIM=no
rem set HB_REBUILD_PARSER=yes
rem set HB_MAKE_PROGRAM=
rem set HB_SHOW_ERRORS=

9
harbour/make_b32.mak
View File

@@ -29,6 +29,7 @@
# dll in addition to normal static build
# HB_BUILD_DEBUG - If set to yes causes to compile with debug info
# HB_BUILD_VERBOSE - Controls echoing commands being executed
# HB_BUILD_OPTIM - Setting it to 'no' disables compiler optimizations
# HB_REBUILD_PARSER - If set to yes force preprocessing new rules by
# Bison (you must use Bison 2.3 or later)
# HB_INSTALL_PREFIX - Path to installation directory into which
@@ -85,7 +86,7 @@ CFLAGS = -I$(INCLUDE_DIR) -I$(OBJ_DIR) $(C_USR)
CFLAGSMT = -DHB_MT_VM
#-----------
!ifndef BCC_NOOPTIM
!if "$(HB_BUILD_OPTIM)" != "no"
CFLAGS = -4 -O2 -OS -Ov -Oi -Oc $(CFLAGS)
!endif
#-----------
@@ -655,15 +656,15 @@ doClean:
@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 $(MT_OBJ_DIR)\*.obj $(DEL) $(MT_OBJ_DIR)\*.obj > nul
@if exist $(MT_OBJ_DIR)\*.c $(DEL) $(MT_OBJ_DIR)\*.c > nul
@if exist $(MT_OBJ_DIR)\*.h $(DEL) $(MT_OBJ_DIR)\*.h > nul
@if exist $(MTDLL_OBJ_DIR)\*.obj $(DEL) $(MTDLL_OBJ_DIR)\*.obj > nul
@if exist $(MTDLL_OBJ_DIR)\*.c $(DEL) $(MTDLL_OBJ_DIR)\*.c > nul
@if exist $(MTDLL_OBJ_DIR)\*.h $(DEL) $(MTDLL_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 $(INCLUDE_DIR)\hbverbld.h $(DEL) $(INCLUDE_DIR)\hbverbld.h > nul
@if exist inst_$(HB_CC_NAME).log $(DEL) inst_$(HB_CC_NAME).log > nul
@if exist bin\*.exe $(DEL) bin\*.exe > nul

9
harbour/make_gcc.mak
View File

@@ -29,6 +29,7 @@
# dll in addition to normal static build (currently not working)
# HB_BUILD_DEBUG - If set to yes causes to compile with debug info
# HB_BUILD_VERBOSE - Controls echoing commands being executed
# HB_BUILD_OPTIM - Setting it to 'no' disables compiler optimizations
# HB_REBUILD_PARSER - If set to yes force preprocessing new rules by
# Bison (you must use Bison 2.3 or later)
# HB_INSTALL_PREFIX - Path to installation directory into which
@@ -149,7 +150,7 @@ endif
CFLAGS := -W -Wall -I$(INCLUDE_DIR) $(C_USR) -I$(OBJ_DIR)
CFLAGSMT := -DHB_MT_VM
#-----------
ifndef GCC_NOOPTIM
ifneq ($(HB_BUILD_OPTIM),no)
ifeq ($(HB_ARCHITECTURE),w32)
CFLAGS := -march=i586 $(CFLAGS)
endif
@@ -548,15 +549,15 @@ doClean:
-$(DEL) $(OBJ_DIR)/*$(OBJEXT)
-$(DEL) $(OBJ_DIR)/*.c
-$(DEL) $(OBJ_DIR)/*.h
-$(DEL) $(DLL_OBJ_DIR)/*$(OBJEXT)
-$(DEL) $(DLL_OBJ_DIR)/*.c
-$(DEL) $(DLL_OBJ_DIR)/*.h
-$(DEL) $(MT_OBJ_DIR)/*$(OBJEXT)
-$(DEL) $(MT_OBJ_DIR)/*.c
-$(DEL) $(MT_OBJ_DIR)/*.h
-$(DEL) $(MTDLL_OBJ_DIR)/*$(OBJEXT)
-$(DEL) $(MTDLL_OBJ_DIR)/*.c
-$(DEL) $(MTDLL_OBJ_DIR)/*.h
-$(DEL) $(DLL_OBJ_DIR)/*$(OBJEXT)
-$(DEL) $(DLL_OBJ_DIR)/*.c
-$(DEL) $(DLL_OBJ_DIR)/*.h
-$(DEL) $(INCLUDE_DIR)/hbverbld.h
-$(DEL) inst_$(HB_CC_NAME).log
-$(DEL) common.cf

1
harbour/make_vc.bat
View File

@@ -14,6 +14,7 @@ rem Set any of the below settings to customize your build process:
rem set HB_BUILD_DLL=no
rem set HB_BUILD_DEBUG=yes
rem set HB_BUILD_VERBOSE=no
rem set HB_BUILD_OPTIM=no
rem set HB_REBUILD_PARSER=yes
rem set HB_MAKE_PROGRAM=
rem set HB_SHOW_ERRORS=

11
harbour/make_vc.mak
View File

@@ -29,6 +29,7 @@
# dll in addition to normal static build
# HB_BUILD_DEBUG - If set to yes causes to compile with debug info
# HB_BUILD_VERBOSE - Controls echoing commands being executed
# HB_BUILD_OPTIM - Setting it to 'no' disables compiler optimizations
# HB_REBUILD_PARSER - If set to yes force preprocessing new rules by
# Bison (you must use Bison 2.3 or later)
# HB_INSTALL_PREFIX - Path to installation directory into which
@@ -100,11 +101,13 @@ MTDLL_OBJS = $(TMP_DLL_OBJS:obj\vc=obj\vc\dll) $(VMMTDLL_LIB_OBJS)
# C Compiler Flags
!if "$(HB_BUILD_WINCE)" == "yes"
!if "$(HB_BUILD_OPTIM)" != "no"
!if $(HB_VISUALC_VER) >= 80
CFLAGS_VER = -Od -Os -Gy -EHsc- -Gm -Zi -GR-
!else
CFLAGS_VER = -Oxsb1 -EHsc -YX -GF
!endif
!endif
# TOFIX: These should be cleaned from everything not absolutely necessary:
@@ -127,11 +130,13 @@ DBGMARKER = d
# NOTE: See here: http://msdn.microsoft.com/en-us/library/fwkeyyhe.aspx
!if "$(HB_BUILD_OPTIM)" != "no"
!if $(HB_VISUALC_VER) >= 80
CFLAGS_VER = -Ot2b1 -EHs-c-
!else
CFLAGS_VER = -Ogt2yb1p -GX- -G6 -YX
!endif
!endif
CFLAGS = -nologo -W4 -wd4127 -Gs -I$(INCLUDE_DIR) $(CFLAGS_VER) \
$(C_USR) -I$(OBJ_DIR)
@@ -1036,15 +1041,15 @@ doClean:
@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 $(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 $(MT_OBJ_DIR)\*.obj $(DEL) $(MT_OBJ_DIR)\*.obj > nul
@if exist $(MT_OBJ_DIR)\*.c $(DEL) $(MT_OBJ_DIR)\*.c > nul
@if exist $(MT_OBJ_DIR)\*.h $(DEL) $(MT_OBJ_DIR)\*.h > nul
@if exist $(MTDLL_OBJ_DIR)\*.obj $(DEL) $(MTDLL_OBJ_DIR)\*.obj > nul
@if exist $(MTDLL_OBJ_DIR)\*.c $(DEL) $(MTDLL_OBJ_DIR)\*.c > nul
@if exist $(MTDLL_OBJ_DIR)\*.h $(DEL) $(MTDLL_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 $(INCLUDE_DIR)\hbverbld.h $(DEL) $(INCLUDE_DIR)\hbverbld.h > nul
@if exist inst_$(HB_CC_NAME).log $(DEL) inst_$(HB_CC_NAME).log > nul
@if exist bin\*.exe $(DEL) bin\*.exe > nul