diff options
| author |  Alexey Yakovenko <wakeroid@gmail.com> | 2010-01-20 22:01:28 +0100 |
|---|---|---|
| committer | Alexey Yakovenko <wakeroid@gmail.com> | 2010-01-20 22:01:28 +0100 |
| commit | daaf116907008753c925cca12f7ff813d494d935 (patch) | |
| tree | 0591fdcad04a3d6cf69abb71788fefaeaf4106ef /Makefile.am | |
| parent | d871f990b703f1b453a727b0346c69d181639118 (diff) | |
| parent | 4872a51d33d9b449f8270a97aa3497e28cd0b3eb (diff) | |
Merge branch 'master' into notify
Conflicts:
configure.ac
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index b5472c65..90b873ba 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,7 +20,8 @@ SUBDIRS = gme/Game_Music_Emu-0.5.2\ ${VFS_CURL_DIR}\ ${CDDA_DIR}\ ${GTKUI_DIR}\ - ${FFMPEG_DIR} + ${FFMPEG_DIR}\ + ${OSS_DIR} dumbpath=@top_srcdir@/dumb sidpath=@top_srcdir@/sid/sidplay-libs-2.1.0 |