Tera TermRevision: 8419
https://osdn.net/projects/ttssh2/scm/svn/commits/8419
Author: zmatsuo
Date: 2019-11-28 23:34:03 +0900 (Thu, 28 Nov 2019)
Log Message:
-----------
cmakeビルドで ttmacro にマニフェスト追加
- マニフェスト組み込み専用rcファイルを追加
- MinGWでもマニフェストが組み込めるようになった
- cmakeビルドでマニフェスト生成を行わないようにした
Modified Paths:
--------------
branches/unicode_buf/teraterm/teraterm/CMakeLists.txt
branches/unicode_buf/teraterm/ttpmacro/CMakeLists.txt
Added Paths:
-----------
branches/unicode_buf/teraterm/teraterm/teraterm_manifest.rc
branches/unicode_buf/teraterm/ttpmacro/ttmacro.manifest
branches/unicode_buf/teraterm/ttpmacro/ttmacro_manifest.rc
-------------- next part --------------
Modified: branches/unicode_buf/teraterm/teraterm/CMakeLists.txt
===================================================================
--- branches/unicode_buf/teraterm/teraterm/CMakeLists.txt 2019-11-28 11:12:35 UTC (rev 8418)
+++ branches/unicode_buf/teraterm/teraterm/CMakeLists.txt 2019-11-28 14:34:03 UTC (rev 8419)
@@ -48,7 +48,6 @@
ttdde.h
ttdialog.c
ttdialog.h
- ttermpro.rc
ttfileio.c
ttfileio.h
ttime.c
@@ -57,7 +56,6 @@
ttplug.h
ttsetup.c
ttsetup.h
- tt-version.rc
ttwinman.c
ttwinman.h
ttwsk.c
@@ -77,7 +75,9 @@
#
uni_combining.map
#
- teraterm.manifest
+ ttermpro.rc
+ tt-version.rc
+ teraterm_manifest.rc
#
svnversion.h.in
${CMAKE_CURRENT_BINARY_DIR}/../ttpdlg/svnversion.h
@@ -169,7 +169,7 @@
"..\/ttpdlg\/")
if (MSVC)
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DELAYLOAD:user32.dll /DELAYLOAD:shell32.dll")
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DELAYLOAD:user32.dll /DELAYLOAD:shell32.dll /MANIFEST:NO")
if( CMAKE_SIZEOF_VOID_P EQUAL 4 )
# 32bit
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DELAYLOAD:imagehlp.dll")
Added: branches/unicode_buf/teraterm/teraterm/teraterm_manifest.rc
===================================================================
--- branches/unicode_buf/teraterm/teraterm/teraterm_manifest.rc (rev 0)
+++ branches/unicode_buf/teraterm/teraterm/teraterm_manifest.rc 2019-11-28 14:34:03 UTC (rev 8419)
@@ -0,0 +1,2 @@
+#include "winuser.h"
+1 RT_MANIFEST teraterm.manifest
Modified: branches/unicode_buf/teraterm/ttpmacro/CMakeLists.txt
===================================================================
--- branches/unicode_buf/teraterm/ttpmacro/CMakeLists.txt 2019-11-28 11:12:35 UTC (rev 8418)
+++ branches/unicode_buf/teraterm/ttpmacro/CMakeLists.txt 2019-11-28 14:34:03 UTC (rev 8419)
@@ -83,6 +83,7 @@
ttpmacro.rc
ttm-version.rc
+ ttmacro_manifest.rc
fileread.h
fileread.cpp
${COMMON_SRC}
@@ -100,7 +101,7 @@
)
if (MSVC)
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DELAYLOAD:iphlpapi.dll /DELAYLOAD:user32.dll")
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DELAYLOAD:iphlpapi.dll /DELAYLOAD:user32.dll /MANIFEST:NO")
endif()
add_executable(
Added: branches/unicode_buf/teraterm/ttpmacro/ttmacro.manifest
===================================================================
--- branches/unicode_buf/teraterm/ttpmacro/ttmacro.manifest (rev 0)
+++ branches/unicode_buf/teraterm/ttpmacro/ttmacro.manifest 2019-11-28 14:34:03 UTC (rev 8419)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly manifestVersion="1.0"
+ xmlns="urn:schemas-microsoft-com:asm.v1"
+ xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+ <description></description>
+ <dependency>
+ <dependentAssembly>
+ <assemblyIdentity
+ type="win32"
+ name="Microsoft.Windows.Common-Controls"
+ version="6.0.0.0"
+ processorArchitecture="*"
+ publicKeyToken="6595b64144ccf1df"
+ language="*"
+ />
+ <!--assemblyIdentity
+ type="win32"
+ name=SXS_ASSEMBLY_NAME
+ version=SXS_ASSEMBLY_VERSION
+ processorArchitecture=SXS_PROCESSOR_ARCHITECTURE
+ /-->
+ </dependentAssembly>
+ </dependency>
+ <!--trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+ <security>
+ <requestedPrivileges>
+ <requestedExecutionLevel
+ level="asInvoker"
+ uiAccess="false"
+ />
+ </requestedPrivileges>
+ </security>
+ </trustInfo-->
+ <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+ <application>
+ <!-- This Id value indicates the application supports Windows Blue/Server 2012 R2 functionality-->
+ <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+ <!-- This Id value indicates the application supports Windows Threshold functionality-->
+ <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+ </application>
+ </compatibility>
+</assembly>
Added: branches/unicode_buf/teraterm/ttpmacro/ttmacro_manifest.rc
===================================================================
--- branches/unicode_buf/teraterm/ttpmacro/ttmacro_manifest.rc (rev 0)
+++ branches/unicode_buf/teraterm/ttpmacro/ttmacro_manifest.rc 2019-11-28 14:34:03 UTC (rev 8419)
@@ -0,0 +1,2 @@
+#include "winuser.h"
+1 RT_MANIFEST ttmacro.manifest