From 709e84952d6b0302428654b58563fe6bcdfa355e Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 25 Aug 2008 20:27:30 +0000 Subject: [PATCH] 2008-08-25 22:25 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * make_vcce.mak ! Attempt to fix /MANIFEST:NO warnings for MSVC 6.0. ! Attempt to fix WinCE .dll linking error. ; Jose, another test would be great. * make_vc.bat * make_vc.mak * make_vcce.bat * make_vcce.mak * Some syncing and minor fixes in comments. --- harbour/ChangeLog | 12 ++++++++++++ harbour/make_vc.bat | 1 + harbour/make_vc.mak | 6 +++--- harbour/make_vcce.bat | 23 ++++++++++++----------- harbour/make_vcce.mak | 17 ++++++++++------- 5 files changed, 38 insertions(+), 21 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index cf8f6cb856..256fd0d153 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,18 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-08-25 22:25 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * make_vcce.mak + ! Attempt to fix /MANIFEST:NO warnings for MSVC 6.0. + ! Attempt to fix WinCE .dll linking error. + ; Jose, another test would be great. + + * make_vc.bat + * make_vc.mak + * make_vcce.bat + * make_vcce.mak + * Some syncing and minor fixes in comments. + 2008-08-25 21:56 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * make_vcce.mak ! Fixed system library list to not contain gdi32.lib. diff --git a/harbour/make_vc.bat b/harbour/make_vc.bat index 319fce94da..1393fb3790 100644 --- a/harbour/make_vc.bat +++ b/harbour/make_vc.bat @@ -19,6 +19,7 @@ rem set HB_REBUILD_PARSER=yes rem set HB_MAKE_PROGRAM= rem set HB_SHOW_ERRORS= rem set HB_MAKE_FLAGS= +rem set HB_CC_NAME= rem --------------------------------------------------------------- set _HB_CC_NAME=%HB_CC_NAME% diff --git a/harbour/make_vc.mak b/harbour/make_vc.mak index 60d3b1f49f..2a1161455d 100644 --- a/harbour/make_vc.mak +++ b/harbour/make_vc.mak @@ -33,8 +33,8 @@ # HARBOURFLAGSDLL - Extra Harbour compiler options for shared libraries # PRG_USR - Extra Harbour compiler options # (GNU make compatible envvar) -# HB_GT_DEFAULT - The default GT driver, Choose between : -# gtstd (default),gtcgi,gtwin,gtwvt +# HB_GT_DEFAULT - The default GT driver, Choose between: +# gtstd (default), gtcgi, gtwin, gtwvt # 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 @@ -48,7 +48,7 @@ # "make_vc.bat install" is lauched. Defaults # to current directory # HB_VISUALC_VER - Version of Visual C++ compiler (defaults to 60). -# Possible values are : 60, 70, 71, 80 +# Possible values are : 60, 70, 71, 80, 90 #********************************************************** diff --git a/harbour/make_vcce.bat b/harbour/make_vcce.bat index 1be1272e76..3ed404c16e 100644 --- a/harbour/make_vcce.bat +++ b/harbour/make_vcce.bat @@ -15,6 +15,7 @@ rem set HB_BUILD_MODE=C rem set HB_BUILD_DLL=yes rem set HB_BUILD_DEBUG=yes rem set HB_BUILD_VERBOSE=yes +rem set HB_REBUILD_PARSER=yes rem set HB_MAKE_PROGRAM= rem set HB_SHOW_ERRORS= rem set HB_MAKE_FLAGS= @@ -52,23 +53,23 @@ rem Checking if HB and HBPP are set if not "%HB%" == "" if exist %HB% goto CHECK_HBPP echo. - echo ******************************************* - echo You must set HB environment variable to a - echo working copy of Harbour compiler executable - echo harbour.exe. - echo. Example : set HB=C:\Harbour\harbour.exe - echo ******************************************* + echo. ******************************************* + echo. You must set HB environment variable to a + echo. working copy of Harbour compiler executable + echo. harbour.exe. + echo. Example: set HB=C:\harbour\harbour.exe + echo. ******************************************* echo. goto EXIT :CHECK_HBPP if not "%HBPP%" == "" if exist %HBPP% goto BUILD echo. - echo ********************************************** - echo You must set HBPP environment variable to a - echo working copy of hbpp.exe helper executable - echo. Example : set HBPP=C:\Harbour\hbpp.exe - echo ********************************************** + echo. ********************************************** + echo. You must set HBPP environment variable to a + echo. working copy of hbpp.exe helper executable + echo. Example: set HBPP=C:\harbour\hbpp.exe + echo. ********************************************** echo. goto EXIT diff --git a/harbour/make_vcce.mak b/harbour/make_vcce.mak index c83c5b89f5..1f88173b96 100644 --- a/harbour/make_vcce.mak +++ b/harbour/make_vcce.mak @@ -33,6 +33,8 @@ # HARBOURFLAGSDLL - Extra Harbour compiler options for shared libraries # PRG_USR - Extra Harbour compiler options # (GNU make compatible envvar) +# HB_GT_DEFAULT - The default GT driver, Choose between: +# gtstd (default), gtcgi, gtwin, gtwvt # 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 @@ -46,7 +48,7 @@ # "make_vc.bat install" is lauched. Defaults # to current directory # HB_VISUALC_VER - Version of Visual C++ compiler (defaults to 80). -# Possible values are : 60, 70, 71, 80 +# Possible values are : 60, 70, 71, 80, 90 #********************************************************** @@ -177,17 +179,18 @@ HARBOURFLAGSDLL= -n1 $(HBFLAGSCMN) $(HARBOURFLAGSDLL) #********************************************************** # Linker Flags -LDFLAGS = /NOLOGO /SUBSYSTEM:windowsce,4.20 /MACHINE:ARM /ARMPADCODE \ - /STACK:65536,4096 /ALIGN:4096 /NODEFAULTLIB:"oldnames.lib" \ - /NODEFAULTLIB:"kernel32.lib" /MANIFEST:NO /LIBPATH:$(LIB_DIR) \ - /OPT:REF /OPT:ICF $(LDFLAGS) +LDFLAGS = /NOLOGO /SUBSYSTEM:WINDOWSCE,4.20 /MACHINE:ARM /ARMPADCODE \ + /STACK:65536,4096 /NODEFAULTLIB:"oldnames.lib" \ + /NODEFAULTLIB:"kernel32.lib" /ALIGN:4096 /OPT:REF /OPT:ICF \ + /LIBPATH:$(LIB_DIR) $(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" \ +LDFLAGSDLL = /DLL \ + /NOLOGO /SUBSYSTEM:WINDOWSCE,4.20 /MACHINE:ARM /ARMPADCODE \ + /STACK:65536,4096 /NODEFAULTLIB:"oldnames.lib" \ /LIBPATH:$(LIB_DIR) $(LDFLAGSDLL) !if "$(HB_BUILD_DEBUG)" == "yes"