Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

optimize release deps #102

Merged
merged 6 commits into from
Nov 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ jobs:
cd deps/pksav/
mkdir build
cd build
cmake .. -DPKSAV_STATIC=ON -DPKSAV_ENABLE_TESTS=OFF -DPKSAV_ENABLE_DOCS=OFF
make
cmake .. -DPKSAV_STATIC=ON -DPKSAV_ENABLE_TESTS=OFF -DPKSAV_ENABLE_DOCS=OFF -DCMAKE_BUILD_TYPE=Release
cmake --build . --config "Release"

- name: Build raylib
run: |
Expand All @@ -44,7 +44,7 @@ jobs:
run: |
# Copy assets to the same directory as the executable
mkdir -p build/assets
cp -r assets/* build/assets/
cp -r assets/images build/assets/images

- name: Publish Build Artifacts
uses: actions/upload-artifact@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ jobs:
cd deps/pksav/
mkdir build
cd build
cmake .. -DPKSAV_STATIC=ON -DPKSAV_ENABLE_TESTS=OFF -DPKSAV_ENABLE_DOCS=OFF
make
cmake .. -DPKSAV_STATIC=ON -DPKSAV_ENABLE_TESTS=OFF -DPKSAV_ENABLE_DOCS=OFF -DCMAKE_BUILD_TYPE=Release
cmake --build . --config "Release"

- name: Build raylib
run: |
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
cd deps/pksav/
mkdir build
cd build
cmake .. -DPKSAV_STATIC=ON -G "Unix Makefiles" -DPKSAV_ENABLE_TESTS=OFF -DPKSAV_ENABLE_DOCS=OFF
cmake .. -DPKSAV_STATIC=ON -G "Unix Makefiles" -DPKSAV_ENABLE_TESTS=OFF -DPKSAV_ENABLE_DOCS=OFF -DPKSAV_ENABLE_APPS=OFF -DPKSAV_ENABLE_LIBRARY=OFF -DCMAKE_BUILD_TYPE=Release
make

- name: Build raylib
Expand All @@ -41,7 +41,10 @@ jobs:

- name: Copy assets
run: |
cp -r assets build
mkdir -p build/assets
cp assets/icon.ico build/assets/icon.ico
cp assets/pkrom.rc.data build/assets/pkrom.rc.data
cp -r assets/images build/assets

- name: Publish Build Artifacts
uses: actions/upload-artifact@v2
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ PLATFORM ?= PLATFORM_DESKTOP

# Define project variables
PROJECT_NAME ?= pokeromtrader
PROJECT_VERSION := 0.8.0
PROJECT_VERSION := 0.9.0
# prerelease or release
PROJECT_VERSION_TYPE ?= release
PROJECT_VERSION_TYPE ?= prerelease
PROJECT_BUILD_PATH ?= .

RAYLIB_PATH ?= deps/raylib
Expand Down Expand Up @@ -201,7 +201,7 @@ else
CFLAGS += -Os
endif
else
CFLAGS += -s -O2
CFLAGS += -O2
endif
endif

Expand Down
24 changes: 12 additions & 12 deletions deps/pksav/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -83,18 +83,18 @@ ENDIF(NOT PKSAV_USED_AS_SUBPROJECT)
ADD_SUBDIRECTORY(include)
ADD_SUBDIRECTORY(lib)

IF(PKSAV_ENABLE_APPS)
ADD_SUBDIRECTORY(apps)
ENDIF(PKSAV_ENABLE_APPS)

IF(PKSAV_ENABLE_DOCS)
ADD_SUBDIRECTORY(docs)
ENDIF(PKSAV_ENABLE_DOCS)

IF(PKSAV_ENABLE_TESTS)
ENABLE_TESTING()
ADD_SUBDIRECTORY(testing)
ENDIF(PKSAV_ENABLE_TESTS)
# IF(PKSAV_ENABLE_APPS)
# ADD_SUBDIRECTORY(apps)
# ENDIF(PKSAV_ENABLE_APPS)

# IF(PKSAV_ENABLE_DOCS)
# ADD_SUBDIRECTORY(docs)
# ENDIF(PKSAV_ENABLE_DOCS)

# IF(PKSAV_ENABLE_TESTS)
# ENABLE_TESTING()
# ADD_SUBDIRECTORY(testing)
# ENDIF(PKSAV_ENABLE_TESTS)

####################################################################
# Final display
Expand Down
2 changes: 0 additions & 2 deletions deps/pksav/include/pksav.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@
#include <pksav/gen1.h>
#include <pksav/gen2.h>
#include <pksav/gba.h>
#include <pksav/gen4/text.h>
#include <pksav/gen5/text.h>

#include <pksav/math/base256.h>
#include <pksav/math/bcd.h>
Expand Down
2 changes: 0 additions & 2 deletions deps/pksav/include/pksav/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ IF(NOT PKSAV_DONT_INSTALL_HEADERS)
ADD_SUBDIRECTORY(gen1)
ADD_SUBDIRECTORY(gen2)
ADD_SUBDIRECTORY(gba)
ADD_SUBDIRECTORY(gen4)
ADD_SUBDIRECTORY(gen5)

INSTALL(
FILES ${pksav_headers}
Expand Down
16 changes: 0 additions & 16 deletions deps/pksav/include/pksav/gen4/CMakeLists.txt

This file was deleted.

62 changes: 0 additions & 62 deletions deps/pksav/include/pksav/gen4/text.h

This file was deleted.

16 changes: 0 additions & 16 deletions deps/pksav/include/pksav/gen5/CMakeLists.txt

This file was deleted.

62 changes: 0 additions & 62 deletions deps/pksav/include/pksav/gen5/text.h

This file was deleted.

2 changes: 0 additions & 2 deletions deps/pksav/lib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,12 @@ ADD_SUBDIRECTORY(gen2)
ADD_SUBDIRECTORY(gba)

ADD_SUBDIRECTORY(common)
ADD_SUBDIRECTORY(crypto)
ADD_SUBDIRECTORY(math)
ADD_SUBDIRECTORY(util)

SET(pksav_c_sources
error.c
${pksav_common_sources}
${pksav_crypto_sources}
${pksav_math_sources}
${pksav_gen1_sources}
${pksav_gen2_sources}
Expand Down
1 change: 0 additions & 1 deletion deps/pksav/lib/common/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,4 @@ SET(pksav_common_sources
${CMAKE_CURRENT_SOURCE_DIR}/pokedex.c
${CMAKE_CURRENT_SOURCE_DIR}/pokerus.c
${CMAKE_CURRENT_SOURCE_DIR}/stats.c
${CMAKE_CURRENT_SOURCE_DIR}/xds_common.c
PARENT_SCOPE)
49 changes: 0 additions & 49 deletions deps/pksav/lib/common/prng.h

This file was deleted.

Loading
Loading