1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
|
--- a/src/Makefile.am 2010-04-10 16:37:27.976380239 +0200
+++ b/src/Makefile.am 2010-04-10 16:39:15.145932297 +0200
@@ -13,7 +13,8 @@
AM_CPPFLAGS = \
-I$(top_srcdir)/dllwrapper/wine \
-I$(top_srcdir)/src/BuzzMachineLoader \
- -I$(top_srcdir)/src
+ -I$(top_srcdir)/src \
+ -DNATIVE_BML_DIR="\"$(pkglibdir)\""
AM_CFLAGS = $(PTHREAD_CFLAGS) $(BML_CFLAGS) $(ARCH_CFLAGS)
--- a/src/BuzzMachineLoader/Makefile.am 2010-04-10 16:41:07.696380470 +0200
+++ b/src/BuzzMachineLoader/Makefile.am 2010-04-10 16:41:10.740380785 +0200
@@ -1,6 +1,6 @@
## $Id: Makefile.am 2174 2008-12-30 12:55:07Z ensonic $
-lib_LTLIBRARIES = libbuzzmachineloader.la
+pkglib_LTLIBRARIES = libbuzzmachineloader.la
libbuzzmachineloader_la_SOURCES = \
BuzzMachineCallbacks.cpp \
--- a/src/bml.c 2010-04-10 16:39:03.424409870 +0200
+++ b/src/bml.c 2010-04-10 16:39:06.826505256 +0200
@@ -484,7 +484,7 @@
BMLX(bmlw_set_logger(use_log?bml_stdout_logger:bml_null_logger));
#endif /* HAVE_X86 */
- if(!(emu_so=dlopen("libbuzzmachineloader.so",RTLD_LAZY))) {
+ if(!(emu_so=dlopen(NATIVE_BML_DIR "/libbuzzmachineloader.so",RTLD_LAZY))) {
TRACE("%s: failed to load native bml : %s\n",__FUNCTION__,dlerror());
return(FALSE);
}
|
