diff options
| author | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-12-27 03:02:25 +0000 |
|---|---|---|
| committer | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-12-27 03:02:25 +0000 |
| commit | e832ac97861db3896e6771d091eb952c706dd101 (patch) | |
| tree | 75f96c74a21527244701f0c9032a46c0170de3f4 /plugins/dfxvideo/Makefile.am | |
| parent | 3f28bbe662d843c6cd3e073e44752f0f28560a02 (diff) | |
| download | pcsxr-e832ac97861db3896e6771d091eb952c706dd101.tar.gz | |
* Removed unnecessary files.
* Clean up build system (Issue #7815, VoidMage).
* properly init some variables on reset (Patch #7887, notaz).
* dfxvideo: several fixes to FPS bar (Patch #7879, dario86).
* Region autodetection for 3 PAL demos (Patch #7879, dario86).
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@61512 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'plugins/dfxvideo/Makefile.am')
| -rw-r--r-- | plugins/dfxvideo/Makefile.am | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/plugins/dfxvideo/Makefile.am b/plugins/dfxvideo/Makefile.am index 89ba770e..a7515a21 100644 --- a/plugins/dfxvideo/Makefile.am +++ b/plugins/dfxvideo/Makefile.am @@ -6,10 +6,9 @@ SUFFIXES = .asm $(LIBTOOL) --tag=CC --mode=compile \ $(STRIP_FPIC) $(NASM) -f elf -d ELF -I${srcdir}/ $< -INCLUDES = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \ - -DLOCALE_DIR=\"${datadir}/locale/\" \ +AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \ -DDATADIR=\"${datadir}/psemu/\" \ - $(GTK2_CFLAGS) $(GLADE2_CFLAGS) -I/usr/X11R6/include \ + $(GTK2_CFLAGS) $(GLADE2_CFLAGS) \ -I../../libpcsxcore \ -I../../include @@ -21,15 +20,14 @@ lib_LTLIBRARIES = libDFXVideo.la libDFXVideo_la_SOURCES = gpu.c cfg.c draw.c fps.c key.c menu.c prim.c soft.c zn.c if X86_NASM libDFXVideo_la_SOURCES += i386.asm -INCLUDES += -DUSE_NASM=1 +AM_CPPFLAGS += -DUSE_NASM=1 endif libDFXVideo_la_LDFLAGS = -module -avoid-version -libDFXVideo_la_LDFLAGS += -L/usr/X11R6/lib64 -L/usr/X11R6/lib \ - -lX11 -lXv -lXext -lm +libDFXVideo_la_LIBADD = -lX11 -lXv -lXext -lm bin_PROGRAMS = cfgDFXVideo cfgDFXVideo_SOURCES = gpucfg-0.1df/main.c -cfgDFXVideo_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS) -L/usr/X11R6/lib -lXext +cfgDFXVideo_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS) -lXext glade_DATA = gpucfg-0.1df/dfxvideo.glade2 gladedir = $(datadir)/psemu/ |