Permalink
Browse files

Misc changes (#2309)

AppVeyor: Improve artifact name
Travis: Update notification email
README: Fix forum link and remove coveralls
sceNp2: Use UNIMPLEMENTED_FUNC macro instead of fmt::throw_exception
VK: Fix pathing for linux
AboutDialog: Fix forum link
  • Loading branch information...
1 parent c733d03 commit 35b7cf4c98e9966ecf4d174af2b9dbfba72d7009 @AniLeo AniLeo committed with Nekotekina Jan 30, 2017
Showing with 143 additions and 77 deletions.
  1. +1 −1 .travis.yml
  2. +1 −2 README.md
  3. +11 −7 appveyor.yml
  4. +126 −63 rpcs3/Emu/Cell/Modules/sceNp2.cpp
  5. +2 −2 rpcs3/Emu/RSX/VK/VKGSRender.h
  6. +2 −2 rpcs3/Gui/AboutDialog.h
View
@@ -82,7 +82,7 @@ addons:
project:
name: $TRAVIS_REPO_SLUG
description: "PS3 emulator/debugger"
- notification_email: raul.tambre@gmail.com
+ notification_email: nekotekina@gmail.com
build_command: "make -j 4"
branch_pattern: coverity_scan
View
@@ -4,11 +4,10 @@ RPCS3
[![Build Status](https://travis-ci.org/RPCS3/rpcs3.svg?branch=master)](https://travis-ci.org/RPCS3/rpcs3)
[![Build status](https://ci.appveyor.com/api/projects/status/411c4clmiohtx7eo/branch/master?svg=true)](https://ci.appveyor.com/project/rpcs3/rpcs3/branch/master)
[![Coverity Status](https://img.shields.io/coverity/scan/3960.svg)](https://scan.coverity.com/projects/3960)
-[![Coverage Status](https://coveralls.io/repos/RPCS3/rpcs3/badge.svg)](https://coveralls.io/r/RPCS3/rpcs3)
An open-source PlayStation 3 emulator/debugger written in C++.
-You can find some basic information in the [FAQ](https://github.com/RPCS3/rpcs3/wiki/FAQ). For discussion about this emulator and PS3 emulation please visit the [official forums](http://www.emunewz.net/forum/forumdisplay.php?fid=162).
+You can find some basic information in the [FAQ](https://github.com/RPCS3/rpcs3/wiki/FAQ). For discussion about this emulator and PS3 emulation please visit the [official forums](http://www.emunewz.net/forum/forumdisplay.php?fid=172).
Official Discord server: https://discord.me/RPCS3
View
@@ -1,19 +1,22 @@
-version: 1.0.{build}
+version: '0.0.1-{build}'
+
os: Visual Studio 2015
-configuration:
-# - Release
- - ReleaseLLVM
platform: x64
-clone_folder: c:\rpcs3
+clone_folder: C:\rpcs3
clone_depth: 3
test: off
+configuration:
+# Release
+ - ReleaseLLVM
+
before_build:
+ - ps: $env:Date="$(git show -s --date=short --format='%ad')"
- git submodule update --init 3rdparty/ffmpeg 3rdparty/pugixml asmjit 3rdparty/GSL 3rdparty/libpng Vulkan/glslang Vulkan/Vulkan-LoaderAndValidationLayers Utilities/yaml-cpp rsx_program_decompiler 3rdparty/cereal
- 7z x wxWidgets.7z -aos -oC:\rpcs3\wxWidgets > null
- 7z x zlib.7z -aos -oC:\rpcs3\ > null
- 7z x vulkan.7z -aos -oC:\rpcs3\Vulkan > null
- - if %configuration%==Release (cmake -G "Visual Studio 14 Win64" -DZLIB_ROOT=C:/rpcs3/zlib/)
+ - if %configuration%==Release (cmake -G "Visual Studio 14 Win64" -DZLIB_ROOT=C:/rpcs3/zlib/ -DVULKAN_PREBUILT=ON)
else (7z x llvmlibs.7z -aos -oC:\rpcs3 > null && cmake -G "Visual Studio 14 Win64" -DLLVM_DIR=C:/rpcs3/llvm_build/share/llvm/cmake -DZLIB_ROOT=C:/rpcs3/zlib/ -DVULKAN_PREBUILT=ON)
build_script:
@@ -31,4 +34,5 @@ install:
artifacts:
- path: bin
- name: rpcs3-$(configuration)-$(COMMIT_SHA)
+ name: 'rpcs3-v0.0.1-$(Date)-$(COMMIT_SHA)_win64'
+ type: zip
Oops, something went wrong.

0 comments on commit 35b7cf4

Please sign in to comment.