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

2014-10-07 10:58 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

Browse Source 
* config/win/msvc.mk
  * utils/hbmk2/hbmk2.prg
    * disabled -nologo option used with resource compiler in MSVC builds.
      Compiler version is not enough to detect supported parameters when
      Platform SDK rc.exe is used.
This commit is contained in:
Przemysław Czerpak
2014-10-07 10:58:04 +02:00
parent e5897132b8
commit 6d2e59b103
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog.txt
View File

@@ -10,6 +10,13 @@
* Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
*/
2014-10-07 10:58 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* config/win/msvc.mk
* utils/hbmk2/hbmk2.prg
* disabled -nologo option used with resource compiler in MSVC builds.
Compiler version is not enough to detect supported parameters when
Platform SDK rc.exe is used.
2014-10-07 10:25 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* contrib/gtqtc/gtqtc1.cpp
* src/rtl/gtxwc/gtxwc.c

8
config/win/msvc.mk
View File

@@ -61,9 +61,11 @@ RC := rc.exe
RC_OUT := -fo$(subst x,x, )
RCFLAGS += -I. -I$(HB_HOST_INC)
# Windows SDK 7.0 also supports it, but we cannot detect it.
ifeq ($(filter $(HB_COMPILER_VER),1200 1300 1310 1400 1500),)
RCFLAGS += -nologo
endif
# # NOTE: Compiler version is not enough to detect supported
# # parameters when Platform SDK rc.exe is used.
# ifeq ($(filter $(HB_COMPILER_VER),1200 1300 1310 1400 1500),)
# RCFLAGS += -nologo
# endif
# # NOTE: -GA flag should be disabled when building MT _.dlls_,
# # as it creates bad code according to MS docs [vszakats].

3
utils/hbmk2/hbmk2.prg
View File

@@ -5242,9 +5242,12 @@ STATIC FUNCTION __hbmk( aArgs, nArgTarget, nLevel, /* @ */ lPause, /* @ */ lExit
IF ! HBMK_ISCOMP( "icc|iccia64" )
cBin_Res := "rc.exe"
cOpt_Res := "{FR} -fo {OS} {IR}"
#if 0
/* NOTE: Compiler version is not enough to detect supported parameters when Platform SDK rc.exe is used. */
IF hbmk[ _HBMK_nCOMPVer ] >= 1600
cOpt_Res := "-nologo " + cOpt_Res /* NOTE: Only in MSVC 2010 and upper. [vszakats] */
ENDIF
#endif
cResExt := ".res"
ENDIF