Commit c4dfdc1f authored by edo9300's avatar edo9300

Update for linux/mac

parent 2aa71d84
...@@ -3,14 +3,7 @@ ...@@ -3,14 +3,7 @@
#ifndef __C_XMLNODE_H_INCLUDED__ #ifndef __C_XMLNODE_H_INCLUDED__
#define __C_XMLNODE_H_INCLUDED__ #define __C_XMLNODE_H_INCLUDED__
#ifdef _WIN32
#include <irrlicht.h> #include <irrlicht.h>
#else
// Setup for compile with stripped down IRRlicht on FreeBSD (stripped by Madoc)
#include <irrString.h>
#include <irrArray.h>
#include <irrTypes.h>
#endif
using namespace irr; using namespace irr;
enum CXMLNODETYPE { enum CXMLNODETYPE {
......
#include "CXMLRegistry.h" #include "CXMLRegistry.h"
#ifndef _WIN32
inline int _wtoi(const wchar_t * str){
return (int)wcstol(str, 0, 10);
}
#endif
CXMLRegistry::CXMLRegistry(io::IFileSystem *fsys) { CXMLRegistry::CXMLRegistry(io::IFileSystem *fsys) {
fileSystem = fsys; fileSystem = fsys;
fileSystem->grab(); fileSystem->grab();
......
...@@ -2,14 +2,9 @@ ...@@ -2,14 +2,9 @@
#ifndef __C_XMLREGISTRY_H_INCLUDED__ #ifndef __C_XMLREGISTRY_H_INCLUDED__
#define __C_XMLREGISTRY_H_INCLUDED__ #define __C_XMLREGISTRY_H_INCLUDED__
#ifdef _WIN32
#include <irrlicht.h> #include <irrlicht.h>
#else
// Setup for compile with stripped down IRRlicht on FreeBSD (stripped by Madoc)
#include <irrString.h>
#include <irrArray.h>
#include <irrTypes.h>
#endif
using namespace irr; using namespace irr;
#include "CXMLNode.h" #include "CXMLNode.h"
//File-> //File->
......
...@@ -17,8 +17,8 @@ project "ygopro" ...@@ -17,8 +17,8 @@ project "ygopro"
configuration {"windows", "not vs*"} configuration {"windows", "not vs*"}
includedirs { "/mingw/include/irrlicht", "/mingw/include/freetype2" } includedirs { "/mingw/include/irrlicht", "/mingw/include/freetype2" }
configuration "not vs*" configuration "not vs*"
buildoptions { "-std=gnu++0x", "-fno-rtti" } buildoptions { "-std=gnu++0x", "-fno-rtti", "-fpermissive" }
configuration "not windows" configuration "not windows"
includedirs { "/usr/include/lua", "/usr/include/lua5.2", "/usr/include/lua/5.2", "/usr/include/irrlicht", "/usr/include/freetype2" } includedirs { "/usr/include/lua", "/usr/include/lua5.3", "/usr/include/lua/5.3", "/usr/include/irrlicht", "/usr/include/freetype2" }
excludes { "COSOperator.*" } excludes { "COSOperator.*" }
links { "event_pthreads", "GL", "dl", "pthread" } links { "event_pthreads", "GL", "dl", "pthread" }
...@@ -22,6 +22,8 @@ solution "ygo" ...@@ -22,6 +22,8 @@ solution "ygo"
configuration "linux" configuration "linux"
defines { "LUA_USE_LINUX" } defines { "LUA_USE_LINUX" }
includedirs { "irrKlang/include" }
libdirs { "irrKlang/lib" }
configuration "vs*" configuration "vs*"
flags "EnableSSE2" flags "EnableSSE2"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment