Minor Mac OS X build fixes.
authorRyan C. Gordon <icculus@icculus.org>
Sat, 28 Jul 2007 05:42:31 +0000
changeset 68 b51db91e34f0
parent 67 135135ec6fa8
child 69 c3079ecb3757
Minor Mac OS X build fixes.
Makefile
--- a/Makefile	Sat Jul 28 05:37:30 2007 +0000
+++ b/Makefile	Sat Jul 28 05:42:31 2007 +0000
@@ -7,9 +7,10 @@
 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 @@
 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