1.1 --- a/src/Makefile.am	Wed Apr 16 12:43:52 2008 +0000
     1.2 +++ b/src/Makefile.am	Sun Jun 01 00:47:45 2008 +0000
     1.3 @@ -5,7 +5,7 @@
     1.4  	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
     1.5  	-DPACKAGE_CONF_DIR=\""$(sysconfdir)"\" \
     1.6          -Ish4 \
     1.7 -	@GTK_CFLAGS@ @LIBPNG_CFLAGS@ @PULSE_CFLAGS@ @ESOUND_CFLAGS@ @ALSA_CFLAGS@
     1.8 +	@GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBPNG_CFLAGS@ @PULSE_CFLAGS@ @ESOUND_CFLAGS@ @ALSA_CFLAGS@
     1.9  
    1.10  bin_PROGRAMS = lxdream
    1.11  noinst_PROGRAMS = gendec genglsl
    1.12 @@ -13,7 +13,7 @@
    1.13  
    1.14  AM_CFLAGS = -D_ISOC99_SOURCE -D_BSD_SOURCE 
    1.15  TESTS = test/testxlt
    1.16 -BUILT_SOURCES = sh4/sh4core.c sh4/sh4dasm.c sh4/sh4x86.c pvr2/gl_slsrc.c
    1.17 +BUILT_SOURCES = sh4/sh4core.c sh4/sh4dasm.c sh4/sh4x86.c pvr2/gl_slsrc.c drivers/mac_keymap.h
    1.18  
    1.19  gendec_SOURCES = tools/gendec.c tools/gendec.h tools/insparse.c tools/actparse.c
    1.20  genglsl_SOURCES = tools/genglsl.c
    1.21 @@ -52,7 +52,7 @@
    1.22          x86dasm/x86dasm.c x86dasm/x86dasm.h \
    1.23          x86dasm/i386-dis.c x86dasm/dis-init.c x86dasm/dis-buf.c 
    1.24  
    1.25 -test_testsh4x86_LDADD = @GTK_LIBS@
    1.26 +test_testsh4x86_LDADD = @GLIB_LIBS@ @GTK_LIBS@ @LIBPNG_LIBS@
    1.27  test_testsh4x86_SOURCES = test/testsh4x86.c x86dasm/x86dasm.c \
    1.28  	x86dasm/x86dasm.h x86dasm/i386-dis.c x86dasm/dis-init.c \
    1.29  	x86dasm/dis-buf.c \
    1.30 @@ -70,6 +70,11 @@
    1.31          drivers/video_gtk.c drivers/video_gtk.h
    1.32  endif
    1.33  
    1.34 +if GUI_COCOA
    1.35 +lxdream_SOURCES += cocoaui/cocoaui.c cocoaui/cocoaui.h \
    1.36 +	cocoaui/cocoa_win.c drivers/video_osx.c drivers/mac_keymap.h
    1.37 +endif
    1.38 +
    1.39  if VIDEO_OSMESA
    1.40  lxdream_SOURCES += drivers/video_gdk.c drivers/video_gdk.h 
    1.41  endif
    1.42 @@ -106,10 +111,10 @@
    1.43  endif
    1.44  
    1.45  
    1.46 -lxdream_LDADD = @GTK_LIBS@ @LIBPNG_LIBS@ @PULSE_LIBS@ @ESOUND_LIBS@ @ALSA_LIBS@ $(INTLLIBS)
    1.47 +lxdream_LDADD = @GLIB_LIBS@ @GTK_LIBS@ @LIBPNG_LIBS@ @PULSE_LIBS@ @ESOUND_LIBS@ @ALSA_LIBS@ $(INTLLIBS)
    1.48  
    1.49 -gendec_LDADD = @GTK_LIBS@ $(INTLLIBS)
    1.50 -genglsl_LDADD = @GTK_LIBS@ $(INTLLIBS)
    1.51 +gendec_LDADD = @GLIB_LIBS@ @GTK_LIBS@ $(INTLLIBS)
    1.52 +genglsl_LDADD = @GLIB_LIBS@ @GTK_LIBS@ $(INTLLIBS)
    1.53  
    1.54  
    1.55  test_testxlt_SOURCES = test/testxlt.c sh4/xltcache.c sh4/xltcache.h
    1.56 @@ -124,3 +129,6 @@
    1.57  	./gendec sh4/sh4.def sh4/sh4stat.in -o sh4/sh4stat.c
    1.58  pvr2/gl_slsrc.c: genglsl pvr2/vertex.glsl pvr2/fragment.glsl
    1.59  	./genglsl pvr2/vertex.glsl pvr2/fragment.glsl pvr2/gl_slsrc.c
    1.60 +drivers/mac_keymap.h: drivers/mac_keymap.txt drivers/genkeymap.pl
    1.61 +	drivers/genkeymap.pl mac drivers/mac_keymap.txt > drivers/mac_keymap.h
    1.62 +	
    1.63 \ No newline at end of file