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:
32
main.c
32
main.c
@@ -45,26 +45,16 @@
|
||||
#include "erreurs.h"
|
||||
#include "readini.h"
|
||||
#include "saveini.h"
|
||||
#include "linux.h"
|
||||
#include "io.h"
|
||||
#include "texte.h"
|
||||
|
||||
#ifndef __linux__
|
||||
#ifndef __amigaos4__
|
||||
#ifndef __BEOS__
|
||||
#ifndef __HAIKU__
|
||||
#if defined(__WIN32__)
|
||||
#include <windows.h>
|
||||
#include <shlwapi.h>
|
||||
#define chdir(dir) SetCurrentDirectory(dir)
|
||||
#define M_PI 3.14159265358979323846
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef __macosx__
|
||||
#import <corefoundation/corefoundation.h>
|
||||
#import <sys/param.h>
|
||||
#elif defined(__macosx__)
|
||||
#import <corefoundation/corefoundation.h>
|
||||
#import <sys/param.h>
|
||||
#endif
|
||||
|
||||
byte Ancien_nb_lignes; // Ancien nombre de lignes de l'écran
|
||||
@@ -227,23 +217,17 @@ void Analyse_de_la_ligne_de_commande(int argc,char * argv[])
|
||||
|
||||
// On récupère le chemin complet du paramètre
|
||||
// Et on découpe ce chemin en répertoire(path) + fichier(.ext)
|
||||
#if defined(__linux__) || defined(__amigaos4__) || defined(__BEOS__) || defined(__HAIKU__)
|
||||
Buffer=realpath(argv[Indice],NULL);
|
||||
#else
|
||||
#if defined(__WIN32__)
|
||||
Buffer = malloc(TAILLE_CHEMIN_FICHIER);
|
||||
_fullpath(Buffer,argv[Indice],TAILLE_CHEMIN_FICHIER);
|
||||
#else
|
||||
Buffer=realpath(argv[Indice],NULL);
|
||||
#endif
|
||||
Extraire_chemin(Principal_Repertoire_fichier, Buffer);
|
||||
Extraire_nom_fichier(Principal_Nom_fichier, Buffer);
|
||||
#ifndef __linux__
|
||||
#ifndef __amigaos4__
|
||||
#ifndef __BEOS__
|
||||
#ifndef __HAIKU__
|
||||
#if defined(__WIN32__)
|
||||
free(Buffer);
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
chdir(Principal_Repertoire_fichier);
|
||||
}
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user