mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-18 06:01:17 +02:00
Code Issues Projects Releases Wiki Activity

- add support for gcc6 in build script -g 6

Browse Source 
- fix issue #132
This commit is contained in:
SoftCoder
2016-10-17 19:05:21 -07:00
parent 6d7bb258a9
commit 2107958ad2
3 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/glest_game

Submodule data/glest_game updated: 0834a3d327...a1e6be2182

15
mk/linux/build-mg.sh
View File

@@ -20,12 +20,13 @@ MAKE_ONLY=0
CLANG_FORCED=0 CLANG_FORCED=0
WANT_STATIC_LIBS="-DWANT_STATIC_LIBS=ON" WANT_STATIC_LIBS="-DWANT_STATIC_LIBS=ON"
FORCE_EMBEDDED_LIBS=0 FORCE_EMBEDDED_LIBS=0
GCC_FORCED_VERSION=0
LUA_FORCED_VERSION=0 LUA_FORCED_VERSION=0
FORCE_32BIT_CROSS_COMPILE=0 FORCE_32BIT_CROSS_COMPILE=0
COMPILATION_WITHOUT=0 COMPILATION_WITHOUT=0
BUILD_MEGAGLEST_TESTS="ON" BUILD_MEGAGLEST_TESTS="ON"
while getopts "c:defhl:mnwx" option; do while getopts "c:defg:hl:mnwx" option; do
case "${option}" in case "${option}" in
c) c)
CPU_COUNT=${OPTARG} CPU_COUNT=${OPTARG}
@@ -43,14 +44,19 @@ while getopts "c:defhl:mnwx" option; do
CLANG_FORCED=1 CLANG_FORCED=1
# echo "${option} value: ${OPTARG}" # echo "${option} value: ${OPTARG}"
;; ;;
g)
GCC_FORCED_VERSION=${OPTARG}
echo "${option} value: ${OPTARG} GCC_FORCED_VERSION [${GCC_FORCED_VERSION}]"
;;
h) h)
echo "Usage: $0 <option>" echo "Usage: $0 <option>"
echo " where <option> can be: -c x, -d, -e, -f, -m, -n, -h, -l x, -w, -x" echo " where <option> can be: -c x, -d, -e, -f, -m, -n, -h, -l x, -w, -x -g"
echo " option descriptions:" echo " option descriptions:"
echo " -c x : Force the cpu / cores count to x - example: -c 4" echo " -c x : Force the cpu / cores count to x - example: -c 4"
echo " -d : Force DYNAMIC compile (do not want static libs)" echo " -d : Force DYNAMIC compile (do not want static libs)"
echo " -e : Force compile with EMBEDDED libraries" echo " -e : Force compile with EMBEDDED libraries"
echo " -f : Force using CLANG compiler" echo " -f : Force using CLANG compiler"
echo " -g x : Force using GCC version x - example: -g 6"
echo " -l x : Force using LUA version x - example: -l 5.3" echo " -l x : Force using LUA version x - example: -l 5.3"
echo " -m : Force running CMAKE only to create Make files (do not compile)" echo " -m : Force running CMAKE only to create Make files (do not compile)"
echo " -n : Force running MAKE only to compile (assume CMAKE already built make files)" echo " -n : Force running MAKE only to compile (assume CMAKE already built make files)"
@@ -264,6 +270,11 @@ elif [ "`echo $CC | grep -oF 'clang'`" = 'clang' -a "`echo $CXX | grep -oF 'clan
#exit 1; #exit 1;
fi fi
if [ "$GCC_FORCED_VERSION" != "0" ] && [ "$GCC_FORCED_VERSION" != "" ]; then
EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DCMAKE_C_COMPILER=$(which gcc-$GCC_FORCED_VERSION) -DCMAKE_CXX_COMPILER=$(which g++-$GCC_FORCED_VERSION)"
echo "USER WANTS TO FORCE USE of GCC $GCC_FORCED_VERSION"
fi
if [ "$LUA_FORCED_VERSION" != "0" ] && [ "$LUA_FORCED_VERSION" != "" ]; then if [ "$LUA_FORCED_VERSION" != "0" ] && [ "$LUA_FORCED_VERSION" != "" ]; then
EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DFORCE_LUA_VERSION=$LUA_FORCED_VERSION" EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DFORCE_LUA_VERSION=$LUA_FORCED_VERSION"
#echo "USER WANTS TO FORCE USE of LUA $LUA_FORCED_VERSION" #echo "USER WANTS TO FORCE USE of LUA $LUA_FORCED_VERSION"

20
source/shared_lib/sources/platform/sdl/thread.cpp
View File

@@ -156,16 +156,18 @@ void Thread::addThreadToList() {
} }
void Thread::removeThreadFromList() { void Thread::removeThreadFromList() {
MutexSafeWrapper safeMutex(&Thread::mutexthreadList); MutexSafeWrapper safeMutex(&Thread::mutexthreadList);
std::vector<Thread *>::iterator iterFind = std::find(Thread::threadList.begin(),Thread::threadList.end(),this); if(Thread::threadList.empty() == false) {
if(iterFind == Thread::threadList.end()) { std::vector<Thread *>::iterator iterFind = std::find(Thread::threadList.begin(),Thread::threadList.end(),this);
if(this != cleanupThread.get()) { if(iterFind == Thread::threadList.end()) {
char szBuf[8096]=""; if(this != cleanupThread.get()) {
snprintf(szBuf,8095,"In [%s::%s Line: %d] iterFind == Thread::threadList.end()",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__); char szBuf[8096]="";
throw megaglest_runtime_error(szBuf); snprintf(szBuf,8095,"In [%s::%s Line: %d] iterFind == Thread::threadList.end() Thread::threadList.size() = %ld",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,Thread::threadList.size());
throw megaglest_runtime_error(szBuf);
}
}
else {
Thread::threadList.erase(iterFind);
} }
}
else {
Thread::threadList.erase(iterFind);
} }
safeMutex.ReleaseLock(); safeMutex.ReleaseLock();
} }