Test
Some checks failed
Raspberry Pi 4 Build / Explore-Gitea-Actions (push) Failing after 1m23s

This commit is contained in:
Arron David Nelson 2024-01-30 19:07:51 -08:00
parent 894b99e678
commit 4adb0c0478
2 changed files with 3 additions and 10 deletions

View File

@ -237,11 +237,6 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION include)
install(TARGETS StrToHash DESTINATION bin) install(TARGETS StrToHash DESTINATION bin)
if (IS_ARCH_AMD64) if (IS_ARCH_AMD64)
target_include_directories(EHS PUBLIC "${PROJECT_SOURCE_DIR}/../Libraries/include")
target_include_directories(EHS PUBLIC "${PROJECT_SOURCE_DIR}/../Libraries/include/zlib")
target_link_directories(StrToHash PUBLIC "${PROJECT_SOURCE_DIR}/../Libraries/x64")
find_package(ZLIB REQUIRED) find_package(ZLIB REQUIRED)
if (ZLIB_FOUND) if (ZLIB_FOUND)
message(STATUS "ZLIB was found.") message(STATUS "ZLIB was found.")
@ -261,8 +256,6 @@ if (IS_ARCH_AMD64)
if (IS_OS_WINDOWS) if (IS_OS_WINDOWS)
target_link_libraries(StrToHash ws2_32 avrt EHS) target_link_libraries(StrToHash ws2_32 avrt EHS)
elseif (IS_OS_LINUX) elseif (IS_OS_LINUX)
#add_compile_definitions(EHS_WOOTING)
target_link_libraries(StrToHash z xcb xcb-cursor xcb-xfixes xcb-xinput wayland-client z asound EHS) target_link_libraries(StrToHash z xcb xcb-cursor xcb-xfixes xcb-xinput wayland-client z asound EHS)
endif () endif ()
endif () endif ()

View File

@ -1,6 +1,6 @@
#include "ehs/EHS.h" #include <ehs/EHS.h>
#include "ehs/Str.h" #include <ehs/Str.h>
#include "ehs/io/Console.h" #include <ehs/io/Console.h>
ehs::Int_32 Main(ehs::Str_8* appName, ehs::Str_8* appVerId, ehs::Version* appVer) ehs::Int_32 Main(ehs::Str_8* appName, ehs::Str_8* appVerId, ehs::Version* appVer)
{ {