m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes issue #78 and some more makefile tuning (ziprelease names the archives according to the platform)

Browse Source 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@427 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Adrien Destugues 2008-12-27 15:10:35 +00:00
parent a8ae3672f8
commit 79aca71830
3 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -43,6 +43,7 @@ ifdef COMSPEC
WINDRES = windres.exe WINDRES = windres.exe
OBJRES = $(OBJDIR)/winres.o OBJRES = $(OBJDIR)/winres.o
CFGOBJRES = $(OBJDIR)/wincfgres.o CFGOBJRES = $(OBJDIR)/wincfgres.o
PLATFORM = win32 #no uname so we'll do that ourselve
else else
PLATFORM = $(shell uname) PLATFORM = $(shell uname)
@ -162,7 +163,7 @@ release : $(BIN) $(CFGBIN)
# A release zip archive # A release zip archive
ziprelease: version $(BIN) $(BINCFG) release ziprelease: version $(BIN) $(BINCFG) release
tar cvzf src-svn`svnversion | sed 's/:/-/'`.tgz *.c *.h Makefile Makefile.dep gfx2.ico gfx2cfg.ico tar cvzf src-svn`svnversion | sed 's/:/-/'`.tgz *.c *.h Makefile Makefile.dep gfx2.ico gfx2cfg.ico
zip grafx2-svn`svnversion | sed 's/:/-/'`$(TTFLABEL)-win32.zip $(BIN) $(CFGBIN) gfx2.dat gfx2.gif gfx2cfg.gif doc/gpl-2.0.txt SDL.dll fonts/8pxfont.png SDL_image.dll zlib1.dll libpng13.dll $(TTFLIBS) doc/README-zlib1.txt doc/README-SDL.txt doc/README-SDL_image.txt doc/README-SDL_ttf.txt fonts/Tuffy.ttf src-svn`svnversion | sed 's/:/-/'`.tgz zip grafx2-svn`svnversion | sed 's/:/-/'`$(TTFLABEL)-$(PLATFORM).zip $(BIN) $(CFGBIN) gfx2.dat gfx2.gif gfx2cfg.gif doc/gpl-2.0.txt SDL.dll fonts/8pxfont.png SDL_image.dll zlib1.dll libpng13.dll $(TTFLIBS) doc/README-zlib1.txt doc/README-SDL.txt doc/README-SDL_image.txt doc/README-SDL_ttf.txt fonts/Tuffy.ttf src-svn`svnversion | sed 's/:/-/'`.tgz
$(DELCOMMAND) src-svn`svnversion | sed 's/:/-/'`.tgz $(DELCOMMAND) src-svn`svnversion | sed 's/:/-/'`.tgz
tar cvzf grafx2-svn`svnversion | sed 's/:/-/'`$(TTFLABEL)-src.tgz *.c *.h Makefile Makefile.dep gfx2.dat gfx2.ico gfx2.gif gfx2cfg.gif doc/gpl-2.0.txt fonts/8pxfont.png fonts/Tuffy.ttf tar cvzf grafx2-svn`svnversion | sed 's/:/-/'`$(TTFLABEL)-src.tgz *.c *.h Makefile Makefile.dep gfx2.dat gfx2.ico gfx2.gif gfx2cfg.gif doc/gpl-2.0.txt fonts/8pxfont.png fonts/Tuffy.ttf

1
divers.c
View File

@ -331,6 +331,7 @@ int Get_input(void)
if (bl) if (bl)
{ {
DEBUG("warp",Operation_Taille_pile);
SDL_WarpMouse( SDL_WarpMouse(
INPUT_Nouveau_Mouse_X*Pixel_width, INPUT_Nouveau_Mouse_X*Pixel_width,
INPUT_Nouveau_Mouse_Y*Pixel_height INPUT_Nouveau_Mouse_Y*Pixel_height

25
moteur.c
View File

@ -961,7 +961,7 @@ void Gestion_principale(void)
{ {
Print_dans_menu("X: Y: ",0); Print_dans_menu("X: Y: ",0);
} }
Curseur_dans_menu_precedent = 1; Curseur_dans_menu_precedent = 0;
} }
else else
{ {
@ -969,7 +969,7 @@ void Gestion_principale(void)
{ {
Print_dans_menu("X: Y: ( )",0); Print_dans_menu("X: Y: ( )",0);
} }
Curseur_dans_menu_precedent = 1; Curseur_dans_menu_precedent = 0;
//Num2str(Pipette_Couleur,Chaine,3); //Num2str(Pipette_Couleur,Chaine,3);
//Print_dans_menu(Chaine,20); //Print_dans_menu(Chaine,20);
//Print_general(170*Menu_Facteur_X,Menu_Ordonnee_Texte," ",0,Pipette_Couleur); //Print_general(170*Menu_Facteur_X,Menu_Ordonnee_Texte," ",0,Pipette_Couleur);
@ -978,18 +978,21 @@ void Gestion_principale(void)
} }
if(Curseur_dans_menu) if(Curseur_dans_menu)
{ {
Curseur_dans_menu_precedent = 0; Curseur_dans_menu_precedent = 1;
}
else
{
Blink=Operation[Operation_en_cours][Mouse_K][Operation_Taille_pile].Effacer_curseur;
if (Blink) Effacer_curseur();
Operation[Operation_en_cours][Mouse_K][Operation_Taille_pile].Action();
if (Blink) Afficher_curseur();
} }
Old_MX=Mouse_X; Old_MX=Mouse_X;
Old_MY=Mouse_Y; Old_MY=Mouse_Y;
Blink=Operation[Operation_en_cours][Mouse_K][Operation_Taille_pile].Effacer_curseur;
if (Blink) Effacer_curseur();
Operation[Operation_en_cours][Mouse_K][Operation_Taille_pile].Action();
if (Blink) Afficher_curseur();
} }
while (!Sortir_du_programme); while (!Sortir_du_programme);
} }