1.1 --- a/src/Makefile.am	Wed Apr 16 10:12:12 2008 +0000
     1.2 +++ b/src/Makefile.am	Thu May 29 11:00:26 2008 +0000
     1.3 @@ -63,31 +63,23 @@
     1.4  endif
     1.5  
     1.6  if GUI_GTK
     1.7 -if OSMESA_DRIVER
     1.8  lxdream_SOURCES += gtkui/gtkui.c gtkui/gtkui.h \
     1.9  	gtkui/main_win.c gtkui/gtkcb.c \
    1.10          gtkui/mmio_win.c gtkui/debug_win.c gtkui/dump_win.c \
    1.11          gtkui/ctrl_dlg.c gtkui/path_dlg.c gtkui/gdrom_menu.c \
    1.12 -        drivers/video_gtk.c drivers/video_gtk.h \
    1.13 -        drivers/video_gdk.c drivers/video_gdk.h 
    1.14 -else
    1.15 -lxdream_SOURCES += gtkui/gtkui.c gtkui/gtkui.h \
    1.16 -	gtkui/main_win.c gtkui/gtkcb.c \
    1.17 -        gtkui/mmio_win.c gtkui/debug_win.c gtkui/dump_win.c \
    1.18 -        gtkui/ctrl_dlg.c gtkui/path_dlg.c gtkui/gdrom_menu.c \
    1.19 -        drivers/video_gtk.c drivers/video_gtk.h \
    1.20 -        drivers/video_glx.c drivers/video_glx.h
    1.21 -endif
    1.22 +        drivers/video_gtk.c drivers/video_gtk.h
    1.23  endif
    1.24  
    1.25 -if CDROM_LINUX
    1.26 -lxdream_SOURCES += drivers/cd_linux.c
    1.27 -else
    1.28 -lxdream_SOURCES += drivers/cd_none.c
    1.29 +if VIDEO_OSMESA
    1.30 +lxdream_SOURCES += drivers/video_gdk.c drivers/video_gdk.h 
    1.31  endif
    1.32  
    1.33 -if JOY_LINUX
    1.34 -lxdream_SOURCES += drivers/joy_linux.c
    1.35 +if VIDEO_GLX 
    1.36 +lxdream_SOURCES += drivers/video_glx.c drivers/video_glx.h
    1.37 +endif
    1.38 +
    1.39 +if VIDEO_NSGL
    1.40 +lxdream_SOURCES += drivers/video_nsgl.c drivers/video_nsgl.h
    1.41  endif
    1.42  
    1.43  if AUDIO_PULSE
    1.44 @@ -102,6 +94,18 @@
    1.45  lxdream_SOURCES += drivers/audio_alsa.c
    1.46  endif
    1.47  
    1.48 +
    1.49 +if CDROM_LINUX
    1.50 +lxdream_SOURCES += drivers/cd_linux.c
    1.51 +else
    1.52 +lxdream_SOURCES += drivers/cd_none.c
    1.53 +endif
    1.54 +
    1.55 +if JOY_LINUX
    1.56 +lxdream_SOURCES += drivers/joy_linux.c
    1.57 +endif
    1.58 +
    1.59 +
    1.60  lxdream_LDADD = @GTK_LIBS@ @LIBPNG_LIBS@ @PULSE_LIBS@ @ESOUND_LIBS@ @ALSA_LIBS@ $(INTLLIBS)
    1.61  
    1.62  gendec_LDADD = @GTK_LIBS@ $(INTLLIBS)