Fix Windows GUI implib and image version in VS 6
These commits: Adding image version number (major.minor) property to windows binaries. Added support for import libraries created by executable and module targets. added content to Templates/EXEHeader.dsptemplate that should also have been added to Templates/EXEWinHeader.dsptemplate for the VS6 generator. This commit corrects the error. See issue #9586.
This commit is contained in:
parent
1a527daa3b
commit
4867b712f9
|
@ -72,8 +72,8 @@ BSC32=bscmake.exe
|
||||||
# ADD BSC32 /nologo
|
# ADD BSC32 /nologo
|
||||||
LINK32=link.exe
|
LINK32=link.exe
|
||||||
# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386 /IGNORE:4089
|
# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386 /IGNORE:4089
|
||||||
# ADD LINK32 /nologo /subsystem:windows /machine:I386 /IGNORE:4089
|
# ADD LINK32 /nologo /subsystem:windows /machine:I386 /IGNORE:4089 TARGET_VERSION_FLAG
|
||||||
# ADD LINK32 /out:"OUTPUT_DIRECTORY\Release\OUTPUT_NAME_RELEASE"
|
# ADD LINK32 /out:"OUTPUT_DIRECTORY\Release\OUTPUT_NAME_RELEASE" TARGET_IMPLIB_FLAG_RELEASE
|
||||||
CM_MULTILINE_OPTIONS_RELEASE
|
CM_MULTILINE_OPTIONS_RELEASE
|
||||||
|
|
||||||
CMAKE_CUSTOM_RULE_CODE_RELEASE
|
CMAKE_CUSTOM_RULE_CODE_RELEASE
|
||||||
|
@ -106,8 +106,8 @@ BSC32=bscmake.exe
|
||||||
# ADD BSC32 /nologo
|
# ADD BSC32 /nologo
|
||||||
LINK32=link.exe
|
LINK32=link.exe
|
||||||
# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /IGNORE:4089
|
# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /IGNORE:4089
|
||||||
# ADD LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /IGNORE:4089
|
# ADD LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /IGNORE:4089 TARGET_VERSION_FLAG
|
||||||
# ADD LINK32 /out:"OUTPUT_DIRECTORY\Debug\OUTPUT_NAME_DEBUG"
|
# ADD LINK32 /out:"OUTPUT_DIRECTORY\Debug\OUTPUT_NAME_DEBUG" TARGET_IMPLIB_FLAG_DEBUG
|
||||||
CM_MULTILINE_OPTIONS_DEBUG
|
CM_MULTILINE_OPTIONS_DEBUG
|
||||||
|
|
||||||
CMAKE_CUSTOM_RULE_CODE_DEBUG
|
CMAKE_CUSTOM_RULE_CODE_DEBUG
|
||||||
|
@ -137,8 +137,8 @@ BSC32=bscmake.exe
|
||||||
# ADD BSC32 /nologo
|
# ADD BSC32 /nologo
|
||||||
LINK32=link.exe
|
LINK32=link.exe
|
||||||
# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386 /pdbtype:sept /IGNORE:4089
|
# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386 /pdbtype:sept /IGNORE:4089
|
||||||
# ADD LINK32 /nologo /subsystem:windows /machine:I386 /pdbtype:sept /IGNORE:4089
|
# ADD LINK32 /nologo /subsystem:windows /machine:I386 /pdbtype:sept /IGNORE:4089 TARGET_VERSION_FLAG
|
||||||
# ADD LINK32 /out:"OUTPUT_DIRECTORY\MinSizeRel\OUTPUT_NAME_MINSIZEREL"
|
# ADD LINK32 /out:"OUTPUT_DIRECTORY\MinSizeRel\OUTPUT_NAME_MINSIZEREL" TARGET_IMPLIB_FLAG_MINSIZEREL
|
||||||
CM_MULTILINE_OPTIONS_MINSIZEREL
|
CM_MULTILINE_OPTIONS_MINSIZEREL
|
||||||
|
|
||||||
CMAKE_CUSTOM_RULE_CODE_MINSIZEREL
|
CMAKE_CUSTOM_RULE_CODE_MINSIZEREL
|
||||||
|
@ -171,8 +171,8 @@ BSC32=bscmake.exe
|
||||||
# ADD BSC32 /nologo
|
# ADD BSC32 /nologo
|
||||||
LINK32=link.exe
|
LINK32=link.exe
|
||||||
# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386 /IGNORE:4089
|
# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386 /IGNORE:4089
|
||||||
# ADD LINK32 /nologo /subsystem:windows /debug /machine:I386 /IGNORE:4089
|
# ADD LINK32 /nologo /subsystem:windows /debug /machine:I386 /IGNORE:4089 TARGET_VERSION_FLAG
|
||||||
# ADD LINK32 /out:"OUTPUT_DIRECTORY\RelWithDebInfo\OUTPUT_NAME_RELWITHDEBINFO"
|
# ADD LINK32 /out:"OUTPUT_DIRECTORY\RelWithDebInfo\OUTPUT_NAME_RELWITHDEBINFO" TARGET_IMPLIB_FLAG_RELWITHDEBINFO
|
||||||
CM_MULTILINE_OPTIONS_RELWITHDEBINFO
|
CM_MULTILINE_OPTIONS_RELWITHDEBINFO
|
||||||
|
|
||||||
CMAKE_CUSTOM_RULE_CODE_RELWITHDEBINFO
|
CMAKE_CUSTOM_RULE_CODE_RELWITHDEBINFO
|
||||||
|
|
Loading…
Reference in New Issue