Skip to content

Commit

Permalink
Add ghc submodule
Browse files Browse the repository at this point in the history
  • Loading branch information
CookiePLMonster committed Feb 14, 2022
1 parent 9b84455 commit 7311352
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 0 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,6 @@
[submodule "flac"]
path = flac
url = https://github.com/CookiePLMonster/flac
[submodule "ghc"]
path = ghc
url = https://github.com/gulrak/filesystem
8 changes: 8 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ if(NOT EXISTS ${PROJECT_SOURCE_DIR}/miniaudio/miniaudio.h)
message(FATAL_ERROR "The miniaudio directory is empty. Run 'git submodule update --init --recursive' to populate it.")
endif()

if(NOT EXISTS ${PROJECT_SOURCE_DIR}/ghc/include/ghc/filesystem.hpp)
message(FATAL_ERROR "The ghc directory is empty. Run 'git submodule update --init --recursive' to populate it.")
endif()

# Build tinyxml2. I didn't bother with tinyxml2's actual CMake integration
# because it's far easier do do this. It is a single-file library after all.
add_library (tinyxml2 STATIC tinyxml2/tinyxml2.cpp)
Expand All @@ -56,6 +60,9 @@ if(NOT MKPSXISO_NO_LIBFLAC)
add_subdirectory(flac EXCLUDE_FROM_ALL)
endif()

# Add ghc to support filesystem on MacOS
add_subdirectory(ghc EXCLUDE_FROM_ALL)

## Internal dependencies

# Populate shared files
Expand All @@ -66,6 +73,7 @@ add_library(iso_shared OBJECT
)
target_include_directories(iso_shared PUBLIC ${shared_dir})
target_compile_definitions(iso_shared PUBLIC VERSION="${PROJECT_VERSION}")
target_link_libraries(iso_shared ghc_filesystem)

find_package(Threads REQUIRED)

Expand Down
1 change: 1 addition & 0 deletions ghc
Submodule ghc added at f43734

0 comments on commit 7311352

Please sign in to comment.