Skip to content
This repository was archived by the owner on Jan 22, 2024. It is now read-only.

Commit a2888b1

Browse files
bturner-r7bturner-r7
committed
Merge pull request #41 from OJ/vs2013
Upgrade to VS 2013
2 parents 9ae4ccf + 4a1815d commit a2888b1

File tree

15 files changed

+158
-190
lines changed

15 files changed

+158
-190
lines changed

‎README.md

+10-25
Original file line numberDiff line numberDiff line change
@@ -9,37 +9,22 @@ This is the new repository for the Meterpreter [source], which was originally in
99
Building - Windows
1010
==================
1111

12-
Meterpreter is now being built with [Visual Studio 2012 Express for Desktop][vs_express] or any
13-
paid version of [Visual Studio 2012][vs_paid]. Earlier toolsets on Windows are no longer
14-
supported.
12+
Meterpreter is now being built with [Visual Studio 2013 Express for Desktop][vs_express] or any
13+
paid version of [Visual Studio 2013][vs_paid]. Earlier toolsets on Windows are no longer
14+
supported. Make sure that the version that you download is
15+
`Visual Studio Express 2013 for Windows Desktop`.
1516

16-
Visual Studio 2012 requires .NET 4.5 in order to run, and as a result isn't compatible
17+
Visual Studio 2013 requires .NET 4.5.1 in order to run, and as a result isn't compatible
1718
with Windows XP due to the fact that .NET 4.5 will not run on Windows XP. However, this
1819
does not mean that Metepreter itself will not run on Windows XP, it just means that it's
1920
not possible to _build_ it on Windows XP.
2021

21-
Visual Studio 2012 Express
22-
--------------------------
23-
24-
In order to build successfully with this version of Visual Studio you must first make sure
25-
that the most recent updates have been applied. At the time of writing, the latest known
26-
update is **Update 3**. Without this update you won't be able to build.
27-
28-
To make sure you have the appropriate updates applied:
29-
30-
1. Open Visual Studio 2012.
31-
1. Open the `Tools` menu and select `Extensions and Updates`
32-
1. Select the `Updates` item on the left side of the dialog box.
33-
1. Follow the prompts to install any updates that are found.
34-
35-
With those updates applied you should be ready to build Meterpreeter.
36-
3722
Running the Build
3823
-----------------
3924

40-
Open up a Visual Studio command prompt by selecting `Developer Command Prompt for VS2012`
25+
Open up a Visual Studio command prompt by selecting `Developer Command Prompt for VS2013`
4126
from the Start menu. Alternatively you can run `vcvars32.bat` from an existing command
42-
line prompt, just make sure it's the VS2012 one if you have multiple versions of VS
27+
line prompt, just make sure it's the VS2013 one if you have multiple versions of VS
4328
installed on your machine.
4429

4530
Once you have your environment variables set up, change to the root folder where the
@@ -133,7 +118,7 @@ project going by doing the following:
133118
1. Create a new folder called `source/extensions/splat`.
134119
1. Copy `source/extensions/bare/bare.c` to `source/extensions/splat/splat.c`
135120
1. Copy `source/extensions/bare/bare.h` to `source/extensions/splat/splat.h`
136-
1. Open `workspace/meterpreter.sln` in Visual Studio 2012.
121+
1. Open `workspace/meterpreter.sln` in Visual Studio 2013.
137122
1. Right-click on the solution item called `Solution 'meterpreter'` and
138123
select `Add`, then `Existing Project...`.
139124
1. Browse to your new project's location at `workspace/ext_server_splat`
@@ -168,8 +153,8 @@ Things to Remember
168153

169154
Good luck!
170155

171-
[vs_express]: http://www.microsoft.com/visualstudio/eng/downloads#d-2012-express
172-
[vs_paid]: http://www.microsoft.com/visualstudio/eng/downloads#d-2012-editions
156+
[vs_express]: http://www.microsoft.com/visualstudio/eng/downloads#d-2013-express
157+
[vs_paid]: http://www.microsoft.com/visualstudio/eng/downloads#d-2013-editions
173158
[source]: https://github.com/rapid7/meterpreter
174159
[framework]: https://github.com/rapid7/metasploit-framework
175160
[build_icon]: https://ci.metasploit.com/buildStatus/icon?job=MeterpreterWin

‎make.bat

