Also set warnings to errors for Windows build, fix one of those warnings.
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
parent
ef28f9cd52
commit
f5aa168f1b
@ -39,7 +39,7 @@ target_link_libraries(CreatureLibTests CreatureLibLibrary)
|
||||
target_link_libraries(CreatureLibTests CreatureLibBattling)
|
||||
|
||||
if (WINDOWS)
|
||||
set(CMAKE_CXX_FLAGS "-m64 -Wa,-mbig-obj -Wl,-allow-multiple-definition")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64 -Wa,-mbig-obj -Wl,-allow-multiple-definition")
|
||||
# Statically link libraries we need in Windows.
|
||||
target_link_libraries(CreatureLibCore -static -static-libgcc -static-libstdc++)
|
||||
target_link_libraries(CreatureLibLibrary -static -static-libgcc -static-libstdc++)
|
||||
|
@ -11,10 +11,10 @@
|
||||
namespace CreatureLib::Battling {
|
||||
class ScriptAggregator {
|
||||
std::vector<ScriptWrapper> _scripts;
|
||||
int _index = 0;
|
||||
size_t _index = 0;
|
||||
bool _isSetSet = false;
|
||||
const std::vector<Script*>* _setScripts;
|
||||
int _setIndex;
|
||||
size_t _setIndex;
|
||||
|
||||
public:
|
||||
ScriptAggregator(std::vector<ScriptWrapper> scripts) : _scripts(std::move(scripts)){};
|
||||
|
Loading…
x
Reference in New Issue
Block a user