Skip to content

Commit

Permalink
Update GRRLIB
Browse files Browse the repository at this point in the history
  • Loading branch information
Crayon2000 committed Oct 19, 2024
1 parent 58fc16c commit bfe0167
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 8 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ All notable changes to this project will be documented in this file.

- Library update
- GRRMOD (afe20fa4c1d0245148dfa290fc916f14195e458d)
- GRRLIB (35ddfba78a139e2e0a676fda38d6675e397f493a)

## 1.1.0

Expand Down
10 changes: 2 additions & 8 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ FetchContent_Declare(fmt
)
FetchContent_Declare(grrlib
GIT_REPOSITORY https://github.com/GRRLIB/GRRLIB.git
GIT_TAG d93847e6a3e350bd1157d61cc1315d8bbff76968
GIT_TAG 35ddfba78a139e2e0a676fda38d6675e397f493a
)
FetchContent_Declare(grrmod
URL https://codeload.github.com/GRRLIB/GRRMOD/tar.gz/afe20fa4c1d0245148dfa290fc916f14195e458d
Expand All @@ -32,10 +32,7 @@ FetchContent_MakeAvailable(fmt grrlib grrmod)

file(GLOB_RECURSE SRC_FILES
"${CMAKE_CURRENT_SOURCE_DIR}/source/*.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/source/*.c"
"${CMAKE_CURRENT_SOURCE_DIR}/fonts/*.cpp"
"${grrlib_SOURCE_DIR}/GRRLIB/GRRLIB/*.c"
"${grrlib_SOURCE_DIR}/GRRLIB/lib/pngu/*.c"
)

file(GLOB_RECURSE BIN_FILES
Expand Down Expand Up @@ -63,10 +60,6 @@ target_sources(Wii-Tac-Toe PRIVATE

target_include_directories(Wii-Tac-Toe PRIVATE
"${CMAKE_CURRENT_SOURCE_DIR}/source"
"${grrlib_SOURCE_DIR}/GRRLIB/GRRLIB"
"${grrlib_SOURCE_DIR}/GRRLIB/lib/pngu"
${PNG_INCLUDE_DIRS}
${FREETYPE_INCLUDE_DIRS}
${MXML_INCLUDE_DIRS}
)

Expand All @@ -77,6 +70,7 @@ dkp_add_embedded_binary_library(data
target_link_libraries(Wii-Tac-Toe PRIVATE
data
fmt::fmt
grrlib
grrmod
${PNG_LIBRARIES}
${FREETYPE_LIBRARIES}
Expand Down

0 comments on commit bfe0167

Please sign in to comment.