Skip to content

Commit

Permalink
Integrate Helix and replace TTS
Browse files Browse the repository at this point in the history
  • Loading branch information
dcvz committed Mar 9, 2023
1 parent 4a89c20 commit 8b56ca4
Show file tree
Hide file tree
Showing 11 changed files with 69 additions and 272 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "libultraship"]
path = libultraship
url = https://github.com/kenix3/libultraship.git
[submodule "helix"]
path = helix
url = [email protected]:dcvz/helix.git
1 change: 1 addition & 0 deletions helix
Submodule helix added at bc2b6a
30 changes: 20 additions & 10 deletions soh/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -145,15 +145,6 @@ if (!BUILD_CROWD_CONTROL)
list(FILTER soh__Enhancements EXCLUDE REGEX "soh/Enhancements/crowd-control/*")
endif()

# handle speechsynthesizer removals
if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
list(FILTER soh__Enhancements EXCLUDE REGEX "soh/Enhancements/speechsynthesizer/Darwin*")
elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
list(FILTER soh__Enhancements EXCLUDE REGEX "soh/Enhancements/speechsynthesizer/SAPI*")
else()
list(FILTER soh__Enhancements EXCLUDE REGEX "soh/Enhancements/speechsynthesizer/(Darwin|SAPI).*")
endif()

source_group("soh\\Enhancements" REGULAR_EXPRESSION "soh/Enhancements/*")
source_group("soh\\Enhancements\\audio" REGULAR_EXPRESSION "soh/Enhancements/audio/*")
source_group("soh\\Enhancements\\controls" REGULAR_EXPRESSION "soh/Enhancements/controls/*")
Expand All @@ -167,7 +158,6 @@ source_group("soh\\Enhancements\\randomizer" REGULAR_EXPRESSION "soh/Enhancement
source_group("soh\\Enhancements\\randomizer\\3drando" REGULAR_EXPRESSION "soh/Enhancements/randomizer/3drando/*")
source_group("soh\\Enhancements\\randomizer\\3drando\\hint_list" REGULAR_EXPRESSION "soh/Enhancements/randomizer/3drando/hint_list/*")
source_group("soh\\Enhancements\\randomizer\\3drando\\location_access" REGULAR_EXPRESSION "soh/Enhancements/randomizer/3drando/location_access/*")
source_group("soh\\Enhancements\\speechsynthesizer" REGULAR_EXPRESSION "soh/Enhancements/speechsynthesizer/*")
source_group("soh\\Enhancements\\tts" REGULAR_EXPRESSION "soh/Enhancements/tts/*")

if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
Expand Down Expand Up @@ -315,6 +305,18 @@ else()
message("Boost found in " ${Boost_INCLUDE_DIRS})
set(BOOST-INCLUDE ${Boost_INCLUDE_DIRS})
endif()
################################################################################
# Rust Build
################################################################################
FetchContent_Declare(
Corrosion
GIT_REPOSITORY https://github.com/corrosion-rs/corrosion.git
GIT_TAG v0.3
)
FetchContent_MakeAvailable(Corrosion)

corrosion_import_crate(MANIFEST_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../helix/Cargo.toml)

################################################################################
# Compile definitions
################################################################################
Expand All @@ -329,6 +331,7 @@ endif()
target_include_directories(${PROJECT_NAME} PRIVATE assets
${CMAKE_CURRENT_SOURCE_DIR}/include/
${CMAKE_CURRENT_SOURCE_DIR}/src/
${CMAKE_CURRENT_SOURCE_DIR}/../helix/include
${CMAKE_CURRENT_SOURCE_DIR}/../libultraship
${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/include
${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/binarytools
Expand Down Expand Up @@ -604,12 +607,15 @@ endif()
add_dependencies(${PROJECT_NAME}
ZAPDUtils
libultraship
helix
)


if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
set(ADDITIONAL_LIBRARY_DEPENDENCIES
"libultraship;"
"helix;"
"ZAPDUtils;"
"glu32;"
"SDL2::SDL2;"
Expand All @@ -624,6 +630,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32")
set(ADDITIONAL_LIBRARY_DEPENDENCIES
"libultraship;"
"helix;"
"ZAPDUtils;"
"glu32;"
"SDL2::SDL2;"
Expand All @@ -641,6 +648,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "NintendoSwitch")
find_package(Threads REQUIRED)
set(ADDITIONAL_LIBRARY_DEPENDENCIES
"libultraship;"
"helix;"
"ZAPDUtils;"
SDL2::SDL2
-lglad
Expand All @@ -650,6 +658,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "CafeOS")
find_package(SDL2 REQUIRED)
set(ADDITIONAL_LIBRARY_DEPENDENCIES
"libultraship;"
"helix;"
"ZAPDUtils;"
SDL2::SDL2-static

Expand All @@ -664,6 +673,7 @@ else()
find_package(Threads REQUIRED)
set(ADDITIONAL_LIBRARY_DEPENDENCIES
"libultraship;"
"helix;"
"ZAPDUtils;"
SDL2::SDL2
"$<$<BOOL:${BUILD_CROWD_CONTROL}>:SDL2_net::SDL2_net>"
Expand Down
27 changes: 0 additions & 27 deletions soh/soh/Enhancements/speechsynthesizer/DarwinSpeechSynthesizer.h

This file was deleted.

33 changes: 0 additions & 33 deletions soh/soh/Enhancements/speechsynthesizer/DarwinSpeechSynthesizer.mm

This file was deleted.

56 changes: 0 additions & 56 deletions soh/soh/Enhancements/speechsynthesizer/SAPISpeechSynthesizer.cpp

This file was deleted.

25 changes: 0 additions & 25 deletions soh/soh/Enhancements/speechsynthesizer/SAPISpeechSynthesizer.h

This file was deleted.

32 changes: 0 additions & 32 deletions soh/soh/Enhancements/speechsynthesizer/SpeechSynthesizer.cpp

This file was deleted.

38 changes: 0 additions & 38 deletions soh/soh/Enhancements/speechsynthesizer/SpeechSynthesizer.h

This file was deleted.

Loading

0 comments on commit 8b56ca4

Please sign in to comment.