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

Finally, proper jvm.dll linking for WP8

Browse Source
This commit is contained in:
Alexey Pelykh 2013-01-30 11:31:06 +02:00
parent d51db00136
commit c6694287e9
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
makefile
View File

@ -734,14 +734,12 @@ ifeq ($(platform),wp8)
arflags = -MACHINE:$(machine_type) arflags = -MACHINE:$(machine_type)
lflags = $(common-lflags) -nologo \ lflags = $(common-lflags) -nologo \
-MACHINE:$(machine_type) \ -MACHINE:$(machine_type) \
-LIBPATH:"$(WP80_KIT)\lib\$(w8kit_arch)" -LIBPATH:"$(WIN8_KIT)\Lib\win8\um\$(w8kit_arch)" -LIBPATH:"$(MSVC_ROOT)\lib$(vc_arch)" \ -LIBPATH:"$(WP80_KIT)\lib\$(w8kit_arch)" -LIBPATH:"$(WP80_SDK)\lib$(vc_arch)" -LIBPATH:"$(WIN8_KIT)\Lib\win8\um\$(w8kit_arch)" \
ws2_32.lib \ ws2_32.lib \
"$(shell $(windows-path) "$(wp8)\lib\$(deps_arch)\$(build-type)\zlib.lib")" "$(shell $(windows-path) "$(wp8)\lib\$(deps_arch)\$(build-type)\ThreadEmulation.lib")" "$(shell $(windows-path) "$(wp8)\lib\$(deps_arch)\$(build-type)\zlib.lib")" "$(shell $(windows-path) "$(wp8)\lib\$(deps_arch)\$(build-type)\ThreadEmulation.lib")"
lflags += -NXCOMPAT -DYNAMICBASE -SUBSYSTEM:CONSOLE -TLBID:1 lflags += -NXCOMPAT -DYNAMICBASE -SUBSYSTEM:CONSOLE -TLBID:1
lflags += -NODEFAULTLIB:"ole32.lib" WindowsPhoneCore.lib lflags += -NODEFAULTLIB:"ole32.lib" -NODEFAULTLIB:"kernel32.lib"
lflags += -WINMD -WINMDFILE:$(subst $(so-suffix),.winmd,$(@)) lflags += PhoneAppModelHost.lib WindowsPhoneCore.lib -WINMD -WINMDFILE:$(subst $(so-suffix),.winmd,$(@))
#lflags += -WINMD:NO
#lflags += -APPCONTAINER
cc = $(cxx) cc = $(cxx)
asm-format = masm asm-format = masm

2
src/machine.h
View File

@ -2695,7 +2695,7 @@ throw_(Thread* t, object e)
t->exception = e; t->exception = e;
// printTrace(t, e); printTrace(t, e);
popResources(t); popResources(t);