mirror of
https://github.com/corda/corda.git
synced 2025-03-17 17:45:17 +00:00
Revert "OSX Lion build changes"
This commit introduced conditional includes which is not the preferred method. Will do it in the makefile instead. This reverts commit 7148556979793c56e69dabf7e31813930a0e979a.
This commit is contained in:
parent
7148556979
commit
c7c0a45a61
@ -15,11 +15,7 @@
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#ifdef __APPLE__
|
||||
# include <JavaVM/jni.h>
|
||||
#else
|
||||
# include "jni.h"
|
||||
#endif
|
||||
#include "jni.h"
|
||||
#include "jni-util.h"
|
||||
|
||||
#ifdef PLATFORM_WINDOWS
|
||||
|
@ -13,11 +13,7 @@
|
||||
#include "time.h"
|
||||
#include "string.h"
|
||||
#include "stdio.h"
|
||||
#ifdef __APPLE__
|
||||
# include <JavaVM/jni.h>
|
||||
#else
|
||||
# include "jni.h"
|
||||
#endif
|
||||
#include "jni.h"
|
||||
#include "jni-util.h"
|
||||
#include "errno.h"
|
||||
#include "fcntl.h"
|
||||
|
@ -8,11 +8,7 @@
|
||||
There is NO WARRANTY for this software. See license.txt for
|
||||
details. */
|
||||
|
||||
#ifdef __APPLE__
|
||||
# include <JavaVM/jni.h>
|
||||
#else
|
||||
# include "jni.h"
|
||||
#endif
|
||||
#include "jni.h"
|
||||
#include "jni-util.h"
|
||||
|
||||
#ifdef PLATFORM_WINDOWS
|
||||
|
@ -13,11 +13,7 @@
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#ifdef __APPLE__
|
||||
# include <JavaVM/jni.h>
|
||||
#else
|
||||
# include "jni.h"
|
||||
#endif
|
||||
#include "jni.h"
|
||||
#include "jni-util.h"
|
||||
|
||||
#ifdef PLATFORM_WINDOWS
|
||||
|
@ -12,11 +12,7 @@
|
||||
#include "string.h"
|
||||
#include "zlib-custom.h"
|
||||
|
||||
#ifdef __APPLE__
|
||||
# include <JavaVM/jni.h>
|
||||
#else
|
||||
# include "jni.h"
|
||||
#endif
|
||||
#include "jni.h"
|
||||
#include "jni-util.h"
|
||||
|
||||
extern "C" JNIEXPORT jlong JNICALL
|
||||
|
@ -9,11 +9,7 @@
|
||||
details. */
|
||||
|
||||
#include "time.h"
|
||||
#ifdef __APPLE__
|
||||
# include <JavaVM/jni.h>
|
||||
#else
|
||||
# include "jni.h"
|
||||
#endif
|
||||
#include "jni.h"
|
||||
#include "jni-util.h"
|
||||
|
||||
namespace {
|
||||
|
18
makefile
18
makefile
@ -234,7 +234,7 @@ ifeq ($(platform),darwin)
|
||||
ar = i686-apple-darwin8-ar
|
||||
ranlib = i686-apple-darwin8-ranlib
|
||||
strip = i686-apple-darwin8-strip
|
||||
sysroot = /opt/mac/SDKs/MacOSX${OSX_SDK_SYSROOT}.sdk
|
||||
sysroot = /opt/mac/SDKs/MacOSX10.4u.sdk
|
||||
cflags = -I$(sysroot)/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Headers/ \
|
||||
$(common-cflags) -fPIC -fvisibility=hidden -I$(src)
|
||||
else
|
||||
@ -257,20 +257,20 @@ ifeq ($(platform),darwin)
|
||||
ifneq (,$(filter i386 x86_64 arm,$(build-arch)))
|
||||
converter-cflags += -DOPPOSITE_ENDIAN
|
||||
endif
|
||||
openjdk-extra-cflags += -arch ppc -mmacosx-version-min=${OSX_SDK_VERSION}
|
||||
cflags += -arch ppc -mmacosx-version-min=${OSX_SDK_VERSION}
|
||||
asmflags += -arch ppc -mmacosx-version-min=${OSX_SDK_VERSION}
|
||||
lflags += -arch ppc -mmacosx-version-min=${OSX_SDK_VERSION}
|
||||
openjdk-extra-cflags += -arch ppc -mmacosx-version-min=10.4
|
||||
cflags += -arch ppc -mmacosx-version-min=10.4
|
||||
asmflags += -arch ppc -mmacosx-version-min=10.4
|
||||
lflags += -arch ppc -mmacosx-version-min=10.4
|
||||
endif
|
||||
|
||||
ifeq ($(arch),i386)
|
||||
ifeq ($(build-arch),powerpc)
|
||||
converter-cflags += -DOPPOSITE_ENDIAN
|
||||
endif
|
||||
openjdk-extra-cflags += -arch i386 -mmacosx-version-min=${OSX_SDK_VERSION}
|
||||
cflags += -arch i386 -mmacosx-version-min=${OSX_SDK_VERSION}
|
||||
asmflags += -arch i386 -mmacosx-version-min=${OSX_SDK_VERSION}
|
||||
lflags += -arch i386 -mmacosx-version-min=${OSX_SDK_VERSION}
|
||||
openjdk-extra-cflags += -arch i386 -mmacosx-version-min=10.4
|
||||
cflags += -arch i386 -mmacosx-version-min=10.4
|
||||
asmflags += -arch i386 -mmacosx-version-min=10.4
|
||||
lflags += -arch i386 -mmacosx-version-min=10.4
|
||||
endif
|
||||
|
||||
ifeq ($(arch),x86_64)
|
||||
|
@ -11,11 +11,7 @@
|
||||
#include "stdlib.h"
|
||||
#include "stdio.h"
|
||||
#include "string.h"
|
||||
#ifdef __APPLE__
|
||||
# include <JavaVM/jni.h>
|
||||
#else
|
||||
# include "jni.h"
|
||||
#endif
|
||||
#include "jni.h"
|
||||
|
||||
#include "system.h"
|
||||
#include "finder.h"
|
||||
|
Loading…
x
Reference in New Issue
Block a user