diff options
| -rw-r--r-- | Makefile.android | 7 | ||||
| -rw-r--r-- | android/main-common.c | 15 | ||||
| -rw-r--r-- | audio/winaudio.c | 4 |
3 files changed, 15 insertions, 11 deletions
diff --git a/Makefile.android b/Makefile.android index d638640..184179e 100644 --- a/Makefile.android +++ b/Makefile.android @@ -192,9 +192,10 @@ endif ifeq ($(HOST_OS),darwin) QEMU_SYSTEM_LDLIBS += -Wl,-framework,Cocoa,-framework,QTKit,-framework,CoreVideo ifneq ($(filter 10.7 10.7.%,$(DARWIN_VERSION)),) - # Lion needs to be forced to link dylib to avoid problems - # with the dynamic function lookups in SDL 1.2 - QEMU_SYSTEM_LDLIBS += /usr/lib/dylib1.o + # Lion/XCode4 needs to be explicitly told the dynamic library + # lookup symbols in the precompiled libSDL are resolved at + # runtime + QEMU_SYSTEM_LDLIBS += -undefined dynamic_lookup endif endif diff --git a/android/main-common.c b/android/main-common.c index a662907..04d200a 100644 --- a/android/main-common.c +++ b/android/main-common.c @@ -806,12 +806,15 @@ AvdInfo* createAVD(AndroidOptions* opts, int* inAndroidBuild) exit(2); } - android_build_root = path_parent( out, 4 ); - if (android_build_root == NULL || !path_exists(android_build_root)) { - derror("Can't find the Android build root from '%s'\n" - "Please check the definition of the ANDROID_PRODUCT_OUT variable.\n" - "It should point to your product-specific build output directory.\n", - out ); + android_build_root = getenv("ANDROID_BUILD_TOP"); + if (android_build_root == NULL || android_build_root[0] == 0) + break; + + if (!path_exists(android_build_root)) { + derror("Can't find the Android build root '%s'\n" + "Please check the definition of the ANDROID_BUILD_TOP variable.\n" + "It should point to the root of your source tree.\n", + android_build_root ); exit(2); } android_build_out = out; diff --git a/audio/winaudio.c b/audio/winaudio.c index 75f6af2..5c2c6b9 100644 --- a/audio/winaudio.c +++ b/audio/winaudio.c @@ -381,7 +381,7 @@ winaudio_in_fini (HWVoiceIn *hw) s->wavein = 0;
}
- for ( i=0; i<NUM_OUT_BUFFERS; ++i ) {
+ for ( i=0; i<NUM_IN_BUFFERS; ++i ) {
if ( s->buffers[i].dwUser != 0xFFFF ) {
waveInUnprepareHeader(
s->wavein, &s->buffers[i], sizeof(s->buffers[i]) );
@@ -411,7 +411,7 @@ winaudio_in_init (HWVoiceIn *hw, struct audsettings *as) s->wavein = NULL;
InitializeCriticalSection( &s->lock );
- for (i = 0; i < NUM_OUT_BUFFERS; i++) {
+ for (i = 0; i < NUM_IN_BUFFERS; i++) {
s->buffers[i].dwUser = 0xFFFF;
}
s->buffer_bytes = NULL;
|