Skip to content

Commit

Permalink
Merge pull request #204 from kobenairb/new_features
Browse files Browse the repository at this point in the history
New features
  • Loading branch information
RetroAntho committed Apr 23, 2023
2 parents 2804da6 + e9d5b2d commit 31887e0
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 23 deletions.
40 changes: 20 additions & 20 deletions .github/workflows/pvsneslib_build_package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,26 +88,26 @@ jobs:
# ------------------------------------ #
# Compiling sources #
# ------------------------------------ #
- name: Build PVSNESLIB for Linux
if: (matrix.name == 'ubuntu-latest')
run: |
cd pvsneslib
export PVSNESLIB_HOME=$(pwd)
make
- name: Build PVSNESLIB for Windows
if: (matrix.name == 'windows-latest')
shell: msys2 {0}
run: |
cd pvsneslib
export PVSNESLIB_HOME=$(pwd)
make
- name: Build PVSNESLIB for MacOS
if: (matrix.name == 'macos-latest')
run: |
cd pvsneslib
export PVSNESLIB_HOME=$(pwd)
PATH="/usr/local/opt/gnu-sed/libexec/gnubin:$PATH"
make
# - name: Build PVSNESLIB for Linux
# if: (matrix.name == 'ubuntu-latest')
# run: |
# cd pvsneslib
# export PVSNESLIB_HOME=$(pwd)
# make
# - name: Build PVSNESLIB for Windows
# if: (matrix.name == 'windows-latest')
# shell: msys2 {0}
# run: |
# cd pvsneslib
# export PVSNESLIB_HOME=$(pwd)
# make
# - name: Build PVSNESLIB for MacOS
# if: (matrix.name == 'macos-latest')
# run: |
# cd pvsneslib
# export PVSNESLIB_HOME=$(pwd)
# PATH="/usr/local/opt/gnu-sed/libexec/gnubin:$PATH"
# make

# ------------------------------------ #
# Compiling sources and create release #
Expand Down
13 changes: 12 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,19 @@ endif
@echo "* Release pvsneslib_$(ARCH)_$(OPERATING_SYSTEM) created successfully !"
@echo

# Print the version of the development tools used on the system
version:
@echo "Version of gcc:"
@$(CC) --version | head -n 1
@echo ""
@echo "Version of cmake:"
@$(CMAKE) --version | head -n 1
@echo ""
@echo "Version of make:"
@$(MAKE) --version | head -n 1

# define phony targets
.PHONY: all
.PHONY: version all

# Set the default target
.DEFAULT_GOAL := all
4 changes: 2 additions & 2 deletions devkitsnes/snes_rules
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# folder containing sources :
SRC =src
SRC := src

LIBDIRSOBJS := $(PVSNESLIB_HOME)/pvsneslib/lib
LIBDIRSOBJS := $(PVSNESLIB_HOME)/pvsneslib/lib

# to avoid some bugs if the PVSNESLIB_HOME is not well defined, we let a small check here
ifeq ($(findstring \,$(PVSNESLIB_HOME)),\)
Expand Down

0 comments on commit 31887e0

Please sign in to comment.