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

Merge remote branch 'origin/B14038_Lion_appshare' into oss-master

Browse Source
This commit is contained in:
Joel Dice 2011-06-03 17:35:40 -06:00
commit 50a699a08f
8 changed files with 14 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
classpath/java-io.cpp
View File

@ -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

6
classpath/java-lang.cpp
View File

@ -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"

6
classpath/java-net.cpp
View File

@ -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

6
classpath/java-nio.cpp
View File

@ -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

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

@ -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

6
classpath/java-util.cpp
View File

@ -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 {

7
makefile
View File

@ -240,6 +240,12 @@ ifeq ($(arch),arm)
endif
ifeq ($(platform),darwin)
ifeq (${OSX_SDK_SYSROOT},)
OSX_SDK_SYSROOT = 10.4u
endif
ifeq (${OSX_SDK_VERSION},)
OSX_SDK_VERSION = 10.4
endif
ifneq ($(build-platform),darwin)
cxx = i686-apple-darwin8-g++ $(mflag)
cc = i686-apple-darwin8-gcc $(mflag)
@ -251,6 +257,7 @@ ifeq ($(platform),darwin)
$(common-cflags) -fPIC -fvisibility=hidden -I$(src)
else
build-cflags = $(common-cflags) -fPIC -fvisibility=hidden -I$(src)
cflags += -I/System/Library/Frameworks/JavaVM.framework/Headers/
build-lflags += -framework CoreFoundation
endif

6
src/main.cpp
View File

@ -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"