mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-04-24 05:45:40 +00:00
* BugFix: Correct many include paths and build platformX11 on non-Apple Unix.
This commit is contained in:
parent
a24149ba3b
commit
247b12e795
7 changed files with 14 additions and 12 deletions
|
|
@ -23,7 +23,7 @@
|
|||
#ifndef __APPLE__
|
||||
|
||||
#include "platform/platform.h"
|
||||
#include "platformX86UNIX/platformX86UNIX.h"
|
||||
#include "platformPOSIX/platformPOSIX.h"
|
||||
#include "console/console.h"
|
||||
#include "core/stringTable.h"
|
||||
#include "core/strings/stringFunctions.h"
|
||||
|
|
|
|||
|
|
@ -151,7 +151,7 @@ bool ResolvePathCaseInsensitive(char* pathName, S32 pathNameSize, bool requiredA
|
|||
#undef Status
|
||||
#endif
|
||||
|
||||
#include "platformX86UNIX/platformX86UNIX.h"
|
||||
#include "platformPOSIX/platformPOSIX.h"
|
||||
|
||||
extern int x86UNIXOpen(const char *path, int oflag);
|
||||
extern int x86UNIXClose(int fd);
|
||||
|
|
@ -159,8 +159,6 @@ extern ssize_t x86UNIXRead(int fd, void *buf, size_t nbytes);
|
|||
extern ssize_t x86UNIXWrite(int fd, const void *buf, size_t nbytes);
|
||||
extern bool ResolvePathCaseInsensitive(char* pathName, S32 pathNameSize, bool requiredAbsolute);
|
||||
|
||||
const int MaxPath = PATH_MAX;
|
||||
|
||||
namespace
|
||||
{
|
||||
const char sTempDir[] = "/tmp/";
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
#include "platform/platformInput.h"
|
||||
#include "console/console.h"
|
||||
|
||||
#include "platformX86UNIX/platformX86UNIX.h"
|
||||
#include "platformPOSIX/platformPOSIX.h"
|
||||
#include "platformPOSIX/POSIXStdConsole.h"
|
||||
#include "platformPOSIX/POSIXState.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
#ifndef __APPLE__
|
||||
|
||||
#include "platformX86UNIX/platformX86UNIX.h"
|
||||
#include "platformPOSIX/platformPOSIX.h"
|
||||
#include "platformPOSIX/POSIXState.h"
|
||||
#include "platformPOSIX/POSIXStdConsole.h"
|
||||
#include "platform/platformInput.h"
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
#ifndef __APPLE__
|
||||
|
||||
#include "platformX86UNIX/platformX86UNIX.h"
|
||||
#include "platformPOSIX/platformPOSIX.h"
|
||||
#include "platform/platformTimer.h"
|
||||
#include "time.h"
|
||||
#include <errno.h>
|
||||
|
|
|
|||
|
|
@ -26,8 +26,8 @@
|
|||
#include "console/console.h"
|
||||
#include "core/strings/unicode.h"
|
||||
#include "core/stringTable.h"
|
||||
#include "platformX86UNIX/platformX86UNIX.h"
|
||||
#include "platformX86UNIX/x86UNIXFont.h"
|
||||
#include "platformPOSIX/platformPOSIX.h"
|
||||
#include "platformX11/X11Font.h"
|
||||
|
||||
// Needed by createFont
|
||||
#include <X11/Xlib.h>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue