diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2012-06-05 04:15:01 +0000 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2012-06-05 04:15:01 +0000 |
| commit | 24eff0998434656177ac09e9820f08192a5c2aef (patch) | |
| tree | 952088f69f923e2729849f8bf9da441fed117cbe | |
| parent | 0b5f6f45cdd2351915db4c113cc68c5214ed6df9 (diff) | |
| download | notepad2-mod-24eff0998434656177ac09e9820f08192a5c2aef.zip notepad2-mod-24eff0998434656177ac09e9820f08192a5c2aef.tar.gz notepad2-mod-24eff0998434656177ac09e9820f08192a5c2aef.tar.bz2 | |
rename the remaining instances of VS2011 to VS2012
git-svn-id: https://notepad2-mod.googlecode.com/svn/trunk@745 28bd50df-7adb-d945-0439-6e466c6a13cc
| -rw-r--r-- | distrib/notepad2_setup.iss | 14 | ||||
| -rw-r--r-- | src/Notepad2_VS2012.vcxproj | 16 |
2 files changed, 15 insertions, 15 deletions
diff --git a/distrib/notepad2_setup.iss b/distrib/notepad2_setup.iss index 7acad80..f93a99f 100644 --- a/distrib/notepad2_setup.iss +++ b/distrib/notepad2_setup.iss @@ -14,7 +14,7 @@ ;#define ICL12
;#define VS2010
-;#define VS2011
+;#define VS2012
;#define WDK
; Preprocessor related stuff
@@ -22,11 +22,11 @@ #error Update your Inno Setup version (5.5.0 or newer)
#endif
-#if !defined(ICL12) && !defined(VS2010) && !defined(VS2011) && !defined(WDK)
- #error You need to define the compiler used; ICL12, VS2010, VS2011 or WDK
+#if !defined(ICL12) && !defined(VS2010) && !defined(VS2012) && !defined(WDK)
+ #error You need to define the compiler used; ICL12, VS2010, VS2012 or WDK
#endif
-#if defined(ICL12) && (defined(VS2010) || defined(VS2011) || defined(WDK)) || defined(VS2010) && (defined(VS2011) || defined(WDK)) || defined(VS2011) && defined(WDK)
+#if defined(ICL12) && (defined(VS2010) || defined(VS2012) || defined(WDK)) || defined(VS2010) && (defined(VS2012) || defined(WDK)) || defined(VS2012) && defined(WDK)
#error You can't use two or more compiler defines at the same time
#endif
@@ -35,8 +35,8 @@ #define sse2_required
#elif defined(VS2010)
#define compiler "VS2010"
-#elif defined(VS2011)
- #define compiler "VS2011"
+#elif defined(VS2012)
+ #define compiler "VS2012"
#elif defined(WDK)
#define compiler "WDK"
#endif
@@ -108,7 +108,7 @@ DisableWelcomePage=yes AllowCancelDuringInstall=no
#if defined(WDK)
MinVersion=5.0
-#elif defined(VS2011)
+#elif defined(VS2012)
MinVersion=6.0
#else
MinVersion=5.1.2600sp3
diff --git a/src/Notepad2_VS2012.vcxproj b/src/Notepad2_VS2012.vcxproj index a66eeb7..c703378 100644 --- a/src/Notepad2_VS2012.vcxproj +++ b/src/Notepad2_VS2012.vcxproj @@ -69,28 +69,28 @@ <PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
- <OutDir>..\bin\VS2011\$(Configuration)_x86\</OutDir>
- <IntDir>..\bin\VS2011\$(Configuration)_x86\obj\</IntDir>
+ <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\VS2011\$(Configuration)_x86\</OutDir>
- <IntDir>..\bin\VS2011\$(Configuration)_x86\obj\</IntDir>
+ <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\VS2011\$(Configuration)_x64\</OutDir>
+ <OutDir>..\bin\VS2012\$(Configuration)_x64\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <IntDir>..\bin\VS2011\$(Configuration)_x64\obj\</IntDir>
+ <IntDir>..\bin\VS2012\$(Configuration)_x64\obj\</IntDir>
<GenerateManifest>false</GenerateManifest>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <OutDir>..\bin\VS2011\$(Configuration)_x64\</OutDir>
+ <OutDir>..\bin\VS2012\$(Configuration)_x64\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <IntDir>..\bin\VS2011\$(Configuration)_x64\obj\</IntDir>
+ <IntDir>..\bin\VS2012\$(Configuration)_x64\obj\</IntDir>
<LinkIncremental>false</LinkIncremental>
<GenerateManifest>false</GenerateManifest>
</PropertyGroup>
|