Ticket #259: 0ad-freebsd-compat.patch

build/premake/src/Src/os.h

@@ -19 +19 @@
  * 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

source/tools/atlas/AtlasScript/ScriptInterface.cpp

@@ -48 +48 @@
 #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 +513 @@
             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

source/ps/DllLoader.cpp

@@ -84 +84 @@
         // 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;

build/workspaces/update-workspaces.sh

@@ -1 @@
-#!/bin/bash
+#!/bin/sh
 
 # build/workspaces/
 
@@ -12 +12 @@
 # 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