diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2012-07-07 17:43:10 +0000 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2012-07-07 17:43:10 +0000 |
| commit | 3a6ce3d423cb5825c7ee4f6a8e5dac67f18afbef (patch) | |
| tree | 5d56fbaed4581837b3fa6fa017b5dc9c7c34dfd8 | |
| parent | c37b5b55f66a57ad971b412d47eaebaa0490544b (diff) | |
| download | notepad2-mod-3a6ce3d423cb5825c7ee4f6a8e5dac67f18afbef.zip notepad2-mod-3a6ce3d423cb5825c7ee4f6a8e5dac67f18afbef.tar.gz notepad2-mod-3a6ce3d423cb5825c7ee4f6a8e5dac67f18afbef.tar.bz2 | |
VS2012: don't embed the manifest via the rc file to work around yet another bug in VS2012
git-svn-id: https://notepad2-mod.googlecode.com/svn/trunk@749 28bd50df-7adb-d945-0439-6e466c6a13cc
| -rw-r--r-- | src/Notepad2.rc | 4 | ||||
| -rw-r--r-- | src/Notepad2_VS2012.vcxproj | 31 | ||||
| -rw-r--r-- | src/Notepad2_VS2012.vcxproj.filters | 5 | ||||
| -rw-r--r-- | src/resource.h | 1 |
4 files changed, 23 insertions, 18 deletions
diff --git a/src/Notepad2.rc b/src/Notepad2.rc index d2b727d..2fe6b0b 100644 --- a/src/Notepad2.rc +++ b/src/Notepad2.rc @@ -21,12 +21,14 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #pragma code_page(1252)
#endif //_WIN32
+#if !defined(VS2012)
/////////////////////////////////////////////////////////////////////////////
//
// RT_MANIFEST
//
-IDR_RT_MANIFEST RT_MANIFEST "..\\res\\Notepad2.exe.manifest"
+1 RT_MANIFEST "..\\res\\Notepad2.exe.manifest"
+#endif
/////////////////////////////////////////////////////////////////////////////
//
diff --git a/src/Notepad2_VS2012.vcxproj b/src/Notepad2_VS2012.vcxproj index c703378..d5e131e 100644 --- a/src/Notepad2_VS2012.vcxproj +++ b/src/Notepad2_VS2012.vcxproj @@ -71,20 +71,17 @@ <LinkIncremental>true</LinkIncremental>
<OutDir>..\bin\VS2012\$(Configuration)_x86\</OutDir>
<IntDir>..\bin\VS2012\$(Configuration)_x86\obj\</IntDir>
- <GenerateManifest>false</GenerateManifest>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>..\bin\VS2012\$(Configuration)_x86\</OutDir>
<IntDir>..\bin\VS2012\$(Configuration)_x86\obj\</IntDir>
- <GenerateManifest>false</GenerateManifest>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<OutDir>..\bin\VS2012\$(Configuration)_x64\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<IntDir>..\bin\VS2012\$(Configuration)_x64\obj\</IntDir>
- <GenerateManifest>false</GenerateManifest>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutDir>..\bin\VS2012\$(Configuration)_x64\</OutDir>
@@ -92,7 +89,6 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<IntDir>..\bin\VS2012\$(Configuration)_x64\obj\</IntDir>
<LinkIncremental>false</LinkIncremental>
- <GenerateManifest>false</GenerateManifest>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -117,8 +113,12 @@ <Message>Generating SVN revision...</Message>
</PreBuildEvent>
<ResourceCompile>
- <PreprocessorDefinitions>WIN32;_UNICODE;UNICODE;BOOKMARK_EDITION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_UNICODE;UNICODE;BOOKMARK_EDITION;VS2012;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
+ <Manifest>
+ <AdditionalManifestFiles>..\res\Notepad2.exe.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ <EnableDpiAwareness>true</EnableDpiAwareness>
+ </Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
@@ -143,8 +143,12 @@ <Message>Generating SVN revision...</Message>
</PreBuildEvent>
<ResourceCompile>
- <PreprocessorDefinitions>_WIN64;_UNICODE;UNICODE;BOOKMARK_EDITION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WIN64;_UNICODE;UNICODE;BOOKMARK_EDITION;VS2012;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
+ <Manifest>
+ <AdditionalManifestFiles>..\res\Notepad2.exe.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ <EnableDpiAwareness>true</EnableDpiAwareness>
+ </Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
@@ -171,8 +175,12 @@ <Message>Generating SVN revision...</Message>
</PreBuildEvent>
<ResourceCompile>
- <PreprocessorDefinitions>WIN32;_UNICODE;UNICODE;BOOKMARK_EDITION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_UNICODE;UNICODE;BOOKMARK_EDITION;VS2012;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
+ <Manifest>
+ <AdditionalManifestFiles>..\res\Notepad2.exe.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ <EnableDpiAwareness>true</EnableDpiAwareness>
+ </Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
@@ -198,8 +206,12 @@ <Message>Generating SVN revision...</Message>
</PreBuildEvent>
<ResourceCompile>
- <PreprocessorDefinitions>_WIN64;_UNICODE;UNICODE;BOOKMARK_EDITION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WIN64;_UNICODE;UNICODE;BOOKMARK_EDITION;VS2012;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
+ <Manifest>
+ <AdditionalManifestFiles>..\res\Notepad2.exe.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ <EnableDpiAwareness>true</EnableDpiAwareness>
+ </Manifest>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\scintilla\lexers\LexAHK.cxx" />
@@ -334,9 +346,6 @@ <None Include="Notepad2.ver" />
</ItemGroup>
<ItemGroup>
- <Manifest Include="..\res\Notepad2.exe.manifest" />
- </ItemGroup>
- <ItemGroup>
<ResourceCompile Include="Notepad2.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/src/Notepad2_VS2012.vcxproj.filters b/src/Notepad2_VS2012.vcxproj.filters index 1c7d557..01d576d 100644 --- a/src/Notepad2_VS2012.vcxproj.filters +++ b/src/Notepad2_VS2012.vcxproj.filters @@ -417,11 +417,6 @@ </None>
</ItemGroup>
<ItemGroup>
- <Manifest Include="..\res\Notepad2.exe.manifest">
- <Filter>Resource Files</Filter>
- </Manifest>
- </ItemGroup>
- <ItemGroup>
<ResourceCompile Include="Notepad2.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
diff --git a/src/resource.h b/src/resource.h index 200e5c9..f254d98 100644 --- a/src/resource.h +++ b/src/resource.h @@ -3,7 +3,6 @@ // Used by Notepad2.rc
//
#define IDC_STATIC -1
-#define IDR_RT_MANIFEST 1
#define IDR_MAINWND 100
#define IDC_FINDTEXT 100
#define IDC_LINENUM 100
|