mirror of
https://github.com/rwengine/openrw.git
synced 2024-11-23 02:42:39 +01:00
Fix some OS X/Clang (build) errors.
For rwengine/src/engine/GameData.cpp, `#ifdef __unix__` is used, which Clang on OS X does not define, thus not finding files while loading.
This commit is contained in:
parent
d02b53e4ad
commit
4c2c42ef6a
@ -32,6 +32,10 @@ else ()
|
||||
message(FATAL_ERROR "Unknown platform \"${CMAKE_SYSTEM_NAME}\". please update CMakeLists.txt.")
|
||||
endif ()
|
||||
|
||||
if (${CMAKE_CXX_COMPILER_ID} STREQUAL Clang)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-gnu-array-member-paren-init")
|
||||
endif()
|
||||
|
||||
# Make GLM use radians
|
||||
add_definitions(-DGLM_FORCE_RADIANS)
|
||||
|
||||
|
@ -4,6 +4,7 @@
|
||||
#include <glm/glm.hpp>
|
||||
#include <map>
|
||||
#include <vector>
|
||||
#include <string>
|
||||
|
||||
/**
|
||||
* @brief Stores data from .CUT files
|
||||
|
@ -10,6 +10,7 @@
|
||||
#include <stack>
|
||||
#include <list>
|
||||
#include <set>
|
||||
#include <array>
|
||||
|
||||
#define SCM_NEGATE_CONDITIONAL_MASK 0x8000
|
||||
#define SCM_CONDITIONAL_MASK_PASSED 0xFF
|
||||
|
@ -30,7 +30,7 @@
|
||||
*/
|
||||
std::string findPathRealCase(const std::string& base, const std::string& path)
|
||||
{
|
||||
#ifdef __unix__
|
||||
#ifndef _WIN32
|
||||
size_t endslash = path.find("/");
|
||||
bool isDirectory = true;
|
||||
if(endslash == path.npos) {
|
||||
|
Loading…
Reference in New Issue
Block a user