Skip to content

Commit

Permalink
Merge pull request #1 from savaughn/github-actions
Browse files Browse the repository at this point in the history
Added GitHub actions
  • Loading branch information
savaughn authored Sep 23, 2023
2 parents 85cb324 + cb6b926 commit a8dd8c6
Show file tree
Hide file tree
Showing 452 changed files with 26,174 additions and 4,211 deletions.
Binary file modified .DS_Store
Binary file not shown.
22 changes: 22 additions & 0 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Build and Test

on:
push:
branches:
- main

jobs:
build:
runs-on: ubuntu-latest

steps:
- name: Checkout Code
uses: actions/checkout@v2

- name: Build Project
run: |
make
- name: Clean Up
run: |
make clean
4 changes: 1 addition & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,8 @@ MACOS_DESTINATION = $(BUILD_DIR)/$(MACOS_BUNDLE)/Contents/MacOS
INFO_PLIST = $(BUILD_DIR)/$(MACOS_BUNDLE)/Contents/Info.plist

# Define mGBA path and save file
SAVES_DIR = $(realpath saves)
SAVE_FILE = crystal2.gbc.sav
ROM_PATH = $(realpath rom)
ROM_FILE = pk-perfectcrystal.gbc
ROM_FILE = pk-crystal.gbc


.PHONY: all run launch clean
Expand Down
Binary file added libpksav/.DS_Store
Binary file not shown.
4 changes: 2 additions & 2 deletions libpksav/include/CMakeFiles/CMakeDirectoryInformation.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
# Generated by "Unix Makefiles" Generator, CMake Version 3.27

# Relative path conversion top directories.
set(CMAKE_RELATIVE_PATH_TOP_SOURCE "/Users/spencer/Projects/pksav")
set(CMAKE_RELATIVE_PATH_TOP_BINARY "/Users/spencer/Projects/pksav")
set(CMAKE_RELATIVE_PATH_TOP_SOURCE "/Users/spencer/Projects/pksav-sv")
set(CMAKE_RELATIVE_PATH_TOP_BINARY "/Users/spencer/Projects/pksav-sv")

# Force unix paths in dependencies.
set(CMAKE_FORCE_UNIX_PATHS 1)
Expand Down
20 changes: 10 additions & 10 deletions libpksav/include/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ RM = /opt/homebrew/Cellar/cmake/3.27.4/bin/cmake -E rm -f
EQUALS = =

# The top-level source directory on which CMake was run.
CMAKE_SOURCE_DIR = /Users/spencer/Projects/pksav
CMAKE_SOURCE_DIR = /Users/spencer/Projects/pksav-sv

# The top-level build directory on which CMake was run.
CMAKE_BINARY_DIR = /Users/spencer/Projects/pksav
CMAKE_BINARY_DIR = /Users/spencer/Projects/pksav-sv

#=============================================================================
# Targets provided globally by CMake.
Expand Down Expand Up @@ -142,14 +142,14 @@ install/strip/fast: preinstall/fast

# The main all target
all: cmake_check_build_system
cd /Users/spencer/Projects/pksav && $(CMAKE_COMMAND) -E cmake_progress_start /Users/spencer/Projects/pksav/CMakeFiles /Users/spencer/Projects/pksav/include//CMakeFiles/progress.marks
cd /Users/spencer/Projects/pksav && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 include/all
$(CMAKE_COMMAND) -E cmake_progress_start /Users/spencer/Projects/pksav/CMakeFiles 0
cd /Users/spencer/Projects/pksav-sv && $(CMAKE_COMMAND) -E cmake_progress_start /Users/spencer/Projects/pksav-sv/CMakeFiles /Users/spencer/Projects/pksav-sv/include//CMakeFiles/progress.marks
cd /Users/spencer/Projects/pksav-sv && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 include/all
$(CMAKE_COMMAND) -E cmake_progress_start /Users/spencer/Projects/pksav-sv/CMakeFiles 0
.PHONY : all

