diff options
| -rw-r--r-- | devtools/create_project/msbuild.cpp | 1 | ||||
| -rw-r--r-- | devtools/create_project/visualstudio.cpp | 2 | ||||
| -rw-r--r-- | dists/scummvm.rc | 7 | ||||
| -rw-r--r-- | dists/win32/scummvm.exe.manifest | 9 |
4 files changed, 16 insertions, 3 deletions
diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp index a2cde964e2..fe73509b73 100644 --- a/devtools/create_project/msbuild.cpp +++ b/devtools/create_project/msbuild.cpp @@ -398,6 +398,7 @@ void MSBuildProvider::createBuildProp(const BuildSetup &setup, bool isRelease, b "\t<PropertyGroup>\n" "\t\t<_PropertySheetDisplayName>" << setup.projectDescription << "_" << configuration << outputBitness << "</_PropertySheetDisplayName>\n" "\t\t<LinkIncremental>" << (isRelease ? "false" : "true") << "</LinkIncremental>\n" + "\t\t<GenerateManifest>false</GenerateManifest>\n" "\t</PropertyGroup>\n" "\t<ItemDefinitionGroup>\n" "\t\t<ClCompile>\n"; diff --git a/devtools/create_project/visualstudio.cpp b/devtools/create_project/visualstudio.cpp index 44bbf6ba91..ba0d103d40 100644 --- a/devtools/create_project/visualstudio.cpp +++ b/devtools/create_project/visualstudio.cpp @@ -289,6 +289,7 @@ void VisualStudioProvider::createBuildProp(const BuildSetup &setup, bool isRelea "\t<Tool\n" "\t\tName=\"VCLinkerTool\"\n" "\t\tLinkIncremental=\"1\"\n" + "\t\tGenerateManifest=\"false\"\n" "\t\tIgnoreDefaultLibraryNames=\"\"\n" "\t\tSetChecksum=\"true\"\n"; } else { @@ -305,6 +306,7 @@ void VisualStudioProvider::createBuildProp(const BuildSetup &setup, bool isRelea "\t<Tool\n" "\t\tName=\"VCLinkerTool\"\n" "\t\tLinkIncremental=\"2\"\n" + "\t\tGenerateManifest=\"false\"\n" "\t\tGenerateDebugInformation=\"true\"\n" "\t\tIgnoreDefaultLibraryNames=\"libcmt.lib\"\n"; } diff --git a/dists/scummvm.rc b/dists/scummvm.rc index c7846fe0eb..d7b1b3becc 100644 --- a/dists/scummvm.rc +++ b/dists/scummvm.rc @@ -12,6 +12,7 @@ #define IDI_COUNT 1002 #define ID_GDF_XML __GDF_XML +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "dists/win32/scummvm.exe.manifest" IDI_ICON ICON DISCARDABLE "icons/scummvm.ico" IDI_COUNT ICON DISCARDABLE "icons/count.ico" @@ -31,13 +32,13 @@ fonts.dat FILE "dists/engine-data/fonts.dat" #endif #if PLUGIN_ENABLED_STATIC(ACCESS) -access.dat FILE "dists/engine-data/access.dat" +access.dat FILE "dists/engine-data/access.dat" #endif #if PLUGIN_ENABLED_STATIC(CRYO) cryo.dat FILE "dists/engine-data/cryo.dat" #endif #if PLUGIN_ENABLED_STATIC(CRYOMNI3D) -cryomni3d.dat FILE "dists/engine-data/cryomni3d.dat" +cryomni3d.dat FILE "dists/engine-data/cryomni3d.dat" #endif #if PLUGIN_ENABLED_STATIC(DRASCULA) drascula.dat FILE "dists/engine-data/drascula.dat" @@ -82,7 +83,7 @@ toon.dat FILE "dists/engine-data/toon.dat" wintermute.zip FILE "dists/engine-data/wintermute.zip" #endif #if PLUGIN_ENABLED_STATIC(XEEN) -xeen.ccs FILE "dists/engine-data/xeen.ccs" +xeen.ccs FILE "dists/engine-data/xeen.ccs" #endif #if PLUGIN_ENABLED_STATIC(AGI) pred.dic FILE "dists/pred.dic" diff --git a/dists/win32/scummvm.exe.manifest b/dists/win32/scummvm.exe.manifest new file mode 100644 index 0000000000..76d99c7c93 --- /dev/null +++ b/dists/win32/scummvm.exe.manifest @@ -0,0 +1,9 @@ +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> + <security> + <requestedPrivileges> + <requestedExecutionLevel level="asInvoker"/> + </requestedPrivileges> + </security> + </trustInfo> +</assembly> |