TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-16 09:04:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* BugFix: Correct many include paths and build platformX11 on non-Apple Unix.

Browse source
This commit is contained in:
Robert MacGregor 2021-11-14 14:45:42 -05:00
parent a24149ba3b
commit 247b12e795
7 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/platformPOSIX/POSIXCPUInfo.cpp
View file

@ -23,7 +23,7 @@
#ifndef __APPLE__ #ifndef __APPLE__
#include "platform/platform.h" #include "platform/platform.h"
#include "platformX86UNIX/platformX86UNIX.h" #include "platformPOSIX/platformPOSIX.h"
#include "console/console.h" #include "console/console.h"
#include "core/stringTable.h" #include "core/stringTable.h"
#include "core/strings/stringFunctions.h" #include "core/strings/stringFunctions.h"

4
Engine/source/platformPOSIX/POSIXFileio.cpp
View file

@ -151,7 +151,7 @@ bool ResolvePathCaseInsensitive(char* pathName, S32 pathNameSize, bool requiredA
#undef Status #undef Status
#endif #endif
#include "platformX86UNIX/platformX86UNIX.h" #include "platformPOSIX/platformPOSIX.h"
extern int x86UNIXOpen(const char *path, int oflag); extern int x86UNIXOpen(const char *path, int oflag);
extern int x86UNIXClose(int fd); 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 ssize_t x86UNIXWrite(int fd, const void *buf, size_t nbytes);
extern bool ResolvePathCaseInsensitive(char* pathName, S32 pathNameSize, bool requiredAbsolute); extern bool ResolvePathCaseInsensitive(char* pathName, S32 pathNameSize, bool requiredAbsolute);
const int MaxPath = PATH_MAX;
namespace namespace
{ {
const char sTempDir[] = "/tmp/"; const char sTempDir[] = "/tmp/";

2
Engine/source/platformPOSIX/POSIXMain.cpp
View file

@ -26,7 +26,7 @@
#include "platform/platformInput.h" #include "platform/platformInput.h"
#include "console/console.h" #include "console/console.h"
#include "platformX86UNIX/platformX86UNIX.h" #include "platformPOSIX/platformPOSIX.h"
#include "platformPOSIX/POSIXStdConsole.h" #include "platformPOSIX/POSIXStdConsole.h"
#include "platformPOSIX/POSIXState.h" #include "platformPOSIX/POSIXState.h"

2
Engine/source/platformPOSIX/POSIXProcessControl.cpp
View file

@ -22,7 +22,7 @@
#ifndef __APPLE__ #ifndef __APPLE__
#include "platformX86UNIX/platformX86UNIX.h" #include "platformPOSIX/platformPOSIX.h"
#include "platformPOSIX/POSIXState.h" #include "platformPOSIX/POSIXState.h"
#include "platformPOSIX/POSIXStdConsole.h" #include "platformPOSIX/POSIXStdConsole.h"
#include "platform/platformInput.h" #include "platform/platformInput.h"

2
Engine/source/platformPOSIX/POSIXTime.cpp
View file

@ -22,7 +22,7 @@
#ifndef __APPLE__ #ifndef __APPLE__
#include "platformX86UNIX/platformX86UNIX.h" #include "platformPOSIX/platformPOSIX.h"
#include "platform/platformTimer.h" #include "platform/platformTimer.h"
#include "time.h" #include "time.h"
#include <errno.h> #include <errno.h>

4
Engine/source/platformX11/X11Font.client.cpp
View file

@ -26,8 +26,8 @@
#include "console/console.h" #include "console/console.h"
#include "core/strings/unicode.h" #include "core/strings/unicode.h"
#include "core/stringTable.h" #include "core/stringTable.h"
#include "platformX86UNIX/platformX86UNIX.h" #include "platformPOSIX/platformPOSIX.h"
#include "platformX86UNIX/x86UNIXFont.h" #include "platformX11/X11Font.h"
// Needed by createFont // Needed by createFont
#include <X11/Xlib.h> #include <X11/Xlib.h>

10
Tools/CMake/torque3d.cmake
View file

@ -80,7 +80,7 @@ if(WIN32)
set(ALSOFT_INSTALL_HRTF_DATA OFF CACHE BOOL "Install HRTF definition files" FORCE) set(ALSOFT_INSTALL_HRTF_DATA OFF CACHE BOOL "Install HRTF definition files" FORCE)
set(ALSOFT_INSTALL_AMBDEC_PRESETS OFF CACHE BOOL "Install AmbDec presets" FORCE) set(ALSOFT_INSTALL_AMBDEC_PRESETS OFF CACHE BOOL "Install AmbDec presets" FORCE)
set(ALSOFT_EMBED_HRTF_DATA OFF CACHE BOOL "Embed the HRTF data (increases library footprint)" FORCE) set(ALSOFT_EMBED_HRTF_DATA OFF CACHE BOOL "Embed the HRTF data (increases library footprint)" FORCE)
add_subdirectory( ${libDir}/openal-soft ${CMAKE_CURRENT_BINARY_DIR}/openal-soft) add_subdirectory( ${libDir}/openal-soft ${CMAKE_CURRENT_BINARY_DIR}/openal-soft)
endif() endif()
@ -241,7 +241,7 @@ if(WIN32)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -wd4018") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -wd4018")
# warning C4244: 'initializing' : conversion from 'XXX' to 'XXX', possible loss of data # warning C4244: 'initializing' : conversion from 'XXX' to 'XXX', possible loss of data
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -wd4244") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -wd4244")
if(TORQUE_SFX_DirectX) if(TORQUE_SFX_DirectX)
if( TORQUE_CPU_X64 ) if( TORQUE_CPU_X64 )
link_directories($ENV{DXSDK_DIR}/Lib/x64) link_directories($ENV{DXSDK_DIR}/Lib/x64)
else() else()
@ -599,11 +599,15 @@ if(APPLE)
addPath("${srcDir}/platformPOSIX") addPath("${srcDir}/platformPOSIX")
endif() endif()
if (UNIX AND NOT APPLE)
addPath("${srcDir}/platformX11")
endif()
if(UNIX AND NOT APPLE) if(UNIX AND NOT APPLE)
# linux_dedicated # linux_dedicated
if(TORQUE_DEDICATED) if(TORQUE_DEDICATED)
addPath("${srcDir}/windowManager/dedicated") addPath("${srcDir}/windowManager/dedicated")
# ${srcDir}/platformX86UNIX/*.client.* files are not needed # ${srcDir}/UNIX/*.client.* files are not needed
# @todo: move to separate file # @todo: move to separate file
file( GLOB tmp_files file( GLOB tmp_files
${srcDir}/platformX86UNIX/*.cpp ${srcDir}/platformX86UNIX/*.cpp