salmon-engine-core/engine
6
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

linux stuff

Browse Source
This commit is contained in:
Vladislav Khorev 2013-06-12 19:19:05 +00:00
parent f83fa2be8b
commit 95bc7fafac
4 changed files with 592 additions and 586 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/Utils/Console/Console.h
View File

@ -25,9 +25,11 @@ Use global variable Console like that:
#include "boost/thread.hpp" #include "boost/thread.hpp"
#endif #endif
#include "include/Utils/DataTypes/DataTypes.h"
#ifndef UTILS_ENGINE
#include "include/Render/RenderMisc.h" #include "include/Render/RenderMisc.h"
#endif
namespace SE namespace SE
{ {
@ -43,8 +45,9 @@ protected:
std::string TextSavedInTriangleList; std::string TextSavedInTriangleList;
#ifndef UTILS_ENGINE
std::shared_ptr<TTriangleList> HistoryTriangeList; std::shared_ptr<TTriangleList> HistoryTriangeList;
#endif
public: public:

4
include/Utils/FileUtils/FileUtils.h
View File

@ -8,6 +8,7 @@ WINDOWS AND ANDROID
*/ */
#include "include/Utils/DataTypes/DataTypes.h" #include "include/Utils/DataTypes/DataTypes.h"
#include "include/Utils/ErrorTypes/ErrorTypes.h"
#include "include/Utils/Console/Console.h" #include "include/Utils/Console/Console.h"
#include "boost/shared_array.hpp" #include "boost/shared_array.hpp"
@ -173,8 +174,9 @@ boost::shared_array<TYPENAME> CreateMemFromFile(const std::string& fileName, car
TYPENAME* fileData; TYPENAME* fileData;
pFile = fopen(fileName.c_str(), "rb" );
if (fopen(&pFile, fileName.c_str(), "rb" ) != 0) if (!pFile)
{ {
throw ErrorToLog("File not loaded: " + fileName); throw ErrorToLog("File not loaded: " + fileName);
} }

1
include/Utils/SerializeInterface/SerializeInterface.h
View File

@ -9,6 +9,7 @@
#include "boost/foreach.hpp" #include "boost/foreach.hpp"
#include <string> #include <string>
#include <map>
namespace SE namespace SE
{ {