forked from 0ad/0ad
Patch from #259: [FreeBSD compat] portability fixes
This was SVN commit r7002.
This commit is contained in:
parent
df36e937f0
commit
6525cfd39e
@ -19,7 +19,7 @@
|
||||
* but since it is the most command I use is as the default */
|
||||
#if defined(__linux__)
|
||||
#define PLATFORM_POSIX 1
|
||||
#elif defined(__FreeBSD) || defined(__NetBSD__) || defined(__OpenBSD__)
|
||||
#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
|
||||
#define PLATFORM_POSIX 1
|
||||
#elif defined(__APPLE__) && defined(__MACH__)
|
||||
#define PLATFORM_POSIX 1
|
||||
|
@ -1,4 +1,4 @@
|
||||
#!/bin/bash
|
||||
#!/bin/sh
|
||||
|
||||
# build/workspaces/
|
||||
|
||||
@ -12,7 +12,7 @@ cd $premake_dir
|
||||
# build/premake/
|
||||
|
||||
make -C src
|
||||
HOSTTYPE=$HOSTTYPE ./premake --outpath $workspace_dir --atlas --collada $* --target gnu
|
||||
HOSTTYPE=$HOSTTYPE ./premake --outpath $workspace_dir --atlas --collada "$@" --target gnu
|
||||
|
||||
# These files need to be linked; premake makefiles assume that the
|
||||
# lua file is accessible from the makefile directory
|
||||
|
@ -84,7 +84,7 @@ bool DllLoader::LoadDLL()
|
||||
// open failed (mostly likely SO not found)
|
||||
if (! m_Handle)
|
||||
{
|
||||
char* error = dlerror();
|
||||
const char* error = dlerror();
|
||||
if (error)
|
||||
LOG(CLogger::Error, "", "dlopen error: %s", error);
|
||||
m_Handle = HANDLE_UNAVAILABLE;
|
||||
|
@ -48,7 +48,7 @@
|
||||
#include <boost/preprocessor/punctuation/comma_if.hpp>
|
||||
#include <boost/preprocessor/repetition/repeat.hpp>
|
||||
|
||||
#ifndef _WIN32
|
||||
#if defined(__linux__) || (defined(__APPLE__) && defined(__MACH__))
|
||||
# include <valgrind/valgrind.h>
|
||||
#endif
|
||||
|
||||
@ -513,7 +513,7 @@ namespace
|
||||
wxLogWarning(_T("%s"), logMessage.c_str());
|
||||
else
|
||||
wxLogError(_T("%s"), logMessage.c_str());
|
||||
#ifndef _WIN32
|
||||
#if defined(__linux__) || (defined(__APPLE__) && defined(__MACH__))
|
||||
// When running under Valgrind, print more information in the error message
|
||||
VALGRIND_PRINTF_BACKTRACE("->");
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user