diff --git a/CMakeLists.txt b/CMakeLists.txt index 5a9f3e81..610069ca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,8 +47,8 @@ if(WIN32) elseif(UNIX) find_package(Curses REQUIRED) - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -DDEBUG_LEVEL=2 -DPRODUCTION=0 -g3 -pipe -O0 -Wall -Wno-overloaded-virtual -Wno-missing-braces -Wno-format -Wno-unused-but-set-variable -Wno-write-strings -Wno-unknown-pragmas -Wno-uninitialized -Wno-reorder") - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DDEBUG_LEVEL=0 -DPRODUCTION=1 -pipe -mtune=native -O2 -Wno-overloaded-virtual -Wno-missing-braces -Wno-format -Wno-unused-but-set-variable -Wno-write-strings -Wno-unknown-pragmas -Wno-uninitialized -Wno-reorder") + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -DDEBUG_LEVEL=2 -DPRODUCTION=0 -g3 -pipe -O0 -Wall -Wno-overloaded-virtual -Wno-missing-braces -Wno-format -Wno-write-strings -Wno-unknown-pragmas -Wno-uninitialized -Wno-reorder") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DDEBUG_LEVEL=0 -DPRODUCTION=1 -pipe -mtune=native -O2 -Wno-overloaded-virtual -Wno-missing-braces -Wno-format -Wno-write-strings -Wno-unknown-pragmas -Wno-uninitialized -Wno-reorder") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -D_GLIBCXX_USE_CXX11_ABI=0") add_definitions(-DLINUX -D_REENTRANT -Dlinux -D_USING_STL -D__STL_NO_BAD_ALLOC -D_GNU_SOURCE -D_XOPEN_SOURCE=500) diff --git a/engine/server/library/serverGame/src/shared/object/ShipObject_Components.cpp b/engine/server/library/serverGame/src/shared/object/ShipObject_Components.cpp index 956fe79d..e6f4cb22 100755 --- a/engine/server/library/serverGame/src/shared/object/ShipObject_Components.cpp +++ b/engine/server/library/serverGame/src/shared/object/ShipObject_Components.cpp @@ -1941,7 +1941,7 @@ bool ShipObject::installComponentFromData(int chassisSlot, ShipComponentData con shipComponentData.getDescriptor().getName().getString(), shipComponentData.getDescriptor().getCompatibility().getString(), getNetworkId().getValueString().c_str(), - chassis, + chassis.c_str(), ShipChassisSlotType::getNameFromType(static_cast(chassisSlot)).c_str(), slot->getCompatibilityString().c_str())); return false;