quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

it now compiles on OS X, but does it work?

Browse Source 
git-svn-id: svn://svn.icculus.org/netradiant/trunk@169 61c419a2-8eb2-4b30-bcec-8cead039b335
This commit is contained in:
divverent 2009-01-09 22:44:43 +00:00
parent 2fbd497884
commit e467f40d4a
5 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -259,7 +259,7 @@ dependencies-check:
checkbinary binutils "$(AR)"; \ checkbinary binutils "$(AR)"; \
checkbinary pkg-config "$(PKGCONFIG)"; \ checkbinary pkg-config "$(PKGCONFIG)"; \
[ "$(OS)" = "Win32" ] && checkbinary mingw32 "$(WINDRES)"; \ [ "$(OS)" = "Win32" ] && checkbinary mingw32 "$(WINDRES)"; \
[ "$(OS)" != "Win32" ] && checkbinary libc6 "$(LDD)"; \ [ -n "$(lDD)" ] && checkbinary libc6 "$(LDD)"; \
$(ECHO) All required tools have been found! $(ECHO) All required tools have been found!
@$(ECHO) @$(ECHO)
@if [ x"$(DEPENDENCIES_CHECK)" = x"verbose" ]; then set -x; fi; \ @if [ x"$(DEPENDENCIES_CHECK)" = x"verbose" ]; then set -x; fi; \
@ -481,8 +481,8 @@ libddslib.$(A): CPPFLAGS_EXTRA := -Ilibs
libddslib.$(A): \ libddslib.$(A): \
libs/ddslib/ddslib.o \ libs/ddslib/ddslib.o \
$(INSTALLDIR)/q3data.$(EXE): LIBS_EXTRA := $(LIBS_XML) $(LIBS_GLIB) $(INSTALLDIR)/q3data.$(EXE): LIBS_EXTRA := $(LIBS_XML) $(LIBS_GLIB) $(LIBS_ZLIB)
$(INSTALLDIR)/q3data.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) -Itools/quake3/common -Ilibs -Iinclude $(INSTALLDIR)/q3data.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) $(CPPFLAGS_ZLIB) -Itools/quake3/common -Ilibs -Iinclude
$(INSTALLDIR)/q3data.$(EXE): \ $(INSTALLDIR)/q3data.$(EXE): \
tools/quake3/common/aselib.o \ tools/quake3/common/aselib.o \
tools/quake3/common/bspfile.o \ tools/quake3/common/bspfile.o \

2
contrib/sunplug/sunplug.cpp
View File

@ -39,7 +39,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
void about_plugin_window(); void about_plugin_window();
void MapCoordinator(); void MapCoordinator();
#ifdef __linux__ #ifndef _WIN32
// linux itoa implementation // linux itoa implementation
char* itoa( int value, char* result, int base ) char* itoa( int value, char* result, int base )
{ {

2
radiant/texwindow.cpp
View File

@ -1917,7 +1917,7 @@ void TextureBrowser_searchTags()
{ {
size_t shaders_found = g_TextureBrowser.m_found_shaders.size(); size_t shaders_found = g_TextureBrowser.m_found_shaders.size();
globalOutputStream() << "Found " << shaders_found << " textures and shaders with " << tags_searched << "\n"; globalOutputStream() << "Found " << (unsigned int)shaders_found << " textures and shaders with " << (unsigned int)tags_searched << "\n";
ScopeDisableScreenUpdates disableScreenUpdates("Searching...", "Loading Textures"); ScopeDisableScreenUpdates disableScreenUpdates("Searching...", "Loading Textures");
std::set<CopiedString>::iterator iter; std::set<CopiedString>::iterator iter;

6
tools/quake2/common/threads.c
View File

@ -542,11 +542,7 @@ void RunThreadsOn (int workcnt, qboolean showpacifier, void(*func)(int))
if(pthread_mutexattr_init(&mattrib) != 0) if(pthread_mutexattr_init(&mattrib) != 0)
Error("pthread_mutexattr_init failed"); Error("pthread_mutexattr_init failed");
#if __GLIBC_MINOR__ == 1 if (pthread_mutexattr_settype(&mattrib, PTHREAD_MUTEX_ERRORCHECK) != 0)
if (pthread_mutexattr_settype(&mattrib, PTHREAD_MUTEX_FAST_NP) != 0)
#else
if (pthread_mutexattr_settype(&mattrib, PTHREAD_MUTEX_ADAPTIVE_NP) != 0)
#endif
Error ("pthread_mutexattr_settype failed"); Error ("pthread_mutexattr_settype failed");
recursive_mutex_init(mattrib); recursive_mutex_init(mattrib);

8
tools/quake3/common/threads.c
View File

@ -415,7 +415,7 @@ void RunThreadsOn (int workcnt, qboolean showpacifier, void(*func)(int))
======================================================================= =======================================================================
*/ */
#ifdef __linux__ #if defined(__linux__) || defined(__APPLE__)
#define USED #define USED
int numthreads = 4; int numthreads = 4;
@ -540,11 +540,7 @@ void RunThreadsOn (int workcnt, qboolean showpacifier, void(*func)(int))
if(pthread_mutexattr_init(&mattrib) != 0) if(pthread_mutexattr_init(&mattrib) != 0)
Error("pthread_mutexattr_init failed"); Error("pthread_mutexattr_init failed");
#if __GLIBC_MINOR__ == 1 if (pthread_mutexattr_settype(&mattrib, PTHREAD_MUTEX_ERRORCHECK) != 0)
if (pthread_mutexattr_settype(&mattrib, PTHREAD_MUTEX_FAST_NP) != 0)
#else
if (pthread_mutexattr_settype(&mattrib, PTHREAD_MUTEX_ADAPTIVE_NP) != 0)
#endif
Error ("pthread_mutexattr_settype failed"); Error ("pthread_mutexattr_settype failed");
recursive_mutex_init(mattrib); recursive_mutex_init(mattrib);