Skip to content

Commit

Permalink
Big update
Browse files Browse the repository at this point in the history
  • Loading branch information
allkern committed Apr 21, 2024
1 parent ce32c2f commit 468ee68
Show file tree
Hide file tree
Showing 78 changed files with 18,710 additions and 18,564 deletions.
54 changes: 27 additions & 27 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
name: macOS CI

on:
push:
branches: [ "master" ]

jobs:
build:
runs-on: macos-latest

steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Install SDL2 and dylibbundler
run: |
brew install sdl2
brew install dylibbundler
- name: Build and pack PSXE
run: |
git fetch --all --tags
./build.sh
tar -czf psxe-macos-latest.tar.gz psxe.app
- uses: actions/upload-artifact@v3
with:
name: psxe-macos-latest
path: ./psxe-macos-latest.tar.gz
name: macOS CI

on:
push:
branches: [ "master" ]

jobs:
build:
runs-on: macos-latest

steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Install SDL2 and dylibbundler
run: |
brew install sdl2
brew install dylibbundler
- name: Build and pack PSXE
run: |
git fetch --all --tags
./build.sh
tar -czf psxe-macos-latest.tar.gz psxe.app
- uses: actions/upload-artifact@v3
with:
name: psxe-macos-latest
path: ./psxe-macos-latest.tar.gz
62 changes: 31 additions & 31 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
name: Ubuntu CI

on:
push:
branches: [ "master" ]

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Install SDL2
run: |
sudo apt update
sudo apt install libsdl2-dev
- name: Build PSXE
run: |
git fetch --all --tags
make
- name: Pack executable
run: |
chmod +x ./bin/psxe
mv ./bin/psxe ./
tar -czf psxe-ubuntu-latest.tar.gz ./psxe
- uses: actions/upload-artifact@v3
with:
name: psxe-ubuntu-latest
path: ./psxe-ubuntu-latest.tar.gz
name: Ubuntu CI

on:
push:
branches: [ "master" ]

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Install SDL2
run: |
sudo apt update
sudo apt install libsdl2-dev
- name: Build PSXE
run: |
git fetch --all --tags
make
- name: Pack executable
run: |
chmod +x ./bin/psxe
mv ./bin/psxe ./
tar -czf psxe-ubuntu-latest.tar.gz ./psxe
- uses: actions/upload-artifact@v3
with:
name: psxe-ubuntu-latest
path: ./psxe-ubuntu-latest.tar.gz
72 changes: 36 additions & 36 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
name: Windows CI

on:
push:
branches: [ "master" ]

jobs:
build:
runs-on: windows-latest

steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Run build-deps
run: ./build-deps.ps1
- name: 64-bit build
run: |
./build-win64.ps1
New-Item -Path "psxe" -ItemType Directory
Copy-Item -Recurse "bin" -Destination "psxe"
- uses: actions/upload-artifact@v3
with:
name: psxe-win64-latest
path: psxe/
- name: Cleanup
run: ./build-clean
- name: 32-bit build
run: |
Remove-Item -Path psxe -Recurse
./build-win32.ps1
New-Item -Path "psxe" -ItemType Directory
Copy-Item -Recurse "bin" -Destination "psxe"
- uses: actions/upload-artifact@v3
with:
name: psxe-win32-latest
name: Windows CI

on:
push:
branches: [ "master" ]

jobs:
build:
runs-on: windows-latest

steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Run build-deps
run: ./build-deps.ps1
- name: 64-bit build
run: |
./build-win64.ps1
New-Item -Path "psxe" -ItemType Directory
Copy-Item -Recurse "bin" -Destination "psxe"
- uses: actions/upload-artifact@v3
with:
name: psxe-win64-latest
path: psxe/
- name: Cleanup
run: ./build-clean
- name: 32-bit build
run: |
Remove-Item -Path psxe -Recurse
./build-win32.ps1
New-Item -Path "psxe" -ItemType Directory
Copy-Item -Recurse "bin" -Destination "psxe"
- uses: actions/upload-artifact@v3
with:
name: psxe-win32-latest
path: psxe/
44 changes: 22 additions & 22 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
.vscode/
bin/
build-win32/
imgui/
res/
sdl2/
SDL2-2.26.5/
sdl2-win32/
sdl2-win64/
test/
bios/
roms/
snap/
*.BIN
*.bin
*.dll
*.exe
*.out
*.toml
*.zip
*.cue
*.iso
.vscode/
bin/
build-win32/
imgui/
res/
sdl2/
SDL2-2.26.5/
sdl2-win32/
sdl2-win64/
test/
bios/
roms/
snap/
*.BIN
*.bin
*.dll
*.exe
*.out
*.toml
*.zip
*.cue
*.iso
*.mcd
*.rom
66 changes: 33 additions & 33 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
.ONESHELL:

CFLAGS += -g -DLOG_USE_COLOR -lSDL2 -lSDL2main
CFLAGS += -Ofast -Wno-overflow -Wall -pedantic -Wno-address-of-packed-member

PLATFORM := $(shell uname -s)

ifeq ($(PLATFORM),Darwin)
CFLAGS += -mmacosx-version-min=10.9 -Wno-newline-eof
endif

VERSION_TAG := $(shell git describe --always --tags --abbrev=0)
COMMIT_HASH := $(shell git rev-parse --short HEAD)
OS_INFO := $(shell uname -rmo)

SOURCES := $(wildcard psx/*.c)
SOURCES += $(wildcard psx/dev/*.c)
SOURCES += $(wildcard psx/input/*.c)
SOURCES += $(wildcard psx/disc/*.c)
SOURCES += $(wildcard frontend/*.c)

bin/psxe frontend/main.c:
mkdir -p bin

gcc $(SOURCES) -o bin/psxe \
-I"." \
-DOS_INFO="$(OS_INFO)" \
-DREP_VERSION="$(VERSION_TAG)" \
-DREP_COMMIT_HASH="$(COMMIT_HASH)" \
$(CFLAGS)

clean:
rm -rf "bin"
.ONESHELL:

CFLAGS += -g -DLOG_USE_COLOR -lSDL2 -lSDL2main
CFLAGS += -Ofast -Wno-overflow -Wall -pedantic -Wno-address-of-packed-member

PLATFORM := $(shell uname -s)

ifeq ($(PLATFORM),Darwin)
CFLAGS += -mmacosx-version-min=10.9 -Wno-newline-eof
endif

VERSION_TAG := $(shell git describe --always --tags --abbrev=0)
COMMIT_HASH := $(shell git rev-parse --short HEAD)
OS_INFO := $(shell uname -rmo)

SOURCES := $(wildcard psx/*.c)
SOURCES += $(wildcard psx/dev/*.c)
SOURCES += $(wildcard psx/input/*.c)
SOURCES += $(wildcard psx/disc/*.c)
SOURCES += $(wildcard frontend/*.c)

bin/psxe frontend/main.c:
mkdir -p bin

gcc $(SOURCES) -o bin/psxe \
-I"." \
-DOS_INFO="$(OS_INFO)" \
-DREP_VERSION="$(VERSION_TAG)" \
-DREP_COMMIT_HASH="$(COMMIT_HASH)" \
$(CFLAGS)

clean:
rm -rf "bin"
Loading

0 comments on commit 468ee68

Please sign in to comment.