Search
lxdream.org :: lxdream/src/Makefile.am :: diff
lxdream 0.9.1
released Jun 29
Download Now
filename src/Makefile.am
changeset 635:76c63aac3590
prev614:a2d239d4438a
next639:162ee7614b60
author nkeynes
date Thu Feb 14 13:54:11 2008 +0000 (12 years ago)
branchlxdream-render
permissions -rw-r--r--
last change Commit render work in progress. Main changes:
* Preliminary OSMesa support
* Move the generic gl code out to pvr2/
* Implement scene data structure + reader
* Remove the 1/z adjustments
file annotate diff log raw
1.1 --- a/src/Makefile.am Mon Jan 28 02:38:09 2008 +0000
1.2 +++ b/src/Makefile.am Thu Feb 14 13:54:11 2008 +0000
1.3 @@ -13,7 +13,7 @@
1.4
1.5 AM_CFLAGS = -D_ISOC99_SOURCE -D_BSD_SOURCE
1.6 TESTS = test/testxlt
1.7 -BUILT_SOURCES = sh4/sh4core.c sh4/sh4dasm.c sh4/sh4x86.c drivers/gl_slsrc.c
1.8 +BUILT_SOURCES = sh4/sh4core.c sh4/sh4dasm.c sh4/sh4x86.c pvr2/gl_slsrc.c
1.9
1.10 gendec_SOURCES = tools/gendec.c tools/gendec.h tools/insparse.c tools/actparse.c
1.11 genglsl_SOURCES = tools/genglsl.c
1.12 @@ -34,14 +34,14 @@
1.13 aica/aica.c aica/aica.h aica/audio.c aica/audio.h \
1.14 pvr2/pvr2.c pvr2/pvr2.h pvr2/pvr2mem.c \
1.15 pvr2/tacore.c pvr2/render.c pvr2/rendcore.c pvr2/rendbkg.c pvr2/rendsort.c \
1.16 - pvr2/texcache.c pvr2/yuv.c pvr2/rendsave.c \
1.17 + pvr2/texcache.c pvr2/yuv.c pvr2/rendsave.c pvr2/scene.c pvr2/scene.h \
1.18 + pvr2/gl_sl.c pvr2/gl_slsrc.c pvr2/glutil.c pvr2/glutil.h \
1.19 maple/maple.c maple/maple.h \
1.20 maple/controller.c maple/controller.h maple/kbd.c maple/mouse.c \
1.21 loader.c bootstrap.c util.c \
1.22 display.c display.h dckeysyms.h \
1.23 drivers/audio_null.c drivers/video_null.c \
1.24 - drivers/gl_common.c drivers/gl_common.h drivers/gl_fbo.c \
1.25 - drivers/gl_sl.c drivers/gl_slsrc.c
1.26 + drivers/video_gl.c drivers/video_gl.h drivers/gl_fbo.c
1.27
1.28 if BUILD_SH4X86
1.29 lxdream_SOURCES += sh4/sh4x86.c sh4/x86op.h \
1.30 @@ -61,12 +61,21 @@
1.31 endif
1.32
1.33 if GUI_GTK
1.34 +if OSMESA_DRIVER
1.35 lxdream_SOURCES += gtkui/gtkui.c gtkui/gtkui.h \
1.36 gtkui/main_win.c gtkui/gtkcb.c \
1.37 gtkui/mmio_win.c gtkui/debug_win.c gtkui/dump_win.c \
1.38 gtkui/ctrl_dlg.c gtkui/path_dlg.c gtkui/gdrom_menu.c \
1.39 drivers/video_gtk.c drivers/video_gtk.h \
1.40 - drivers/video_glx.c drivers/video_glx.h
1.41 + drivers/video_gdk.c drivers/video_gdk.h
1.42 +else
1.43 +lxdream_SOURCES += gtkui/gtkui.c gtkui/gtkui.h \
1.44 + gtkui/main_win.c gtkui/gtkcb.c \
1.45 + gtkui/mmio_win.c gtkui/debug_win.c gtkui/dump_win.c \
1.46 + gtkui/ctrl_dlg.c gtkui/path_dlg.c gtkui/gdrom_menu.c \
1.47 + drivers/video_gtk.c drivers/video_gtk.h \
1.48 + drivers/video_glx.c drivers/video_glx.h
1.49 +endif
1.50 endif
1.51
1.52 if CDROM_LINUX
1.53 @@ -99,5 +108,5 @@
1.54 ./gendec sh4/sh4.def sh4/sh4x86.in -o sh4/sh4x86.c
1.55 sh4/sh4stat.c: gendec sh4/sh4.def sh4/sh4stat.in
1.56 ./gendec sh4/sh4.def sh4/sh4stat.in -o sh4/sh4stat.c
1.57 -drivers/gl_slsrc.c: genglsl drivers/vertex.glsl drivers/fragment.glsl
1.58 - ./genglsl drivers/vertex.glsl drivers/fragment.glsl drivers/gl_slsrc.c
1.59 +pvr2/gl_slsrc.c: genglsl pvr2/vertex.glsl pvr2/fragment.glsl
1.60 + ./genglsl pvr2/vertex.glsl pvr2/fragment.glsl pvr2/gl_slsrc.c
.