From 90b3f9b1a17af2e88a220bd693c6e1c44761d62c Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Tue, 16 Dec 2008 22:14:08 +0000 Subject: [PATCH] Finished updating the includes for graph.c split. Now we have : -Graph.c : everything related to drawing. -Brush.c : everything related to brushes (displaying, erasing, capturing, and effects) -Windows.c : windows and menu drawing functions Some functions were also moved to divers.c. git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@396 416bcca6-2ee7-4201-b75f-2eb2f807beb1 --- Makefile.dep | 22 +++++++++++----------- aide.c | 1 + divers.c | 1 + files.c | 1 + loadsave.c | 1 + moteur.c | 2 ++ operatio.c | 3 +++ pages.c | 2 ++ palette.c | 1 + readini.c | 1 + readline.c | 1 + sdlscreen.c | 1 + special.c | 1 + 13 files changed, 27 insertions(+), 11 deletions(-) diff --git a/Makefile.dep b/Makefile.dep index ee10b005..d9cdcb8a 100644 --- a/Makefile.dep +++ b/Makefile.dep @@ -1,15 +1,15 @@ $(OBJDIR)/SFont.o: SFont.c SFont.h $(OBJDIR)/aide.o: aide.c const.h struct.h global.h loadsave.h divers.h graph.h \ - moteur.h tables_aide.h aide.h sdlscreen.h texte.h clavier.h + moteur.h tables_aide.h aide.h sdlscreen.h texte.h clavier.h windows.h $(OBJDIR)/boutons.o: boutons.c const.h struct.h global.h loadsave.h divers.h \ graph.h moteur.h readline.h files.h init.h boutons.h operatio.h pages.h \ erreurs.h readini.h saveini.h shade.h io.h aide.h texte.h sdlscreen.h windows.h brush.h $(OBJDIR)/brush.o: brush.c brush.h erreurs.h windows.h sdlscreen.h $(OBJDIR)/clavier.o: clavier.c global.h struct.h const.h loadsave.h $(OBJDIR)/divers.o: divers.c struct.h const.h sdlscreen.h global.h loadsave.h \ - graph.h erreurs.h boutons.h moteur.h divers.h clavier.h + graph.h erreurs.h boutons.h moteur.h divers.h clavier.h windows.h $(OBJDIR)/files.o: files.c const.h struct.h global.h loadsave.h graph.h divers.h \ - erreurs.h io.h + erreurs.h io.h windows.h $(OBJDIR)/gfxcfg.o: gfxcfg.c SFont.h struct.h const.h clavier.h io.h hotkeys.h \ setup.h $(OBJDIR)/graph.o: graph.c global.h struct.h const.h loadsave.h moteur.h boutons.h \ @@ -20,20 +20,20 @@ $(OBJDIR)/init.o: init.c const.h struct.h global.h loadsave.h graph.h boutons.h files.h setup.h windows.h $(OBJDIR)/io.o: io.c struct.h const.h io.h $(OBJDIR)/loadsave.o: loadsave.c const.h struct.h global.h loadsave.h graph.h \ - divers.h pages.h op_c.h boutons.h erreurs.h io.h sdlscreen.h + divers.h pages.h op_c.h boutons.h erreurs.h io.h sdlscreen.h windows.h $(OBJDIR)/main.o: main.c const.h struct.h global.h loadsave.h graph.h divers.h \ init.h boutons.h moteur.h pages.h files.h sdlscreen.h erreurs.h \ readini.h saveini.h io.h texte.h setup.h windows.h brush.h $(OBJDIR)/moteur.o: moteur.c const.h struct.h global.h loadsave.h graph.h divers.h \ - special.h boutons.h operatio.h shade.h erreurs.h sdlscreen.h + special.h boutons.h operatio.h shade.h erreurs.h sdlscreen.h windows.h brush.h $(OBJDIR)/op_c.o: op_c.c op_c.h struct.h const.h erreurs.h graph.h $(OBJDIR)/operatio.o: operatio.c const.h struct.h global.h loadsave.h divers.h \ - moteur.h graph.h operatio.h boutons.h pages.h erreurs.h sdlscreen.h + moteur.h graph.h operatio.h boutons.h pages.h erreurs.h sdlscreen.h brush.h windows.h $(OBJDIR)/pages.o: pages.c global.h struct.h const.h loadsave.h pages.h graph.h \ - erreurs.h + erreurs.h divers.h windows.h $(OBJDIR)/palette.o: palette.c const.h struct.h global.h loadsave.h divers.h \ graph.h moteur.h readline.h boutons.h pages.h aide.h sdlscreen.h \ - erreurs.h op_c.h + erreurs.h op_c.h windows.h $(OBJDIR)/pxsimple.o: pxsimple.c global.h struct.h const.h loadsave.h sdlscreen.h \ divers.h $(OBJDIR)/pxtall.o: pxtall.c global.h struct.h const.h loadsave.h sdlscreen.h \ @@ -42,16 +42,16 @@ $(OBJDIR)/pxwide.o: pxwide.c global.h struct.h const.h loadsave.h sdlscreen.h \ divers.h $(OBJDIR)/readini.o: readini.c const.h global.h struct.h loadsave.h graph.h divers.h $(OBJDIR)/readline.o: readline.c const.h struct.h global.h loadsave.h graph.h \ - divers.h erreurs.h sdlscreen.h readline.h + divers.h erreurs.h sdlscreen.h readline.h windows.h $(OBJDIR)/saveini.o: saveini.c const.h global.h struct.h loadsave.h readini.h io.h \ erreurs.h graph.h divers.h $(OBJDIR)/sdlscreen.o: sdlscreen.c global.h struct.h const.h loadsave.h sdlscreen.h \ - erreurs.h graph.h + erreurs.h graph.h divers.h $(OBJDIR)/setup.o: setup.c struct.h const.h io.h files.h $(OBJDIR)/shade.o: shade.c global.h struct.h const.h loadsave.h graph.h moteur.h \ divers.h readline.h aide.h sdlscreen.h windows.h $(OBJDIR)/special.o: special.c const.h struct.h global.h loadsave.h graph.h \ - moteur.h + moteur.h windows.h $(OBJDIR)/texte.o: texte.c SFont.h struct.h const.h global.h loadsave.h sdlscreen.h \ io.h files.h $(OBJDIR)/version.o: version.c diff --git a/aide.c b/aide.c index c5685336..88b05407 100644 --- a/aide.c +++ b/aide.c @@ -44,6 +44,7 @@ #include "sdlscreen.h" #include "texte.h" #include "clavier.h" +#include "windows.h" extern char SVNRevision[]; diff --git a/divers.c b/divers.c index 0fc1b4ed..990aea7f 100644 --- a/divers.c +++ b/divers.c @@ -33,6 +33,7 @@ #include "divers.h" #include "clavier.h" #include "sdlscreen.h" +#include "windows.h" word Palette_Compter_nb_couleurs_utilisees(dword* Tableau) { diff --git a/files.c b/files.c index f04d1c7a..439e44a4 100644 --- a/files.c +++ b/files.c @@ -52,6 +52,7 @@ #include "divers.h" #include "erreurs.h" #include "io.h" +#include "windows.h" #define COULEUR_FICHIER_NORMAL CM_Clair // Couleur du texte pour une ligne de fichier non sélectionné #define COULEUR_REPERTOIRE_NORMAL CM_Fonce // Couleur du texte pour une ligne de répertoire non sélectionné diff --git a/loadsave.c b/loadsave.c index d05b61c1..ce1ab3d2 100644 --- a/loadsave.c +++ b/loadsave.c @@ -41,6 +41,7 @@ #include "erreurs.h" #include "io.h" #include "sdlscreen.h" +#include "windows.h" #define FILENAMESPACE 13 diff --git a/moteur.c b/moteur.c index 5ac563f5..306391fb 100644 --- a/moteur.c +++ b/moteur.c @@ -36,6 +36,8 @@ #include "shade.h" #include "erreurs.h" #include "sdlscreen.h" +#include "windows.h" +#include "brush.h" //---------- Annuler les effets des modes de dessin (sauf la grille) --------- diff --git a/operatio.c b/operatio.c index c940ba92..a15821cc 100644 --- a/operatio.c +++ b/operatio.c @@ -21,6 +21,7 @@ #include #include #include + #include "const.h" #include "struct.h" #include "global.h" @@ -32,6 +33,8 @@ #include "pages.h" #include "erreurs.h" #include "sdlscreen.h" +#include "brush.h" +#include "windows.h" #ifdef __WATCOMC__ #define M_PI 3.14159265358979323846 diff --git a/pages.c b/pages.c index 2dd516f7..d0c3aa4b 100644 --- a/pages.c +++ b/pages.c @@ -31,6 +31,8 @@ #include "pages.h" #include "graph.h" #include "erreurs.h" +#include "divers.h" +#include "windows.h" /// /// GESTION DES PAGES diff --git a/palette.c b/palette.c index a08dba0e..98aac47b 100644 --- a/palette.c +++ b/palette.c @@ -34,6 +34,7 @@ #include "sdlscreen.h" #include "erreurs.h" #include "op_c.h" +#include "windows.h" byte Palette_mode_RGB = 1; // Indique si on est en HSL ou en RGB diff --git a/readini.c b/readini.c index 4a86b94a..f8c912f4 100644 --- a/readini.c +++ b/readini.c @@ -28,6 +28,7 @@ #include "global.h" #include "graph.h" #include "windows.h" +#include "divers.h" void Charger_INI_Clear_string(char * String) { diff --git a/readline.c b/readline.c index abcb1162..cc99b301 100644 --- a/readline.c +++ b/readline.c @@ -37,6 +37,7 @@ #include "const.h" #include "sdlscreen.h" #include "readline.h" +#include "windows.h" #define COULEUR_TEXTE CM_Noir #define COULEUR_FOND CM_Clair diff --git a/sdlscreen.c b/sdlscreen.c index d171e38f..d88fba31 100644 --- a/sdlscreen.c +++ b/sdlscreen.c @@ -27,6 +27,7 @@ #include "sdlscreen.h" #include "erreurs.h" #include "graph.h" +#include "divers.h" // Mise à jour minimaliste en nombre de pixels #define METHODE_UPDATE_MULTI_RECTANGLE 1 diff --git a/special.c b/special.c index 1c3a1f2b..68eafe77 100644 --- a/special.c +++ b/special.c @@ -25,6 +25,7 @@ #include "global.h" #include "graph.h" #include "moteur.h" +#include "windows.h"