diff options
| author | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2009-10-30 15:57:34 +0000 |
|---|---|---|
| committer | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2009-10-30 15:57:34 +0000 |
| commit | ca856e539419b30201a64b7608debd0fb191a2a3 (patch) | |
| tree | 9f15cc6540cd56d1686d140222f6d9fa7c642f0a | |
| parent | 0b461b4c836f6a95d858f81c216b264e3e3e58e5 (diff) | |
| download | pcsxr-ca856e539419b30201a64b7608debd0fb191a2a3.tar.gz | |
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@34067 e17a0e51-4ae3-4d35-97c3-1a29b211df97
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | plugins/dfinput/Makefile.am | 4 | ||||
| -rw-r--r-- | plugins/dfinput/Makefile.in | 4 |
3 files changed, 5 insertions, 4 deletions
@@ -4,6 +4,7 @@ October 30, 2009 Wei Mingzhi <weimingzhi@gmail.com> * plugins/dfsound/spucfg-0.1df/dfsound.glade2: Likewise. * plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2: Likewise. * plugins/dfinput/pad.h: Declare several variables as volatile. + * plugins/dfinput/Makefile.am: Use $(SDL_CONFIG) instead of "sdl-config". October 29, 2009 Wei Mingzhi <weimingzhi@gmail.com> diff --git a/plugins/dfinput/Makefile.am b/plugins/dfinput/Makefile.am index b600352f..7c7a8a48 100644 --- a/plugins/dfinput/Makefile.am +++ b/plugins/dfinput/Makefile.am @@ -5,13 +5,13 @@ lib_LTLIBRARIES = libDFInput.la libDFInput_la_SOURCES = cfg.c pad.c pad.h sdljoy.c xkb.c analog.c libDFInput_la_LDFLAGS = -module -avoid-version -lpthread -lX11 \ - `sdl-config --libs` -L/usr/X11R6/lib64 -L/usr/X11R6/lib + `$(SDL_CONFIG) --libs` -L/usr/X11R6/lib64 -L/usr/X11R6/lib INCLUDES = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \ -DLOCALE_DIR=\"${datadir}/locale/\" \ -DDATADIR=\"${datadir}/psemu/\" \ $(GTK2_CFLAGS) $(GLADE2_CFLAGS) -I/usr/X11R6/include \ - -I../../include -I../../libpcsxcore `sdl-config --cflags` + -I../../include -I../../libpcsxcore `$(SDL_CONFIG) --cflags` bin_PROGRAMS = cfgDFInput cfgDFInput_SOURCES = cfg-gtk2.c pad.h diff --git a/plugins/dfinput/Makefile.in b/plugins/dfinput/Makefile.in index 4a2982ba..3a12a2f9 100644 --- a/plugins/dfinput/Makefile.in +++ b/plugins/dfinput/Makefile.in @@ -241,13 +241,13 @@ top_srcdir = @top_srcdir@ lib_LTLIBRARIES = libDFInput.la libDFInput_la_SOURCES = cfg.c pad.c pad.h sdljoy.c xkb.c analog.c libDFInput_la_LDFLAGS = -module -avoid-version -lpthread -lX11 \ - `sdl-config --libs` -L/usr/X11R6/lib64 -L/usr/X11R6/lib + `$(SDL_CONFIG) --libs` -L/usr/X11R6/lib64 -L/usr/X11R6/lib INCLUDES = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \ -DLOCALE_DIR=\"${datadir}/locale/\" \ -DDATADIR=\"${datadir}/psemu/\" \ $(GTK2_CFLAGS) $(GLADE2_CFLAGS) -I/usr/X11R6/include \ - -I../../include -I../../libpcsxcore `sdl-config --cflags` + -I../../include -I../../libpcsxcore `$(SDL_CONFIG) --cflags` cfgDFInput_SOURCES = cfg-gtk2.c pad.h cfgDFInput_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS) |