Work on directory handling in save/load,
Mingw support for the config utility, with a larger font I made some time ago (I hoped the e' would work for Be'zier curves, but no) git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@144 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
parent
37ca8d13aa
commit
77f3c5763e
BIN
cfg_new/8pxfont.png
Normal file
BIN
cfg_new/8pxfont.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.7 KiB |
@ -1,11 +1,16 @@
|
||||
ifdef COMSPEC
|
||||
COPT = -Wall -O -g -ggdb -Dmain=SDL_main
|
||||
LOPT = `sdl-config --libs` -lSDL_image -g
|
||||
else
|
||||
COPT = -c `sdl-config --cflags` -Wall -g
|
||||
LOPT = `sdl-config --libs` -lSDL_image -lSDL_gfx -g
|
||||
endif
|
||||
|
||||
gfxcfg: gfxcfg.o SFont.o
|
||||
gcc gfxcfg.o SFont.o -o gfxcfg $(LOPT)
|
||||
|
||||
gfxcfg.o: gfxcfg.c SFont.h scancodes.h
|
||||
gcc gfxcfg.c -o gfxcfg.o $(COPT)
|
||||
gcc -c gfxcfg.c -o gfxcfg.o $(COPT)
|
||||
|
||||
SFont.o: SFont.h SFont.c
|
||||
gcc SFont.c -o SFont.o $(COPT)
|
||||
gcc -c SFont.c -o SFont.o $(COPT)
|
||||
|
||||
@ -25,6 +25,7 @@
|
||||
karlb@gmx.net
|
||||
*/
|
||||
#include <SDL/SDL.h>
|
||||
#include <SDL/SDL_video.h>
|
||||
|
||||
#include <assert.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
@ -1,5 +1,7 @@
|
||||
//C
|
||||
#include <stdbool.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
//POSIX
|
||||
#include <unistd.h>
|
||||
@ -7,7 +9,8 @@
|
||||
//SDL
|
||||
#include <SDL.h>
|
||||
#include <SDL_image.h>
|
||||
#include <SDL_gfxPrimitives.h>
|
||||
#include <SDL_events.h>
|
||||
//#include <SDL_gfxPrimitives.h>
|
||||
|
||||
//mine
|
||||
#include "SFont.h"
|
||||
@ -403,11 +406,11 @@ bool Initialiser_config()
|
||||
"Allows you to replace all the pixels of the color pointed by the mouse with",
|
||||
"the fore-color or the back-color.",
|
||||
true,0x0121); /*Shift + F*/
|
||||
Definir_option(31,"B‚zier""s curves",
|
||||
Definir_option(31,"Bézier""s curves",
|
||||
"Allows you to draw B‚zier""s curves.",
|
||||
"",
|
||||
true,0x0017); /*I*/
|
||||
Definir_option(32,"B‚zier""s curve with 3 or 4 points",
|
||||
Definir_option(32,"Bézier""s curve with 3 or 4 points",
|
||||
"Allows you to choose whether you want to draw B‚zier""s curves with 3 or 4",
|
||||
"points.",
|
||||
true,0x0117); /*Shift + I*/
|
||||
@ -754,7 +757,7 @@ bool Initialiser_config()
|
||||
Definir_option(112,"Center brush attachment point",
|
||||
"Set the attachement of the user-defined brush to its center.",
|
||||
"",
|
||||
true,0x028F); /*Ctrl + 5 (pav‚ num‚rique)*/
|
||||
true,0x028F); /*Ctrl + 5 (pavé numérique)*/
|
||||
Definir_option(113,"Top-left brush attachment point",
|
||||
"Set the attachement of the user-defined brush to its top-left corner.",
|
||||
"",
|
||||
@ -1121,7 +1124,7 @@ void Enregistrer_config()
|
||||
|
||||
/*** Main program ***/
|
||||
|
||||
int main(void)
|
||||
int main(int argc, char * argv[])
|
||||
{
|
||||
|
||||
if (Verifier_ecriture_possible())
|
||||
@ -1132,7 +1135,7 @@ int main(void)
|
||||
SDL_WM_SetCaption ("Grafx2 configuration tool","../gfx2.gif");
|
||||
|
||||
/* On initialise SFont */
|
||||
MyFont = SFont_InitFont(IMG_Load("5pxtinyfont.png"));
|
||||
MyFont = SFont_InitFont(IMG_Load("8pxfont.png"));
|
||||
|
||||
Dessiner_ecran_principal();
|
||||
|
||||
|
||||
4
files.c
4
files.c
@ -168,6 +168,10 @@ void Ajouter_element_a_la_liste(struct dirent* Enreg)
|
||||
Element_temporaire->Type = (Enreg->d_type == DT_DIR);
|
||||
#elif __WATCOMC__
|
||||
Element_temporaire->Type = (Enreg->d_attr & _A_SUBDIR);
|
||||
#else
|
||||
struct stat Infos_enreg;
|
||||
stat(Enreg->d_name,&Infos_enreg);
|
||||
Element_temporaire->Type = S_ISDIR(Infos_enreg.st_mode);
|
||||
#endif
|
||||
|
||||
Element_temporaire->Suivant =Liste_du_fileselect;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user