From 7adb8c864f2438ca3e1882e5201c00f2016f617c Mon Sep 17 00:00:00 2001 From: arcum42 Date: Sat, 31 Jan 2009 03:01:47 +0000 Subject: [PATCH] A few quick changes to get Linux compiling again. And the 0x8000000 in vtlb_malloc does turn out to be neccessary... git-svn-id: http://pcsx2-playground.googlecode.com/svn/trunk@669 a6443dda-0b58-4228-96e9-037be469359c --- pcsx2/Linux/Linux.h | 4 +++- pcsx2/vtlb.cpp | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pcsx2/Linux/Linux.h b/pcsx2/Linux/Linux.h index 169ec93073..09ad03c2ce 100644 --- a/pcsx2/Linux/Linux.h +++ b/pcsx2/Linux/Linux.h @@ -84,12 +84,14 @@ extern void SaveConfig(); /* GtkGui */ extern void init_widgets(); extern MemoryAlloc* g_RecoveryState; -extern bool g_GameInProgress; extern void SysRestorableReset(); extern void SysDetect(); extern void RunExecute( const char* elf_file, bool use_bios = false); extern void ExecuteCpu(); +extern bool g_ReturnToGui; // set to exit the execution of the emulator and return control to the GUI +extern bool g_EmulationInProgress; // Set TRUE if a game is actively running (set to false on reset) + typedef struct { char lang[g_MaxPath]; } _langs; diff --git a/pcsx2/vtlb.cpp b/pcsx2/vtlb.cpp index 06fce249eb..9749f567b0 100644 --- a/pcsx2/vtlb.cpp +++ b/pcsx2/vtlb.cpp @@ -571,7 +571,7 @@ void vtlb_Term() u8* vtlb_malloc( uint size, uint align, uptr tryBaseAddress ) { #ifdef __LINUX__ - return SysMmap( tryBaseAddress, size, "Vtlb" ); + return SysMmap( tryBaseAddress, size, 0x80000000, "Vtlb" ); #else // Win32 just needs this, since malloc always maps below 2GB. return (u8*)_aligned_malloc(size, align);