ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-06 05:04:20 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

OSX Lion build changes

Browse Source
This commit is contained in:
Matt Klich 2011-05-26 11:57:30 -06:00
parent 8e736327d4
commit 7148556979
8 changed files with 44 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
classpath/java-io.cpp
View File

@ -15,7 +15,11 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#ifdef __APPLE__
# include <JavaVM/jni.h>
#else
# include "jni.h" # include "jni.h"
#endif
#include "jni-util.h" #include "jni-util.h"
#ifdef PLATFORM_WINDOWS #ifdef PLATFORM_WINDOWS

4
classpath/java-lang.cpp
View File

@ -13,7 +13,11 @@
#include "time.h" #include "time.h"
#include "string.h" #include "string.h"
#include "stdio.h" #include "stdio.h"
#ifdef __APPLE__
# include <JavaVM/jni.h>
#else
# include "jni.h" # include "jni.h"
#endif
#include "jni-util.h" #include "jni-util.h"
#include "errno.h" #include "errno.h"
#include "fcntl.h" #include "fcntl.h"

4
classpath/java-net.cpp
View File

@ -8,7 +8,11 @@
There is NO WARRANTY for this software. See license.txt for There is NO WARRANTY for this software. See license.txt for
details. */ details. */
#ifdef __APPLE__
# include <JavaVM/jni.h>
#else
# include "jni.h" # include "jni.h"
#endif
#include "jni-util.h" #include "jni-util.h"
#ifdef PLATFORM_WINDOWS #ifdef PLATFORM_WINDOWS

4
classpath/java-nio.cpp
View File

@ -13,7 +13,11 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#ifdef __APPLE__
# include <JavaVM/jni.h>
#else
# include "jni.h" # include "jni.h"
#endif
#include "jni-util.h" #include "jni-util.h"
#ifdef PLATFORM_WINDOWS #ifdef PLATFORM_WINDOWS

4
classpath/java-util-zip.cpp
View File

@ -12,7 +12,11 @@
#include "string.h" #include "string.h"
#include "zlib-custom.h" #include "zlib-custom.h"
#ifdef __APPLE__
# include <JavaVM/jni.h>
#else
# include "jni.h" # include "jni.h"
#endif
#include "jni-util.h" #include "jni-util.h"
extern "C" JNIEXPORT jlong JNICALL extern "C" JNIEXPORT jlong JNICALL

4
classpath/java-util.cpp
View File

@ -9,7 +9,11 @@
details. */ details. */
#include "time.h" #include "time.h"
#ifdef __APPLE__
# include <JavaVM/jni.h>
#else
# include "jni.h" # include "jni.h"
#endif
#include "jni-util.h" #include "jni-util.h"
namespace { namespace {

18
makefile
View File

@ -234,7 +234,7 @@ ifeq ($(platform),darwin)
ar = i686-apple-darwin8-ar ar = i686-apple-darwin8-ar
ranlib = i686-apple-darwin8-ranlib ranlib = i686-apple-darwin8-ranlib
strip = i686-apple-darwin8-strip strip = i686-apple-darwin8-strip
sysroot = /opt/mac/SDKs/MacOSX10.4u.sdk sysroot = /opt/mac/SDKs/MacOSX${OSX_SDK_SYSROOT}.sdk
cflags = -I$(sysroot)/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Headers/ \ cflags = -I$(sysroot)/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Headers/ \
$(common-cflags) -fPIC -fvisibility=hidden -I$(src) $(common-cflags) -fPIC -fvisibility=hidden -I$(src)
else else
@ -257,20 +257,20 @@ ifeq ($(platform),darwin)
ifneq (,$(filter i386 x86_64 arm,$(build-arch))) ifneq (,$(filter i386 x86_64 arm,$(build-arch)))
converter-cflags += -DOPPOSITE_ENDIAN converter-cflags += -DOPPOSITE_ENDIAN
endif endif
openjdk-extra-cflags += -arch ppc -mmacosx-version-min=10.4 openjdk-extra-cflags += -arch ppc -mmacosx-version-min=${OSX_SDK_VERSION}
cflags += -arch ppc -mmacosx-version-min=10.4 cflags += -arch ppc -mmacosx-version-min=${OSX_SDK_VERSION}
asmflags += -arch ppc -mmacosx-version-min=10.4 asmflags += -arch ppc -mmacosx-version-min=${OSX_SDK_VERSION}
lflags += -arch ppc -mmacosx-version-min=10.4 lflags += -arch ppc -mmacosx-version-min=${OSX_SDK_VERSION}
endif endif
ifeq ($(arch),i386) ifeq ($(arch),i386)
ifeq ($(build-arch),powerpc) ifeq ($(build-arch),powerpc)
converter-cflags += -DOPPOSITE_ENDIAN converter-cflags += -DOPPOSITE_ENDIAN
endif endif
openjdk-extra-cflags += -arch i386 -mmacosx-version-min=10.4 openjdk-extra-cflags += -arch i386 -mmacosx-version-min=${OSX_SDK_VERSION}
cflags += -arch i386 -mmacosx-version-min=10.4 cflags += -arch i386 -mmacosx-version-min=${OSX_SDK_VERSION}
asmflags += -arch i386 -mmacosx-version-min=10.4 asmflags += -arch i386 -mmacosx-version-min=${OSX_SDK_VERSION}
lflags += -arch i386 -mmacosx-version-min=10.4 lflags += -arch i386 -mmacosx-version-min=${OSX_SDK_VERSION}
endif endif
ifeq ($(arch),x86_64) ifeq ($(arch),x86_64)

4
src/main.cpp
View File

@ -11,7 +11,11 @@
#include "stdlib.h" #include "stdlib.h"
#include "stdio.h" #include "stdio.h"
#include "string.h" #include "string.h"
#ifdef __APPLE__
# include <JavaVM/jni.h>
#else
# include "jni.h" # include "jni.h"
#endif
#include "system.h" #include "system.h"
#include "finder.h" #include "finder.h"