diff --git a/harbour/ChangeLog b/harbour/ChangeLog index e7380ddce2..52cbf8f04d 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,22 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-02-16 16:29 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbwin/wce_smsc.c + ! Fixed to skip content for msvc 2003 in C mode. + + * config/globsh.mk + + Now also deleting .pch (MSVC precompiled header) files on + clean, in case someone enables them. + + ; NOTE: I turned out all my tests using "msvc 2003" compiler + was in fact a 12.20.9615 (_MSV_VER=1201, clarm.exe) + version compiler, which equals to VC++ 6.0. + Just for the record, since I can't oversee what WinCE + compilers were released between this and MSVC2005 (8.0/1400), + so until then I have to assume that everything + below 8.0 are "old" msvcarm versions (7.1/1310 or lower). + 2010-02-16 15:06 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg ! Fix to add 'lib' prefix for gcc compiler when using -implib option. diff --git a/harbour/config/globsh.mk b/harbour/config/globsh.mk index d870c9bfaa..306565f71f 100644 --- a/harbour/config/globsh.mk +++ b/harbour/config/globsh.mk @@ -59,12 +59,14 @@ clean:: fi ; \ if [ -n "$(BIN_FILE)" ]; then \ $(RM) $(basename $(BIN_FILE)).tds; \ + $(RM) $(basename $(BIN_FILE)).pch; \ $(RM) $(basename $(BIN_FILE)).pdb; \ $(RM) $(basename $(BIN_FILE)).ilk; \ [ "`$(ECHO) $(BIN_DIR)/*`" != "$(BIN_DIR)/*" ] || $(RDP) $(BIN_DIR); \ fi ; \ if [ -n "$(DYN_FILE)" ]; then \ $(RM) $(basename $(DYN_FILE)).tds; \ + $(RM) $(basename $(DYN_FILE)).pch; \ $(RM) $(basename $(DYN_FILE)).pdb; \ $(RM) $(basename $(DYN_FILE)).ilk; \ $(RM) $(basename $(DYN_FILE)).def; \ @@ -114,11 +116,13 @@ clean:: $(if $(LIB_FILE),-@if exist "$(LIB_DIR_OS)" if not exist "$(LIB_DIR_OS)\*" $(RDP) "$(LIB_DIR_OS)",) $(if $(BIN_FILE),-@if exist "$(BIN_FILE_OS)" $(RM) "$(BIN_FILE_OS)",) $(if $(BIN_FILE),-@if exist "$(basename $(BIN_FILE_OS)).tds" $(RM) "$(basename $(BIN_FILE_OS)).tds",) + $(if $(BIN_FILE),-@if exist "$(basename $(BIN_FILE_OS)).pch" $(RM) "$(basename $(BIN_FILE_OS)).pch",) $(if $(BIN_FILE),-@if exist "$(basename $(BIN_FILE_OS)).pdb" $(RM) "$(basename $(BIN_FILE_OS)).pdb",) $(if $(BIN_FILE),-@if exist "$(basename $(BIN_FILE_OS)).ilk" $(RM) "$(basename $(BIN_FILE_OS)).ilk",) $(if $(BIN_FILE),-@if exist "$(BIN_DIR_OS)" if not exist "$(BIN_DIR_OS)\*" $(RDP) "$(BIN_DIR_OS)",) $(if $(DYN_FILE),-@if exist "$(DYN_FILE_OS)" $(RM) "$(DYN_FILE_OS)",) $(if $(DYN_FILE),-@if exist "$(basename $(DYN_FILE_OS)).tds" $(RM) "$(basename $(DYN_FILE_OS)).tds",) + $(if $(DYN_FILE),-@if exist "$(basename $(DYN_FILE_OS)).pch" $(RM) "$(basename $(DYN_FILE_OS)).pch",) $(if $(DYN_FILE),-@if exist "$(basename $(DYN_FILE_OS)).pdb" $(RM) "$(basename $(DYN_FILE_OS)).pdb",) $(if $(DYN_FILE),-@if exist "$(basename $(DYN_FILE_OS)).ilk" $(RM) "$(basename $(DYN_FILE_OS)).ilk",) $(if $(DYN_FILE),-@if exist "$(basename $(DYN_FILE_OS)).def" $(RM) "$(basename $(DYN_FILE_OS)).def",) @@ -162,10 +166,12 @@ clean:: $(if $(LIB_FILE),-@$(RM) $(basename $(LIB_FILE_OS)).bak,) $(if $(LIB_FILE),$(if $(wildcard $(LIB_DIR)/*.*),,-@$(RDP) $(LIB_DIR_OS)),) $(if $(BIN_FILE),-@$(RM) $(basename $(BIN_FILE_OS)).tds,) + $(if $(BIN_FILE),-@$(RM) $(basename $(BIN_FILE_OS)).pch,) $(if $(BIN_FILE),-@$(RM) $(basename $(BIN_FILE_OS)).pdb,) $(if $(BIN_FILE),-@$(RM) $(basename $(BIN_FILE_OS)).ilk,) $(if $(BIN_FILE),$(if $(wildcard $(BIN_DIR)/*.*),,-@$(RDP) $(BIN_DIR_OS)),) $(if $(DYN_FILE),-@$(RM) $(basename $(DYN_FILE_OS)).tds,) + $(if $(DYN_FILE),-@$(RM) $(basename $(DYN_FILE_OS)).pch,) $(if $(DYN_FILE),-@$(RM) $(basename $(DYN_FILE_OS)).pdb,) $(if $(DYN_FILE),-@$(RM) $(basename $(DYN_FILE_OS)).ilk,) $(if $(DYN_FILE),-@$(RM) $(basename $(DYN_FILE_OS)).def,) @@ -209,10 +215,12 @@ clean:: $(if $(LIB_FILE),-@$(RM) $(basename $(LIB_FILE_OS)).bak,) $(if $(LIB_FILE),$(if $(wildcard $(LIB_DIR)/*.*),,-@$(RDP) $(LIB_DIR_OS)),) $(if $(BIN_FILE),-@$(RM) $(basename $(BIN_FILE_OS)).tds,) + $(if $(BIN_FILE),-@$(RM) $(basename $(BIN_FILE_OS)).pch,) $(if $(BIN_FILE),-@$(RM) $(basename $(BIN_FILE_OS)).pdb,) $(if $(BIN_FILE),-@$(RM) $(basename $(BIN_FILE_OS)).ilk,) $(if $(BIN_FILE),$(if $(wildcard $(BIN_DIR)/*.*),,-@$(RDP) $(BIN_DIR_OS)),) $(if $(DYN_FILE),-@$(RM) $(basename $(DYN_FILE_OS)).tds,) + $(if $(DYN_FILE),-@$(RM) $(basename $(DYN_FILE_OS)).pch,) $(if $(DYN_FILE),-@$(RM) $(basename $(DYN_FILE_OS)).pdb,) $(if $(DYN_FILE),-@$(RM) $(basename $(DYN_FILE_OS)).ilk,) $(if $(DYN_FILE),-@$(RM) $(basename $(DYN_FILE_OS)).def,) diff --git a/harbour/contrib/hbwin/wce_smsc.c b/harbour/contrib/hbwin/wce_smsc.c index 643e11aef5..2af6dae7c2 100644 --- a/harbour/contrib/hbwin/wce_smsc.c +++ b/harbour/contrib/hbwin/wce_smsc.c @@ -52,7 +52,9 @@ #include "hbwin.h" -#if defined( HB_OS_WIN_CE ) && ! defined( __MINGW32__ ) +#if defined( HB_OS_WIN_CE ) && \ + ! defined( __MINGW32__ ) && \ + !( ! defined( __cplusplus ) && ( defined( _MSC_VER ) && ( _MSC_VER <= 1310 ) ) ) #include