Changeset 324

Show
Ignore:
Timestamp:
01/27/06 12:44:44 (3 years ago)
Author:
conrad
Message:

update to current evas API, build gtk version

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • scrubbery/trunk/src/Makefile.am

    r321 r324  
    33INCLUDES = @REMIX_CFLAGS@ @EVAS_CFLAGS@ @GTK2_CFLAGS@ 
    44 
    5 #bin_PROGRAMS = scrubbery @GTK2_TARGETS@ 
    6 #EXTRA_PROGRAMS = scrubbery-gtk 
    7 bin_PROGRAMS = @GTK2_TARGETS@ 
     5bin_PROGRAMS = scrubbery @GTK2_TARGETS@ 
    86EXTRA_PROGRAMS = scrubbery-gtk 
    97 
     
    119        scrubbery.h scrubbery.c evas_software_x11_main.c 
    1210 
    13 scrubbery_LDADD = @REMIX_LIBS@ @JACK_LIBS@ @EVAS_LIBS@ 
     11scrubbery_LDADD = @REMIX_LIBS@ @JACK_LIBS@ @EVAS_LIBS@ -lX11 
    1412 
    1513scrubbery_gtk_SOURCES = \ 
  • scrubbery/trunk/src/evas_software_gtk2_main.c

    r321 r324  
    6565                         GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK); 
    6666 
     67  evas_init(); 
    6768  evas = evas_new(); 
    6869  evas_output_method_set(evas, evas_render_method_lookup("software_x11")); 
  • scrubbery/trunk/src/evas_software_x11_main.c

    r321 r324  
    11#include "scrubbery.h" 
    22 
     3#include <unistd.h> 
    34#include <X11/Xlib.h> 
    45#include <X11/Xutil.h> 
     
    6465   XSync(disp, False); 
    6566 
     67   evas_init(); 
    6668   evas = evas_new(); 
    6769   evas_output_method_set(evas, evas_render_method_lookup("software_x11"));