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

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

Browse Source 
* make_vc.mak
    + TOFIX added for the case when HB_CC_NAME is overridden 
      by user and MT/DLL targets are being created.

  * common.mak
  * source/common/hbver.c
    % Minor opts.
This commit is contained in:
Viktor Szakats
2008-11-12 13:45:27 +00:00
parent 8171ecbecf
commit 20b768bbce
4 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
harbour/ChangeLog
View File

@@ -8,6 +8,15 @@
2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2008-11-12 14:44 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* make_vc.mak
+ TOFIX added for the case when HB_CC_NAME is overridden
by user and MT/DLL targets are being created.
* common.mak
* source/common/hbver.c
% Minor opts.
2008-11-12 13:57 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* source/common/hbverdsp.c
! Fixed displaying tracing status. (INFO and DEBUG level

6
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\$(HB_CC_NAME)\mt
MTDLL_OBJ_DIR = obj\$(HB_CC_NAME)\mt_dll
DLL_OBJ_DIR = obj\$(HB_CC_NAME)\dll
MT_OBJ_DIR = $(OBJ_DIR)\mt
MTDLL_OBJ_DIR = $(OBJ_DIR)\mt_dll
DLL_OBJ_DIR = $(OBJ_DIR)\dll
# Targets Destination Directories
HB_DEST_DIRS = \

2
harbour/make_vc.mak
View File

@@ -87,9 +87,9 @@ MKLIB = lib.exe
# Nmake does not support macros in string
# substitution, so we have to hardcode it
# TOFIX: This won't work properly if HB_CC_NAME is overridden by user (f.e. for WinCE builds).
VMMTDLL_LIB_OBJS = $(VM_DLL_OBJS:obj\vc=obj\vc\mt_dll)
VMMT_LIB_OBJS = $(VM_LIB_OBJS:obj\vc=obj\vc\mt)
DLL_OBJS = $(TMP_DLL_OBJS:obj\vc=obj\vc\dll) $(VM_DLL_OBJS:obj\vc=obj\vc\dll)
MTDLL_OBJS = $(TMP_DLL_OBJS:obj\vc=obj\vc\dll) $(VMMTDLL_LIB_OBJS)

32
harbour/source/common/hbver.c
View File

@@ -55,10 +55,10 @@
* www - http://www.harbour-project.org
*
* Copyright 1999 Luiz Rafael Culik <culik@sl.conex.net>
* hb_verPlatform() (support for determining the windows version)
* hb_verPlatform() (support for determining the Windows version)
*
* Copyright 1999 Jose Lalin <dezac@corevia.com>
* hb_verPlatform() (support for determining many windows flavours)
* hb_verPlatform() (support for determining many Windows flavours)
* hb_verCompiler() (support for determining some compiler version/revision)
*
* Copyright 2000-2001 Viktor Szakats <viktor.szakats@syenar.hu>
@@ -205,18 +205,18 @@ char * hb_verPlatform( void )
if( GetVersionExA( &osVer ) )
{
char * pszName = "Windows";
char * pszName = "";
switch( osVer.dwPlatformId )
{
case VER_PLATFORM_WIN32_WINDOWS:
if( osVer.dwMajorVersion == 4 && osVer.dwMinorVersion < 10 )
pszName = "Windows 95";
pszName = " 95";
else if( osVer.dwMajorVersion == 4 && osVer.dwMinorVersion == 10 )
pszName = "Windows 98";
pszName = " 98";
else
pszName = "Windows ME";
pszName = " ME";
break;
@@ -232,35 +232,35 @@ char * hb_verPlatform( void )
if( GetVersionExA( ( OSVERSIONINFOA * ) &osVerEx ) )
{
if( osVerEx.wProductType == VER_NT_WORKSTATION )
pszName = "Windows Vista";
pszName = " Vista";
else
pszName = "Windows Server 2008";
pszName = " Server 2008";
}
else
#endif
pszName = "Windows";
pszName = "";
}
else if( osVer.dwMajorVersion == 5 && osVer.dwMinorVersion >= 2 )
pszName = "Windows Server 2003 / XP x64";
pszName = " Server 2003 / XP x64";
else if( osVer.dwMajorVersion == 5 && osVer.dwMinorVersion == 1 )
pszName = "Windows XP";
pszName = " XP";
else if( osVer.dwMajorVersion == 5 )
pszName = "Windows 2000";
pszName = " 2000";
else
pszName = "Windows NT";
pszName = " NT";
break;
case VER_PLATFORM_WIN32s:
pszName = "Windows 32s";
pszName = " 32s";
break;
case VER_PLATFORM_WIN32_CE:
pszName = "Windows CE";
pszName = " CE";
break;
}
hb_snprintf( pszPlatform, PLATFORM_BUF_SIZE + 1, "%s %lu.%lu.%04d",
hb_snprintf( pszPlatform, PLATFORM_BUF_SIZE + 1, "Windows%s %lu.%lu.%04d",
pszName,
( ULONG ) osVer.dwMajorVersion,
( ULONG ) osVer.dwMinorVersion,