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

fix MSVC build regression

Browse Source
This commit is contained in:
Joel Dice 2012-06-04 09:51:11 -06:00
parent 84034c00a8
commit 9ea6a28383
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
makefile
View File

@ -230,6 +230,8 @@ so-suffix = .so
shared = -shared shared = -shared
no-error = -Wno-error
openjdk-extra-cflags = -fvisibility=hidden openjdk-extra-cflags = -fvisibility=hidden
bootimage-cflags = -DTARGET_BYTES_PER_WORD=$(pointer-size) bootimage-cflags = -DTARGET_BYTES_PER_WORD=$(pointer-size)
@ -506,6 +508,7 @@ ld := $(cc)
build-ld := $(build-cc) build-ld := $(build-cc)
ifdef msvc ifdef msvc
no-error =
windows-path = $(native-path) windows-path = $(native-path)
windows-java-home := $(shell $(windows-path) "$(JAVA_HOME)") windows-java-home := $(shell $(windows-path) "$(JAVA_HOME)")
zlib := $(shell $(windows-path) "$(win32)/msvc") zlib := $(shell $(windows-path) "$(win32)/msvc")
@ -931,7 +934,7 @@ $(vm-cpp-objects): $(build)/%.o: $(src)/%.cpp $(vm-depends)
$(build)/%.o: $(lzma)/C/%.c $(build)/%.o: $(lzma)/C/%.c
@echo "compiling $(@)" @echo "compiling $(@)"
@mkdir -p $(dir $(@)) @mkdir -p $(dir $(@))
$(cxx) $(cflags) -Wno-error -c $$($(windows-path) $(<)) $(call output,$(@)) $(cxx) $(cflags) $(no-error) -c $$($(windows-path) $(<)) $(call output,$(@))
$(vm-asm-objects): $(build)/%-asm.o: $(src)/%.S $(vm-asm-objects): $(build)/%-asm.o: $(src)/%.S
$(compile-asm-object) $(compile-asm-object)
@ -1011,7 +1014,7 @@ $(build)/%-build.o: $(lzma)/C/%.c
@echo "compiling $(@)" @echo "compiling $(@)"
@mkdir -p $(dir $(@)) @mkdir -p $(dir $(@))
$(build-cxx) -DPOINTER_SIZE=$(pointer-size) -O0 -g3 $(build-cflags) \ $(build-cxx) -DPOINTER_SIZE=$(pointer-size) -O0 -g3 $(build-cflags) \
-Wno-error -c $(<) -o $(@) $(no-error) -c $(<) -o $(@)
$(jni-objects): $(build)/%.o: $(classpath-src)/%.cpp $(jni-objects): $(build)/%.o: $(classpath-src)/%.cpp
$(compile-object) $(compile-object)