Changed a lot of platform-specific code to "simplify" it:
A Unix-like system is now considered the default. The number of platform-specific blocks is down to: win32: 13, watcomc: 3, linux: 4, macosx: 16, amigaos4: 8, beos/haiku: 1 Removed linux.c, implemented the relevant functions for all platforms. (win32) In Stats screen, included free memory report (macosx) Conversion_ANSI: Fixed the __macosx__ with wrong case from my former 'fix', sorry. (macosx) readline.c : Removed a manual "Update_necessaire=1", because normally all calls to UpdateRect() will set this flag already. Don't hesitate to call Flush_Update() anywhere where it's lacking, but you shouldn't put it inside a #ifdef __macosx__ (win32) Packaging: 'make ziprelease' now includes libpng13.dll and zlib1.dll (win32) Hacked something to resolve naming conflict of MOD_SHIFT constants with windows.h (all) Resolution: Fixed the black space that appeared between button and label, the memory overwrite also caused resolutions above number 2 to disappear from list. Tested fine on Linux (without TTF) and Windows git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@345 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
54
graph.c
54
graph.c
@@ -19,35 +19,28 @@
|
||||
write to the Free Software Foundation, Inc.,
|
||||
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
#include "sdlscreen.h"
|
||||
#include "graph.h"
|
||||
#include "divers.h"
|
||||
#include <math.h>
|
||||
#ifdef __macosx__
|
||||
#include <sys/malloc.h>
|
||||
#if defined(__WIN32__)
|
||||
#define _WIN32_WINNT 0x0500
|
||||
#include <windows.h>
|
||||
#elif defined(__macosx__)
|
||||
#include <sys/sysctl.h>
|
||||
#else
|
||||
#include <malloc.h>
|
||||
#include <sys/sysinfo.h>
|
||||
#endif
|
||||
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <math.h>
|
||||
|
||||
#include "global.h"
|
||||
#include "struct.h"
|
||||
#include "moteur.h"
|
||||
#include "boutons.h"
|
||||
#include "pages.h"
|
||||
#include "global.h"
|
||||
#include "struct.h"
|
||||
#include "erreurs.h"
|
||||
|
||||
#ifdef __linux__
|
||||
#ifdef __macosx__
|
||||
#include <sys/sysctl.h>
|
||||
#else
|
||||
#include <sys/sysinfo.h>
|
||||
#endif
|
||||
#elif __WATCOMC__
|
||||
#define _WIN32_WINNT 0x0500
|
||||
#include <windows.h>
|
||||
#endif
|
||||
#include "sdlscreen.h"
|
||||
#include "graph.h"
|
||||
#include "divers.h"
|
||||
|
||||
// Fonction qui met à jour la zone de l'image donnée en paramètre sur l'écran.
|
||||
// Tient compte du décalage X et Y et du zoom, et fait tous les controles nécessaires
|
||||
@@ -565,8 +558,15 @@ unsigned long Memoire_libre(void)
|
||||
A revoir, mais est-ce vraiment utile?
|
||||
_heapmin();
|
||||
*/
|
||||
#ifdef __linux__
|
||||
#ifdef __macosx__
|
||||
// Memory is no longer relevant. If there is ANY problem or doubt here,
|
||||
// you can simply return 10*1024*1024 (10Mb), to make the "Pages"something
|
||||
// memory allocation functions happy.
|
||||
#if defined(__WIN32__)
|
||||
MEMORYSTATUSEX mstt;
|
||||
mstt.dwLength = sizeof(MEMORYSTATUSEX);
|
||||
GlobalMemoryStatusEx(&mstt);
|
||||
return mstt.ullAvailPhys;
|
||||
#elif defined(__macosx__)
|
||||
int mib[2];
|
||||
int maxmem;
|
||||
size_t len;
|
||||
@@ -576,18 +576,10 @@ unsigned long Memoire_libre(void)
|
||||
len = sizeof(maxmem);
|
||||
sysctl(mib,2,&maxmem,&len,NULL,0);
|
||||
return maxmem;
|
||||
#else
|
||||
#else
|
||||
struct sysinfo info;
|
||||
sysinfo(&info);
|
||||
return info.freeram*info.mem_unit;
|
||||
#endif
|
||||
#elif __WATCOMC__
|
||||
MEMORYSTATUSEX mstt;
|
||||
mstt.dwLength = sizeof(MEMORYSTATUSEX);
|
||||
GlobalMemoryStatusEx(&mstt);
|
||||
return mstt.ullAvailPhys;
|
||||
#else
|
||||
return 10*1024*1024;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user