Hacked scons scripts and got it building on Ubuntu with clang.

Minor changes to support building on recent clang
Addition of some headers for non-compiling files
This commit is contained in:
ultra
2016-10-11 20:08:03 -04:00
committed by Celtic Minstrel
parent 65aed58d33
commit ffa2d0e950
14 changed files with 38 additions and 19 deletions

View File

@@ -23,4 +23,4 @@ elif str(platform) == "win32":
tools_obj = env.StaticLibrary("#build/lib/tools", tools)
Return("tools_obj")
Return("tools_obj")

View File

@@ -15,7 +15,7 @@
#ifdef _WIN32
#include <windows.h>
#endif
#include <GL/GL.h>
#include <GL/gl.h>
#endif
#include <iostream>

View File

@@ -12,6 +12,7 @@
#include <cctype>
#include <iterator>
#include <numeric>
#include <cstring>
using namespace std;

View File

@@ -36,10 +36,8 @@ void erase_if(ContainerT& items, const PredicateT& predicate) {
};
// Case-insensitive string comparison seems to be semi-standard, but with different names.
#if defined(__APPLE__)
#define strnicmp strncasecmp
#elif defined(_MSC_VER)
#if defined(_MSC_VER)
#define strnicmp _strnicmp
#else
#error Missing strnicmp / strncasecmp
#define strnicmp strncasecmp
#endif

View File

@@ -10,6 +10,7 @@
#include <algorithm>
#include <cstdio>
#include <ctime>
#include <cstring>
#ifdef _MSC_VER
// For some bizarre reason, Visual Studio doesn't declare snprintf in <cstdio>