xavi/pcsxr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@34067 e17a0e51-4ae3-4d35-97c3-1a29b211df97

Browse Source
This commit is contained in:
SND\weimingzhi_cp 2009-10-30 15:57:34 +00:00
parent 0b461b4c83
commit ca856e5394
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -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>

4
plugins/dfinput/Makefile.am
View File

@ -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

4
plugins/dfinput/Makefile.in
View File

@ -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)