Compare commits

...

5 Commits

Author SHA1 Message Date
OmniStudent 8ab5f94e40 test file add 2014-05-20 07:37:43 +02:00
OmniStudent 1fa7b8a3f7 removed cmakecache 2014-05-04 11:36:48 +02:00
OmniStudent 49806c4c79 applied patch mt6 2014-05-04 10:58:43 +02:00
OmniStudent 1b5d24a5b2 applied patch mt5 2014-05-04 10:58:03 +02:00
OmniStudent 8f2a45c2f5 applied patch mt4 2014-05-04 10:57:09 +02:00
7 changed files with 8 additions and 7 deletions

BIN
.DS_Store vendored

Binary file not shown.

BIN
minetest/.DS_Store vendored

Binary file not shown.

BIN
minetest/src/.DS_Store vendored

Binary file not shown.

View File

@ -614,7 +614,7 @@ if(MSVC)
else()
# Probably GCC
SET( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pagezero_size 10000 -image_base 100000000" )
if(WARN_ALL)
set(RELEASE_WARNING_FLAGS "-Wall")
else()
@ -632,12 +632,12 @@ else()
set(OTHER_FLAGS "-mthreads -fexceptions")
endif()
if(APPLE)
set(CMAKE_OSX_ARCHITECTURES i386 CACHE STRING "do not build for 64-bit" FORCE)
set(ARCH i386)
endif()
#if(APPLE)
# set(CMAKE_OSX_ARCHITECTURES i386 CACHE STRING "do not build for 64-bit" FORCE)
# set(ARCH i386)
#endif()
set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} ${OTHER_FLAGS} -O3 -ffast-math -Wall -fomit-frame-pointer -pipe -funroll-loops")
set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} ${OTHER_FLAGS} -O3 -ffast-math -Wall -pipe -funroll-loops")
set(CMAKE_CXX_FLAGS_DEBUG "-g -O1 -Wall ${WARNING_FLAGS} ${OTHER_FLAGS}")
if(USE_GPROF)

View File

@ -56,7 +56,7 @@ private:
#else
semaphore_t m_semaphore;
#endif
int semcount = 0;
int semcount;
};

View File

@ -75,6 +75,7 @@ JSemaphore::JSemaphore() {
int sem_init_retval = sem_init(&m_semaphore,0,0);
assert(sem_init_retval == 0);
UNUSED(sem_init_retval);
semcount = 0;
}
JSemaphore::~JSemaphore() {

0
minetest/test.txt Normal file
View File