ShuriZma
/
xenia-canary
mirror of https://github.com/xenia-canary/xenia-canary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename exe to xenia-canary, simplify CI steps, remove SSE2 

SSE2 was only for troubleshooting Fable II, and didn't do anything anyway.
This commit is contained in:
Margen67 2020-01-17 07:16:11 -08:00 committed by illusion
parent e59ea2e8e1
commit 7477f020bc
5 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.appveyor.yml
View File

@ -27,10 +27,7 @@ skip_branch_with_pr: true
pull_requests: pull_requests:
do_not_increment_build_number: true do_not_increment_build_number: true
os: Visual Studio 2019 image: Visual Studio 2019
init:
- git config --global core.autocrlf input
install: install:
- xb setup - xb setup
@ -41,7 +38,6 @@ build_script:
after_build: after_build:
- |- - |-
cd build\bin\Windows\Release cd build\bin\Windows\Release
ren xenia.exe xenia-canary.exe
7z a ..\..\..\..\xenia-%appveyor_repo_branch%.zip ..\..\..\..\LICENSE xenia-canary.exe 7z a ..\..\..\..\xenia-%appveyor_repo_branch%.zip ..\..\..\..\LICENSE xenia-canary.exe
7z a ..\..\..\..\xenia-vfs-dump-%appveyor_repo_branch%.zip ..\..\..\..\LICENSE xenia-vfs-dump.exe 7z a ..\..\..\..\xenia-vfs-dump-%appveyor_repo_branch%.zip ..\..\..\..\LICENSE xenia-vfs-dump.exe
cd ..\..\..\.. cd ..\..\..\..

11
.azure-pipelines.yml
View File

@ -7,8 +7,8 @@ trigger:
- master - master
paths: paths:
exclude: exclude:
- docs/* - docs/**
- .github/* - .github/**
- LICENSE - LICENSE
- README.md - README.md
- .appveyor.yml - .appveyor.yml
@ -22,8 +22,8 @@ pr:
- master - master
paths: paths:
exclude: exclude:
- docs/* - docs/**
- .github/* - .github/**
- LICENSE - LICENSE
- README.md - README.md
- .appveyor.yml - .appveyor.yml
@ -35,8 +35,6 @@ jobs:
vmImage: windows-latest vmImage: windows-latest
strategy: strategy:
matrix: matrix:
SSE2: # SSE2 BUILDS WON'T WORK ON NON-AVX(2) CPUs!
cpu_arch: SSE2 # SSE2 BUILDS WON'T WORK ON NON-AVX(2) CPUs!
AVX: AVX:
cpu_arch: AVX cpu_arch: AVX
AVX2: AVX2:
@ -52,7 +50,6 @@ jobs:
- script: | - script: |
cd build\bin\Windows\Release cd build\bin\Windows\Release
ren xenia.exe xenia-canary.exe
7z a $(Build.ArtifactStagingDirectory)\xenia-$(Build.SourceBranchName).zip ..\..\..\..\LICENSE xenia-canary.exe 7z a $(Build.ArtifactStagingDirectory)\xenia-$(Build.SourceBranchName).zip ..\..\..\..\LICENSE xenia-canary.exe
7z a $(Build.ArtifactStagingDirectory)\xenia-vfs-dump-$(Build.SourceBranchName).zip ..\..\..\..\LICENSE xenia-vfs-dump.exe 7z a $(Build.ArtifactStagingDirectory)\xenia-vfs-dump-$(Build.SourceBranchName).zip ..\..\..\..\LICENSE xenia-vfs-dump.exe
displayName: 'Create archives' displayName: 'Create archives'

3
.github/workflows/main.yml vendored
View File

@ -35,7 +35,7 @@ jobs:
runs-on: windows-latest runs-on: windows-latest
strategy: strategy:
matrix: matrix:
cpu_arch: [SSE2, AVX, AVX2, AVX512] # SSE2 BUILDS WON'T WORK ON NON-AVX(2) CPUs! cpu_arch: [AVX, AVX2, AVX512]
steps: steps:
- uses: actions/checkout@master - uses: actions/checkout@master
with: with:
@ -49,7 +49,6 @@ jobs:
- name: Prepare artifacts - name: Prepare artifacts
run: | run: |
ren build\bin\Windows\Release\xenia.exe xenia-canary.exe
robocopy build\bin\Windows\Release artifacts xenia*.exe robocopy build\bin\Windows\Release artifacts xenia*.exe
robocopy . artifacts LICENSE robocopy . artifacts LICENSE
$LastExitCode = 0 $LastExitCode = 0

2
src/xenia/app/premake5.lua
View File

@ -5,7 +5,7 @@ group("src")
project("xenia-app") project("xenia-app")
uuid("d7e98620-d007-4ad8-9dbd-b47c8853a17f") uuid("d7e98620-d007-4ad8-9dbd-b47c8853a17f")
kind("WindowedApp") kind("WindowedApp")
targetname("xenia") targetname("xenia-canary")
language("C++") language("C++")
links({ links({
"aes_128", "aes_128",

2
xenia-build
View File

@ -598,7 +598,7 @@ class BaseBuildCommand(Command):
'--config', choices=['release', 'debug', 'checked'], default='release', '--config', choices=['release', 'debug', 'checked'], default='release',
type=str.lower, help='Chooses the build configuration.') type=str.lower, help='Chooses the build configuration.')
self.parser.add_argument( self.parser.add_argument(
'--cpu_arch', choices=['sse2', 'avx', 'avx2', 'avx512'], default='sse2', '--cpu_arch', choices=['avx', 'avx2', 'avx512'], default='avx',
type=str.lower, help='Chooses the CPU architecture.') type=str.lower, help='Chooses the CPU architecture.')
self.parser.add_argument( self.parser.add_argument(
'--target', action='append', default=[], '--target', action='append', default=[],