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

Merge branch 'master' of dice:git/vm

Browse Source
This commit is contained in:
Joel Dice 2007-10-26 18:05:02 -06:00
commit 8e1637ec6b
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classpath/classpath.cpp
View File

@ -10,6 +10,7 @@
extern "C" { extern "C" {
#ifndef __APPLE__
extern const uint8_t SYMBOL(start)[]; extern const uint8_t SYMBOL(start)[];
extern const uint8_t SYMBOL(size)[]; extern const uint8_t SYMBOL(size)[];
@ -19,5 +20,6 @@ extern "C" {
*size = reinterpret_cast<uintptr_t>(SYMBOL(size)); *size = reinterpret_cast<uintptr_t>(SYMBOL(size));
return SYMBOL(start); return SYMBOL(start);
} }
#endif
} // extern "C" } // extern "C"

14
makefile
View File

@ -33,9 +33,6 @@ input = $(test-build)/Hello.class
build-cxx = g++ build-cxx = g++
build-cc = gcc build-cc = gcc
pthread = -pthread
lpthread = -lpthread
cxx = $(build-cxx) cxx = $(build-cxx)
cc = $(build-cc) cc = $(build-cc)
ar = ar ar = ar
@ -59,13 +56,13 @@ common-cflags = $(warnings) -fno-rtti -fno-exceptions \
-D__STDC_LIMIT_MACROS -D_JNI_IMPLEMENTATION_ -D__STDC_LIMIT_MACROS -D_JNI_IMPLEMENTATION_
build-cflags = $(common-cflags) -fPIC -fvisibility=hidden \ build-cflags = $(common-cflags) -fPIC -fvisibility=hidden \
-I$(JAVA_HOME)/include/linux -I$(src) $(pthread) -I$(JAVA_HOME)/include/linux -I$(src) -pthread
cflags = $(build-cflags) cflags = $(build-cflags)
common-lflags = -lm -lz common-lflags = -lm -lz
lflags = $(common-lflags) $(lpthread) -ldl -rdynamic lflags = $(common-lflags) -lpthread -ldl -rdynamic
system = posix system = posix
asm = x86 asm = x86
@ -81,8 +78,9 @@ ifeq ($(arch),i386)
endif endif
ifeq ($(platform),darwin) ifeq ($(platform),darwin)
build-cflags = $(common-cflags) -fPIC -fvisibility=hidden \
-I$(JAVA_HOME)/include/linux -I$(src)
lflags = $(common-lflags) -ldl lflags = $(common-lflags) -ldl
objcopy = gobjcopy
endif endif
ifeq ($(platform),windows) ifeq ($(platform),windows)
@ -190,6 +188,10 @@ classpath-classes = \
$(call java-classes,$(classpath-sources),$(classpath),$(classpath-build)) $(call java-classes,$(classpath-sources),$(classpath),$(classpath-build))
classpath-object = $(native-build)/classpath-jar.o classpath-object = $(native-build)/classpath-jar.o
ifeq ($(platform),darwin)
classpath-object =
endif
test-sources = $(shell find $(test) -name '*.java') test-sources = $(shell find $(test) -name '*.java')
test-classes = $(call java-classes,$(test-sources),$(test),$(test-build)) test-classes = $(call java-classes,$(test-sources),$(test),$(test-build))