ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-11 05:12:09 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'master' of dice:git/vm

Browse Source 
Conflicts:

	src/interpret.cpp
This commit is contained in:
Joel Dice 2007-10-25 09:05:24 -06:00
commit 2de0decfe3
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
makefile
View File

@ -33,6 +33,9 @@ test = test
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
@ -54,18 +57,19 @@ common-cflags = $(warnings) -fno-rtti -fno-exceptions \
-I$(JAVA_HOME)/include -idirafter $(src) -I$(bld) -D__STDC_LIMIT_MACROS \ -I$(JAVA_HOME)/include -idirafter $(src) -I$(bld) -D__STDC_LIMIT_MACROS \
-DBUILTIN_LIBRARIES=\"natives,tlscontext,scaler\" -D_JNI_IMPLEMENTATION_ -DBUILTIN_LIBRARIES=\"natives,tlscontext,scaler\" -D_JNI_IMPLEMENTATION_
cflags = $(common-cflags) -fPIC -fvisibility=hidden \
-I$(JAVA_HOME)/include/linux -I$(src) -pthread
lflags = -lpthread -ldl -lm -lz
system = posix system = posix
asm = x86 asm = x86
begin-merge-archive = -Wl,--whole-archive
end-merge-archive = -Wl,--no-whole-archive
ifeq ($(platform),darwin) ifeq ($(platform),darwin)
rdynamic = rdynamic =
thread-cflags = thread-cflags =
shared = -dynamiclib shared = -dynamiclib
pthread =
lpthread =
begin-merge-archive = -Wl,-all_load
end-merge-archive =
endif endif
ifeq ($(platform),windows) ifeq ($(platform),windows)
inc = /usr/local/win32/include inc = /usr/local/win32/include
@ -84,6 +88,11 @@ ifeq ($(platform),windows)
cflags = $(common-cflags) -I$(inc) cflags = $(common-cflags) -I$(inc)
endif endif
cflags = $(common-cflags) -fPIC -fvisibility=hidden \
-I$(JAVA_HOME)/include/linux -I$(src) $(pthread)
lflags = $(lpthread) -ldl -lm -lz
ifeq ($(mode),debug) ifeq ($(mode),debug)
cflags += -O0 -g3 cflags += -O0 -g3
endif endif
@ -281,7 +290,7 @@ endif
$(executable): $(archive) $(driver-objects) $(executable): $(archive) $(driver-objects)
@echo "linking $(@)" @echo "linking $(@)"
$(cc) -Wl,--whole-archive $(^) -Wl,--no-whole-archive \ $(cc) $(begin-merge-archive) $(^) $(end-merge-archive) \
$(lflags) $(rdynamic) -o $(@) $(lflags) $(rdynamic) -o $(@)
@$(strip) --strip-all $(@) @$(strip) --strip-all $(@)
@$(show-size) $(@) @$(show-size) $(@)