mirror of
https://github.com/luanti-org/luanti.git
synced 2025-09-15 18:57:08 +00:00
Minetest for C++11 (CMakeLists + Travis)
* Move GCC to GCC 6 & GCC 7 * Move Clang to Clang 3.6 & Clang 4.0 * LINT moves from Clang 3.9 to Clang 4.0 * Move XCode 7.3 to 8.0 * Use more travis tricks to install compilers instead of adding complexity to our build script * Clang format fixes on checked files (compat Cpp11 instead of Cpp03) * Mingw GCC update from 4.8.4 to 5.3 (Ubuntu Xenial) * Drop mingw cmake generated files and add them to gitignore
This commit is contained in:
parent
0e58168fe5
commit
bf6569b570
16 changed files with 149 additions and 77 deletions
|
@ -708,7 +708,7 @@ include(CheckCXXCompilerFlag)
|
|||
|
||||
if(MSVC)
|
||||
# Visual Studio
|
||||
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++11")
|
||||
# EHa enables SEH exceptions (used for catching segfaults)
|
||||
set(CMAKE_CXX_FLAGS_RELEASE "/EHa /Ox /GL /FD /MT /GS- /Zi /arch:SSE /fp:fast /D NDEBUG /D _HAS_ITERATOR_DEBUGGING=0 /TP")
|
||||
#set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/LTCG /NODEFAULTLIB:\"libcmtd.lib\" /NODEFAULTLIB:\"libcmt.lib\"")
|
||||
|
@ -728,9 +728,10 @@ if(MSVC)
|
|||
# /MT = Link statically with standard library stuff
|
||||
set(CMAKE_C_FLAGS_RELEASE "/O2 /Ob2 /MT")
|
||||
else()
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
|
||||
# Probably GCC
|
||||
if(APPLE)
|
||||
SET( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pagezero_size 10000 -image_base 100000000" )
|
||||
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pagezero_size 10000 -image_base 100000000" )
|
||||
endif()
|
||||
if(WARN_ALL)
|
||||
set(RELEASE_WARNING_FLAGS "-Wall")
|
||||
|
|
|
@ -40,6 +40,7 @@ public:
|
|||
|
||||
void beginSave() {}
|
||||
void endSave() {}
|
||||
|
||||
private:
|
||||
std::map<s64, std::string> m_database;
|
||||
};
|
||||
|
|
|
@ -41,6 +41,7 @@ public:
|
|||
|
||||
void beginSave() {}
|
||||
void endSave() {}
|
||||
|
||||
private:
|
||||
leveldb::DB *m_database;
|
||||
};
|
||||
|
|
|
@ -79,6 +79,7 @@ public:
|
|||
u32 m_added_objects;
|
||||
|
||||
IGameDef *getGameDef() { return m_gamedef; }
|
||||
|
||||
protected:
|
||||
GenericAtomic<float> m_time_of_day_speed;
|
||||
|
||||
|
|
|
@ -80,6 +80,7 @@ public:
|
|||
return true;
|
||||
}
|
||||
u16 size() const { return m_id_to_name.size(); }
|
||||
|
||||
private:
|
||||
UNORDERED_MAP<u16, std::string> m_id_to_name;
|
||||
UNORDERED_MAP<std::string, u16> m_name_to_id;
|
||||
|
|
|
@ -32,6 +32,7 @@ class MetaDataRef : public ModApiBase
|
|||
{
|
||||
public:
|
||||
virtual ~MetaDataRef() {}
|
||||
|
||||
protected:
|
||||
static MetaDataRef *checkobject(lua_State *L, int narg);
|
||||
|
||||
|
|
|
@ -172,7 +172,7 @@ private:
|
|||
IEventReceiver *m_receiver;
|
||||
ISimpleTextureSource *m_texturesource;
|
||||
v2u32 m_screensize;
|
||||
std::map<int, rect<s32> > m_hud_rects;
|
||||
std::map<int, rect<s32>> m_hud_rects;
|
||||
std::map<int, irr::EKEY_CODE> m_hud_ids;
|
||||
bool m_visible; // is the gui visible
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue