diff options
| author | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-05-20 04:55:02 +0000 |
|---|---|---|
| committer | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-05-20 04:55:02 +0000 |
| commit | b8b814362e39bd1abbcaf47df579cd8ad2793aa4 (patch) | |
| tree | a7d4dab6a4a78e0a501098f82229cc292fb60293 /plugins | |
| parent | e1e09a77d27270ea451e043c66bc14789a5e57a4 (diff) | |
| download | pcsxr-b8b814362e39bd1abbcaf47df579cd8ad2793aa4.tar.gz | |
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@48367 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/dfinput/Makefile.am | 4 | ||||
| -rw-r--r-- | plugins/dfinput/Makefile.in | 4 | ||||
| -rw-r--r-- | plugins/dfsound/Makefile.am | 4 | ||||
| -rw-r--r-- | plugins/dfsound/Makefile.in | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/plugins/dfinput/Makefile.am b/plugins/dfinput/Makefile.am index 96a340d5..8c81e94f 100644 --- a/plugins/dfinput/Makefile.am +++ b/plugins/dfinput/Makefile.am @@ -11,12 +11,12 @@ 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_CFLAGS) bin_PROGRAMS = cfgDFInput cfgDFInput_SOURCES = cfg-gtk2.c pad.h cfgDFInput_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS) -cfgDFInput_LDFLAGS = `$(SDL_CONFIG) --libs` +cfgDFInput_LDFLAGS = $(SDL_LIBS) glade_DATA = dfinput.glade2 gladedir = $(datadir)/psemu/ diff --git a/plugins/dfinput/Makefile.in b/plugins/dfinput/Makefile.in index 9d4c25d8..da23e1d9 100644 --- a/plugins/dfinput/Makefile.in +++ b/plugins/dfinput/Makefile.in @@ -263,11 +263,11 @@ 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_CFLAGS) cfgDFInput_SOURCES = cfg-gtk2.c pad.h cfgDFInput_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS) -cfgDFInput_LDFLAGS = `$(SDL_CONFIG) --libs` +cfgDFInput_LDFLAGS = $(SDL_LIBS) glade_DATA = dfinput.glade2 gladedir = $(datadir)/psemu/ EXTRA_DIST = $(glade_DATA) diff --git a/plugins/dfsound/Makefile.am b/plugins/dfsound/Makefile.am index 6c02286c..5324e169 100644 --- a/plugins/dfsound/Makefile.am +++ b/plugins/dfsound/Makefile.am @@ -11,9 +11,9 @@ lib_LTLIBRARIES = libDFSound.la libDFSound_la_SOURCES = spu.c cfg.c dma.c freeze.c psemu.c registers.c sdl.c -libDFSound_la_CFLAGS = `$(SDL_CONFIG) --cflags` +libDFSound_la_CFLAGS = $(SDL_CFLAGS) libDFSound_la_LDFLAGS = -module -avoid-version -lpthread -lm -libDFSound_la_LDFLAGS += `$(SDL_CONFIG) --libs` +libDFSound_la_LDFLAGS += $(SDL_LIBS) bin_PROGRAMS = cfgDFSound cfgDFSound_SOURCES = spucfg-0.1df/main.c diff --git a/plugins/dfsound/Makefile.in b/plugins/dfsound/Makefile.in index 1fde641d..a02374ea 100644 --- a/plugins/dfsound/Makefile.in +++ b/plugins/dfsound/Makefile.in @@ -262,9 +262,9 @@ INCLUDES = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \ lib_LTLIBRARIES = libDFSound.la libDFSound_la_SOURCES = spu.c cfg.c dma.c freeze.c psemu.c registers.c sdl.c -libDFSound_la_CFLAGS = `$(SDL_CONFIG) --cflags` +libDFSound_la_CFLAGS = $(SDL_CFLAGS) libDFSound_la_LDFLAGS = -module -avoid-version -lpthread -lm \ - `$(SDL_CONFIG) --libs` + $(SDL_LIBS) cfgDFSound_SOURCES = spucfg-0.1df/main.c cfgDFSound_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS) glade_DATA = spucfg-0.1df/dfsound.glade2 |