diff options
| author | SND\edgbla_cp <SND\edgbla_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-12-23 15:37:49 +0000 |
|---|---|---|
| committer | SND\edgbla_cp <SND\edgbla_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-12-23 15:37:49 +0000 |
| commit | 3de3fe16d3b0eb823b64de2b6d7f4949a642b87b (patch) | |
| tree | 692466f84cbda740a39dd0bd9a3e1ab3828aa7ef /plugins/peopsxgl/Makefile.am | |
| parent | a72a3208b9649b4e2ae5c18976485ba297865c4c (diff) | |
| download | pcsxr-3de3fe16d3b0eb823b64de2b6d7f4949a642b87b.tar.gz | |
Patches (7851): 7851, 7855, 7856;
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@61440 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'plugins/peopsxgl/Makefile.am')
| -rw-r--r-- | plugins/peopsxgl/Makefile.am | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/plugins/peopsxgl/Makefile.am b/plugins/peopsxgl/Makefile.am index d88dc94b..9875cbfe 100644 --- a/plugins/peopsxgl/Makefile.am +++ b/plugins/peopsxgl/Makefile.am @@ -1,8 +1,8 @@ -INCLUDES = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \ +AM_CPPFLAGS = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \ -DLOCALE_DIR=\"${datadir}/locale/\" \ -DDATADIR=\"${datadir}/psemu/\" \ - $(GTK2_CFLAGS) $(GLADE2_CFLAGS) -I/usr/X11R6/include \ - -I../../libpcsxcore -I../../include -fPIC + $(GTK2_CFLAGS) \ + -I../../libpcsxcore -I../../include bindir = @libdir@/games/psemu/ libdir = @libdir@/games/psemu/ @@ -11,14 +11,13 @@ lib_LTLIBRARIES = libpeopsxgl.la libpeopsxgl_la_SOURCES = cfg.c draw.c fps.c gpu.c key.c menu.c \ prim.c soft.c texture.c -libpeopsxgl_la_LDFLAGS = -module -avoid-version \ - -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11 -lXxf86vm -lGL -lm +libpeopsxgl_la_LDFLAGS = -module -avoid-version +libpeopsxgl_la_LIBADD = -lX11 -lXxf86vm -lGL -lm bin_PROGRAMS = cfgpeopsxgl -cfgpeopsxgl_SOURCES = gpucfg/main.c gpucfg/callbacks.c gpucfg/interface.c \ - gpucfg/support.c -cfgpeopsxgl_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS) +cfgpeopsxgl_SOURCES = gpucfg/main.c +cfgpeopsxgl_LDADD = $(GTK2_LIBS) -#glade_DATA = gpucfg-0.1df/peopsxgl.glade2 -#gladedir = $(datadir)/psemu/ +glade_DATA = gpucfg/gpucfg-newstyle2.glade +gladedir = $(datadir)/psemu/ #EXTRA_DIST = $(glade_DATA) |