mirror of
https://github.com/ZDoom/Raze.git
synced 2024-11-15 00:42:08 +00:00
- finally - we have a compile on linux!
This commit is contained in:
parent
bab394b061
commit
a637ec60c4
7 changed files with 24 additions and 7 deletions
|
@ -45,7 +45,7 @@
|
|||
#include "sc_man.h"
|
||||
#include "v_video.h"
|
||||
#include "v_text.h"
|
||||
#include "../platform/win32/i_findfile.h" // This is a temporary direct path. Needs to be fixed when stuff gets cleaned up.
|
||||
#include "i_system.h"
|
||||
|
||||
#ifndef PATH_MAX
|
||||
#define PATH_MAX 260
|
||||
|
|
|
@ -50,7 +50,7 @@
|
|||
#include "savegamehelp.h"
|
||||
#include "i_specialpaths.h"
|
||||
#include "c_dispatch.h"
|
||||
#include "../../platform/win32/i_findfile.h" // This is a temporary direct path. Needs to be fixed when stuff gets cleaned up.
|
||||
#include "i_system.h"
|
||||
|
||||
|
||||
FSavegameManager savegameManager;
|
||||
|
|
|
@ -41,7 +41,7 @@
|
|||
#include "zmusic/zmusic.h"
|
||||
#include "resourcefile.h"
|
||||
#include "version.h"
|
||||
#include "../platform/win32/i_findfile.h" // This is a temporary direct path. Needs to be fixed when stuff gets cleaned up.
|
||||
#include "i_system.h"
|
||||
|
||||
//==========================================================================
|
||||
//
|
||||
|
|
|
@ -47,6 +47,7 @@
|
|||
#include "gamecontrol.h"
|
||||
#include "m_argv.h"
|
||||
#include "filesystem/filesystem.h"
|
||||
#include "filesystem/resourcefile.h"
|
||||
|
||||
static const char* res_exts[] = { ".grp", ".zip", ".pk3", ".pk4", ".7z", ".pk7" };
|
||||
|
||||
|
|
|
@ -116,4 +116,5 @@ inline int I_GetNumaNodeThreadCount(int numaNode) { return std::max<int>(std::th
|
|||
inline void I_SetThreadNumaNode(std::thread &thread, int numaNode) { }
|
||||
|
||||
FString I_GetFromClipboard (bool use_primary_selection);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -47,8 +47,6 @@ static void I_CheckNativeMouse ();
|
|||
|
||||
static bool NativeMouse = true;
|
||||
|
||||
extern int paused;
|
||||
|
||||
CVAR (Bool, use_mouse, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
|
||||
CVAR (Bool, m_noprescale, false, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
|
||||
CVAR (Bool, m_filter, false, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
|
||||
|
@ -241,8 +239,8 @@ static void I_CheckNativeMouse ()
|
|||
bool focus = SDL_GetKeyboardFocus() != NULL;
|
||||
bool fs = screen->IsFullscreen();
|
||||
|
||||
// TODO: We want this to check for demo playback, as well.
|
||||
bool wantNative = !focus || (!use_mouse || GUICapture || paused || !inGame());
|
||||
// TODO: We want this to check for demo playback, as well. And paused state
|
||||
bool wantNative = !focus || (!use_mouse || GUICapture || !inGame());
|
||||
|
||||
if (wantNative != NativeMouse)
|
||||
{
|
||||
|
|
|
@ -199,4 +199,21 @@ FString M_GetDemoPath()
|
|||
return M_GetDocumentsPath() + "/demo/";
|
||||
}
|
||||
|
||||
//===========================================================================
|
||||
//
|
||||
// M_NormalizedPath
|
||||
//
|
||||
// Normalizes the given path and returns the result.
|
||||
//
|
||||
//===========================================================================
|
||||
|
||||
FString M_GetNormalizedPath(const char* path)
|
||||
{
|
||||
char *actualpath;
|
||||
actualpath = realpath(path, NULL);
|
||||
if (!actualpath) // error ?
|
||||
return nullptr;
|
||||
FString fullpath = actualpath;
|
||||
return fullpath;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue