npepinpe

diff --git a/source/mupen64plus-audio-sdl/projects/unix/Makefile b/source/mupen64plus-audio-sdl/projects/unix/Makefile
index 45db3d1..133ee44 100644
--- a/source/mupen64plus-audio-sdl/projects/unix/Makefile
+++ b/source/mupen64plus-audio-sdl/projects/unix/Makefile
@@ -134,19 +134,32 @@ ifeq ($(OS), LINUX)
   LDLIBS += -ldl
 endif
 ifeq ($(OS), OSX)
+  # Select the proper SDK
+  # Also, SDKs are stored in a different location since XCode 4.3

npepinpe

diff --git a/source/mupen64plus-ui-console/src/main.c b/source/mupen64plus-ui-console/src/main.c
index 0568deb..c84def2 100644
--- a/source/mupen64plus-ui-console/src/main.c
+++ b/source/mupen64plus-ui-console/src/main.c
@@ -31,7 +31,7 @@
 
 // The mac version of SDL requires inclusion of SDL_main in the executable
 #ifdef __APPLE__
-#include <SDL/SDL_main.h>
+#include <SDL_main.h>

npepinpe

diff --git a/source/mupen64plus-audio-sdl/projects/unix/Makefile b/source/mupen64plus-audio-sdl/projects/unix/Makefile
index 45db3d1..133ee44 100644
--- a/source/mupen64plus-audio-sdl/projects/unix/Makefile
+++ b/source/mupen64plus-audio-sdl/projects/unix/Makefile
@@ -134,19 +134,32 @@ ifeq ($(OS), LINUX)
   LDLIBS += -ldl
 endif
 ifeq ($(OS), OSX)
+  # Select the proper SDK
+  # Also, SDKs are stored in a different location since XCode 4.3

npepinpe

diff --git a/source/mupen64plus-core/projects/unix/Makefile b/source/mupen64plus-core/projects/unix/Makefile
index e2df2c6..d57d8a8 100644
--- a/source/mupen64plus-core/projects/unix/Makefile
+++ b/source/mupen64plus-core/projects/unix/Makefile
@@ -171,8 +183,14 @@ endif
 ifeq ($(shell pkg-config --modversion libpng 2>/dev/null),)
   $(error No libpng development libraries found!)
 endif
-ifeq ($(shell pkg-config --modversion zlib 2>/dev/null),)
-  $(error No zlib development libraries found!)

npepinpe

diff --git a/Makefile b/Makefile
index e76bfe3..56c9bc1 100644
--- a/Makefile
+++ b/Makefile
@@ -389,11 +389,11 @@ tools/input_common_joyconfig.o: input/input_common.c
 
 install: $(TARGET)
 	mkdir -p $(DESTDIR)$(PREFIX)/bin 2>/dev/null || /bin/true
-	mkdir -p $(DESTDIR)/etc 2>/dev/null || /bin/true
+	mkdir -p $(DESTDIR)HOMEBREW_PREFIX/etc 2>/dev/null || /bin/true

npepinpe

diff --git a/Makefile b/Makefile
index e76bfe3..56c9bc1 100644
--- a/Makefile
+++ b/Makefile
@@ -389,11 +389,11 @@ tools/input_common_joyconfig.o: input/input_common.c
 
 install: $(TARGET)
 	mkdir -p $(DESTDIR)$(PREFIX)/bin 2>/dev/null || /bin/true
-	mkdir -p $(DESTDIR)/etc 2>/dev/null || /bin/true
+	mkdir -p $(DESTDIR)HOMEBREW_PREFIX/etc 2>/dev/null || /bin/true

npepinpe

def context(context)
  previous_context = self.get_context
  Thread.current[:__honeybadger_context] = previous_context.respond_to?(:merge) ? previous_context.merge(context) : context
  yield
ensure
  Thread.current[:__honeybadger_context] = previous_context
end

npepinpe

$ terraform init -backend-config='key=global.tfstate' -backend-config=config.tfvars
2017/03/22 17:03:20 [INFO] Terraform version: 0.9.1
2017/03/22 17:03:20 [INFO] Go runtime version: go1.8
2017/03/22 17:03:20 [INFO] CLI args: []string{"/usr/local/Cellar/terraform/0.9.1_1/bin/terraform", "init", "-backend-config='key=global.tfstate'", "-backend-config=config.tfvars"}
2017/03/22 17:03:20 [DEBUG] Detected home directory from env var: /Users/npepinpe
2017/03/22 17:03:20 [DEBUG] Detected home directory from env var: /Users/npepinpe
2017/03/22 17:03:20 [DEBUG] Attempting to open CLI config file: /Users/npepinpe/.terraformrc
2017/03/22 17:03:20 [DEBUG] File doesn't exist, but doesn't need to. Ignoring.
2017/03/22 17:03:20 [DEBUG] Detected home directory from env var: /Users/npepinpe
2017/03/22 17:03:20 [INFO] CLI command args: []string{"init", "-backend-config='key=global.tfstate'", "-backend-config=config.tfvars"}

npepinpe

org.junit.ComparisonFailure: expected:<[tru]e> but was:<[fals]e>
at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method)
at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62)
at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45)
at io.zeebe.test.util.TestUtil$Invocation.until(TestUtil.java:96)
at io.zeebe.test.util.TestUtil$Invocation.until(TestUtil.java:69)
at io.zeebe.test.util.TestUtil.waitUntil(TestUtil.java:41)
at io.zeebe.exporter.ElasticsearchExporterFaultToleranceIT.lambda$shouldExportEvenIfElasticNotInitiallyReachable$1(ElasticsearchExporterFaultToleranceIT.java:44)
at java.util.stream.ForEachOps$ForEachOp$OfRef.accept(ForEachOps.java:184)
at java.util.stream.ReferencePipeline$2$1.accept(ReferencePipeline.java:175)

npepinpe

io.zeebe.test.util.stream.StreamWrapperException: No event found matching the criteria
at java.util.Optional.orElseThrow(Optional.java:290)
at io.zeebe.test.util.stream.StreamWrapper.getFirst(StreamWrapper.java:80)
at io.zeebe.test.exporter.ExporterIntegrationRule.performSampleWorkload(ExporterIntegrationRule.java:285)
at io.zeebe.exporter.ElasticsearchExporterIT.shouldExportRecords(ElasticsearchExporterIT.java:73)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:498)
at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)