Theoretically resolved jenky cross-compiler compatability

This commit is contained in:
Kayne Ruse
2014-11-05 23:54:10 +11:00
parent 4434900afc
commit 0f139562c3
14 changed files with 42 additions and 44 deletions
+3 -3
View File
@@ -22,10 +22,10 @@
#ifndef REGIONAPI_HPP_
#define REGIONAPI_HPP_
#ifdef __unix__
#include "lua.hpp"
#if defined(__MINGW32__)
#include "lua/lua.hpp"
#else
#include "lua/lua.hpp"
#include "lua.hpp"
#endif
#define TORTUGA_REGION_NAME "Region"
+3 -3
View File
@@ -22,10 +22,10 @@
#ifndef REGIONPAGERAPI_HPP_
#define REGIONPAGERAPI_HPP_
#ifdef __unix__
#include "lua.hpp"
#if defined(__MINGW32__)
#include "lua/lua.hpp"
#else
#include "lua/lua.hpp"
#include "lua.hpp"
#endif
#define TORTUGA_REGION_PAGER_NAME "RegionPager"
+3 -3
View File
@@ -24,10 +24,10 @@
#include "region_pager_base.hpp"
#ifdef __unix__
#include "lua.hpp"
#if defined(__MINGW32__)
#include "lua/lua.hpp"
#else
#include "lua/lua.hpp"
#include "lua.hpp"
#endif
#include <string>
+3 -3
View File
@@ -22,10 +22,10 @@
#ifndef TILESHEETAPI_HPP_
#define TILESHEETAPI_HPP_
#ifdef __unix__
#include "lua.hpp"
#if defined(__MINGW32__)
#include "lua/lua.hpp"
#else
#include "lua/lua.hpp"
#include "lua.hpp"
#endif
+1 -3
View File
@@ -29,10 +29,8 @@ std::string truncatePath(std::string pathname) {
pathname.rbegin(),
pathname.rend(),
[](char ch) -> bool {
//windows only
//windows & unix tested
return ch == '/' || ch == '\\';
// //unix only
// return ch == '/';
}).base(),
pathname.end());
}