+2-19
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,7 @@
11
@ECHO OFF
22
IF "%1"=="clean" GOTO CLEAN
33
IF "%1"=="docs" GOTO DOCS
4-
IF "%VCINSTALLDIR%" == "" (
5-
ECHO "VC++ Environment not found, attempting to locate..."
6-
REM Attempt to load up the dev env variables if they're not
7-
REM set, saves people doing it manually
8-
SET SETUP="Microsoft Visual Studio 11.0\Common7\Tools\vsvars32.bat"
9-
IF EXIST "%ProgramFiles%\%SETUP%" (
10-
ECHO "Found at '%ProgramFiles%\%SETUP%'"
11-
"%ProgramFiles%\%SETUP%"
12-
)
13-
14-
IF EXIST "%ProgramFiles(x86)%\%SETUP%" (
15-
ECHO "Found at '%ProgramFiles(x86)%\%SETUP%'"
16-
"%ProgramFiles(x86)%\%SETUP%"
17-
)
18-
19-
REM If we still don't have what we need, then throw an error
20-
IF "%VCINSTALLDIR%" == "" GOTO NEED_VS
21-
)
4+
IF "%VCINSTALLDIR%" == "" GOTO NEED_VS
225

236
SET PREF=
247
IF EXIST "..\pssdk\" SET PREF=r7_
@@ -62,6 +45,6 @@ GOTO :END
6245

6346
:NEED_VS
6447
ECHO "This command must be executed from within a Visual Studio Command prompt."
65-
ECHO "This can be found under Microsoft Visual Studio 2012 -> Visual Studio Tools"
48+
ECHO "This can be found under Microsoft Visual Studio 2013 -> Visual Studio Tools"
6649

6750
:END

‎workspace/ReflectiveDLLInjection/ReflectiveDLLInjection.vcxproj

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -44,45 +44,45 @@
4444
<ConfigurationType>StaticLibrary</ConfigurationType>
4545
<CharacterSet>Unicode</CharacterSet>
4646
<WholeProgramOptimization>false</WholeProgramOptimization>
47-
<PlatformToolset>v110_xp</PlatformToolset>
47+
<PlatformToolset>v120_xp</PlatformToolset>
4848
</PropertyGroup>
4949
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='r7_release|Win32'" Label="Configuration">
5050
<ConfigurationType>StaticLibrary</ConfigurationType>
5151
<CharacterSet>Unicode</CharacterSet>
5252
<WholeProgramOptimization>false</WholeProgramOptimization>
53-
<PlatformToolset>v110_xp</PlatformToolset>
53+
<PlatformToolset>v120_xp</PlatformToolset>
5454
</PropertyGroup>
5555
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
5656
<ConfigurationType>StaticLibrary</ConfigurationType>
5757
<CharacterSet>Unicode</CharacterSet>
58-
<PlatformToolset>v110_xp</PlatformToolset>
58+
<PlatformToolset>v120_xp</PlatformToolset>
5959
</PropertyGroup>
6060
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='r7_debug|Win32'" Label="Configuration">
6161
<ConfigurationType>StaticLibrary</ConfigurationType>
6262
<CharacterSet>Unicode</CharacterSet>
63-
<PlatformToolset>v110_xp</PlatformToolset>
63+
<PlatformToolset>v120_xp</PlatformToolset>
6464
</PropertyGroup>
6565
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
6666
<ConfigurationType>StaticLibrary</ConfigurationType>
6767
<CharacterSet>MultiByte</CharacterSet>
6868
<WholeProgramOptimization>true</WholeProgramOptimization>
69-
<PlatformToolset>v110_xp</PlatformToolset>
69+
<PlatformToolset>v120_xp</PlatformToolset>
7070
</PropertyGroup>
7171
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='r7_release|x64'" Label="Configuration">
7272
<ConfigurationType>StaticLibrary</ConfigurationType>
7373
<CharacterSet>MultiByte</CharacterSet>
7474
<WholeProgramOptimization>true</WholeProgramOptimization>
75-
<PlatformToolset>v110_xp</PlatformToolset>
75+
<PlatformToolset>v120_xp</PlatformToolset>
7676
</PropertyGroup>
7777
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
7878
<ConfigurationType>StaticLibrary</ConfigurationType>
7979
<CharacterSet>Unicode</CharacterSet>
80-
<PlatformToolset>v110_xp</PlatformToolset>
80+
<PlatformToolset>v120_xp</PlatformToolset>
8181
</PropertyGroup>
8282
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='r7_debug|x64'" Label="Configuration">
8383
<ConfigurationType>StaticLibrary</ConfigurationType>
8484
<CharacterSet>Unicode</CharacterSet>
85-
<PlatformToolset>v110_xp</PlatformToolset>
85+
<PlatformToolset>v120_xp</PlatformToolset>
8686
</PropertyGroup>
8787
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
8888
<ImportGroup Label="ExtensionSettings">

