From 4e231f9bba6d33d22fce10f5778719d108225cd4 Mon Sep 17 00:00:00 2001 From: Marek Paliwoda Date: Fri, 4 Jul 2008 18:45:17 +0000 Subject: [PATCH] 2008-07-04 20:45 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl) * make_vcce.mak ! Fixes required by an old eVC4 compiler, Better synchronization with make_vc.mak. --- harbour/ChangeLog | 53 +++++++++++++++++++++++-------------------- harbour/make_vcce.mak | 24 +++++++++++++------- 2 files changed, 45 insertions(+), 32 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 03bb5acc90..7710b2aca3 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,11 +8,16 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-07-04 20:45 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl) + * make_vcce.mak + ! Fixes required by an old eVC4 compiler, + Better synchronization with make_vc.mak. + 2008-07-04 19:00 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * contrib/hbziparch/Makefile ! Fixed commented file in file list. ; This may fix some GNU-make problems regarding hbziparch. - ; hbziparch may not work in RC2 GNU-make builds for this + ; hbziparch may not work in RC2 GNU-make builds for this reason. * harbour-ce-spec @@ -21,13 +26,13 @@ * include/hbver.h * harbour.spec * RC2 -> rc2 - ; We should use lowercase for 'RC' in the future, for consistency - with 'alpha', 'beta' (and with other projects too). It looks + ; We should use lowercase for 'RC' in the future, for consistency + with 'alpha', 'beta' (and with other projects too). It looks smoother too. * source/rtl/errorint.c ! hb_setGetCPtr( HB_SET_HBOUTLOG ) checked for NULL value. - I'm not sure if this is required in real life, so this may + I'm not sure if this is required in real life, so this may be unnecessary safety. * utils/Makefile @@ -37,7 +42,7 @@ * contrib/hbmzip/hbmzip.c + Reenabled new OS/2 code. ! Fixed defines in OS/2 part. Requested definitions. - Fixed one potential error. Pls review and test, all + Fixed one potential error. Pls review and test, all this was done blindly. 2008-07-04 03:06 UTC+0200 Viktor Szakats (harbour.01 syenar hu) @@ -48,7 +53,7 @@ 2008-07-03 22:45 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * source/rtl/errorint.c + Internal error are now logged to hb_out.log (by default). - ; This addition looks quite humble, yet very useful, please + ; This addition looks quite humble, yet very useful, please test and comment it. Credits to Randy Portnoff for the idea. ; First post-RC2, RC3/FINAL modification. @@ -109,21 +114,21 @@ 2008-07-03 16:48 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * contrib/hbmzip/hbmzip.c - + Added ".cmd" to the (commented) list of OS/2 executable + + Added ".cmd" to the (commented) list of OS/2 executable extensions. + Added headers for DOS/GCC line. - + Guarded new DOS section with GCC guards, added dummy + + Guarded new DOS section with GCC guards, added dummy branch for other DOS compilers. ! Fixed embedded comment. - ; TOFIX: + ; TOFIX: ../../hbmzip.c:563: error: 'FILE_ATTRIBUTE_READONLY' undeclared (first use in this function) ../../hbmzip.c:568: error: 'FILE_ATTRIBUTE_DIRECTORY' undeclared (first use in this function) * contrib/hbmisc/spd.c - - Removed two __XHARBOUR__ guards, because these feature + - Removed two __XHARBOUR__ guards, because these feature have since been implemented in xhb. - ! Fixed DJGPP warning. The problem is that DJGPP will preprocess - snprintf() to sprintf() (not very safe), which makes ulMaxBuf + ! Fixed DJGPP warning. The problem is that DJGPP will preprocess + snprintf() to sprintf() (not very safe), which makes ulMaxBuf var unused. 2008-07-03 16:35 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) @@ -151,10 +156,10 @@ 2008-07-03 16:30 UTC+0300 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt) * contrib/hbmzip/hbmzip.c + implemented file get attributes and file set attributes for DOS and OS2 - ; I've not even tried to compile the code. I have no required OS and - compile enviroment. DOS implementation is written using docs from + ; I've not even tried to compile the code. I have no required OS and + compile enviroment. DOS implementation is written using docs from http://www.delorie.com/djgpp/doc/libc-2.02/, OS2 implementation - is just guess... Please test, I hope adding some #include + is just guess... Please test, I hope adding some #include will make this code usable. 2008-07-03 15:15 UTC+0200 Viktor Szakats (harbour.01 syenar hu) @@ -213,9 +218,9 @@ 2008-07-03 14:11 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * contrib/hbmisc/spd.c ! DJGPP warning fixed, plus another update from Xavi. - ; Sorry I've removed _SPD() as IMO there is not much point - in keeping compatibility with a name which was never used - by Harbour. That can be easily done outside Harbour + ; Sorry I've removed _SPD() as IMO there is not much point + in keeping compatibility with a name which was never used + by Harbour. That can be easily done outside Harbour though for those (few) who need it nevertheless. 2008-07-03 13:16 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) @@ -237,7 +242,7 @@ 2008-07-03 11:55 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * contrib/hbcurl/hbcurl.c - ! Fixed compile errors when compiled with some (but not all + ! Fixed compile errors when compiled with some (but not all possible) older libcurl versions. ; It still requires libcurl 7.17.0 in order to work properly though. @@ -247,8 +252,8 @@ * contrib/hbziparch/hbzipnew.cpp * contrib/hbziparch/common.mak * Merged source module hbzipcom.cpp into hbzipnew.cpp. - + Using hb_fsSize() Harbour API instead of implementing - this functionality locally and only for a limited + + Using hb_fsSize() Harbour API instead of implementing + this functionality locally and only for a limited number of platforms/compilers. 2008-07-03 11:21 UTC+0200 Viktor Szakats (harbour.01 syenar hu) @@ -256,8 +261,8 @@ * hbziparch/hbziparc.h * hbziparch/hbzipcom.cpp * hbziparch/hbzipnew.cpp - ! Fixed reintroduced warnings. Sorry Miguel, but the - latest fix was not needed, since bAdded was reinited + ! Fixed reintroduced warnings. Sorry Miguel, but the + latest fix was not needed, since bAdded was reinited to FALSE in each iteration of the loop. ! sprintf() -> snprintf() % Optimizations. @@ -272,7 +277,7 @@ * contrib/hbsqlit3/make_gcc.sh * contrib/hbvpdf/make_gcc.sh + svn propset svn:executable ON * - ; Thanks Marek. I'm updating my local files to avoid + ; Thanks Marek. I'm updating my local files to avoid this in the future. 2008-07-03 09:15 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl) diff --git a/harbour/make_vcce.mak b/harbour/make_vcce.mak index f73902e18b..c6d19c177f 100644 --- a/harbour/make_vcce.mak +++ b/harbour/make_vcce.mak @@ -35,6 +35,7 @@ # (GNU make compatible envvar) # HB_GT_LIB - To override the default GT driver # (search for HB_GT_LIBS for a list of values) +# HB_BUILD_ST - If set to yes builds harbour in SingleThread mode # HB_BUILD_DLL - If set to yes enables building harbour VM+RTL # dll in addition to normal static build # HB_BUILD_MODE - If set to cpp causes to compile in C++ mode @@ -135,26 +136,30 @@ CFLAGS = -I$(INCLUDE_DIR) -I$(CFLAGS_VER) -T$(HB_BUILD_MODE) -W3 -nologo -DHB_WINCE $(C_USR) $(CFLAGS) -D_UWIN -I$(OBJ_DIR) # -D"_CONSOLE" +#----------- !ifndef HB_WINCE_COMPILE_WITH_GTWIN -CFLAGS = $(CFLAGS) -DHB_NO_WIN_CONSOLE +CFLAGS = $(CFLAGS) -DHB_NO_WIN_CONSOLE !endif - +#----------- !if "$(HB_BUILD_DEBUG)" == "yes" -CFLAGS = $(CFLAGS) -D "_DEBUG" -D "DEBUG" -DBGMARKER = d +CFLAGS = $(CFLAGS) -D "_DEBUG" -D "DEBUG" +DBGMARKER = d !else -CFLAGS = $(CFLAGS) -D "NDEBUG" +CFLAGS = $(CFLAGS) -D "NDEBUG" +!endif +#----------- +!if "$(HB_BUILD_ST)" != "yes" +CFLAGS = -MT$(DBGMARKER) $(CFLAGS) !endif #----------- !if "$(HB_GT_DEFAULT)" != "" -CFLAGS = -D"HB_GT_DEFAULT=$(HB_GT_DEFAULT:gt=)" $(CFLAGS) +CFLAGS = -D"HB_GT_DEFAULT=$(HB_GT_DEFAULT:gt=)" $(CFLAGS) !endif #----------- !if "$(HB_GT_LIB)" != "" -CFLAGS = -D"HB_GT_LIB=$(HB_GT_LIB:gt=)" $(CFLAGS) +CFLAGS = -D"HB_GT_LIB=$(HB_GT_LIB:gt=)" $(CFLAGS) !endif #----------- -CFLAGS = -MT$(DBGMARKER) $(CFLAGS) #********************************************************** @@ -177,6 +182,9 @@ LDFLAGS = /NOLOGO /SUBSYSTEM:windowsce,4.20 /MACHINE:ARM /ARMPADCODE \ /NODEFAULTLIB:"kernel32.lib" /MANIFEST:NO /LIBPATH:$(LIB_DIR) \ /OPT:REF /OPT:ICF $(LDFLAGS) # /ERRORREPORT:PROMPT /ENTRY:"mainWCRTStartup" +!if $(HB_VISUALC_VER) >= 80 +LDFLAGS = $(LDFLAGS) /MANIFEST:NO +!endif LDFLAGSDLL = /NOLOGO /DLL /MACHINE:ARM /ARMPADCODE \ /STACK:65536,4096 /ALIGN:4096 /NODEFAULTLIB:"oldnames.lib" \