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

Merge branch 'master' of dice:git/vm

Browse Source 
Conflicts:

	makefile
This commit is contained in:
Joel Dice 2007-10-26 15:03:53 -06:00
commit 476a0d70f2
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
makefile
View File

@ -82,6 +82,7 @@ endif
ifeq ($(platform),darwin) ifeq ($(platform),darwin)
lflags = $(common-lflags) -ldl lflags = $(common-lflags) -ldl
objcopy = gobjcopy
endif endif
ifeq ($(platform),windows) ifeq ($(platform),windows)
@ -280,7 +281,7 @@ $(driver-object): $(native-build)/%.o: $(src)/%.cpp
$(build)/classpath.jar: $(classpath-classes) $(build)/classpath.jar: $(classpath-classes)
(wd=$$(pwd); \ (wd=$$(pwd); \
cd $(classpath-build); \ cd $(classpath-build); \
$(jar) c0f $${wd}/$(@) $$(find -name '*.class')) $(jar) c0f $${wd}/$(@) $$(find . -name '*.class'))
$(classpath-object): $(build)/classpath.jar $(classpath-object): $(build)/classpath.jar
(wd=$$(pwd); \ (wd=$$(pwd); \