‎workspace/backcompat/backcompat.vcxproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -28,27 +28,27 @@
2828
<ConfigurationType>StaticLibrary</ConfigurationType>
2929
<UseDebugLibraries>true</UseDebugLibraries>
3030
<CharacterSet>Unicode</CharacterSet>
31-
<PlatformToolset>v110_xp</PlatformToolset>
31+
<PlatformToolset>v120_xp</PlatformToolset>
3232
</PropertyGroup>
3333
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='r7_debug|Win32'" Label="Configuration">
3434
<ConfigurationType>StaticLibrary</ConfigurationType>
3535
<UseDebugLibraries>true</UseDebugLibraries>
3636
<CharacterSet>Unicode</CharacterSet>
37-
<PlatformToolset>v110_xp</PlatformToolset>
37+
<PlatformToolset>v120_xp</PlatformToolset>
3838
</PropertyGroup>
3939
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4040
<ConfigurationType>StaticLibrary</ConfigurationType>
4141
<UseDebugLibraries>false</UseDebugLibraries>
4242
<WholeProgramOptimization>true</WholeProgramOptimization>
4343
<CharacterSet>Unicode</CharacterSet>
44-
<PlatformToolset>v110_xp</PlatformToolset>
44+
<PlatformToolset>v120_xp</PlatformToolset>
4545
</PropertyGroup>
4646
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='r7_release|Win32'" Label="Configuration">
4747
<ConfigurationType>StaticLibrary</ConfigurationType>
4848
<UseDebugLibraries>false</UseDebugLibraries>
4949
<WholeProgramOptimization>true</WholeProgramOptimization>
5050
<CharacterSet>Unicode</CharacterSet>
51-
<PlatformToolset>v110_xp</PlatformToolset>
51+
<PlatformToolset>v120_xp</PlatformToolset>
5252
</PropertyGroup>
5353
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5454
<ImportGroup Label="ExtensionSettings">

‎workspace/common/common.vcxproj

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -43,49 +43,49 @@
4343
<ConfigurationType>StaticLibrary</ConfigurationType>
4444
<UseOfMfc>false</UseOfMfc>
4545
<CharacterSet>MultiByte</CharacterSet>
46-
<PlatformToolset>v110_xp</PlatformToolset>
46+
<PlatformToolset>v120_xp</PlatformToolset>
4747
</PropertyGroup>
4848
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='r7_release|Win32'" Label="Configuration">
4949
<ConfigurationType>StaticLibrary</ConfigurationType>
5050
<UseOfMfc>false</UseOfMfc>
5151
<CharacterSet>MultiByte</CharacterSet>
52-
<PlatformToolset>v110_xp</PlatformToolset>
52+
<PlatformToolset>v120_xp</PlatformToolset>
5353
</PropertyGroup>
5454
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
5555
<ConfigurationType>StaticLibrary</ConfigurationType>
5656
<UseOfMfc>false</UseOfMfc>
5757
<CharacterSet>MultiByte</CharacterSet>
58-
<PlatformToolset>v110_xp</PlatformToolset>
58+
<PlatformToolset>v120_xp</PlatformToolset>
5959
</PropertyGroup>
6060
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='r7_debug|Win32'" Label="Configuration">
6161
<ConfigurationType>StaticLibrary</ConfigurationType>
6262
<UseOfMfc>false</UseOfMfc>
6363
<CharacterSet>MultiByte</CharacterSet>
64-
<PlatformToolset>v110_xp</PlatformToolset>
64+
<PlatformToolset>v120_xp</PlatformToolset>
6565
</PropertyGroup>
6666
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
6767
<ConfigurationType>StaticLibrary</ConfigurationType>
6868
<UseOfMfc>false</UseOfMfc>
6969
<CharacterSet>MultiByte</CharacterSet>
70-
<PlatformToolset>v110_xp</PlatformToolset>
70+
<PlatformToolset>v120_xp</PlatformToolset>
7171
</PropertyGroup>
7272
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='r7_release|x64'" Label="Configuration">
7373
<ConfigurationType>StaticLibrary</ConfigurationType>
7474
<UseOfMfc>false</UseOfMfc>
7575
<CharacterSet>MultiByte</CharacterSet>
76-
<PlatformToolset>v110_xp</PlatformToolset>
76+
<PlatformToolset>v120_xp</PlatformToolset>
7777
</PropertyGroup>
7878
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
7979
<ConfigurationType>StaticLibrary</ConfigurationType>
8080
<UseOfMfc>false</UseOfMfc>
8181
<CharacterSet>MultiByte</CharacterSet>
82-
<PlatformToolset>v110_xp</PlatformToolset>
82+
<PlatformToolset>v120_xp</PlatformToolset>
8383
</PropertyGroup>
8484
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='r7_debug|x64'" Label="Configuration">
8585
<ConfigurationType>StaticLibrary</ConfigurationType>
8686
<UseOfMfc>false</UseOfMfc>
8787
<CharacterSet>MultiByte</CharacterSet>
88-
<PlatformToolset>v110_xp</PlatformToolset>
88+
<PlatformToolset>v120_xp</PlatformToolset>
8989
</PropertyGroup>
9090
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
9191
<ImportGroup Label="ExtensionSettings">

