From 40734a0e7e57bdbb275b9ec7b5d6b973410fd9e8 Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <icculus@icculus.org>
Date: Sat, 28 Jul 2007 05:42:31 +0000
Subject: [PATCH] Minor Mac OS X build fixes.

---
 Makefile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 8fa4de5..c333ede 100644
--- a/Makefile
+++ b/Makefile
@@ -7,9 +7,10 @@ macosx := false
 cygwin := false
 
 uname_s := $(shell uname -s)
-uname_o := $(shell uname -o)
 ifeq ($(strip $(uname_s)),Darwin)
   macosx := true
+else
+  uname_o := $(shell uname -o)
 endif
 ifeq ($(strip $(uname_s)),Linux)
   linux := true
@@ -28,12 +29,10 @@ CC := gcc
 LD := gcc
 
 ifeq ($(strip $(macosx)),true)
-  CFLAGS += -fPIC -framework Carbon -framework IOKit
   LDFLAGS += -framework Carbon -framework IOKit
   JAVAC := javac
   MANYMOUSEJNILIB := libManyMouse.jnilib
-  #JNICFLAGS += -I/System/Library/Frameworks/JavaVM.framework/Headers
-  JNICFLAGS += -framework JavaVM
+  JNICFLAGS += -I/System/Library/Frameworks/JavaVM.framework/Headers
   JNILDFLAGS += -bundle -framework JavaVM
 endif