Minor Mac OS X build fixes.

icculus · Jul 28, 2007 · 40734a0 · 40734a0
1 parent 31b75a5
commit 40734a0
Showing 1 changed file with 3 additions and 4 deletions.
diff --git 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