Search
lxdream.org :: lxdream/src/Makefile.in :: diff
lxdream 0.9.1
released Jun 29
Download Now
filename src/Makefile.in
changeset 1245:01e0020adf88
prev1239:be3121267597
next1255:d63f73cc586f
author nkeynes
date Fri Mar 02 23:49:10 2012 +1000 (8 years ago)
permissions -rw-r--r--
last change Android WIP:
* Rename gui_jni.c to gui_android.c - now quite android specific.
* Implement generic EGL driver with very minimal Java wrapper
* Run emulation in separate thread, and implement simple queue for
inter-thread communication.
* Add menu/action-bar items for start + reset
file annotate diff log raw
1.1 --- a/src/Makefile.in Sat Feb 25 21:30:49 2012 +1000
1.2 +++ b/src/Makefile.in Fri Mar 02 23:49:10 2012 +1000
1.3 @@ -58,7 +58,7 @@
1.4 @GUI_GTK_TRUE@ gtkui/gtk_ctrl.c gtkui/gtk_gd.c \
1.5 @GUI_GTK_TRUE@ drivers/video_gtk.c
1.6
1.7 -@GUI_ANDROID_TRUE@am__append_5 = gui_none.c
1.8 +@GUI_ANDROID_TRUE@am__append_5 = gui_none.c drivers/video_egl.c drivers/video_egl.h
1.9 @GUI_ANDROID_TRUE@noinst_PROGRAMS = liblxdream.so$(EXEEXT)
1.10 @GUI_COCOA_TRUE@am__append_6 = cocoaui/paths_osx.m drivers/io_osx.m drivers/mac_keymap.h drivers/mac_keymap.txt
1.11 @GUI_COCOA_TRUE@am__append_7 = cocoaui/cocoaui.m cocoaui/cocoaui.h cocoaui/cocoa_cfg.m \
1.12 @@ -216,9 +216,11 @@
1.13 input_lirc_@SOEXT@_OBJECTS = $(am_input_lirc_@SOEXT@_OBJECTS)
1.14 @BUILD_PLUGINS_TRUE@@INPUT_LIRC_TRUE@input_lirc_@SOEXT@_DEPENDENCIES = \
1.15 @BUILD_PLUGINS_TRUE@@INPUT_LIRC_TRUE@ input_lirc.lo
1.16 -am__liblxdream_so_SOURCES_DIST = gui_jni.c drivers/cdrom/cd_none.c
1.17 -@GUI_ANDROID_TRUE@am_liblxdream_so_OBJECTS = gui_jni.$(OBJEXT) \
1.18 -@GUI_ANDROID_TRUE@ cd_none.$(OBJEXT)
1.19 +am__liblxdream_so_SOURCES_DIST = gui_android.c drivers/cdrom/cd_none.c \
1.20 + drivers/video_egl.c drivers/video_egl.h tqueue.c tqueue.h
1.21 +@GUI_ANDROID_TRUE@am_liblxdream_so_OBJECTS = gui_android.$(OBJEXT) \
1.22 +@GUI_ANDROID_TRUE@ cd_none.$(OBJEXT) video_egl.$(OBJEXT) \
1.23 +@GUI_ANDROID_TRUE@ tqueue.$(OBJEXT)
1.24 liblxdream_so_OBJECTS = $(am_liblxdream_so_OBJECTS)
1.25 am__DEPENDENCIES_1 =
1.26 @GUI_ANDROID_TRUE@liblxdream_so_DEPENDENCIES = liblxdream-core.a \
1.27 @@ -227,14 +229,15 @@
1.28 gtkui/gtkui.h gtkui/gtk_win.c gtkui/gtkcb.c gtkui/gtk_cfg.c \
1.29 gtkui/gtk_mmio.c gtkui/gtk_debug.c gtkui/gtk_dump.c \
1.30 gtkui/gtk_ctrl.c gtkui/gtk_gd.c drivers/video_gtk.c gui_none.c \
1.31 - cocoaui/cocoaui.m cocoaui/cocoaui.h cocoaui/cocoa_cfg.m \
1.32 - cocoaui/cocoa_win.m cocoaui/cocoa_gd.m cocoaui/cocoa_prefs.m \
1.33 - cocoaui/cocoa_ctrl.m drivers/video_osx.m drivers/video_gdk.c \
1.34 - drivers/video_glx.c drivers/video_glx.h drivers/video_nsgl.m \
1.35 - drivers/video_nsgl.h drivers/audio_osx.m drivers/audio_sdl.c \
1.36 - drivers/audio_pulse.c drivers/audio_esd.c drivers/audio_alsa.c \
1.37 - drivers/input_lirc.c drivers/cdrom/cd_linux.c \
1.38 - drivers/cdrom/cd_osx.c drivers/osx_iokit.m drivers/osx_iokit.h \
1.39 + drivers/video_egl.c drivers/video_egl.h cocoaui/cocoaui.m \
1.40 + cocoaui/cocoaui.h cocoaui/cocoa_cfg.m cocoaui/cocoa_win.m \
1.41 + cocoaui/cocoa_gd.m cocoaui/cocoa_prefs.m cocoaui/cocoa_ctrl.m \
1.42 + drivers/video_osx.m drivers/video_gdk.c drivers/video_glx.c \
1.43 + drivers/video_glx.h drivers/video_nsgl.m drivers/video_nsgl.h \
1.44 + drivers/audio_osx.m drivers/audio_sdl.c drivers/audio_pulse.c \
1.45 + drivers/audio_esd.c drivers/audio_alsa.c drivers/input_lirc.c \
1.46 + drivers/cdrom/cd_linux.c drivers/cdrom/cd_osx.c \
1.47 + drivers/osx_iokit.m drivers/osx_iokit.h \
1.48 drivers/cdrom/cd_none.c drivers/joy_linux.c \
1.49 drivers/joy_linux.h
1.50 @BUILD_PLUGINS_TRUE@am__objects_4 = plugin.$(OBJEXT)
1.51 @@ -243,7 +246,8 @@
1.52 @GUI_GTK_TRUE@ gtk_mmio.$(OBJEXT) gtk_debug.$(OBJEXT) \
1.53 @GUI_GTK_TRUE@ gtk_dump.$(OBJEXT) gtk_ctrl.$(OBJEXT) \
1.54 @GUI_GTK_TRUE@ gtk_gd.$(OBJEXT) video_gtk.$(OBJEXT)
1.55 -@GUI_ANDROID_TRUE@am__objects_6 = gui_none.$(OBJEXT)
1.56 +@GUI_ANDROID_TRUE@am__objects_6 = gui_none.$(OBJEXT) \
1.57 +@GUI_ANDROID_TRUE@ video_egl.$(OBJEXT)
1.58 @GUI_COCOA_TRUE@am__objects_7 = cocoaui.$(OBJEXT) cocoa_cfg.$(OBJEXT) \
1.59 @GUI_COCOA_TRUE@ cocoa_win.$(OBJEXT) cocoa_gd.$(OBJEXT) \
1.60 @GUI_COCOA_TRUE@ cocoa_prefs.$(OBJEXT) cocoa_ctrl.$(OBJEXT) \
1.61 @@ -343,6 +347,7 @@
1.62 AMTAR = @AMTAR@
1.63 ANDROID_GDBSERVER = @ANDROID_GDBSERVER@
1.64 ANDROID_NDK_HOME = @ANDROID_NDK_HOME@
1.65 +ANDROID_NDK_VERSION = @ANDROID_NDK_VERSION@
1.66 ANDROID_SDK_HOME = @ANDROID_SDK_HOME@
1.67 ANDROID_SDK_VERSION = @ANDROID_SDK_VERSION@
1.68 ANT = @ANT@
1.69 @@ -624,7 +629,7 @@
1.70
1.71 @GUI_ANDROID_TRUE@liblxdream_so_LINK = $(LINK) -Wl,-soname,liblxdream.so -shared
1.72 @GUI_ANDROID_TRUE@liblxdream_so_LDADD = liblxdream-core.a @GLIB_LIBS@ @GTK_LIBS@ @LIBPNG_LIBS@ @LIBISOFS_LIBS@ $(INTLLIBS) @LXDREAM_LIBS@ -lm
1.73 -@GUI_ANDROID_TRUE@liblxdream_so_SOURCES = gui_jni.c drivers/cdrom/cd_none.c
1.74 +@GUI_ANDROID_TRUE@liblxdream_so_SOURCES = gui_android.c drivers/cdrom/cd_none.c drivers/video_egl.c drivers/video_egl.h tqueue.c tqueue.h
1.75 @GUI_ANDROID_TRUE@liblxdream_so_LIBS = liblxdream-core.a
1.76 @BUILD_PLUGINS_TRUE@lxdream_dummy_@SOEXT@_SOURCES =
1.77 @BUILD_PLUGINS_TRUE@lxdream_dummy_@SOEXT@_LDADD = lxdream_dummy.lo @SDL_LIBS@
1.78 @@ -844,7 +849,7 @@
1.79 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtk_win.Po@am__quote@
1.80 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkcb.Po@am__quote@
1.81 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkui.Po@am__quote@
1.82 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui_jni.Po@am__quote@
1.83 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui_android.Po@am__quote@
1.84 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui_none.Po@am__quote@
1.85 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hotkeys.Po@am__quote@
1.86 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i386-dis.Po@am__quote@
1.87 @@ -897,8 +902,10 @@
1.88 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testxlt.Po@am__quote@
1.89 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/texcache.Po@am__quote@
1.90 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timer.Po@am__quote@
1.91 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tqueue.Po@am__quote@
1.92 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Po@am__quote@
1.93 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version.Po@am__quote@
1.94 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_egl.Po@am__quote@
1.95 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_gdk.Po@am__quote@
1.96 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_gl.Po@am__quote@
1.97 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_glx.Po@am__quote@
1.98 @@ -1852,6 +1859,20 @@
1.99 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1.100 @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cd_none.obj `if test -f 'drivers/cdrom/cd_none.c'; then $(CYGPATH_W) 'drivers/cdrom/cd_none.c'; else $(CYGPATH_W) '$(srcdir)/drivers/cdrom/cd_none.c'; fi`
1.101
1.102 +video_egl.o: drivers/video_egl.c
1.103 +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT video_egl.o -MD -MP -MF "$(DEPDIR)/video_egl.Tpo" -c -o video_egl.o `test -f 'drivers/video_egl.c' || echo '$(srcdir)/'`drivers/video_egl.c; \
1.104 +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/video_egl.Tpo" "$(DEPDIR)/video_egl.Po"; else rm -f "$(DEPDIR)/video_egl.Tpo"; exit 1; fi
1.105 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='drivers/video_egl.c' object='video_egl.o' libtool=no @AMDEPBACKSLASH@
1.106 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1.107 +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o video_egl.o `test -f 'drivers/video_egl.c' || echo '$(srcdir)/'`drivers/video_egl.c
1.108 +
1.109 +video_egl.obj: drivers/video_egl.c
1.110 +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT video_egl.obj -MD -MP -MF "$(DEPDIR)/video_egl.Tpo" -c -o video_egl.obj `if test -f 'drivers/video_egl.c'; then $(CYGPATH_W) 'drivers/video_egl.c'; else $(CYGPATH_W) '$(srcdir)/drivers/video_egl.c'; fi`; \
1.111 +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/video_egl.Tpo" "$(DEPDIR)/video_egl.Po"; else rm -f "$(DEPDIR)/video_egl.Tpo"; exit 1; fi
1.112 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='drivers/video_egl.c' object='video_egl.obj' libtool=no @AMDEPBACKSLASH@
1.113 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1.114 +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o video_egl.obj `if test -f 'drivers/video_egl.c'; then $(CYGPATH_W) 'drivers/video_egl.c'; else $(CYGPATH_W) '$(srcdir)/drivers/video_egl.c'; fi`
1.115 +
1.116 gtkui.o: gtkui/gtkui.c
1.117 @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gtkui.o -MD -MP -MF "$(DEPDIR)/gtkui.Tpo" -c -o gtkui.o `test -f 'gtkui/gtkui.c' || echo '$(srcdir)/'`gtkui/gtkui.c; \
1.118 @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/gtkui.Tpo" "$(DEPDIR)/gtkui.Po"; else rm -f "$(DEPDIR)/gtkui.Tpo"; exit 1; fi
.