# The main clean target
clean:
cd /Users/spencer/Projects/pksav && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 include/clean
cd /Users/spencer/Projects/pksav-sv && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 include/clean
.PHONY : clean

# The main clean target
Expand All @@ -158,17 +158,17 @@ clean/fast: clean

# Prepare targets for installation.
preinstall: all
cd /Users/spencer/Projects/pksav && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 include/preinstall
cd /Users/spencer/Projects/pksav-sv && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 include/preinstall
.PHONY : preinstall

# Prepare targets for installation.
preinstall/fast:
cd /Users/spencer/Projects/pksav && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 include/preinstall
cd /Users/spencer/Projects/pksav-sv && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 include/preinstall
.PHONY : preinstall/fast

# clear depends
depend:
cd /Users/spencer/Projects/pksav && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
cd /Users/spencer/Projects/pksav-sv && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
.PHONY : depend

# Help Target
Expand All @@ -195,6 +195,6 @@ help:
# No rule that depends on this can have commands that come from listfiles
# because they might be regenerated.
cmake_check_build_system:
cd /Users/spencer/Projects/pksav && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
cd /Users/spencer/Projects/pksav-sv && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
.PHONY : cmake_check_build_system

6 changes: 3 additions & 3 deletions libpksav/include/cmake_install.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Install script for directory: /Users/spencer/Projects/pksav/include
# Install script for directory: /Users/spencer/Projects/pksav-sv/include

# Set the install prefix
if(NOT DEFINED CMAKE_INSTALL_PREFIX)
Expand Down Expand Up @@ -38,12 +38,12 @@ if(NOT DEFINED CMAKE_OBJDUMP)
endif()

if(CMAKE_INSTALL_COMPONENT STREQUAL "Headers" OR NOT CMAKE_INSTALL_COMPONENT)
file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/include" TYPE FILE FILES "/Users/spencer/Projects/pksav/include/pksav.h")
file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/include" TYPE FILE FILES "/Users/spencer/Projects/pksav-sv/include/pksav.h")
endif()

if(NOT CMAKE_INSTALL_LOCAL_ONLY)
# Include the install script for each subdirectory.
include("/Users/spencer/Projects/pksav/include/pksav/cmake_install.cmake")
include("/Users/spencer/Projects/pksav-sv/include/pksav/cmake_install.cmake")

endif()

