diff --git a/.gitignore b/.gitignore index d6f091b..d9e5a24 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ build-fat/ build-m68k/ build-ppc/ +build/ +.vscode/ diff --git a/.gitmodules b/.gitmodules index c01ecca..f70a63b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "opentransport-mbedtls"] path = opentransport-mbedtls url = git@github.com:cy384/opentransport-mbedtls.git +[submodule "libvterm"] + path = libvterm + url = git@github.com:cy384/cy384/libvterm diff --git a/CMakeLists.txt b/CMakeLists.txt index fa370cf..ec43b38 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ add_application(ssheven CREATOR "SSH7" ssheven.c ssheven-console.c ssheven.r ssh # set up and build mbedtls set(ENABLE_PROGRAMS OFF CACHE BOOL "disable mbedtls programs" FORCE) -set(UNSAFE_BUILD ON CACHE BOOL "ignore mac os jank fro mbedtls" FORCE) +set(UNSAFE_BUILD ON CACHE BOOL "ignore mac os jank for mbedtls" FORCE) set(ENABLE_TESTING OFF CACHE BOOL "disable mbedtls tests" FORCE) add_subdirectory(opentransport-mbedtls) @@ -21,6 +21,9 @@ set(BUILD_EXAMPLES OFF CACHE BOOL "disable libssh2 examples" FORCE) set(BUILD_TESTING OFF CACHE BOOL "disable libssh2 tests" FORCE) add_subdirectory(opentransport-libssh2) +# set up and build libvterm +add_subdirectory(libvterm) + IF(CMAKE_SYSTEM_NAME MATCHES Retro68) # for 68k set_target_properties(ssheven PROPERTIES COMPILE_FLAGS "-ffunction-sections -mcpu=68020 -O3 -Wall -Wextra -Wno-unused-parameter") @@ -30,5 +33,5 @@ ELSE() # for PPC set_target_properties(ssheven PROPERTIES COMPILE_FLAGS "-ffunction-sections -mcpu=601 -O3 -Wall -Wextra -Wno-unused-parameter") set_target_properties(ssheven PROPERTIES LINK_FLAGS "-Wl,-gc-sections") - target_link_libraries(ssheven ThreadsLib ssh2 mbedtls mbedx509 mbedcrypto OpenTransportAppPPC OpenTransportLib OpenTptInternetLib vterm retrocrt) + target_link_libraries(ssheven ThreadsLib libssh2 mbedtls mbedx509 mbedcrypto OpenTransportAppPPC OpenTransportLib OpenTptInternetLib vterm retrocrt) ENDIF() diff --git a/libvterm b/libvterm new file mode 160000 index 0000000..de55f41 --- /dev/null +++ b/libvterm @@ -0,0 +1 @@ +Subproject commit de55f41bbafa75be1050ccf002f7218a4e1b8dd0