Skip to content

Commit

Permalink
Some small change.
Browse files Browse the repository at this point in the history
Update README.md for VS 2015.
remove sln buildbot
remove unused appveyor config
remove package.bat, no longer current, now found in bigpet/rpcs3-buildbot-tools
  • Loading branch information
Zangetsu38 authored and Bigpet committed Jul 23, 2015
1 parent 4624377 commit e47493e
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 189 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ If you want to contribute please take a took at the [Coding Style](https://githu
### Dependencies

__Windows__
* [Visual C++ Redistributable Packages for Visual Studio 2013](http://www.microsoft.com/en-us/download/details.aspx?id=40784)
* [Visual C++ Redistributable Packages for Visual Studio 2015](http://www.microsoft.com/en-us/download/details.aspx?id=48145)

__Linux__
* Debian & Ubuntu: `sudo apt-get install libopenal-dev libwxgtk3.0-dev build-essential libglew-dev`
Expand All @@ -32,7 +32,7 @@ __Mac OSX__
### Building

To initialize the repository don't forget to execute `git submodule update --init` to pull the wxWidgets source.
* __Windows__: Install *Visual Studio 2013*, *Cmake*, *Python* and select *Add in the PATH variable* for both. Then open the *.SLN* file, and press *Build* > *Rebuild Solution*.
* __Windows__: Install *Visual Studio 2015*, *Cmake*, *Python* and select *Add in the PATH variable* for both. Then open the *.SLN* file, and press *Build* > *Rebuild Solution*.
* __Linux & Mac OSX__:
`cd rpcs3 && cmake CMakeLists.txt && make && cd ../` Then run with `cd bin && ./rpcs3`

Expand Down
56 changes: 0 additions & 56 deletions appveyor.yml

This file was deleted.

23 changes: 0 additions & 23 deletions package.bat

This file was deleted.

54 changes: 0 additions & 54 deletions rpcs3/copy_setup_h.vcxproj
Original file line number Diff line number Diff line change
@@ -1,34 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="DLL Debug|Win32">
<Configuration>DLL Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="DLL Debug|x64">
<Configuration>DLL Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="DLL Release|Win32">
<Configuration>DLL Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="DLL Release|x64">
<Configuration>DLL Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
Expand All @@ -40,27 +24,15 @@
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<Import Project="..\wxWidgets\build\msw\wx_config.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
</PropertyGroup>
Expand All @@ -73,39 +45,13 @@
</ImportGroup>
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<ItemDefinitionGroup Condition="!Exists('..\wxWidgets\include\wx\msw\setup.h') And '$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
<Command>copy ..\Utilities\wxWidgets\setup.h ..\wxWidgets\include\wx\msw\setup.h /Y</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="!Exists('..\wxWidgets\include\wx\msw\setup.h') And '$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
<Command>copy ..\Utilities\wxWidgets\setup.h ..\wxWidgets\include\wx\msw\setup.h /Y</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="!Exists('..\wxWidgets\include\wx\msw\setup.h') And '$(Configuration)|$(Platform)'=='Debug|x64'">
<PreBuildEvent>
<Command>copy ..\Utilities\wxWidgets\setup.h ..\wxWidgets\include\wx\msw\setup.h /Y</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="!Exists('..\wxWidgets\include\wx\msw\setup.h') And '$(Configuration)|$(Platform)'=='DLL Release|Win32'">
<PreBuildEvent>
<Command>copy ..\Utilities\wxWidgets\setup.h ..\wxWidgets\include\wx\msw\setup.h /Y</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="!Exists('..\wxWidgets\include\wx\msw\setup.h') And '$(Configuration)|$(Platform)'=='DLL Debug|Win32'">
<PreBuildEvent>
<Command>copy ..\Utilities\wxWidgets\setup.h ..\wxWidgets\include\wx\msw\setup.h /Y</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="!Exists('..\wxWidgets\include\wx\msw\setup.h') And '$(Configuration)|$(Platform)'=='DLL Release|x64'">
<PreBuildEvent>
<Command>copy ..\Utilities\wxWidgets\setup.h ..\wxWidgets\include\wx\msw\setup.h /Y</Command>
Expand Down
54 changes: 0 additions & 54 deletions rpcs3_buildbot.sln

This file was deleted.

0 comments on commit e47493e

Please sign in to comment.