From e47493e81bfb2dc4813510d050b73b254fb319be Mon Sep 17 00:00:00 2001 From: Zangetsu38 Date: Thu, 23 Jul 2015 13:53:10 +0200 Subject: [PATCH] Some small change. 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 --- README.md | 4 +-- appveyor.yml | 56 -------------------------------------- package.bat | 23 ---------------- rpcs3/copy_setup_h.vcxproj | 54 ------------------------------------ rpcs3_buildbot.sln | 54 ------------------------------------ 5 files changed, 2 insertions(+), 189 deletions(-) delete mode 100644 appveyor.yml delete mode 100644 package.bat delete mode 100644 rpcs3_buildbot.sln diff --git a/README.md b/README.md index 51ab3095f2..d990bf73d2 100644 --- a/README.md +++ b/README.md @@ -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` @@ -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` diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 9ebfa5fbe6..0000000000 --- a/appveyor.yml +++ /dev/null @@ -1,56 +0,0 @@ - - -# version format -version: 0.1.{build} - -branches: - only: - - appveyorbuild - # blacklist - #except: - # - gh-pages - -#---------------------------------# -# environment configuration # -#---------------------------------# - -# clone directory -clone_folder: c:\projects\rpcs3 - -platform: - - x64 - -configuration: - - Release - -install: - - cmd: cinst wget -x86 - - cmd: cinst 7zip.commandline -x86 - - cmd: git submodule update --init --recursive .\ffmpeg .\asmjit - - cmd: wget -q --no-check-certificate https://googledrive.com/host/0B3tDmChwjRbRTTdhaTFOeGN1eEU/wxWidgets.7z -O c:\projects\rpcs3\wxwidgets.7z - - cmd: 7z x C:\projects\rpcs3\wxwidgets.7z -oc:\projects\rpcs3\wxWidgets - -build: - -build_script: - - msbuild /m /p:Configuration=Release rpcs3_buildbot.sln - -after_build: - - cmd: package.bat - -artifacts: - - path: .\rpcs3*.7z - -deploy: OFF -# - provider: FTP -# server: -# secure: kZT7rsbEPGQ0fC2GFRBGfL2vPwUgih2JkwjbSuw00T8= -# username: -# secure: YJzwsi4wfSezFLqaB9uiww== -# password: -# secure: EQ3xa2LoRgelAdE57+qakQ== -# folder: .\rpcs3\ -# enable_ssl: false - -test: OFF - diff --git a/package.bat b/package.bat deleted file mode 100644 index 30efc34ebf..0000000000 --- a/package.bat +++ /dev/null @@ -1,23 +0,0 @@ -mkdir build -mkdir build\rpcs3 -copy bin\rpcs3-*.exe build\rpcs3 -copy bin\soft_oal.dll build\rpcs3 -copy bin\make_fself.cmd build\rpcs3 - -mkdir build\rpcs3\dev_hdd1 -xcopy /Y /e bin\dev_hdd1 build\rpcs3\dev_hdd1 - -mkdir build\rpcs3\dev_hdd0 -xcopy /Y /e bin\dev_hdd0 build\rpcs3\dev_hdd0 - -mkdir build\rpcs3\dev_flash -xcopy /Y /e bin\dev_flash build\rpcs3\dev_flash - -mkdir build\rpcs3\dev_usb000 -xcopy /Y /e bin\dev_usb000 build\rpcs3\dev_usb000 - -for /f "delims=" %%a in ('git describe') do @set gitrev=%%a - -cd build -7z a -mx9 ..\rpcs3-%gitrev%-windows-x86_64.7z rpcs3 -cd .. diff --git a/rpcs3/copy_setup_h.vcxproj b/rpcs3/copy_setup_h.vcxproj index b063e080ed..2016f003ea 100644 --- a/rpcs3/copy_setup_h.vcxproj +++ b/rpcs3/copy_setup_h.vcxproj @@ -1,34 +1,18 @@  - - Debug - Win32 - Debug x64 - - DLL Debug - Win32 - DLL Debug x64 - - DLL Release - Win32 - DLL Release x64 - - Release - Win32 - Release x64 @@ -40,27 +24,15 @@ - - Utility - Utility - - Utility - Utility - - Utility - Utility - - Utility - Utility @@ -73,39 +45,13 @@ - - - - - - - - - copy ..\Utilities\wxWidgets\setup.h ..\wxWidgets\include\wx\msw\setup.h /Y - - - - - copy ..\Utilities\wxWidgets\setup.h ..\wxWidgets\include\wx\msw\setup.h /Y - - copy ..\Utilities\wxWidgets\setup.h ..\wxWidgets\include\wx\msw\setup.h /Y - - - copy ..\Utilities\wxWidgets\setup.h ..\wxWidgets\include\wx\msw\setup.h /Y - - - - - copy ..\Utilities\wxWidgets\setup.h ..\wxWidgets\include\wx\msw\setup.h /Y - - copy ..\Utilities\wxWidgets\setup.h ..\wxWidgets\include\wx\msw\setup.h /Y diff --git a/rpcs3_buildbot.sln b/rpcs3_buildbot.sln deleted file mode 100644 index 2945457917..0000000000 --- a/rpcs3_buildbot.sln +++ /dev/null @@ -1,54 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Express 2013 for Windows Desktop -VisualStudioVersion = 12.0.30501.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rpcs3", "rpcs3\rpcs3.vcxproj", "{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}" - ProjectSection(ProjectDependencies) = postProject - {AC40FF01-426E-4838-A317-66354CEFAE88} = {AC40FF01-426E-4838-A317-66354CEFAE88} - {C4A10229-4712-4BD2-B63E-50D93C67A038} = {C4A10229-4712-4BD2-B63E-50D93C67A038} - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "stblib", "stblib", "{9D839DFB-76E6-4F10-8EED-BA2AC7CC3FB6}" - ProjectSection(SolutionItems) = preProject - stblib\stb_image.c = stblib\stb_image.c - stblib\stb_image.h = stblib\stb_image.h - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asmjit", "asmjitsrc\asmjit.vcxproj", "{AC40FF01-426E-4838-A317-66354CEFAE88}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "asmjit", "asmjit", "{E2A982F2-4B1A-48B1-8D77-A17A589C58D7}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "emucore", "rpcs3\emucore.vcxproj", "{C4A10229-4712-4BD2-B63E-50D93C67A038}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug - MemLeak|x64 = Debug - MemLeak|x64 - Debug|x64 = Debug|x64 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug - MemLeak|x64.ActiveCfg = Debug - MemLeak|x64 - {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug - MemLeak|x64.Build.0 = Debug - MemLeak|x64 - {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug|x64.ActiveCfg = Debug|x64 - {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug|x64.Build.0 = Debug|x64 - {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Release|x64.ActiveCfg = Release|x64 - {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Release|x64.Build.0 = Release|x64 - {AC40FF01-426E-4838-A317-66354CEFAE88}.Debug - MemLeak|x64.ActiveCfg = Debug|x64 - {AC40FF01-426E-4838-A317-66354CEFAE88}.Debug|x64.ActiveCfg = Debug|x64 - {AC40FF01-426E-4838-A317-66354CEFAE88}.Debug|x64.Build.0 = Debug|x64 - {AC40FF01-426E-4838-A317-66354CEFAE88}.Release|x64.ActiveCfg = Release|x64 - {AC40FF01-426E-4838-A317-66354CEFAE88}.Release|x64.Build.0 = Release|x64 - {C4A10229-4712-4BD2-B63E-50D93C67A038}.Debug - MemLeak|x64.ActiveCfg = Debug - MemLeak|x64 - {C4A10229-4712-4BD2-B63E-50D93C67A038}.Debug - MemLeak|x64.Build.0 = Debug - MemLeak|x64 - {C4A10229-4712-4BD2-B63E-50D93C67A038}.Debug|x64.ActiveCfg = Debug|x64 - {C4A10229-4712-4BD2-B63E-50D93C67A038}.Debug|x64.Build.0 = Debug|x64 - {C4A10229-4712-4BD2-B63E-50D93C67A038}.Release|x64.ActiveCfg = Release|x64 - {C4A10229-4712-4BD2-B63E-50D93C67A038}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {AC40FF01-426E-4838-A317-66354CEFAE88} = {E2A982F2-4B1A-48B1-8D77-A17A589C58D7} - EndGlobalSection -EndGlobal