mirror of
https://github.com/SWG-Source/src.git
synced 2026-07-31 00:15:55 -04:00
remove -s (strip) flag for now as it is gcc specific, fix a couple errors clang found
This commit is contained in:
+1
-1
@@ -48,7 +48,7 @@ elseif(UNIX)
|
||||
find_package(Curses REQUIRED)
|
||||
|
||||
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -DDEBUG_LEVEL=2 -DPRODUCTION=0 -g -pipe -Wall -Wno-unknown-pragmas -Wno-reorder -O0")
|
||||
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DDEBUG_LEVEL=0 -DPRODUCTION=1 -march=native -pipe -mtune=native -O2 -s")
|
||||
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DDEBUG_LEVEL=0 -DPRODUCTION=1 -march=native -pipe -mtune=native -O2 ")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-write-strings -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)
|
||||
|
||||
@@ -63,8 +63,8 @@ public:
|
||||
void getAsDbTextString(std::string &result, int maxNibbleCount = 32767) const;
|
||||
void setFromDbTextString(const char * text);
|
||||
|
||||
friend void Archive::get (ReadIterator &source, BitArray &target);
|
||||
friend void Archive::put (ByteStream &target, const BitArray &source);
|
||||
friend void Archive::get (Archive::ReadIterator &source, BitArray &target);
|
||||
friend void Archive::put (Archive::ByteStream &target, const BitArray &source);
|
||||
|
||||
private:
|
||||
// *****WARNING***** *****WARNING***** *****WARNING***** *****WARNING*****
|
||||
|
||||
@@ -161,8 +161,8 @@ private:
|
||||
mutable bool m_cachedValueDirty;
|
||||
mutable void * m_cachedValue[2];
|
||||
|
||||
friend void Archive::get(ReadIterator & source, DynamicVariable & target);
|
||||
friend void Archive::put(ByteStream & target, const DynamicVariable & source);
|
||||
friend void Archive::get(Archive::ReadIterator & source, DynamicVariable & target);
|
||||
friend void Archive::put(Archive::ByteStream & target, const DynamicVariable & source);
|
||||
};
|
||||
|
||||
//========================================================================
|
||||
|
||||
Reference in New Issue
Block a user