BlueGreycalmElegant

Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → /contrib/ @ 6071

  → /contrib/ @ 6072

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Regard whitespace Rev 6071 → Rev 6072

/contrib/sdk/samples/cairo/Makefile
19,7 → 19,7
default: cairo
cairo: $(OBJECTS) Makefile
$(LD) $(LDFLAGS) $(LIBPATH) -o cairo $(OBJECTS) -lcairo2.dll -lgcc -lc.dll -lapp
$(LD) $(LDFLAGS) $(LIBPATH) -Map cairo.map -o cairo $(OBJECTS) -lcairo2.dll -lgcc -lc.dll -lapp
objcopy cairo -O binary
%.o : %.c Makefile $(SOURCES)

/contrib/sdk/samples/cairo/Makefile.static
18,13 → 18,13
default: cairo
cairo: $(OBJECTS) Makefile
$(LD) $(LDFLAGS) $(LIBPATH) -o cairo $(OBJECTS) -lcairo2 -lpixman-1 -lfreetype -lc -lgcc -lc
cairo: $(OBJECTS) Makefile.static
$(LD) $(LDFLAGS) $(LIBPATH) -Map cairo.map -o cairo $(OBJECTS) -lcairo2 -lpixman-1 -lfreetype -lc -lgcc -lc
objcopy cairo -O binary
%.o : %.c Makefile $(SOURCES)
$(CC) $(CFLAGS) $(INCLUDES) -o $@ $<
%.o : %.asm Makefile
%.o : %.asm Makefile.static
$(FASM) $< $@

/contrib/sdk/samples/cairo/cairo.c
336,7 → 336,7
};
static int check_events(cairo_t *cr)
int check_events(cairo_t *cr)
{
uint32_t ev;
oskey_t key;
348,7 → 348,7
{
case 1:
BeginDraw();
DrawWindow(0,0,0,0,NULL,0,0x74);
DrawWindow(0,0,0,0,NULL,0,0x73);
Blit(winbitmap, TYPE_3_BORDER_WIDTH, get_skin_height(),
0, 0, width, height,width,height,winstride);
EndDraw();
498,6 → 498,10
:"=a"(tmp)
:"a"(66),"b"(1),"c"(1));
__asm__ __volatile__(
"int $0x40"
::"a"(40), "b"(0xc0000027));
main_surface = main_surface_create(width, height);
cr = cairo_create(main_surface);
507,8 → 511,8
screen_hello(cr,width,height);
BeginDraw();
DrawWindow(10, 40, width+TYPE_3_BORDER_WIDTH*2,
height+TYPE_3_BORDER_WIDTH+get_skin_height(), "Cairo demo", 0x000000, 0x74);
DrawWindow(30, 40, width+TYPE_3_BORDER_WIDTH*2,
height+TYPE_3_BORDER_WIDTH+get_skin_height(), "Cairo demo", 0x000000, 0x73);
Blit(winbitmap, TYPE_3_BORDER_WIDTH, get_skin_height(), 0, 0, width, height,
width,height,winstride);
EndDraw();