‎workspace/elevator/elevator.vcxproj

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -44,45 +44,45 @@
4444
<ConfigurationType>DynamicLibrary</ConfigurationType>
4545
<CharacterSet>MultiByte</CharacterSet>
4646
<WholeProgramOptimization>true</WholeProgramOptimization>
47-
<PlatformToolset>v110_xp</PlatformToolset>
47+
<PlatformToolset>v120_xp</PlatformToolset>
4848
</PropertyGroup>
4949
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='r7_release|Win32'" Label="Configuration">
5050
<ConfigurationType>DynamicLibrary</ConfigurationType>
5151
<CharacterSet>MultiByte</CharacterSet>
5252
<WholeProgramOptimization>true</WholeProgramOptimization>
53-
<PlatformToolset>v110_xp</PlatformToolset>
53+
<PlatformToolset>v120_xp</PlatformToolset>
5454
</PropertyGroup>
5555
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
5656
<ConfigurationType>DynamicLibrary</ConfigurationType>
5757
<CharacterSet>MultiByte</CharacterSet>
58-
<PlatformToolset>v110_xp</PlatformToolset>
58+
<PlatformToolset>v120_xp</PlatformToolset>
5959
</PropertyGroup>
6060
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='r7_debug|Win32'" Label="Configuration">
6161
<ConfigurationType>DynamicLibrary</ConfigurationType>
6262
<CharacterSet>MultiByte</CharacterSet>
63-
<PlatformToolset>v110_xp</PlatformToolset>
63+
<PlatformToolset>v120_xp</PlatformToolset>
6464
</PropertyGroup>
6565
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
6666
<ConfigurationType>DynamicLibrary</ConfigurationType>
6767
<CharacterSet>MultiByte</CharacterSet>
6868
<WholeProgramOptimization>true</WholeProgramOptimization>
69-
<PlatformToolset>v110_xp</PlatformToolset>
69+
<PlatformToolset>v120_xp</PlatformToolset>
7070
</PropertyGroup>
7171
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='r7_release|x64'" Label="Configuration">
7272
<ConfigurationType>DynamicLibrary</ConfigurationType>
7373
<CharacterSet>MultiByte</CharacterSet>
7474
<WholeProgramOptimization>true</WholeProgramOptimization>
75-
<PlatformToolset>v110_xp</PlatformToolset>
75+
<PlatformToolset>v120_xp</PlatformToolset>
7676
</PropertyGroup>
7777
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
7878
<ConfigurationType>DynamicLibrary</ConfigurationType>
7979
<CharacterSet>MultiByte</CharacterSet>
80-
<PlatformToolset>v110_xp</PlatformToolset>
80+
<PlatformToolset>v120_xp</PlatformToolset>
8181
</PropertyGroup>
8282
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='r7_debug|x64'" Label="Configuration">
8383
<ConfigurationType>DynamicLibrary</ConfigurationType>
8484
<CharacterSet>MultiByte</CharacterSet>
85-
<PlatformToolset>v110_xp</PlatformToolset>
85+
<PlatformToolset>v120_xp</PlatformToolset>
8686
</PropertyGroup>
8787
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
8888
<ImportGroup Label="ExtensionSettings">
@@ -427,4 +427,4 @@ copy /y "$(TargetDir)$(TargetFileName)" "$(ProjectDir)..\..\output\$(PlatformSho
427427
<ImportGroup Label="ExtensionTargets">
428428
<Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
429429
</ImportGroup>
430-
</Project>
430+
</Project>

0 commit comments

Comments
 (0)