Deukhoofd
/
PkmnLib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use lld for Clang.
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Deukhoofd 2020-09-29 18:28:54 +02:00
parent 9a91d356e0
commit 1686434440
Signed by: Deukhoofd
GPG Key ID: F63E044490819F6F
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CMakeLists.txt
View File

@ -17,6 +17,10 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
add_compile_options(-fconcepts) add_compile_options(-fconcepts)
endif () endif ()
if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
add_link_options(-fuse-ld=lld)
endif ()
if (WINDOWS) if (WINDOWS)
SET(CMAKE_SYSTEM_NAME Windows) SET(CMAKE_SYSTEM_NAME Windows)
ADD_DEFINITIONS(-D WINDOWS=1) ADD_DEFINITIONS(-D WINDOWS=1)
@ -34,8 +38,19 @@ message(STATUS "Using:
\t CXX ABI ${CMAKE_CXX_COMPILER_ABI} \t CXX ABI ${CMAKE_CXX_COMPILER_ABI}
\t C++ Version ${CMAKE_CXX_STANDARD}") \t C++ Version ${CMAKE_CXX_STANDARD}")
if (LEVEL_SIZE STREQUAL "8") if (LEVEL_SIZE STREQUAL "8")
add_definitions(-DLEVEL_U8) add_definitions(-DLEVEL_U8)
message(STATUS "Using level size of 8")
elseif (LEVEL_SIZE STREQUAL "16")
add_definitions(-DLEVEL_U16)
message(STATUS "Using level size of 16")
elseif (LEVEL_SIZE STREQUAL "32")
add_definitions(-DLEVEL_U32)
message(STATUS "Using level size of 32")
elseif (LEVEL_SIZE STREQUAL "64")
add_definitions(-DLEVEL_U64)
message(STATUS "Using level size of 64")
else () else ()
message(FATAL_ERROR, "Invalid level size was given.") message(FATAL_ERROR, "Invalid level size was given.")
endif () endif ()

2
src/Library/Species/LearnableMoves.hpp
View File

@ -9,7 +9,7 @@ namespace PkmnLib::Library {
ArbUt::List<ArbUt::BorrowedPtr<const MoveData>> _eggMoves; ArbUt::List<ArbUt::BorrowedPtr<const MoveData>> _eggMoves;
public: public:
explicit LearnableMoves(size_t levelAttackCapacity) : LearnableAttacks(levelAttackCapacity) {} explicit LearnableMoves(level_int_t levelAttackCapacity) : LearnableAttacks(levelAttackCapacity) {}
void AddEggMove(const ArbUt::BorrowedPtr<const MoveData>& move) noexcept { void AddEggMove(const ArbUt::BorrowedPtr<const MoveData>& move) noexcept {
if (!_eggMoves.Contains(move)) if (!_eggMoves.Contains(move))