15 changes: 4 additions & 11 deletions libpksav/include/pksav.h
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
/*!
* @file pksav.h
* @ingroup PKSav
* @brief Global include file, includes all PKSav headers.
*
* Copyright (c) 2016-2017 Nicholas Corgan ([email protected])
/*
* Copyright (c) 2016-2018 Nicholas Corgan ([email protected])
*
* Distributed under the MIT License (MIT) (See accompanying file LICENSE.txt
* or copy at http://opensource.org/licenses/MIT)
Expand All @@ -16,16 +12,13 @@
#include <pksav/error.h>
#include <pksav/version.h>

#include <pksav/common/condition.h>
#include <pksav/common/constants.h>
#include <pksav/common/contest_stats.h>
#include <pksav/common/datetime.h>
#include <pksav/common/gen3_ribbons.h>
#include <pksav/common/gen4_encounter_type.h>
#include <pksav/common/markings.h>
#include <pksav/common/nature.h>
#include <pksav/common/nds_pokemon.h>
#include <pksav/common/pokedex.h>
#include <pksav/common/pokerus.h>
#include <pksav/common/prng.h>
#include <pksav/common/stats.h>
#include <pksav/common/trainer_id.h>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
# Generated by "Unix Makefiles" Generator, CMake Version 3.27

# Relative path conversion top directories.
set(CMAKE_RELATIVE_PATH_TOP_SOURCE "/Users/spencer/Projects/pksav")
set(CMAKE_RELATIVE_PATH_TOP_BINARY "/Users/spencer/Projects/pksav")
set(CMAKE_RELATIVE_PATH_TOP_SOURCE "/Users/spencer/Projects/pksav-sv")
set(CMAKE_RELATIVE_PATH_TOP_BINARY "/Users/spencer/Projects/pksav-sv")

# Force unix paths in dependencies.
set(CMAKE_FORCE_UNIX_PATHS 1)
Expand Down
6 changes: 3 additions & 3 deletions libpksav/include/pksav/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ IF(NOT PKSAV_DONT_INSTALL_HEADERS)
error.h
${CMAKE_CURRENT_BINARY_DIR}/config.h
${CMAKE_CURRENT_BINARY_DIR}/version.h
gen1.h
gen2.h
gba.h
gen1.h
gen2.h
gba.h
)

ADD_SUBDIRECTORY(common)
Expand Down
20 changes: 10 additions & 10 deletions libpksav/include/pksav/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ RM = /opt/homebrew/Cellar/cmake/3.27.4/bin/cmake -E rm -f
EQUALS = =

# The top-level source directory on which CMake was run.
CMAKE_SOURCE_DIR = /Users/spencer/Projects/pksav
CMAKE_SOURCE_DIR = /Users/spencer/Projects/pksav-sv

# The top-level build directory on which CMake was run.
CMAKE_BINARY_DIR = /Users/spencer/Projects/pksav
CMAKE_BINARY_DIR = /Users/spencer/Projects/pksav-sv

#=============================================================================
# Targets provided globally by CMake.
Expand Down Expand Up @@ -142,14 +142,14 @@ install/strip/fast: preinstall/fast

# The main all target
all: cmake_check_build_system
cd /Users/spencer/Projects/pksav && $(CMAKE_COMMAND) -E cmake_progress_start /Users/spencer/Projects/pksav/CMakeFiles /Users/spencer/Projects/pksav/include/pksav//CMakeFiles/progress.marks
cd /Users/spencer/Projects/pksav && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 include/pksav/all
$(CMAKE_COMMAND) -E cmake_progress_start /Users/spencer/Projects/pksav/CMakeFiles 0
cd /Users/spencer/Projects/pksav-sv && $(CMAKE_COMMAND) -E cmake_progress_start /Users/spencer/Projects/pksav-sv/CMakeFiles /Users/spencer/Projects/pksav-sv/include/pksav//CMakeFiles/progress.marks
cd /Users/spencer/Projects/pksav-sv && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 include/pksav/all
$(CMAKE_COMMAND) -E cmake_progress_start /Users/spencer/Projects/pksav-sv/CMakeFiles 0
.PHONY : all

# The main clean target
clean:
cd /Users/spencer/Projects/pksav && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 include/pksav/clean
cd /Users/spencer/Projects/pksav-sv && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 include/pksav/clean
.PHONY : clean

# The main clean target
Expand All @@ -158,17 +158,17 @@ clean/fast: clean

# Prepare targets for installation.
preinstall: all
cd /Users/spencer/Projects/pksav && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 include/pksav/preinstall
cd /Users/spencer/Projects/pksav-sv && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 include/pksav/preinstall
.PHONY : preinstall

# Prepare targets for installation.
preinstall/fast:
cd /Users/spencer/Projects/pksav && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 include/pksav/preinstall
cd /Users/spencer/Projects/pksav-sv && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 include/pksav/preinstall
.PHONY : preinstall/fast

# clear depends
depend:
cd /Users/spencer/Projects/pksav && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
cd /Users/spencer/Projects/pksav-sv && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
.PHONY : depend

# Help Target
Expand All @@ -195,6 +195,6 @@ help:
# No rule that depends on this can have commands that come from listfiles
# because they might be regenerated.
cmake_check_build_system:
cd /Users/spencer/Projects/pksav && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
cd /Users/spencer/Projects/pksav-sv && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
.PHONY : cmake_check_build_system

28 changes: 14 additions & 14 deletions libpksav/include/pksav/cmake_install.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Install script for directory: /Users/spencer/Projects/pksav/include/pksav
# Install script for directory: /Users/spencer/Projects/pksav-sv/include/pksav

# Set the install prefix
if(NOT DEFINED CMAKE_INSTALL_PREFIX)
Expand Down Expand Up @@ -39,24 +39,24 @@ endif()

if(CMAKE_INSTALL_COMPONENT STREQUAL "Headers" OR NOT CMAKE_INSTALL_COMPONENT)
file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/include/pksav" TYPE FILE FILES
"/Users/spencer/Projects/pksav/include/pksav/error.h"
"/Users/spencer/Projects/pksav/include/pksav/config.h"
"/Users/spencer/Projects/pksav/include/pksav/version.h"
"/Users/spencer/Projects/pksav/include/pksav/gen1.h"
"/Users/spencer/Projects/pksav/include/pksav/gen2.h"
"/Users/spencer/Projects/pksav/include/pksav/gba.h"
"/Users/spencer/Projects/pksav-sv/include/pksav/error.h"
"/Users/spencer/Projects/pksav-sv/include/pksav/config.h"
"/Users/spencer/Projects/pksav-sv/include/pksav/version.h"
"/Users/spencer/Projects/pksav-sv/include/pksav/gen1.h"
"/Users/spencer/Projects/pksav-sv/include/pksav/gen2.h"
"/Users/spencer/Projects/pksav-sv/include/pksav/gba.h"
)
endif()

if(NOT CMAKE_INSTALL_LOCAL_ONLY)
# Include the install script for each subdirectory.
include("/Users/spencer/Projects/pksav/include/pksav/common/cmake_install.cmake")
include("/Users/spencer/Projects/pksav/include/pksav/math/cmake_install.cmake")
include("/Users/spencer/Projects/pksav/include/pksav/gen1/cmake_install.cmake")
include("/Users/spencer/Projects/pksav/include/pksav/gen2/cmake_install.cmake")
include("/Users/spencer/Projects/pksav/include/pksav/gba/cmake_install.cmake")
include("/Users/spencer/Projects/pksav/include/pksav/gen4/cmake_install.cmake")
include("/Users/spencer/Projects/pksav/include/pksav/gen5/cmake_install.cmake")
include("/Users/spencer/Projects/pksav-sv/include/pksav/common/cmake_install.cmake")
include("/Users/spencer/Projects/pksav-sv/include/pksav/math/cmake_install.cmake")
include("/Users/spencer/Projects/pksav-sv/include/pksav/gen1/cmake_install.cmake")
include("/Users/spencer/Projects/pksav-sv/include/pksav/gen2/cmake_install.cmake")
include("/Users/spencer/Projects/pksav-sv/include/pksav/gba/cmake_install.cmake")
include("/Users/spencer/Projects/pksav-sv/include/pksav/gen4/cmake_install.cmake")
include("/Users/spencer/Projects/pksav-sv/include/pksav/gen5/cmake_install.cmake")

endif()

Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
# Generated by "Unix Makefiles" Generator, CMake Version 3.27

# Relative path conversion top directories.
set(CMAKE_RELATIVE_PATH_TOP_SOURCE "/Users/spencer/Projects/pksav")
set(CMAKE_RELATIVE_PATH_TOP_BINARY "/Users/spencer/Projects/pksav")
set(CMAKE_RELATIVE_PATH_TOP_SOURCE "/Users/spencer/Projects/pksav-sv")
set(CMAKE_RELATIVE_PATH_TOP_BINARY "/Users/spencer/Projects/pksav-sv")

# Force unix paths in dependencies.
set(CMAKE_FORCE_UNIX_PATHS 1)
Expand Down
6 changes: 2 additions & 4 deletions libpksav/include/pksav/common/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,24 +1,22 @@
#
# Copyright (c) 2016 Nicholas Corgan ([email protected])
# Copyright (c) 2016,2018 Nicholas Corgan ([email protected])
#
# Distributed under the MIT License (MIT) (See accompanying file LICENSE.txt
# or copy at http://opensource.org/licenses/MIT)
#

SET(pksav_common_headers
condition.h
constants.h
contest_stats.h
coordinates.h
datetime.h
gen3_ribbons.h
gen4_encounter_type.h
item.h
markings.h
nature.h
nds_pokemon.h
pokedex.h
pokerus.h
prng.h
stats.h
trainer_id.h
)
Expand Down
20 changes: 10 additions & 10 deletions libpksav/include/pksav/common/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ RM = /opt/homebrew/Cellar/cmake/3.27.4/bin/cmake -E rm -f
EQUALS = =

# The top-level source directory on which CMake was run.
CMAKE_SOURCE_DIR = /Users/spencer/Projects/pksav
CMAKE_SOURCE_DIR = /Users/spencer/Projects/pksav-sv

# The top-level build directory on which CMake was run.
CMAKE_BINARY_DIR = /Users/spencer/Projects/pksav
CMAKE_BINARY_DIR = /Users/spencer/Projects/pksav-sv

#=============================================================================
# Targets provided globally by CMake.
Expand Down Expand Up @@ -142,14 +142,14 @@ install/strip/fast: preinstall/fast

# The main all target
all: cmake_check_build_system
cd /Users/spencer/Projects/pksav && $(CMAKE_COMMAND) -E cmake_progress_start /Users/spencer/Projects/pksav/CMakeFiles /Users/spencer/Projects/pksav/include/pksav/common//CMakeFiles/progress.marks
cd /Users/spencer/Projects/pksav && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 include/pksav/common/all
$(CMAKE_COMMAND) -E cmake_progress_start /Users/spencer/Projects/pksav/CMakeFiles 0
cd /Users/spencer/Projects/pksav-sv && $(CMAKE_COMMAND) -E cmake_progress_start /Users/spencer/Projects/pksav-sv/CMakeFiles /Users/spencer/Projects/pksav-sv/include/pksav/common//CMakeFiles/progress.marks
cd /Users/spencer/Projects/pksav-sv && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 include/pksav/common/all
$(CMAKE_COMMAND) -E cmake_progress_start /Users/spencer/Projects/pksav-sv/CMakeFiles 0
.PHONY : all

# The main clean target
clean:
cd /Users/spencer/Projects/pksav && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 include/pksav/common/clean
cd /Users/spencer/Projects/pksav-sv && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 include/pksav/common/clean
.PHONY : clean

# The main clean target
Expand All @@ -158,17 +158,17 @@ clean/fast: clean

# Prepare targets for installation.
preinstall: all
cd /Users/spencer/Projects/pksav && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 include/pksav/common/preinstall
cd /Users/spencer/Projects/pksav-sv && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 include/pksav/common/preinstall
.PHONY : preinstall

# Prepare targets for installation.
preinstall/fast:
cd /Users/spencer/Projects/pksav && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 include/pksav/common/preinstall
cd /Users/spencer/Projects/pksav-sv && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 include/pksav/common/preinstall
.PHONY : preinstall/fast

# clear depends
depend:
cd /Users/spencer/Projects/pksav && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
cd /Users/spencer/Projects/pksav-sv && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
.PHONY : depend

# Help Target
Expand All @@ -195,6 +195,6 @@ help:
# No rule that depends on this can have commands that come from listfiles
# because they might be regenerated.
cmake_check_build_system:
cd /Users/spencer/Projects/pksav && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
cd /Users/spencer/Projects/pksav-sv && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
.PHONY : cmake_check_build_system

Loading

0 comments on commit a8dd8c6

Please sign in to comment.